From e8427b9127717bff795160e2b297b18b604dfbdd Mon Sep 17 00:00:00 2001
From: qzc <qzc@cloudowr.com>
Date: Tue, 21 Oct 2025 13:53:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home/MapCtrl/Map3D/layermgr3d.js   |   3 +-
 src/views/Home/MapCtrl/Markers/AdcdMarker.js | 140 +++++++++----------
 2 files changed, 70 insertions(+), 73 deletions(-)

diff --git a/src/views/Home/MapCtrl/Map3D/layermgr3d.js b/src/views/Home/MapCtrl/Map3D/layermgr3d.js
index ea7cfd9c4..a398a1753 100644
--- a/src/views/Home/MapCtrl/Map3D/layermgr3d.js
+++ b/src/views/Home/MapCtrl/Map3D/layermgr3d.js
@@ -33,9 +33,10 @@ export default class LayerMgr3D extends LayerMgr {
     for (const layer of this.layers) {
       layer.destroy();
     }
+    this.viewer.dataSources.removeAll();
     this.viewer.entities.removeAll();
-
     this.viewer.imageryLayers.removeAll()
+    this.viewer.destroy();
   }
 
   frameUpdate() {
diff --git a/src/views/Home/MapCtrl/Markers/AdcdMarker.js b/src/views/Home/MapCtrl/Markers/AdcdMarker.js
index c1351c8cf..3b9ae7422 100644
--- a/src/views/Home/MapCtrl/Markers/AdcdMarker.js
+++ b/src/views/Home/MapCtrl/Markers/AdcdMarker.js
@@ -160,81 +160,77 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
   return (
     <>
       {
-        ( (zoom > 8 || distSq < dist2 || highlight) && (data.level === 5 || data.level === 4) && 
-        // isShow
-        true
-         ) && (
-          <>
-            <div
-              id={`marker_tuxiang_${data.id}`}
-              style={{
-                position: 'absolute',
-                bottom: 0,
-                left: 0,
-                transformOrigin: 'bottom center',
-                transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-                lineHeight: 1,
-                zIndex: data.level === 4?6:4,//zindexmarker.tuxiang + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
-              }}
-              // onClick={showPop}
-            ></div>
-            <div
-              className="markerLabel"
-              style={{
-                // backgroundColor: '#0008',
-                padding: 4,
-                borderRadius: 4,
-                fontSize: 10,
-                lineHeight: 1,
-                top: 0,
-                left: 0,
-                transform: 'translateX(-50%)',
-                zIndex: 3,//zindexmarker.tuxiangLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), 
-                color: data.level === 4? 'red':'#0008'
-              }}>
-              {data?.NAME}
-            </div>
-          </>
-        )
+        (data.level === 5 || data.level === 4) &&
+        <>
+          <div
+            id={`marker_tuxiang_${data.id}`}
+            style={{
+              display:(zoom > 8 || distSq < dist2 || highlight)?'block':'none',
+              position: 'absolute',
+              bottom: 0,
+              left: 0,
+              transformOrigin: 'bottom center',
+              transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
+              lineHeight: 1,
+              zIndex: data.level === 4?6:4,//zindexmarker.tuxiang + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
+            }}
+            // onClick={showPop}
+          ></div>
+          <div
+            className="markerLabel"
+            style={{
+              // backgroundColor: '#0008',
+              display:(zoom > 8 || distSq < dist2 || highlight)?'block':'none',
+              padding: 4,
+              borderRadius: 4,
+              fontSize: 10,
+              lineHeight: 1,
+              top: 0,
+              left: 0,
+              transform: 'translateX(-50%)',
+              zIndex: 3,//zindexmarker.tuxiangLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), 
+              color: data.level === 4? 'red':'#0008'
+            }}>
+            {data?.NAME}
+          </div>
+        </>
       }
 
       {
-        ( (zoom > 12 || distSq < dist2 || highlight) && data.level === 6 && 
-        // isShow
-        true
-         ) && (
-          <>
-            <div
-              id={`marker_tuxiang_${data.id}`}
-              style={{
-                position: 'absolute',
-                bottom: 0,
-                left: 0,
-                transformOrigin: 'bottom center',
-                transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
-                lineHeight: 1,
-                zIndex: 2,//zindexmarker.tuxiang + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
-              }}
-              // onClick={showPop}
-            ></div>
-            <div
-              className="markerLabel"
-              style={{
-                // backgroundColor: '#0008',
-                padding: 4,
-                borderRadius: 4,
-                fontSize: 10,
-                lineHeight: 1,
-                top: 0,
-                left: 0,
-                transform: 'translateX(-50%)',
-                zIndex: 1,//zindexmarker.tuxiangLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), 
-                color: !layerVisible.SatelliteImage?'#0008':'#fff'
-              }}>
-              {data?.NAME}
-            </div>
-          </>
-        )
+        data.level === 6 &&
+        <>
+          <div
+            id={`marker_tuxiang_${data.id}`}
+            style={{
+              display:(zoom > 12 || distSq < dist2 || highlight)?'block':'none',
+              position: 'absolute',
+              bottom: 0,
+              left: 0,
+              transformOrigin: 'bottom center',
+              transform: `translateX(-50%)${markerZoom > 1 ? ' scale(' + markerZoom + ')' : ''}`,
+              lineHeight: 1,
+              zIndex: 2,//zindexmarker.tuxiang + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0)
+            }}
+            // onClick={showPop}
+          ></div>
+          <div
+            className="markerLabel"
+            style={{
+              display:(zoom > 12 || distSq < dist2 || highlight)?'block':'none',
+              // backgroundColor: '#0008',
+              padding: 4,
+              borderRadius: 4,
+              fontSize: 10,
+              lineHeight: 1,
+              top: 0,
+              left: 0,
+              transform: 'translateX(-50%)',
+              zIndex: 1,//zindexmarker.tuxiangLabel + zindexOffset + (highlight ? zindexmarker.hilightPlus : 0), 
+              color: !layerVisible.SatelliteImage?'#0008':'#fff'
+            }}>
+            {data?.NAME}
+          </div>
+        </>
       }
     </>
   )