From cd7eb0bcb27a51d0ee94bbe2960fa5d5252bde7b Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 05 Aug 2019 13:50:31 +0800
Subject: [PATCH] 多点重合超过数量弹窗增加下拉显示
---
src/main/webapp/view/uavTrajectory.jsp | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/view/uavTrajectory.jsp b/src/main/webapp/view/uavTrajectory.jsp
index 25df3e1..8ad31c3 100644
--- a/src/main/webapp/view/uavTrajectory.jsp
+++ b/src/main/webapp/view/uavTrajectory.jsp
@@ -158,7 +158,8 @@
marker = new BMap.Marker(startPoint);
}
var count = 0;
- var winfowText = "";
+ var winfowText =
+ '<div style="min-height:20px;overflow-y:auto;max-height:400px;" >';
for (var j = i + 1; j < trackPoints.length; j++) {
distance = map.getDistance(trackPoints[i], trackPoints[j]).toFixed(5);
if (distance <= 1.9) {
@@ -167,7 +168,7 @@
}
coincidentPoints.push(j);
count++;
- winfowTextAdd = '<p id="' + j + '" onclick="openInfo(this)">' + "���������" + sensorInfo[j].������ + "</p>";
+ winfowTextAdd = '<p id="' + j + '" onclick="openInfo(this)" onmousemove="red(this.id)" onmouseout="black(this.id)">' + "���������" + sensorInfo[j].������ + "</p>";
winfowText += winfowTextAdd;
if (j == trackPoints.length - 1) {
marker = new BMap.Marker(trackPoints[j], {icon: endIcon, offset: new BMap.Size(0, -20)});
@@ -176,15 +177,15 @@
}
if (coincidentPoints.indexOf(i) > -1) {
- winfowText = '<p id="' + i + '" onclick="openInfo(this)">' + "���������" + sensorInfo[i].������ + "</p>" + winfowText;
+ winfowText = '<p id="' + i + '" onclick="openInfo(this)" onmousemove="red(this.id)" onmouseout="black(this.id)">' + "���������" + sensorInfo[i].������ + "</p>" + winfowText + "</div>";
} else {
- for(var prop in sensorInfo[i]){
+ for (var prop in sensorInfo[i]) {
if (sensorInfo[i].hasOwnProperty(prop)) {
- winfowText+=(prop+"���"+sensorInfo[i][prop]+"</br>");
+ winfowText += (prop + "���" + sensorInfo[i][prop] + "</br>");
}
}
+ winfowText += "</div>";
}
-
(function (x) {
var infoWindow = new BMap.InfoWindow(winfowText, {enableMessage: false});
marker.addEventListener("click", function () {
@@ -194,10 +195,10 @@
function openInfo(e) {
var point = new BMap.Point(sensorInfo[e.id].������, sensorInfo[e.id].������);
- var winfowText1="";
- for(var prop in sensorInfo[e.id]){
+ var winfowText1 = "";
+ for (var prop in sensorInfo[e.id]) {
if (sensorInfo[e.id].hasOwnProperty(prop)) {
- winfowText1+=(prop+"���"+sensorInfo[e.id][prop]+"</br>");
+ winfowText1 += (prop + "���" + sensorInfo[e.id][prop] + "</br>");
}
}
var infoWindow1 = new BMap.InfoWindow(winfowText1, {enableMessage: false});
@@ -205,6 +206,15 @@
map.openInfoWindow(infoWindow1, point);
}
+ function red(x) {
+ document.getElementById(x).style.color = "#FF1111";
+ document.getElementById(x).style.cursor = "pointer";
+ }
+
+ function black(x) {
+ document.getElementById(x).style.color = "#000000";
+ }
+
if (count > 0) {
var lab = new BMap.Label(count + 1, {position: startPoint, offset: new BMap.Size(-7, -23)});
lab.setStyle({
--
Gitblit v1.8.0