提交

src/App.vue

@@ -391,6 +391,9 @@ export default {
         sessionStorage.getItem('token') &&
         sessionStorage.getItem('token') != undefined
       ) {
+          // 集合
+          // this.$store.dispatch('d2admin/typeList/set', e.typeList)
+
         //登录才能获取
         // this.tipList = JSON.parse(e.data)
         console.log('接管数据' + e.data)
@@ -436,7 +439,7 @@ export default {
           this.ishowAlarm = true
           this.$message.success('拒绝了接管申请')
           sessionStorage.removeItem('takeover')
-          this.$store.dispatch('d2admin/takeover/set', true)
+          this.$store.dispatch('d2admin/typeList/set', true)
           this.takeoverClose()
         } else if (bean && bean.valids === 0 && bean.status === 4) {
           sessionStorage.removeItem('takeover')
@@ -445,7 +448,7 @@ export default {
           location.reload(true)
         }
         // 设置刷新页面（站点接管管理页面）
-        this.$store.dispatch('d2admin/takeover/set', true)
+        this.$store.dispatch('d2admin/typeList/set', true)
         // console.log(this.takeoverInfo, '-------')
       }
     },
@@ -507,7 +510,7 @@ export default {
         if (data && data.code === 0) {
           // this.$message.success('操作成功')
           sessionStorage.removeItem('takeover')
-          this.$store.dispatch('d2admin/takeover/set', true)
+          this.$store.dispatch('d2admin/typeList/set', true)
           this.takeoverClose()
         }
       })

src/pages/ol/demo/index.vue

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

src/pages/ol/kanban/index.vue

@@ -48,40 +48,14 @@ export default {
               type: 'slyl',
               value: '0.319mp',
               scope: '参考值：0.2~0.8mp'
-            },
-            {
-              leftName: '喷淋系统',
-              rightName: '泵房温度',
-              type: 'wd',
-              value: '22.5℃',
-              scope: '参考值：0.0~50℃'
-            },
-            {
-              leftName: '喷淋系统',
-              rightName: '水位高度',
-              type: 'swgd',
-              value: '22.5℃',
-              scope: '参考值：0.0~50℃'
-            },
-            {
-              leftName: '喷淋系统',
-              rightName: '水流流量',
-              type: 'slll',
-              value: '22.5℃',
-              scope: '参考值：0.0~50℃'
             }
+
           ]
         },
         {
           name: '喷淋系统',
           list: [
-            {
-              leftName: '喷淋系统',
-              rightName: '二氧化碳',
-              type: 'co2',
-              value: '0.319mp',
-              scope: '参考值：0.2~0.8mp'
-            },
+
             {
               leftName: '喷淋系统',
               rightName: '一氧化碳',
@@ -96,6 +70,13 @@ export default {
               value: '22.5℃',
               scope: '参考值：0.0~50℃'
             },
+            {
+              leftName: '喷淋系统',
+              rightName: '风速',
+              type: 'fs',
+              value: '22.5℃',
+              scope: '参考值：0.0~50℃'
+            },
             {
               leftName: '喷淋系统',
               rightName: '风速',
@@ -175,6 +156,12 @@ export default {
         }
       ]
     }
+  },
+computed: {
+  // 类型列表
+    // typeList() {
+    //   return this.$store.state.d2admin.typeList
+    // }
   }
 }
 </script>

src/store/modules/d2admin/index.js

@@ -14,7 +14,7 @@ import search from './modules/search'
 import size from './modules/size'
 import toast from './modules/toast'
 import alramfj from './modules/alramfj'
-import takeover from './modules/takeover'
+import typeList from './modules/typeList'
 import bjCode from './modules/bjCode'
 import bim from './modules/bim'
 
@@ -37,7 +37,7 @@ export default {
     size,
     toast,
     alramfj,
-    takeover,
+    typeList,
     bjCode,
     bim
   }

src/store/modules/d2admin/modules/takeover.js → src/store/modules/d2admin/modules/typeList.js

 export default {
     namespaced: true,
     state: {
-        message: '',
-        takeover: {}
+        typeList: []
     },
     actions: {
-      set ({ state, dispatch }, message) {
+      set ({ state, dispatch }, data) {
         return new Promise(async resolve => {
-          state.message = message
-        })
-      },
-      setTakeover ({ state, dispatch }, takeover) {
-        return new Promise(async resolve => {
-          state.takeover = takeover
+          state.typeList = data
         })
       }
     }