From 2508384070b834968b2ebb1a917af3fca345c5dc Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Thu, 11 Apr 2024 22:45:27 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=94=AF=E6=8C=81=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=9B=BE=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/page/device_overview.html       | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/sec-beidou/src/main/resources/templates/page/device_overview.html b/sec-beidou/src/main/resources/templates/page/device_overview.html
index 5f0c85e6..cda88f6b 100644
--- a/sec-beidou/src/main/resources/templates/page/device_overview.html
+++ b/sec-beidou/src/main/resources/templates/page/device_overview.html
@@ -120,6 +120,9 @@
     var greenMarkers=[];
     var orangeMarkers=[];
     var redMarkers=[];
+    var greenLabels=[];
+    var orangeLabels=[];
+    var redLabels=[];
     var batch_id = 0;
     var deviceList=
     [
@@ -163,38 +166,39 @@
         translateCallback = function (data){
             if(data.status === 0) {
                 var i=0;
-                for(; i<data.points.length; i++) {
+                for(; i<data.points.length; i++)
+                    var label = new BMapGL.Label(deviceList[batch_id+i].deviceid,
+                      {
+                          position: data.points[i], // 指定文本标注所在的地理位置
+                          offset: new BMapGL.Size(10, 10) // 设置文本偏移量
+                      });             // 创建文本标注对象
+
                     var marker;
                     if(deviceList[batch_id+i].warning == 2) {
                         marker = new BMapGL.Marker(data.points[i], {
                             icon: loc_red
                         });
                         redMarkers.push(marker);
+                        redLabels.push(label);
                     }
                     else if(deviceList[batch_id+i].warning == 1) {
                         marker = new BMapGL.Marker(data.points[i], {
                             icon: loc_orange
                         });
                         orangeMarkers.push(marker);
+                        orangeLabels.push(label);
                     }
                     else {
                         marker = new BMapGL.Marker(data.points[i], {
                             icon: loc_green
                         });
                         greenMarkers.push(marker);
+                        greenLabels.push(label);
                     }
 
                     // 点标记添加点击事件
                     map.addOverlay(marker);
-
-                    //if(deviceList[batch_id+i].warning != 0){
-                    var label = new BMapGL.Label(deviceList[batch_id+i].deviceid,
-                        {
-                            position: data.points[i], // 指定文本标注所在的地理位置
-                            offset: new BMapGL.Size(10, 10) // 设置文本偏移量
-                        });             // 创建文本标注对象
                     map.addOverlay(label);
-                    //}
 
                 }
 
@@ -271,36 +275,42 @@
    function showGreen(){
 	   for(var i=0; i<greenMarkers.length; i++){
 		   map.addOverlay(greenMarkers[i]);
+           map.addOverlay(greenLabels[i]);
 	   }
    }
    
    function showOrange(){
 	   for(var i=0; i<orangeMarkers.length; i++){
 	   		map.addOverlay(orangeMarkers[i]);
+           map.addOverlay(orangeLabels[i]);
 	   }
    }
    
    function showRed(){
 	   for(var i=0; i<redMarkers.length; i++){
 	   		map.addOverlay(redMarkers[i]);
+           map.addOverlay(redLabels[i]);
 	   }
    }
    
    function hideGreen(){
 	   for(var i=0; i<greenMarkers.length; i++){
 	   		map.removeOverlay(greenMarkers[i]);
+           map.removeOverlay(greenLabels[i]);
 	   }
    }
    
    function hideOrange(){
    	   for(var i=0; i<orangeMarkers.length; i++){
    	   		map.removeOverlay(orangeMarkers[i]);
+           map.removeOverlay(orangeLabels[i]);
    	   }
    }
    
    function hideRed(){
    	   for(var i=0; i<redMarkers.length; i++){
    	   		map.removeOverlay(redMarkers[i]);
+           map.removeOverlay(redLabels[i]);
    	   }
    }