zc

src/views/components/mapComponent.vue

@@ -61,13 +61,13 @@
         checkIndex: 0,
         //通知切换时间
         // noticeSwitchTime:600000,
-        noticeSwitchTime:600000,
+        noticeSwitchTime:60000,
         //房间展示切换时间
         // subSwitchTime:30000,
-        subSwitchTime:30000,
+        subSwitchTime:3000,
         //预案查询定时
         // alarmSwitchTime:60000,
-        alarmSwitchTime:60000,
+        alarmSwitchTime:6000,
         //通知开启状态
         noticeType:false,
         //通知数据
@@ -209,9 +209,9 @@
                 }
               }
             }
+            obj.videoList = [];
             //查询实验室监控
             if(obj.monitorVisable){
-              obj.videoList = [];
               let videoObj = {
                 page:'1',
                 pageSize:'10',

src/views/components/overviewComponent.vue

@@ -14,7 +14,7 @@
       <img src="@/assets/ZDimages/icon_shiyong@1x.png">
       <div>
         <p>使用</p>
-        <p>{{data1}}</p>
+        <p>{{data2}}</p>
         <p>间</p>
       </div>
     </div>
@@ -22,7 +22,7 @@
       <img src="@/assets/ZDimages/icon_weixiu@1x.png">
       <div>
         <p>维修</p>
-        <p>{{data1}}</p>
+        <p>{{data3}}</p>
         <p>间</p>
       </div>
     </div>

src/views/components/subComponent.vue

@@ -172,7 +172,7 @@
     },
     data() {
       return {
-        newDataShow: true,
+        newDataShow: false,
         newData: {
           status: '',
           roomNumName: '',
@@ -198,16 +198,14 @@
 
     },
     mounted() {
-
     },
     methods: {
       getSubData(item) {
         this.switchBox(item)
       },
       switchBox(obj) {
-        // console.log('subObj', obj)
         let self = this
-        self.$set(self, 'newDataShow', !self.newDataShow)
+        self.$set(self, 'newDataShow', false)
         setTimeout(function() {
           obj.alarmSensor = [];
           for(let i=0;i<obj.sensor.length;i++){
@@ -236,7 +234,7 @@
             self.$set(self, 'alarmVideoData', videoObj)
             self.$set(self, 'checkVideoIndex', 0)
           }
-          self.$set(self, 'newDataShow', !self.newDataShow)
+          self.$set(self, 'newDataShow', true)
           if(obj.alarmType){
             self.openAlarm();
           }