From 217ed5eaab142370b1ba71188abddb5bc1a540ab Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 12 Aug 2019 15:10:42 +0800
Subject: [PATCH] 修改无人机信息弹窗显示效果
---
src/main/webapp/view/uavTrajectory.jsp | 116 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 88 insertions(+), 28 deletions(-)
diff --git a/src/main/webapp/view/uavTrajectory.jsp b/src/main/webapp/view/uavTrajectory.jsp
index 7b27d2e..80e4004 100644
--- a/src/main/webapp/view/uavTrajectory.jsp
+++ b/src/main/webapp/view/uavTrajectory.jsp
@@ -36,22 +36,74 @@
}
#cpm {
- width:300px;
- height:100px;
+ width: 300px;
+ height: 100px;
position: absolute;
background-color: #ffffff;
display: none;
- left:50%;
- top:50%;
+ left: 50%;
+ top: 50%;
margin-left: -150px;
margin-top: -50px;
z-index: 11;
color: #000000;
border: 2px solid #FF7F50;
- font-size : 28px;
- line-height : 100px;
- text-align : center;
+ font-size: 28px;
+ line-height: 100px;
+ text-align: center;
}
+
+ .BMap_top {
+ display: none;
+ }
+
+ .BMap_center {
+ display: none;
+ }
+
+ .BMap_bubble_title {
+ color: white;
+ font-size: 13px;
+ font-weight: bold;
+ text-align: left;
+ padding-left: 5px;
+ padding-top: 5px;
+ background-color: #2DA0EB;
+ }
+
+ .BMap_bubble_content {
+ background-color: white;
+ padding-left: 5px;
+ padding-top: 5px;
+ padding-bottom: 10px;
+ }
+
+ .BMap_pop img {
+ top: 45px !important;
+ left: 220px !important;
+ }
+
+ .BMap_pop div:nth-child(1) div {
+ display: none;
+ }
+
+ .BMap_pop div:nth-child(3) {
+ display: none;
+ }
+
+ .BMap_pop div:nth-child(5) {
+ display: none;
+ }
+
+ .BMap_pop div:nth-child(7) {
+ display: none;
+ }
+
+ .BMap_pop div:nth-child(9) {
+ top: 35px !important;
+ border-radius: 5px;
+ }
+
</style>
<body>
@@ -90,28 +142,17 @@
});
map.addControl(navigation);
map.addControl(new BMap.ScaleControl());
- var longitude;
- var latitude;
- var point;
if (sensorInfo.length == 0) {
- longitude = 120.987287;
- latitude = 31.391562;
- point = new BMap.Point(longitude, latitude);
- map.centerAndZoom(point, 17);
- document.getElementById("cpm").style.display='block';
+ showNoFlightTrajectory();
}
var trackPoints = []; //���������������������������������������������������������������
var coincidentPoints = new Array();
if (sensorInfo.length > 0) {
$.each(sensorInfo, function (item, value) {
- if(typeof(value.������)=="undefined"){
- longitude = 120.987287;
- latitude = 31.391562;
- point = new BMap.Point(longitude, latitude);
- map.centerAndZoom(point, 17);
- document.getElementById("cpm").style.display='block';
- }else{
- trackPoints.push(new BMap.Point(value.������.substr(0,value.������.length-1), value.������.substr(0,value.������.length-1)));
+ if (typeof (value.������) == "undefined") {
+ showNoFlightTrajectory();
+ } else {
+ trackPoints.push(new BMap.Point(value.������.substr(0, value.������.length - 1), value.������.substr(0, value.������.length - 1)));
}
})
for (var i = 0; i < trackPoints.length; i++) {
@@ -189,7 +230,13 @@
}
var count = 0;
var winfowText =
- '<div style="min-height:20px;overflow-y:auto;max-height:400px;" >';
+ '<div style="min-height:20px;overflow:auto;max-height:400px;" >';
+ var opts = {
+ width: 220,
+ title: '<h4>���������������</h4>', // ������������������
+ enableMessage: false, //���������������������������������
+ }
+
for (var j = i + 1; j < trackPoints.length; j++) {
distance = map.getDistance(trackPoints[i], trackPoints[j]).toFixed(5);
if (distance <= 1.9) {
@@ -214,22 +261,25 @@
}
winfowText += "</div>";
}
+
(function (x) {
- var infoWindow = new BMap.InfoWindow(winfowText, {enableMessage: false});
+ var infoWindow = new BMap.InfoWindow(winfowText, opts);
marker.addEventListener("click", function () {
this.openInfoWindow(infoWindow);
});
})(i);
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 winfowText1 = "";
+ 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 winfowText1 =
+ '<div style="min-height:20px;overflow:auto;max-height:400px;" >';
for (var prop in sensorInfo[e.id]) {
if (sensorInfo[e.id].hasOwnProperty(prop)) {
winfowText1 += (prop + "���" + sensorInfo[e.id][prop] + "</br>");
}
}
- var infoWindow1 = new BMap.InfoWindow(winfowText1, {enableMessage: false});
+ winfowText1 += "</div>";
+ var infoWindow1 = new BMap.InfoWindow(winfowText1, opts);
//������������������
map.openInfoWindow(infoWindow1, point);
}
@@ -321,4 +371,14 @@
}
};
+ function showNoFlightTrajectory() {
+ var longitude = 120.987287;
+ var latitude = 31.391562;
+ var point = new BMap.Point(longitude, latitude);
+ map.centerAndZoom(point, 17);
+ setTimeout(function () {
+ document.getElementById("cpm").style.display = 'block';
+ }, 250);
+ };
+
</script>
--
Gitblit v1.8.0