合并qzc-dev

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() {

src/views/Home/MapCtrl/Markers/AdcdMarker.js

@@ -160,14 +160,12 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
   return (
     <>
       {
-        ( (zoom > 8 || distSq < dist2 || highlight) && (data.level === 5 || data.level === 4) && 
-        // isShow
-        true
-         ) && (
+        (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,
@@ -182,6 +180,7 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
             className="markerLabel"
             style={{
               // backgroundColor: '#0008',
+              display:(zoom > 8 || distSq < dist2 || highlight)?'block':'none',
               padding: 4,
               borderRadius: 4,
               fontSize: 10,
@@ -195,18 +194,15 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
             {data?.NAME}
           </div>
         </>
-        )
       }
 
       {
-        ( (zoom > 12 || distSq < dist2 || highlight) && data.level === 6 && 
-        // isShow
-        true
-         ) && (
+        data.level === 6 &&
         <>
           <div
             id={`marker_tuxiang_${data.id}`}
             style={{
+              display:(zoom > 12 || distSq < dist2 || highlight)?'block':'none',
               position: 'absolute',
               bottom: 0,
               left: 0,
@@ -220,6 +216,7 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
           <div
             className="markerLabel"
             style={{
+              display:(zoom > 12 || distSq < dist2 || highlight)?'block':'none',
               // backgroundColor: '#0008',
               padding: 4,
               borderRadius: 4,
@@ -234,7 +231,6 @@ function AdcdMarker({ data, dispatch, setting, zoom, distSq, layerVisible }) {
             {data?.NAME}
           </div>
         </>
-        )
       }
     </>
   )