wang_xy пре 2 година
родитељ
комит
d106bd4a72

+ 9 - 3
src/components/supermap-2.5d.vue

@@ -42,18 +42,24 @@ export default {
   },
   watch: {},
   created() {
-    // this.superMapRootUrl = Cookies.get('superMap.iServer');
+    this.superMapRootUrl = Cookies.get('superMap.iServer');
     //进入主页时就获取超图地址并存入cookie
-
+    if(this.superMapRootUrl != null && this.superMapRootUrl != '' && this.superMapRootUrl != undefined && this.superMapRootUrl != 'undefined'){
+      this.onload();
+    }else{
+      this.superMapInfo();
+    }
   },
   mounted() {
-    this.superMapInfo();
   },
   props: {},
   methods: {
     superMapInfo(){
       getConfigKey('superMap.iServer').then(response => {
         this.superMapRootUrl = response.msg;
+        Cookies.set('superMap.iServer', response.msg, {
+          expires: 300
+        })
         this.onload();
       })
     },

+ 4 - 4
src/views/datacenter.vue

@@ -516,7 +516,7 @@ export default {
       const params = Object.assign({})
       params.longitude = data.longitude;
       params.latitude = data.latitude;
-      
+
       const treeLabels = [{
         "id": null,
         "labelCode": "999",
@@ -554,9 +554,9 @@ export default {
           "labelChannels": labelChannels
         }
       ]
-
-      this.$refs.TVWall.showTVWall1(data.longitude, data.latitude, dianshiqiang);
-
+      if(data.cameraList.length > 0){
+        this.$refs.TVWall.showTVWall1(data.longitude, data.latitude, dianshiqiang);
+      }
     },
   }
 }

+ 1 - 1
src/views/eventdetailsdialog.vue

@@ -5,7 +5,7 @@
     <!--主体-->
     <div class="visual-body">
       <button @click="showEventDialog"
-              style="position: absolute; left:50%;top: 50vh; transform: translateX(-50%);">触发事件详情
+              style="position: absolute; left:50%;top: 50vh; transform: translateX(-50%);">
       </button>
       <!-- 弹层 -->
       <el-dialog title="事件详情" :visible.sync="eventDialog" customClass="customWidth" v-if="eventDialog"

+ 1 - 1
src/views/firespread.vue

@@ -5,7 +5,7 @@
     <!--主体-->
     <div class="visual-body">
       <button @click="showEventDialog"
-              style="position: absolute; left:50%;top: 50vh; transform: translateX(-50%);">触发事件详情
+              style="position: absolute; left:50%;top: 50vh; transform: translateX(-50%);">
       </button>
       <!-- 弹层 -->
       <el-dialog title="事件详情" :visible.sync="eventDialog" customClass="customWidth" v-if="eventDialog"

+ 2 - 2
src/views/monitor.vue

@@ -217,8 +217,8 @@ export default {
     this.selectKeyAreaList()
     this.getTreeselect()
     this.deptId = Cookies.get("deptId")
-    this.getSensorListByDeptId()
-    this.getDlblistBydeptId()
+    // this.getSensorListByDeptId()
+    // this.getDlblistBydeptId()
     this.selectDeviceType(-1)
     this.bottomMenuList() //获取底部公共组件消息和任务
   },