From 153144cbee10bb4999242bc62358ffe63ca9ceb9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 07 Jul 2020 09:30:04 +0800
Subject: [PATCH] update
---
src/main/webapp/view/uavchannelnew.jsp | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/view/uavchannelnew.jsp b/src/main/webapp/view/uavchannelnew.jsp
index c28a50e..5ee91b2 100644
--- a/src/main/webapp/view/uavchannelnew.jsp
+++ b/src/main/webapp/view/uavchannelnew.jsp
@@ -78,7 +78,6 @@
position: absolute;
z-index: 1;
width: 120px;
- /*height: 30px;*/
right: 100px;
bottom: 5px;
font-size: 18px;
@@ -88,8 +87,6 @@
#form {
position: absolute;
z-index: 1;
- /* width: 300px;
- height: 50px;*/
right: 400px;
bottom: 5px;
font-size: 18px;
@@ -332,11 +329,7 @@
}
});
var point = new BMap.Point(lon2, lat2);
- var hashMap = new Map();
- hashMap.set("time", time);
- hashMap.set("point", point);
- hashMap.set("heigh", heigh);
- hashMap.set("concentration", concentration);
+ var hashMap = {"time":time,"point":point,"heigh":heigh,"concentration":concentration};
if (heigh > 0 && heigh <= 20) {
trackPointsOne.push(hashMap);
} else if (heigh >= 21 && heigh <= 40) {
@@ -407,10 +400,10 @@
function addMarkers(arry) {
$.each(arry, function (item, value) {
var myIcon = new BMap.Icon('/img/uav_red.png', new BMap.Size(50, 50));
- var time = value.get("time");
- var heigh = value.get("heigh");
- var concentration = value.get("concentration");
- var point = value.get("point");
+ var time = value["time"];
+ var heigh = value["heigh"];
+ var concentration = value["concentration"];
+ var point = value["point"];
var marker = new BMap.Marker(point, {icon: myIcon});
map.addOverlay(marker);
var lon = marker.getPosition().lng;
@@ -450,9 +443,9 @@
function getPoints(arry) {
var points = [];
$.each(arry, function (item, value) {
- var point = value.get("point");
+ var point = value["point"];
points.push(point);
});
return points;
}
-</script>
+</script>
\ No newline at end of file
--
Gitblit v1.8.0