Merge remote-tracking branch 'origin/visu_firecontrol_01_siping_2.5d' into visu_firecontrol_01_siping_2.5d

src/views/datacenter.vue

@@ -310,18 +310,12 @@ export default {
           console.log("icon_" + (index + 1) + "=", icon);
           that.$set(that.resourcesList[index], 'icon', icon);
 
-          // v-on:click="fireControlViewPoint(item.type)">
           if(index < 5){
             // that.fireControlViewPoint(data.type, 'undefined');
             that.fireControlViewPoint(data.type, '所有');
           }
         })
-        // console.log(JSON.stringify(res.data));
       })
-        .catch(function (error) {
-          console.log(error);
-        });
-
     },
     /*    getResource() {
           let that = this

src/views/eventdetailsdialog.vue

@@ -1347,14 +1347,12 @@ export default {
     calendarDay: null//首页日历选择
   },
   created() {
-    // 获取消防左侧菜单列表
-    this.fireControlViewList();
+
     /** ----------------------------------摄像头预览开始------------------------------------- */
     const DHWsInstance = DHWs.getInstance()
     this.ws = DHWsInstance
     /** ----------------------------------摄像头预览结束------------------------------------- */
   },
-
   methods: {
     // 获取消防左侧菜单列表
     fireControlViewList() {
@@ -2119,6 +2117,7 @@ export default {
       this.eventLogList = []
     },
     showEventDialog(eventCode) {
+      this.fireControlViewList()
       this.eventCode = eventCode
       let that = this
       //获取事件详情

src/views/firespread.vue

@@ -1264,7 +1264,6 @@
       /** ----------------------------------摄像头预览开始------------------------------------- */
       const DHWsInstance = DHWs.getInstance()
       this.ws = DHWsInstance
-      this.fireControlViewList();
       /** ----------------------------------摄像头预览结束------------------------------------- */
     },
     methods: {
@@ -1989,6 +1988,7 @@
         this.eventLogList = []
       },
       showEventDialog(eventCode) {
+        this.fireControlViewList();
         this.getNewDataByDate(this.calendarDay)
         this.eventCode = eventCode
         let that = this