From 7c980e9a4ea55e8b97bb1914f9fb19364af9b949 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 30 Apr 2025 10:26:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/synthesisQuery/digitalSignage.js       | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/static/js/synthesisQuery/digitalSignage.js b/src/main/resources/static/js/synthesisQuery/digitalSignage.js
index 8c203ef..5d21022 100644
--- a/src/main/resources/static/js/synthesisQuery/digitalSignage.js
+++ b/src/main/resources/static/js/synthesisQuery/digitalSignage.js
@@ -307,16 +307,16 @@ function addAllMapPoints() {
     // 绘制索道标点
     if (cablewayList && cablewayList.length > 0) {
         cablewayList.forEach((pointData, index) => {
-            const pointKey = `117.132663,31.877325`;
-            // const pointKey = `${pointData.baiduLon},${pointData.baiduLat}`;
+            // const pointKey = `117.132663,31.877325`;
+            const pointKey = `${pointData.baiduLon},${pointData.baiduLat}`;
 
             // 如果该坐标点已经添加过标记，则跳过
-            if (addedPoints[pointKey]) {
-                console.warn(`重复的点坐标被跳过: ${pointKey}`);
-                return;
-            }
+            // if (addedPoints[pointKey]) {
+            //     console.warn(`重复的点坐标被跳过: ${pointKey}`);
+            //     return;
+            // }
 
-            addedPoints[pointKey] = true;
+            // addedPoints[pointKey] = true;
             // const point = new BMapGL.Point(
             //     pointData.baiduLon,
             //     pointData.baiduLat
@@ -327,7 +327,7 @@ function addAllMapPoints() {
             // 检查图标是否存在，不存在则使用默认图标
             const iconUrl = iconTypeList[9]; // 默认使用第一个图标
             const myIcon = new BMapGL.Icon(iconUrl, new BMapGL.Size(40, 38), {
-                anchor: new BMapGL.Size(16, 20), // 修正锚点位置为中心底部
+                anchor: new BMapGL.Size(32, 40), // 修正锚点位置为中心底部
                 imageSize: new BMapGL.Size(40, 38), // 与实际图片尺寸一致
             });
 
@@ -407,12 +407,14 @@ function addAllMapPoints() {
             const pointKey = `${pointData.baiduLon},${pointData.baiduLat}`;
             // const pointKey = `116.254,39.965`;
             // 如果该坐标点已经添加过标记，则跳过
-            if (addedPoints[pointKey]) {
-                console.warn(`重复的点坐标被跳过: ${pointKey}`);
-                return;
-            }
+            // if (addedPoints[pointKey]) {
+            //     console.warn(`重复的点坐标被跳过: ${pointKey}`);
+            //     return;
+            // }
 
-            addedPoints[pointKey] = true;
+            // addedPoints[pointKey] = true;
+
+            if (pointData.towerProgress == 0) return;
             const point = new BMapGL.Point(
                 pointData.baiduLon,
                 pointData.baiduLat
@@ -784,8 +786,8 @@ function getOrgTreeData() {
                         data[0].children[0].children[0].lon &&
                         data[0].children[0].children[0].lat
                     ) {
-                        // intLng = data[0].children[0].children[0].lon;
-                        // intLat = data[0].children[0].children[0].lat;
+                        intLng = data[0].children[0].children[0].lon;
+                        intLat = data[0].children[0].children[0].lat;
                     }
 
                     getScrollData(nodeId);