Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/zhxf_vue into dev

# Conflicts:
#	src/App.vue

src/App.vue

@@ -340,16 +340,6 @@ export default {
         console.log('接管数据' + e.data)
       }
     },
-    //关闭连接
-    takeoverClose() {},
-    clickClose(id) {
-      if (id && id === this.takeoverInfo.id) {
-        //有id的话只关闭id跟后台传递过来id相同的弹出层，不一样不关。防止一边同意一边立马申请，申请后发的但是先到了。websocket先发但是后到
-        console.log('关闭的时候', this.takeoverInfo)
-        //只关闭id跟返回的id一样的数据
-        this.takeoverClose()
-      }
-    },
     //连接建立失败重连
     websocketonerror2(e) {
       console.log(`连接失败的信息2：`, e)

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

@@ -966,6 +966,7 @@ export default {
         //切换根节点
         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({