From 17c9b0305aaf3f48ea090e14dbcc3e6ab4f399c2 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 15 Aug 2019 17:24:51 +0800
Subject: [PATCH] 新增页面无人机查询最大值和最小值的功能
---
src/main/webapp/view/uavTrajectory.jsp | 113 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 73 insertions(+), 40 deletions(-)
diff --git a/src/main/webapp/view/uavTrajectory.jsp b/src/main/webapp/view/uavTrajectory.jsp
index 7196543..d076c38 100644
--- a/src/main/webapp/view/uavTrajectory.jsp
+++ b/src/main/webapp/view/uavTrajectory.jsp
@@ -77,7 +77,7 @@
.BMap_pop img {
top: 45px !important;
- left: 220px !important;
+ left: 420px !important;
}
.BMap_pop div:nth-child(1) div {
@@ -126,8 +126,9 @@
style: "normal" // ������������������������������
};
var params = $.parseJSON($("#uavTrajectoryParams").html());
- moralMap['params'] = params;
var sensorInfo = params["sensorInfo"];
+ var sensorInfoMin = params["sensorInfoMin"];
+ var sensorInfoMax = params["sensorInfoMax"];
//var map = new BMap.Map("mapCanvas", defaultParam);
var map = new BMap.Map("mapCanvas", {enableMapClick: false});
map.setCurrentCity("������");
@@ -144,8 +145,8 @@
}
var trackPoints = []; //���������������������������������������������������������������
var coincidentPoints = new Array();
- var flyingParameters=['������','������','������','������x','������y','������z'];
- var monitorParameters=['PM2.5','PM10','������������','������������','������������','������','VOCs������','������','������','������','���������'];
+ var flyingParameters = ['������', '������', '������', '������x', '������y', '������z'];
+ var monitorParameters = ['PM2.5', 'PM10', '������������', '������������', '������������', '������', 'VOCs������', '������', '������', '������', '���������'];
if (sensorInfo.length > 0) {
$.each(sensorInfo, function (item, value) {
if (typeof (value.������) == "undefined") {
@@ -155,8 +156,12 @@
}
})
for (var i = 0; i < trackPoints.length; i++) {
- var flyingData=[];
- var monitorData=[];
+ var flyingData = [];
+ var monitorData = [];
+ var flyingDataMin = [];
+ var monitorDataMin = [];
+ var flyingDataMax = [];
+ var monitorDataMax = [];
var startPoint = trackPoints[i];
var endPoint = trackPoints[i + 1];
var marker;
@@ -235,14 +240,14 @@
var winfowText =
'<div style="min-height:20px;overflow:auto;max-height:400px;" >';
var opts = {
- width: 220,
- title: '<h4>���������'+sensorInfo[i].������+'</h4>', // ������������������
+ width: 420,
+ title: '<h4>���������' + sensorInfo[i].������ + '</h4>', // ������������������
enableMessage: false, //���������������������������������
}
var optsCoincide = {
width: 220,
- title: '<h4>������������������</h4>', // ������������������
+ title: '<h4>���������������������</h4>', // ������������������
enableMessage: false, //���������������������������������
}
@@ -251,7 +256,7 @@
if (distance <= 1.9) {
if (coincidentPoints.indexOf(i) == -1) {
coincidentPoints.push(i);
- winfowText +='<p id="' + i + '" onclick="openInfo(this)" onmousemove="red(this.id)" onmouseout="black(this.id)">' + "���������" + sensorInfo[i].������ + "</p>";
+ winfowText += '<p id="' + i + '" onclick="openInfo(this)" onmousemove="red(this.id)" onmouseout="black(this.id)">' + "���������" + sensorInfo[i].������ + "</p>";
}
coincidentPoints.push(j);
count++;
@@ -260,21 +265,25 @@
winfowText += winfowTextAdd;
}
}
- var monitorDataResult=monitorDataSort(sensorInfo[i],monitorData,monitorParameters);
- var flyingDataResult=flyingDataSort(sensorInfo[i],flyingData,flyingParameters);
+ var monitorDataResult = monitorDataSort(sensorInfo[i], monitorData, monitorParameters);
+ var flyingDataResult = flyingDataSort(sensorInfo[i], flyingData, flyingParameters);
+ var monitorSensorsCount = -1;
+ var flyingSensorsCount = -1;
if (coincidentPoints.indexOf(i) > -1) {
winfowText = winfowText + "</div>";
} else {
- winfowText +='<h4 style="background-color: #CD5C5C;color:white">������������������</h4>';
+ winfowText += '<h4 style="background-color: #CD5C5C;color:white;margin-bottom: 1px">������������������</h4>';
for (var prop in monitorDataResult) {
if (monitorDataResult.hasOwnProperty(prop)) {
- winfowText += (prop + "���" + monitorDataResult[prop] + "</br>");
+ monitorSensorsCount++;
+ winfowText += ("<p style='height: 22px;line-height: 22px'>" + prop + "���" + monitorDataResult[prop] + '<input id="a' + i + monitorSensorsCount + '" class="' + i + '" type="button" value="���������" onclick="showMonitorMinOrMax(this,sensorInfoMin,monitorDataMin,monitorParameters)" style="width:80px;display: inline-block;position: absolute;right:120px"/><span id="aa' + i + monitorSensorsCount + '" style="width:80px;display: none;position: absolute;right:120px;text-align: center"></span><input id="b' + i + monitorSensorsCount + '" class="' + i + '" type="button" value="���������" onclick="showMonitorMinOrMax(this,sensorInfoMax,monitorDataMax,monitorParameters)" style="width:80px;display: inline-block;position: absolute;right:25px"/><span id="bb' + i + monitorSensorsCount + '" style="width:80px;display: none;position: absolute;right:25px;text-align: center"></span>' + "</p>");
}
}
- winfowText +='<h4 style="background-color: #66CD00;color:white">������������������</h4>';
+ winfowText += '<h4 style="background-color: #66CD00;color:white;margin-bottom: 1px">������������������</h4>';
for (var prop in flyingDataResult) {
if (flyingDataResult.hasOwnProperty(prop)) {
- winfowText += (prop + "���" + flyingDataResult[prop] + "</br>");
+ flyingSensorsCount++;
+ winfowText += ("<p style='height: 22px;line-height: 22px'>" + prop + "���" + flyingDataResult[prop] + '<input id="c' + i + flyingSensorsCount + '" class="' + i + '" type="button" value="���������" onclick="showFlyingMinOrMax(this,sensorInfoMin,flyingDataMin,flyingParameters)" style="width:80px;display: inline-block;position: absolute;right:120px"/><span id="cc' + i + flyingSensorsCount + '" style="width:80px;display: none;position: absolute;right:120px;text-align: center"></span><input id="d' + i + flyingSensorsCount + '" class="' + i + '" type="button" value="���������" onclick="showFlyingMinOrMax(this,sensorInfoMax,flyingDataMax,flyingParameters)" style="width:80px;display: inline-block;position: absolute;right:25px"/><span id="dd' + i + flyingSensorsCount + '" style="width:80px;display: none;position: absolute;right:25px;text-align: center"></span>' + "</p>");
}
}
winfowText += "</div>";
@@ -283,7 +292,7 @@
(function (x) {
if (coincidentPoints.indexOf(i) > -1) {
var infoWindow = new BMap.InfoWindow(winfowText, optsCoincide);
- }else{
+ } else {
var infoWindow = new BMap.InfoWindow(winfowText, opts);
}
marker.addEventListener("click", function () {
@@ -293,28 +302,36 @@
function openInfo(e) {
var point = new BMap.Point(sensorInfo[e.id].������.substr(0, sensorInfo[e.id].������.length - 1), sensorInfo[e.id].������.substr(0, sensorInfo[e.id].������.length - 1));
- var flyingData=[];
- var monitorData=[];
- var monitorDataCoincide=monitorDataSort(sensorInfo[e.id],monitorData,monitorParameters);
- var flyingDataCoincide=flyingDataSort(sensorInfo[e.id],flyingData,flyingParameters);
+ var flyingData = [];
+ var monitorData = [];
+ var flyingDataMin = [];
+ var monitorDataMin = [];
+ var flyingDataMax = [];
+ var monitorDataMax = [];
+ var monitorDataCoincide = monitorDataSort(sensorInfo[e.id], monitorData, monitorParameters);
+ var flyingDataCoincide = flyingDataSort(sensorInfo[e.id], flyingData, flyingParameters);
var winfowText1 =
'<div style="min-height:20px;overflow:auto;max-height:400px;" >';
- winfowText1 +='<h4 style="background-color: #CD5C5C;color:white">������������������</h4>';
+ winfowText1 += '<h4 style="background-color: #CD5C5C;color:white;margin-bottom: 1px">������������������</h4>';
+ var monitorSensorsCoincideCount = -1;
+ var flyingSensorsCoincideCount = -1;
for (var prop in monitorDataCoincide) {
if (monitorDataCoincide.hasOwnProperty(prop)) {
- winfowText1 += (prop + "���" + monitorDataCoincide[prop] + "</br>");
+ monitorSensorsCoincideCount++;
+ winfowText1 += ("<p style='height: 22px;line-height: 22px'>" + prop + "���" + monitorDataCoincide[prop] + '<input id="e' + e.id + monitorSensorsCoincideCount + '" class="' + e.id + '" type="button" value="���������" onclick="showMonitorMinOrMax(this,sensorInfoMin,monitorDataMin,monitorParameters)" style="width:80px;display: inline-block;position: absolute;right:120px"/><span id="ee' + e.id + monitorSensorsCoincideCount + '" style="width:80px;display: none;position: absolute;right:120px;text-align: center"></span><input id="f' + e.id + monitorSensorsCoincideCount + '" class="' + e.id + '" type="button" value="���������" onclick="showMonitorMinOrMax(this,sensorInfoMax,monitorDataMax,monitorParameters)" style="width:80px;display: inline-block;position: absolute;right:25px"/><span id="ff' + e.id + monitorSensorsCoincideCount + '" style="width:80px;display: none;position: absolute;right:25px;text-align: center"></span>' + "</p>");
}
}
- winfowText1 +='<h4 style="background-color: #66CD00;color:white">������������������</h4>';
+ winfowText1 += '<h4 style="background-color: #66CD00;color:white;margin-bottom: 1px">������������������</h4>';
for (var prop in flyingDataCoincide) {
if (flyingDataCoincide.hasOwnProperty(prop)) {
- winfowText1 += (prop + "���" + flyingDataCoincide[prop] + "</br>");
+ flyingSensorsCoincideCount++;
+ winfowText1 += ("<p style='height: 22px;line-height: 22px'>" + prop + "���" + flyingDataCoincide[prop] + '<input id="g' + e.id + flyingSensorsCoincideCount + '" class="' + e.id + '" type="button" value="���������" onclick="showFlyingMinOrMax(this,sensorInfoMin,flyingDataMin,flyingParameters)" style="width:80px;display: inline-block;position: absolute;right:120px"/><span id="gg' + e.id + flyingSensorsCoincideCount + '" style="width:80px;display: none;position: absolute;right:120px;text-align: center"></span><input id="h' + e.id + flyingSensorsCoincideCount + '" class="' + e.id + '" type="button" value="���������" onclick="showFlyingMinOrMax(this,sensorInfoMax,flyingDataMax,flyingParameters)" style="width:80px;display: inline-block;position: absolute;right:25px"/><span id="hh' + e.id + flyingSensorsCoincideCount + '" style="width:80px;display: none;position: absolute;right:25px;text-align: center"></span>' + "</p>");
}
}
winfowText1 += "</div>";
var optsCoincideChild = {
- width: 220,
- title: '<h4>���������'+sensorInfo[e.id].������+'</h4>', // ������������������
+ width: 420,
+ title: '<h4>���������' + sensorInfo[e.id].������ + '</h4>', // ������������������
enableMessage: false, //���������������������������������
}
var infoWindow1 = new BMap.InfoWindow(winfowText1, optsCoincideChild);
@@ -334,27 +351,43 @@
function openInfoWindow() {
map.openInfoWindow.apply(map, arguments); //������������������
}
-
- function monitorDataSort(sensorMap,monitorData,monitorParameters) {
- for(var j = 0; j < monitorParameters.length; j++) {
- $.map(sensorMap,function(value,key){
- if (monitorParameters[j]==key) {
- monitorData[key]=sensorMap[key];
+
+ function monitorDataSort(sensorMap, monitorData, monitorParameters) {
+ for (var j = 0; j < monitorParameters.length; j++) {
+ $.map(sensorMap, function (value, key) {
+ if (monitorParameters[j] == key) {
+ monitorData[key] = sensorMap[key];
}
});
}
return monitorData;
}
- function flyingDataSort(sensorMap,flyingData,flyingParameters) {
- for(var k = 0; k < flyingParameters.length; k++) {
- $.map(sensorMap,function(value,key){
- if (flyingParameters[k]==key) {
- flyingData[key]=sensorMap[key];
+ function flyingDataSort(sensorMap, flyingData, flyingParameters) {
+ for (var k = 0; k < flyingParameters.length; k++) {
+ $.map(sensorMap, function (value, key) {
+ if (flyingParameters[k] == key) {
+ flyingData[key] = sensorMap[key];
}
});
}
return flyingData;
+ }
+
+ function showMonitorMinOrMax(e, sensorInfoMinOrMax, monitorDataMinOrMax, monitorParameters) {
+ var i = $("#" + e.id).attr('class');
+ var monitorDataResultMinOrMax = monitorDataSort(sensorInfoMinOrMax[i], monitorDataMinOrMax, monitorParameters);
+ $("#" + e.id).hide();
+ $("#" + e.id.substr(0, 1) + e.id).html(monitorDataResultMinOrMax[monitorParameters[e.id.substr(1 + i.length, e.id.length)]]);
+ $("#" + e.id.substr(0, 1) + e.id).show();
+ }
+
+ function showFlyingMinOrMax(e, sensorInfoMinOrMax, flyingDataMinOrMax, flyingParameters) {
+ var i = $("#" + e.id).attr('class');
+ var flyingDataResultMinOrMax = flyingDataSort(sensorInfoMinOrMax[i], flyingDataMinOrMax, flyingParameters);
+ $("#" + e.id).hide();
+ $("#" + e.id.substr(0, 1) + e.id).html(flyingDataResultMinOrMax[flyingParameters[e.id.substr(1 + i.length, e.id.length)]]);
+ $("#" + e.id.substr(0, 1) + e.id).show();
}
if (count > 0) {
@@ -377,8 +410,8 @@
});
map.addOverlay(lab);
}
- if(count==0){
- var lab=new BMap.Label(count + 1, {position: startPoint, offset: new BMap.Size(-7,-22)});
+ if (count == 0) {
+ var lab = new BMap.Label(count + 1, {position: startPoint, offset: new BMap.Size(-7, -22)});
lab.setStyle({
color: "#fff",
fontSize: "16px",
--
Gitblit v1.8.0