Merge branch 'zh' of http://xny.yj-3d.com:3000/fengsen/4.0 into zh

src/renderer/views/dashboard/index.vue

@@ -704,28 +704,30 @@ export default {
     },
     closeSituationEdit() {
       // 新增态势0906
-      window.draw && window.draw.end();
-      Array.from(ts_Map.values()).forEach((entity) => entity.remove());
 
-      ts_Map.clear();
-      // setTimeout(() => {
       if (window.Earth1) {
+        window.draw && window.draw.end();
+        Array.from(ts_Map.values()).forEach((entity) => entity.remove());
+
+        ts_Map.clear();
         window.Earth1.destroy();
         window.Earth1 = null;
       }
+      this.$refs.Deduction.stop();
       this.editSituation = !this.editSituation;
       this.eventsList = false;
       this.showList = !this.showList;
-      //新增态势0824
+      // //新增态势0824
       this.showElementBtn = "";
+      this.showCabinBtn = "";
+      this.showCabin = "";
       this.showElement = "";
+      //
+      // this.eventBox = false;
 
-      this.eventBox = false;
-      this.$refs.Deduction.stop();
       this.$nextTick(() => {
         this.$refs.situation.getList();
       });
-      // }, 10);
     },
     getRowKey(row) {
       // 需要为每一行设置一个唯一标识，这里假设每行的id是唯一的
@@ -828,7 +830,7 @@ export default {
         this.createEarth("earthContainers");
 
         /*
- 
+
          console.log("eventList", res);
          // obj.tasks = res.list;
          let arr = [];
@@ -841,7 +843,7 @@ export default {
          // window.Clock = new TSTY.clock();
          this.scales = Store.scales;
          this.tasks = Store.tasks;
- 
+
          this.showList = !this.showList;
          this.editSituation = !this.editSituation;
          this.createEarth("earthContainers");
@@ -1128,8 +1130,7 @@ export default {
     .selectImgBox {
       z-index: 9999999;
     }
-
-    .ModelSetBox {
+    .ModelSetBox{
       z-index: 10000;
     }