From 4c872cea75d5b3c3832f0f0796ba727e8f91168d Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 21 Oct 2020 15:03:50 +0800
Subject: [PATCH] 增加获取单台设备五分钟平均值以及沧州环保局下属设备只显示十个参数
---
src/main/webapp/view/uavchannelnew.jsp | 78 +++++++++++++++++---------------------
1 files changed, 35 insertions(+), 43 deletions(-)
diff --git a/src/main/webapp/view/uavchannelnew.jsp b/src/main/webapp/view/uavchannelnew.jsp
index 792d071..2895664 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;
@@ -103,7 +100,7 @@
</head>
<body>
-<div id="data" style="display:block">
+<div id="data" style="display:none">
<%--������������������--%>
<table id="tab" style="border:1px solid black;width: 280px">
</table>
@@ -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) {
@@ -356,35 +349,34 @@
if (trackPoints.length == 0) {
showNoDroppoint();
}
- $(function () {
- var points = getPoints(trackPoints);
- map.centerAndZoom(points, 17);// ������������������������������������
- map.setViewport(points);// ������������������������������������������������������
- listen(trackPoints);
- $("#form").change(function () {
- map.clearOverlays();
- var result = [];
- $('input:checkbox:checked').each(function () {
- var val = $(this).val();
- if (val == "one") {
- getResult(result, trackPointsOne);
- } else if (val == "two") {
- getResult(result, trackPointsTwo);
- } else if (val == "three") {
- getResult(result, trackPointsThree);
- } else if (val == "four") {
- getResult(result, trackPointsFour);
- } else if (val == "five") {
- getResult(result, trackPointsFive);
- }
- });
- var zoom = map.getZoom();
- if (zoom > 17) {
- addMarkers(result);
+
+ var points = getPoints(trackPoints);
+ map.centerAndZoom(points, 17);// ������������������������������������
+ map.setViewport(points);// ������������������������������������������������������
+ listen(trackPoints);
+ $("#form").change(function () {
+ map.clearOverlays();
+ var result = [];
+ $('input:checkbox:checked').each(function () {
+ var val = $(this).val();
+ if (val == "one") {
+ getResult(result, trackPointsOne);
+ } else if (val == "two") {
+ getResult(result, trackPointsTwo);
+ } else if (val == "three") {
+ getResult(result, trackPointsThree);
+ } else if (val == "four") {
+ getResult(result, trackPointsFour);
+ } else if (val == "five") {
+ getResult(result, trackPointsFive);
}
- addPolygon(getPoints(result));
- listen(result);
});
+ var zoom = map.getZoom();
+ if (zoom > 17) {
+ addMarkers(result);
+ }
+ addPolygon(getPoints(result));
+ listen(result);
});
function getResult(result, arry) {
@@ -408,17 +400,17 @@
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;
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 == "") {
@@ -451,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