From e34d88ad7d3d950da12f032e6932ba14f868db72 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 21 Aug 2019 10:22:50 +0800
Subject: [PATCH] 修改大屏无人机地图弹窗显示不全问题，设置可拖动
---
src/main/webapp/view/uavTrajectory.jsp | 102 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 68 insertions(+), 34 deletions(-)
diff --git a/src/main/webapp/view/uavTrajectory.jsp b/src/main/webapp/view/uavTrajectory.jsp
index 94f69a1..b029cf9 100644
--- a/src/main/webapp/view/uavTrajectory.jsp
+++ b/src/main/webapp/view/uavTrajectory.jsp
@@ -63,20 +63,18 @@
.BMap_bubble_title {
color: white;
- font-size: 13px;
- font-weight: bold;
- text-align: left;
- padding: 5px 5px 0 5px;
+ padding: 0 5px 0 5px;
background-color: #2DA0EB;
}
.BMap_bubble_content {
background-color: white;
- padding: 5px 5px 10px 5px;
+ padding: 5px;
}
- .BMap_pop img {
- top: 45px !important;
+ .BMap_pop > img {
+ top: 42px !important;
+ margin-left: -10px;
}
.BMap_pop div:nth-child(1) div {
@@ -255,6 +253,7 @@
var sensorInfo = params["sensorInfo"];
var sensorInfoMin = params["sensorInfoMin"];
var sensorInfoMax = params["sensorInfoMax"];
+ var sensorsMap = params['sensorsMap'];
//var map = new BMap.Map("mapCanvas", defaultParam);
var map = new BMap.Map("mapCanvas", {enableMapClick: false});
map.setCurrentCity("������");
@@ -271,15 +270,15 @@
}
var trackPoints = []; //���������������������������������������������������������������
var coincidentPoints = new Array();
- var flyingParameters = ['������', '������', '������', '������x', '������y', '������z'];
- var monitorParameters = ['PM2.5', 'PM10', '������������', '������������', '������������', '������', 'VOCs������', '������', '������', '������', '���������'];
+ var flyingParameters = ['e76', 'e77', 'e78', 'e79', 'e80', 'e81'];
+ var monitorParameters = ['e1', 'e2', 'e10', 'e11', 'e16', 'e15', 'e17', 'e28', 'e7', 'e6', 'e82'];
if (sensorInfo.length > 0) {
$.each(sensorInfo, function (item, value) {
- if (typeof (value.������) == "undefined") {
+ if (typeof (value.e76) == "undefined") {
showNoFlightTrajectory();
} else {
- var lon = parseFloat(value.������.substr(0, value.������.length - 1));
- var lat = parseFloat(value.������.substr(0, value.������.length - 1));
+ var lon = parseFloat(value.e76.substr(0, value.e76.length - 1));
+ var lat = parseFloat(value.e77.substr(0, value.e77.length - 1));
var lon1 = GPS.gcj_encrypt(lat, lon).lon;
var lat1 = GPS.gcj_encrypt(lat, lon).lat;
var lon2 = GPS.bd_encrypt(lat1, lon1).lon;
@@ -371,16 +370,16 @@
}
var count = 0;
var winfowText =
- '<div style="min-height:20px;overflow:auto;max-height:400px;" >';
+ '<div style="min-height:20px;overflow:auto;max-height:330px;" >';
var opts = {
width: 420,
- title: '<h4>���������' + sensorInfo[i].������ + '</h4>', // ������������������
+ title: '<h3>���������' + sensorInfo[i].time + '</h3>', // ������������������
enableMessage: false, //���������������������������������
}
var optsCoincide = {
width: 220,
- title: '<h4>���������������������</h4>', // ������������������
+ title: '<h3>���������������������</h3>', // ������������������
enableMessage: false, //���������������������������������
}
@@ -389,12 +388,12 @@
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].time + "</p>";
}
coincidentPoints.push(j);
count++;
marker = new BMap.Marker(startPoint, {icon: aggregationIcon});
- winfowTextAdd = '<p id="' + j + '" onclick="openInfo(this)" onmousemove="red(this.id)" onmouseout="black(this.id)">' + "���������" + sensorInfo[j].������ + "</p>";
+ winfowTextAdd = '<p id="' + j + '" onclick="openInfo(this)" onmousemove="red(this.id)" onmouseout="black(this.id)">' + "���������" + sensorInfo[j].time + "</p>";
winfowText += winfowTextAdd;
}
}
@@ -405,18 +404,36 @@
if (coincidentPoints.indexOf(i) > -1) {
winfowText = winfowText + "</div>";
} else {
- winfowText += '<h4 style="background-color: #CD5C5C;color:white;margin-bottom: 1px">������������������</h4>';
+ winfowText += '<h3 style="background-color: #CD5C5C;color:white;margin-bottom: 1px">������������������</h3>';
for (var prop in monitorDataResult) {
if (monitorDataResult.hasOwnProperty(prop)) {
- 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)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:120px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><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)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:25px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="bb' + i + monitorSensorsCount + '" style="width:80px;display: none;position: absolute;right:25px;text-align: center"></span>' + "</p>");
+ for (var j = 0; j < monitorParameters.length; j++) {
+ if (prop == monitorParameters[j]) {
+ monitorSensorsCount = j;
+ }
+ }
+ for (var key in sensorsMap) {
+ if (prop == key) {
+ var prop1 = sensorsMap[key];
+ }
+ }
+ winfowText += ("<p style='height: 22px;line-height: 22px'>" + prop1 + "���" + monitorDataResult[prop] + '<input id="b' + i + monitorSensorsCount + '" class="' + i + '" type="button" value="���������" onclick="showMonitorMinOrMax(this,sensorInfoMax,monitorDataMax,monitorParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;float:right;margin-right:15px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="bb' + i + monitorSensorsCount + '" style="width:80px;display: none;float:right;margin-right:15px;text-align: center"></span><input id="a' + i + monitorSensorsCount + '" class="' + i + '" type="button" value="���������" onclick="showMonitorMinOrMax(this,sensorInfoMin,monitorDataMin,monitorParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;float:right;margin-right:15px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="aa' + i + monitorSensorsCount + '" style="width:80px;display: none;float:right;margin-right:15px;text-align: center"></span>' + "</p>");
}
}
- winfowText += '<h4 style="background-color: #66CD00;color:white;margin-bottom: 1px">������������������</h4>';
+ winfowText += '<h3 style="background-color: #66CD00;color:white;margin-bottom: 1px">������������������</h3>';
for (var prop in flyingDataResult) {
if (flyingDataResult.hasOwnProperty(prop)) {
- 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)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:120px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><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)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:25px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="dd' + i + flyingSensorsCount + '" style="width:80px;display: none;position: absolute;right:25px;text-align: center"></span>' + "</p>");
+ for (var j = 0; j < flyingParameters.length; j++) {
+ if (prop == flyingParameters[j]) {
+ flyingSensorsCount = j;
+ }
+ }
+ for (var key in sensorsMap) {
+ if (prop == key) {
+ var prop1 = sensorsMap[key];
+ }
+ }
+ winfowText += ("<p style='height: 22px;line-height: 22px'>" + prop1 + "���" + flyingDataResult[prop] + '<input id="d' + i + flyingSensorsCount + '" class="' + i + '" type="button" value="���������" onclick="showFlyingMinOrMax(this,sensorInfoMax,flyingDataMax,flyingParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;float:right;margin-right:15px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="dd' + i + flyingSensorsCount + '" style="width:80px;display: none;float:right;margin-right:15px;text-align: center"></span><input id="c' + i + flyingSensorsCount + '" class="' + i + '" type="button" value="���������" onclick="showFlyingMinOrMax(this,sensorInfoMin,flyingDataMin,flyingParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;float:right;margin-right:15px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="cc' + i + flyingSensorsCount + '" style="width:80px;display: none;float:right;margin-right:15px;text-align: center"></span>' + "</p>");
}
}
winfowText += "</div>";
@@ -430,7 +447,6 @@
}
marker.addEventListener("click", function () {
this.openInfoWindow(infoWindow);
- $(".BMap_pop img").css('margin-left', '-10px');
for (var i = 0; i < list.length; i++) {
$("#" + list[i]).css('color', 'blue');
}
@@ -441,8 +457,8 @@
if (list.indexOf(e.id) == -1) {
list.push(e.id);
}
- var lona = parseFloat(sensorInfo[e.id].������.substr(0, sensorInfo[e.id].������.length - 1));
- var lata = parseFloat(sensorInfo[e.id].������.substr(0, sensorInfo[e.id].������.length - 1));
+ var lona = parseFloat(sensorInfo[e.id].e76.substr(0, sensorInfo[e.id].e76.length - 1));
+ var lata = parseFloat(sensorInfo[e.id].e77.substr(0, sensorInfo[e.id].e77.length - 1));
var lona1 = GPS.gcj_encrypt(lata, lona).lon;
var lata1 = GPS.gcj_encrypt(lata, lona).lat;
var lona2 = GPS.bd_encrypt(lata1, lona1).lon;
@@ -451,27 +467,45 @@
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;margin-bottom: 1px">������������������</h4>';
+ '<div style="min-height:20px;overflow:auto;max-height:330px;" >';
+ winfowText1 += '<h3 style="background-color: #CD5C5C;color:white;margin-bottom: 1px">������������������</h3>';
var monitorSensorsCoincideCount = -1;
var flyingSensorsCoincideCount = -1;
for (var prop in monitorDataCoincide) {
if (monitorDataCoincide.hasOwnProperty(prop)) {
- 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)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:120px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white "/><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)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:25px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="ff' + e.id + monitorSensorsCoincideCount + '" style="width:80px;display: none;position: absolute;right:25px;text-align: center"></span>' + "</p>");
+ for (var j = 0; j < monitorParameters.length; j++) {
+ if (prop == monitorParameters[j]) {
+ monitorSensorsCoincideCount = j;
+ }
+ }
+ for (var key in sensorsMap) {
+ if (prop == key) {
+ var prop1 = sensorsMap[key];
+ }
+ }
+ winfowText1 += ("<p style='height: 22px;line-height: 22px'>" + prop1 + "���" + monitorDataCoincide[prop] + '<input id="f' + e.id + monitorSensorsCoincideCount + '" class="' + e.id + '" type="button" value="���������" onclick="showMonitorMinOrMax(this,sensorInfoMax,monitorDataMax,monitorParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;float:right;margin-right:15px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="ff' + e.id + monitorSensorsCoincideCount + '" style="width:80px;display: none;float:right;margin-right:15px;text-align: center"></span><input id="e' + e.id + monitorSensorsCoincideCount + '" class="' + e.id + '" type="button" value="���������" onclick="showMonitorMinOrMax(this,sensorInfoMin,monitorDataMin,monitorParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;float:right;margin-right:15px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white "/><span id="ee' + e.id + monitorSensorsCoincideCount + '" style="width:80px;display: none;float:right;margin-right:15px;text-align: center"></span>' + "</p>");
}
}
- winfowText1 += '<h4 style="background-color: #66CD00;color:white;margin-bottom: 1px">������������������</h4>';
+ winfowText1 += '<h3 style="background-color: #66CD00;color:white;margin-bottom: 1px">������������������</h3>';
for (var prop in flyingDataCoincide) {
if (flyingDataCoincide.hasOwnProperty(prop)) {
- 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)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:120px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white "/><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)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:25px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="hh' + e.id + flyingSensorsCoincideCount + '" style="width:80px;display: none;position: absolute;right:25px;text-align: center"></span>' + "</p>");
+ for (var j = 0; j < flyingParameters.length; j++) {
+ if (prop == flyingParameters[j]) {
+ flyingSensorsCoincideCount = j;
+ }
+ }
+ for (var key in sensorsMap) {
+ if (prop == key) {
+ var prop1 = sensorsMap[key];
+ }
+ }
+ winfowText1 += ("<p style='height: 22px;line-height: 22px'>" + prop1 + "���" + flyingDataCoincide[prop] + '<input id="h' + e.id + flyingSensorsCoincideCount + '" class="' + e.id + '" type="button" value="���������" onclick="showFlyingMinOrMax(this,sensorInfoMax,flyingDataMax,flyingParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;float:right;margin-right:15px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="hh' + e.id + flyingSensorsCoincideCount + '" style="width:80px;display: none;float:right;margin-right:15px;text-align: center"></span><input id="g' + e.id + flyingSensorsCoincideCount + '" class="' + e.id + '" type="button" value="���������" onclick="showFlyingMinOrMax(this,sensorInfoMin,flyingDataMin,flyingParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;float:right;margin-right:15px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white "/><span id="gg' + e.id + flyingSensorsCoincideCount + '" style="width:80px;display: none;float:right;margin-right:15px;text-align: center"></span>' + "</p>");
}
}
winfowText1 += "</div>";
var optsCoincideChild = {
width: 420,
- title: '<h4>���������' + sensorInfo[e.id].������ + '</h4>', // ������������������
+ title: '<h3>���������' + sensorInfo[e.id].time + '</h3>', // ������������������
enableMessage: false, //���������������������������������
}
var infoWindow1 = new BMap.InfoWindow(winfowText1, optsCoincideChild);
--
Gitblit v1.8.0