From e745dd38c5a413eaa000c7c5434621fbcd1800d5 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 23 Dec 2020 13:55:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/view/uavchannelnew.jsp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/view/uavchannelnew.jsp b/src/main/webapp/view/uavchannelnew.jsp
index 5ee91b2..2895664 100644
--- a/src/main/webapp/view/uavchannelnew.jsp
+++ b/src/main/webapp/view/uavchannelnew.jsp
@@ -329,7 +329,7 @@
}
});
var point = new BMap.Point(lon2, lat2);
- var hashMap = {"time":time,"point":point,"heigh":heigh,"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) {
@@ -410,7 +410,7 @@
var lat = marker.getPosition().lat;
var opts = {
width: 200, // ������������������
- height: 100, // ������������������
+ height: 100 // ������������������
}
var infoWindow = new BMap.InfoWindow("������: " + time + "</br>������: " + lon.toFixed(4) + "��</br>������: " + lat.toFixed(4) + "��</br>������: " + heigh + "m</br>" + description + ": " + concentration + unit, opts); // ������������������������
if (heigh == "") {
--
Gitblit v1.8.0