From 3e8e381d224145a676ef932bf2878c6f4b204523 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 19 Aug 2019 08:59:02 +0800
Subject: [PATCH] 修改最大值、最小值按钮和信息保持在同一水平线上及调整起点和终点图标上1显示的位置
---
src/main/webapp/view/uavTrajectory.jsp | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/view/uavTrajectory.jsp b/src/main/webapp/view/uavTrajectory.jsp
index d076c38..e110ffe 100644
--- a/src/main/webapp/view/uavTrajectory.jsp
+++ b/src/main/webapp/view/uavTrajectory.jsp
@@ -77,7 +77,6 @@
.BMap_pop img {
top: 45px !important;
- left: 420px !important;
}
.BMap_pop div:nth-child(1) div {
@@ -162,6 +161,7 @@
var monitorDataMin = [];
var flyingDataMax = [];
var monitorDataMax = [];
+ var list = new Array();
var startPoint = trackPoints[i];
var endPoint = trackPoints[i + 1];
var marker;
@@ -276,14 +276,14 @@
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)" 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 += ("<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>");
}
}
winfowText += '<h4 style="background-color: #66CD00;color:white;margin-bottom: 1px">������������������</h4>';
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)" 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 += ("<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>");
}
}
winfowText += "</div>";
@@ -297,17 +297,18 @@
}
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');
+ }
});
})(i);
function openInfo(e) {
+ if (list.indexOf(e.id) == -1) {
+ list.push(e.id);
+ }
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 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 =
@@ -318,14 +319,14 @@
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)" 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 += ("<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>");
}
}
winfowText1 += '<h4 style="background-color: #66CD00;color:white;margin-bottom: 1px">������������������</h4>';
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)" 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 += ("<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>");
}
}
winfowText1 += "</div>";
@@ -345,7 +346,15 @@
}
function black(x) {
- document.getElementById(x).style.color = "#000000";
+ if (list.length > 0) {
+ if (list.indexOf(x) == -1) {
+ document.getElementById(x).style.color = "#000000";
+ } else {
+ document.getElementById(x).style.color = "blue";
+ }
+ } else {
+ document.getElementById(x).style.color = "#000000";
+ }
}
function openInfoWindow() {
@@ -390,6 +399,14 @@
$("#" + e.id.substr(0, 1) + e.id).show();
}
+ function moveChangeColor(e) {
+ $("#" + e.id).css('backgroundColor', '#A49EF0');
+ }
+
+ function outChangeColor(e) {
+ $("#" + e.id).css('backgroundColor', '#7C73E9');
+ }
+
if (count > 0) {
var lab;
if (count > 0 && count <= 8) {
@@ -411,7 +428,11 @@
map.addOverlay(lab);
}
if (count == 0) {
- var lab = new BMap.Label(count + 1, {position: startPoint, offset: new BMap.Size(-7, -22)});
+ if (i != 0 && i != trackPoints.length - 1) {
+ var lab = new BMap.Label(count + 1, {position: startPoint, offset: new BMap.Size(-7, -22)});
+ } else if (i == 0 || i == trackPoints.length - 1) {
+ var lab = new BMap.Label(count + 1, {position: startPoint, offset: new BMap.Size(-6, -21)});
+ }
lab.setStyle({
color: "#fff",
fontSize: "16px",
--
Gitblit v1.8.0