From 01b792fb98a3f7f468018fffa64f2c48cda3f91f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 15 Apr 2025 20:50:27 +0800
Subject: [PATCH] feat:选择机巢清除原地图图层---处理完善

---
 src/hooks/useMapAggregation/useMapAggregation.js |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/hooks/useMapAggregation/useMapAggregation.js b/src/hooks/useMapAggregation/useMapAggregation.js
index 3565f3c..41d33ee 100644
--- a/src/hooks/useMapAggregation/useMapAggregation.js
+++ b/src/hooks/useMapAggregation/useMapAggregation.js
@@ -59,12 +59,15 @@
   const eventTimeType = computed(() => store.state.home.eventTimeType)
   const eventTimeRang = computed(() => store.state.home.eventTimeRang)
 
+  const singleUavHome = computed(() => store.state.home.singleUavHome)
+
   let needFly = true
 
   const combinedValues = computed(() => ({
     selectedAreaCode: selectedAreaCode.value,
     eventTimeType: eventTimeType.value,
     eventTimeRang: eventTimeRang.value,
+    singleUavHome: singleUavHome.value,
   }))
 
   let saveParams = { area_code: '', date_enum: 'CURRENT_WEEK' }
@@ -240,6 +243,13 @@
   }
 
   watch(combinedValues, async (newValue, oldValue) => {
+    if (newValue.singleUavHome?.device_sn) {
+      clearMapEntity()
+      return
+    }
+
+    handlerInit()
+
     if (newValue.eventTimeType) {
       saveParams = { area_code: newValue.selectedAreaCode, date_enum: store.state.home.eventTimeParams }
     }
@@ -511,6 +521,11 @@
 
   // 移除所有监听事件,变量置空
   const removeAll = () => {
+    clearMapEntity()
+    viewer = null
+  }
+
+  const clearMapEntity = () => {
     if (!viewer) return
     removeEntities()
     removeLabel()
@@ -518,21 +533,28 @@
     viewer.scene.postRender.removeEventListener(determineScaling)
     handler?.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK)
     handler?.destroy()
-    viewer = null
     active = null
     handler = null
     currentEntity = null
   }
+
   const init = () => {
     viewer = window.$viewer
     viewer.scene.postRender.removeEventListener(determineScaling)
     initMapData(selectedAreaCode.value || userAreaCode.value).then(() => {
       viewer.scene.postRender.addEventListener(determineScaling)
     })
+
+    handlerInit()
+  }
+
+  const handlerInit = () => {
+    if (handler) return
+
     handler = new Cesium.ScreenSpaceEventHandler(viewer.scene.canvas)
     handler.setInputAction(singleMachineEvent, Cesium.ScreenSpaceEventType.LEFT_CLICK)
-
   }
+
   onBeforeUnmount(() => { })
   // onMounted(() => {
   //   nextTick(() => {

--
Gitblit v1.9.3