From 95f7d3b2fa9399514af2d32dbffbc9e4a7c9b197 Mon Sep 17 00:00:00 2001
From: wangyawei <1796609990@qq.com>
Date: 星期五, 18 四月 2025 14:27:44 +0800
Subject: [PATCH] Merge branch 'master' of http://103.135.160.14:9034/r/NslWeb

---
 src/components/tools/Tools.vue |   51 +++++++++++++++++++++------------------------------
 1 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/src/components/tools/Tools.vue b/src/components/tools/Tools.vue
index 32dcd30..146a429 100644
--- a/src/components/tools/Tools.vue
+++ b/src/components/tools/Tools.vue
@@ -199,51 +199,42 @@
 
 // 澶勭悊宸ュ叿鐐瑰嚮浜嬩欢
 function handleClick(tool, event) {
+  // 閬嶅巻宸ュ叿鍒楄〃锛屾洿鏂版縺娲荤姸鎬�
   toolList.value.forEach((item) => {
-    item.active =
-      item.name === tool.name && currentToolOptions.value !== tool.options;
+    item.active = item.name === tool.name && currentToolOptions.value !== tool.options;
   });
-  console.log(tool.options);
+
+  // 瀹氫箟涓�涓嚱鏁扮敤浜庨噸缃墍鏈夌姸鎬�
+  const resetAllStates = () => {
+    isPopupVisible.value = false;
+    seeAnalyzeShow.value = false;
+    topographyShow.value = false;
+    echartsShow.value = false;
+    showAspect.value = false;
+    showRain.value = false;
+    showSnow.value = false;
+    isContourLabel.value = false;
+  };
+
   // 濡傛灉褰撳墠宸ュ叿宸茬粡鏄縺娲荤姸鎬侊紝鍒欏叧闂畠
   if (currentToolOptions.value === tool.options) {
     currentToolOptions.value = null; // 娓呯┖褰撳墠宸ュ叿閫夐」
-    isPopupVisible.value = false; // 闅愯棌寮圭獥
-    seeAnalyzeShow.value = false; // 鍙鍩�
-    topographyShow.value = false; // 鍓栭潰
-    echartsShow.value = false; // 鍓栭潰echarts
-    showAspect.value = false; // 鍧″害鍧″悜鍒嗘瀽
-    showRain.value = false; // 闆ㄥぉ
-    showSnow.value = false; // 闆ぉ
-    isContourLabel.value = false; //绛夐珮绾�
-
+    resetAllStates();
     return;
   }
-  // 濡傛灉宸ュ叿鍚嶇О鏄� "鍥惧眰绠$悊"
-  if (tool.name === "鍥惧眰绠$悊") {
-    showLayerTree.value = !showLayerTree.value; // 鍒囨崲鍥惧眰鏍戠殑鏄剧ず鐘舵��
-    isPopupVisible.value = false; // 闅愯棌寮圭獥
-    seeAnalyzeShow.value = false; //鍙鍩�
-    topographyShow.value = false; //鍓栭潰
-    echartsShow.value = false; //鍓栭潰echarts
-    showAspect.value = false; //鍧″悜绠ご
-    showRain.value = false; //闆ㄥぉ
-    showSnow.value = false; //闆ㄥぉ
-    isContourLabel.value = false; //绛夐珮绾�
 
+  // 濡傛灉宸ュ叿鍚嶇О鏄� "鍥惧眰绠$悊"锛屽垏鎹㈠浘灞傛爲鏄剧ず鐘舵��
+  if (tool.name === "鍥惧眰绠$悊") {
+    showLayerTree.value = !showLayerTree.value;
+    resetAllStates();
     return;
   }
 
   // 瀵逛簬鍏朵粬宸ュ叿
+  resetAllStates();
   showLayerTree.value = false; // 纭繚鍥惧眰鏍戦殣钘�
   isPopupVisible.value = true; // 鏄剧ず寮圭獥
   currentToolOptions.value = tool.options; // 璁剧疆褰撳墠宸ュ叿鐨勫姛鑳介�夐」
-  seeAnalyzeShow.value = false; //鍙鍩�
-  topographyShow.value = false; //鍓栭潰
-  echartsShow.value = false; //鍓栭潰echarts
-  showAspect.value = false; //鍧″悜绠ご
-  showRain.value = false; //闆ㄥぉ
-  showSnow.value = false; //闆ぉ
-  isContourLabel.value = false; //绛夐珮绾�
 }
 
 const currentOption = ref(null);

--
Gitblit v1.9.3