From 5d2106137232b0559a14a28165094f0e1b28d14f Mon Sep 17 00:00:00 2001
From: TreeWish <1131093754@qq.com>
Date: 星期一, 20 二月 2023 18:11:14 +0800
Subject: [PATCH] Merge branch 'master' of http://103.85.165.99:8989/r/LFWEB_NEW

---
 src/views/Synthesis/LeftMenu.vue |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/views/Synthesis/LeftMenu.vue b/src/views/Synthesis/LeftMenu.vue
index 8a000da..eb6449d 100644
--- a/src/views/Synthesis/LeftMenu.vue
+++ b/src/views/Synthesis/LeftMenu.vue
@@ -411,13 +411,6 @@
     //浜岀礆鑿滃崟鐐瑰嚮鍒囨崲
     setChangeTwoMenu(res) {
 
-
-
-      //鍏抽棴鎵撳紑鐨勪俊鎭獥浣�
-
-
-
-      this.showTwoMenuFlag = res.id;
       this.$store.state.mapMenuBoolean = false;
       this.$store.state.mapMenuBoxFlag = null;
       this.$store.state.mapPopBoolean = false;
@@ -427,8 +420,11 @@
         window.model.deleteObject();
         window.model = null;
       }
-
-      if (this.isMenuFlag != val) {
+      sgworld.Analysis.clearCurtainContrast();
+      if (this.isMenuFlag == "d") {
+        this.clearAllAnalsy();
+      }
+      if (this.isMenuFlag !=val) {
         sgworld.Creator.SimpleGraphic.clear();
         this.isMenuFlag = val;
         if (this.entityaLayers.length != 0) {
@@ -442,11 +438,12 @@
         }
         this.$store.state.queryInfo = [];
         if (this.$store.state.primitLayer != null) {
+          sgworld.Viewer.entities.remove(this.$store.state.primitLayer);
           sgworld.Creator.DeleteObject(this.$store.state.primitLayer);
           this.$store.state.primitLayer = null;
         }
       }
-
+      this.showTwoMenuFlag = res.id;
 
       switch (val) {
         case 'a': //鍥惧眰绠$悊
@@ -1086,6 +1083,23 @@
           break;
       }
     },
+    clearAllAnalsy() {
+      // switch (this.showTwoMenuFlag) {
+      //   case 'd1':
+      //     that.isolineFlag = false;
+      //     elevationTool.tf = that.isolineFlag;
+      //     elevationTool.render();
+      //     break;
+      //   case 'd2':
+      //     that.isslopeFlag = false;
+      //     elevationTool.type = 'none';
+      //     elevationTool.render();
+      //     break;
+      // }
+    },
+
+
+
     setAnalsy(res) {
       //this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.close("queryinfo");
       var that = this;

--
Gitblit v1.9.3