From 4da6b6c20b540930ab9167227b2d9c2679ca972d Mon Sep 17 00:00:00 2001
From: Zzc <1373857752@qq.com>
Date: Tue, 25 Nov 2025 14:45:15 +0800
Subject: [PATCH] =?UTF-8?q?refactor(3d-situational-awareness):=20=E5=B0=86?=
 =?UTF-8?q?=20MapControls=20=E7=9A=84=20`activeTool`=20=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E8=AE=BE=E4=B8=BA=20`prop`=20=E5=8F=AF=E6=8E=A7=E3=80=82=20?=
 =?UTF-8?q?=E5=B0=86=20`activeTool`=20=E4=BB=8E=E5=86=85=E9=83=A8=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=20(`ref`)=20=E6=9B=B4=E6=94=B9=E4=B8=BA=E5=9F=BA?=
 =?UTF-8?q?=E4=BA=8E=20`activeToolKey`=20=E7=9A=84=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=EF=BC=8C=E4=BB=8E=E8=80=8C=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E7=88=B6=E7=BB=84=E4=BB=B6=E6=8E=A7=E5=88=B6=E6=B4=BB=E8=B7=83?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=9A=84=E7=8A=B6=E6=80=81=EF=BC=8C=E4=BB=A5?=
 =?UTF-8?q?=E6=8F=90=E9=AB=98=E5=A4=8D=E7=94=A8=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/MapViewer/MapControls.vue      | 27 ++++++++++++-------
 .../components/MapViewer/index.vue            | 10 +++++++
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/MapViewer/MapControls.vue b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/MapViewer/MapControls.vue
index b4d094c..e506165 100644
--- a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/MapViewer/MapControls.vue
+++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/MapViewer/MapControls.vue
@@ -41,14 +41,23 @@
 </template>
 
 <script setup>
-import { ref } from "vue";
+import { ref, computed } from "vue";
 import { MAP_TOOLS, DEVICE_WATCH } from "../../constants";
 
+// 定义props
+const props = defineProps({
+  // 当前激活的工具
+  activeToolKey: {
+    type: String,
+    default: null
+  }
+})
+
 // 卫星设备观看状态
 const isWatchingDevice = ref(false);
 
-// 当前激活的测量工具（默认激活模型对比）
-const activeTool = ref('modelCompare');
+// 当前激活的测量工具 - 使用computed从props获取
+const activeTool = computed(() => props.activeToolKey)
 
 // 定义对外事件
 const emit = defineEmits(["device-watch", "tool-change"]);
@@ -105,15 +114,13 @@ const handleDeviceWatch = () => {
  */
 const handleToolClick = (toolKey) => {
   // 点击同一个工具则取消激活
-  if (activeTool.value === toolKey) {
-    activeTool.value = null;
-  } else {
-    activeTool.value = toolKey;
-  }
-  console.log("切换地图工具:", toolKey);
+  const newActiveState = activeTool.value === toolKey ? null : toolKey
+  const isActive = newActiveState === toolKey
+
+  console.log("切换地图工具:", toolKey, "激活状态:", isActive);
   emit("tool-change", {
     tool: toolKey,
-    active: activeTool.value === toolKey,
+    active: isActive,
   });
 };
 </script>
diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/MapViewer/index.vue b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/MapViewer/index.vue
index 748a8de..727c7b2 100644
--- a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/MapViewer/index.vue
+++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/MapViewer/index.vue
@@ -7,6 +7,7 @@
     <!-- 延迟渲染确保目标元素已存在 -->
     <Teleport to="#sa-controls" v-if="isMounted">
       <MapControls
+        :active-tool-key="activeToolKey"
         @tool-change="handleToolChange"
         @device-watch="handleDeviceWatch"
       />
@@ -19,6 +20,15 @@ import { ref, onMounted } from 'vue'
 import { MapViewport } from '@/map'
 import MapControls from './MapControls.vue'
 
+// 定义props
+const props = defineProps({
+  // 当前激活的工具键
+  activeToolKey: {
+    type: String,
+    default: null
+  }
+})
+
 /**
  * 向外抛出的事件
  * @event tool-change - 地图工具变化事件，包含 { tool: string, active: boolean }