tj

src/App.vue

@@ -157,20 +157,20 @@ export default {
     }
   },
   watch: {
-    takeover(newValue) {
-      // console.log(2222, newValue)
-      if (newValue) {
-        this.takeoverInfo = newValue
-        this.dialogVisible = true
-      } else {
-        this.dialogVisible = false
-      }
-    }
+    // takeover(newValue) {
+    //   // console.log(2222, newValue)
+    //   if (newValue) {
+    //     this.takeoverInfo = newValue
+    //     this.dialogVisible = true
+    //   } else {
+    //     this.dialogVisible = false
+    //   }
+    // }
   },
   computed: {
-    takeover() {
-      return this.$store.state.d2admin.takeover.takeover
-    }
+    // takeover() {
+    //   return this.$store.state.d2admin.takeover.takeover
+    // }
   },
   mounted() {
     //let token = util.cookies.get('token')
@@ -457,7 +457,7 @@ export default {
       //直接关闭
       this.takeoverInfo = {}
       this.dialogVisible = false
-      this.$store.dispatch('d2admin/takeover/setTakeover', null)
+      // this.$store.dispatch('d2admin/takeover/setTakeover', null)
     },
     clickClose(id) {
       if (id && id === this.takeoverInfo.id) {
@@ -568,7 +568,7 @@ export default {
         })
       } else {
         //清空接管提示框
-        this.$store.dispatch('d2admin/takeover/setTakeover', null)
+        // this.$store.dispatch('d2admin/takeover/setTakeover', null)
       }
     },
     /**数组根据数组对象中的某个属性值进行排序的方法

src/pages/login/page.vue

@@ -260,7 +260,7 @@ export default {
                       let takeover = res.takeover
                       if(takeover && takeover.status === 1){
                         // 弹出提示框
-                        this.$store.dispatch('d2admin/takeover/setTakeover', takeover)
+                        // this.$store.dispatch('d2admin/takeover/setTakeover', takeover)
                       } else if(takeover && takeover.status === 2 ){
                         sessionStorage.setItem('takeover',true)
                       }

src/pages/ol/demo/index.vue

@@ -964,11 +964,9 @@ export default {
       console.log('选中节点的层级', node)
       if (node.level === 3) {
         //切换根节点
-        // this.clearLayer()
-        this.map.removeLayer(this.vectorLayer)
-        this.map.removeLayer(this.lineVectorLayer)
-        this.map.removeInteraction(this.modify)
+        this.clearLayer()
         this.initStation(id)
+        console.log(this.mapList)
       } else if (node.level === 4) {
         this.map.removeLayer(this.boxVectorLayer)
 

src/plugin/axios/index.js

@@ -226,13 +226,13 @@ service.interceptors.response.use(
 					sessionStorage.removeItem('menuList')
 					sessionStorage.removeItem('permissions')
 					sessionStorage.removeItem('routerList')
-					sessionStorage.removeItem('takeover')
+					// sessionStorage.removeItem('takeover')
 					sessionStorage.removeItem('token')
 					sessionStorage.removeItem('uuid')
 					if (this) {
 						this.$parent.getDateList()
 						//清空接管提示框
-						this.$store.dispatch('d2admin/takeover/setTakeover', null)
+						// this.$store.dispatch('d2admin/takeover/setTakeover', null)
 					}
 					// 跳转路由
 					router.push({