zc

src/api/index.js

@@ -25,6 +25,14 @@ export function laboratoryBigViewSelectTriggerInfo(query) {
     params: query
   })
 }
+//查询当前正在发生的预案
+export function laboratorySelectTriggerInfo(query) {
+  return request({
+    url: '/laboratory/selectTriggerInfo',
+    method: 'get',
+    params: query
+  })
+}
 //应急处置-获取楼层布局数据
 export function laboratoryBigViewGetFloorByBigView(query) {
   return request({

src/components/planAlarm/planAlarm.vue

@@ -142,7 +142,7 @@
 <script>
   import mqtt from 'mqtt'
   import {
-    laboratoryBigViewSelectTriggerInfo,
+    laboratorySelectTriggerInfo,
     iotBigViewDeviceFindByType,
     iotCameraFindByCondition,
     iotBigViewDeviceFindBySubId,
@@ -215,7 +215,7 @@
       if(!this.planClient.unsubscribe){
         this.offPlanMQTT('on');
       }
-      this.laboratoryBigViewSelectTriggerInfo();
+      this.laboratorySelectTriggerInfo();
     },
     methods:{
       //选中喇叭
@@ -285,7 +285,7 @@
         }).then(() => {
           laboratoryPlanCloseRiskPlan({eventId:self.planData.eventId}).then(response => {
             self.$set(self,'showType',false);
-            self.laboratoryBigViewSelectTriggerInfo();
+            self.laboratorySelectTriggerInfo();
           });
         }).catch(() => {});
       },
@@ -384,14 +384,14 @@
         this.planClient.on("message", (topic, message) => {
           if (message){
             //获取预案数据
-            this.laboratoryBigViewSelectTriggerInfo();
+            this.laboratorySelectTriggerInfo();
           }
         });
       },
       //查询当前正在发生的预案
-      laboratoryBigViewSelectTriggerInfo(){
+      laboratorySelectTriggerInfo(){
         clearInterval(this.timer);
-        laboratoryBigViewSelectTriggerInfo().then(response => {
+        laboratorySelectTriggerInfo().then(response => {
           if(response.data[0]){
             let planData = {
               buildId:response.data[response.data.length-1].buildId,

src/views/home.vue

@@ -15,7 +15,7 @@
       </div>
     </div>
     <!--安全总览-->
-    <newSafetyOverview v-if="pageType === 1"></newSafetyOverview>
+    <newSafetyOverview ref="newSafetyOverview" v-if="pageType === 1"></newSafetyOverview>
     <!--设备资源-->
     <resourceDevice v-if="pageType === 2"></resourceDevice>
     <!--三维模型-->
@@ -24,7 +24,7 @@
     <videoSurveillance v-if="pageType === 4"></videoSurveillance>
     <!--应急管控-->
     <emergencyManagement v-if="pageType === 5"></emergencyManagement>
-    <planAlarm></planAlarm>
+    <planAlarm ref="planAlarm"></planAlarm>
   </div>
 </template>
 <script>
@@ -52,7 +52,7 @@
         timeData:null,
         // 定时器
         timer:null,
-        pageType:4,
+        pageType:1,
       }
     },
     created(){
@@ -82,6 +82,7 @@
         }else{
           if(type !== this.pageType){
             this.$set(this,'pageType',type);
+            this.$refs['planAlarm'].laboratoryBigViewSelectTriggerInfo();
           }
         }
       },
@@ -100,6 +101,11 @@
           self.$set(self,'timeData',y+'年'+m+'月'+d+'日 '+hours+':'+minutes+':'+seconds);
         }
       },
+      goDataMap(obj){
+        if(this.pageType == 1){
+          this.$refs['newSafetyOverview'].laboratoryBigViewSelectTriggerInfoData(obj)
+        }
+      },
     },
     beforeDestroy() {
       //清除定时器

src/views/newSafetyOverview/index.vue

@@ -129,8 +129,8 @@
           {school:'N',	name:'家畜生物学重点实验室楼',	buildId:'101093843117592787',buildIdList:[],},
           {school:'N',	name:'木艺坊',	buildId:'101093843117592819',buildIdList:[],},
           {school:'N',	name:'林学院实验楼',	buildId:'101093843117592818',buildIdList:[],},
-          {school:'N',	name:'科研主楼',	buildId:'101093843117592784',buildIdList:[],},
-          {school:'N',	name:'科研楼',	buildId:'101093843117592822',buildIdList:[],},
+          {school:'N',	name:'科研主楼',	buildId:'101093843117592784',buildIdList:['101093843117592784','101093843117592822'],},
+          // {school:'N',	name:'科研楼',	buildId:'101093843117592822',buildIdList:[],},
           {school:'N',	name:'经管园林楼（文科楼）A',	buildId:'101093843117592777',buildIdList:[],},
           {school:'N',	name:'经管园林楼（文科楼）C',	buildId:'101093843117592778',buildIdList:[],},
           {school:'N',	name:'草业与草原楼',	buildId:'101093843117592825',buildIdList:[],},

src/views/newSafetyOverview/pageComponent/canvasMap.vue

@@ -93,7 +93,7 @@
           {school:'N',	name:'家畜生物学重点实验室楼',	buildId:'101093843117592787',centerValue:'101093843117592787',valueList:['101093843117592787'],alarmType:false,},
           {school:'N',	name:'木艺坊',	buildId:'101093843117592819',centerValue:'101093843117592819',valueList:['101093843117592819'],alarmType:false,},
           {school:'N',	name:'林学院实验楼',	buildId:'101093843117592818',centerValue:'',valueList:[],alarmType:false,},
-          {school:'N',	name:'科研主楼',	buildId:'101093843117592784',centerValue:'101093843117592784',valueList:['101093843117592784'],alarmType:false,},
+          {school:'N',	name:'科研主楼',	buildId:'101093843117592784',centerValue:'101093843117592784',valueList:['101093843117592784','101093843117592822'],alarmType:false,},
           {school:'N',	name:'科研楼',	buildId:'101093843117592822',centerValue:'',valueList:[],alarmType:false,},
           {school:'N',	name:'经管园林楼（文科楼）A',	buildId:'101093843117592777',centerValue:'101093843117592777',valueList:['101093843117592777'],alarmType:false,},
           {school:'N',	name:'经管园林楼（文科楼）C',	buildId:'101093843117592778',centerValue:'',valueList:[],alarmType:false,},

src/views/newSafetyOverview/pageComponent/laboratoryData.vue

@@ -63,18 +63,24 @@
       </div>
       <div class="bottom-box">
         <div class="bottom-min-box">
-          <p class="left-p">{{bottomDataName1}}：</p>
-          <dv-digital-flop :config="bottomDataTotal1" class="dvDigitalFlop"/>
+          <!--<p class="left-p">{{bottomDataName1}}：</p>-->
+          <p class="left-p">公共平台：</p>
+          <p style="width:65px;color:#0183FA;text-align: right;line-height:50px;">- -</p>
+          <!--<dv-digital-flop :config="bottomDataTotal1" class="dvDigitalFlop"/>-->
           <p class="right-p">间</p>
         </div>
         <div class="bottom-min-box">
-          <p class="left-p">{{bottomDataName2}}：</p>
-          <dv-digital-flop :config="bottomDataTotal2" class="dvDigitalFlop"/>
+          <!--<p class="left-p">{{bottomDataName2}}：</p>-->
+          <p class="left-p">生物类：</p>
+          <p style="width:65px;color:#25D748;text-align: right;line-height:50px;">- -</p>
+          <!--<dv-digital-flop :config="bottomDataTotal2" class="dvDigitalFlop"/>-->
           <p class="right-p">间</p>
         </div>
         <div class="bottom-min-box">
-          <p class="left-p">{{bottomDataName3}}：</p>
-          <dv-digital-flop :config="bottomDataTotal3" class="dvDigitalFlop"/>
+          <!--<p class="left-p">{{bottomDataName3}}：</p>-->
+          <p class="left-p">科研类：</p>
+          <p style="width:65px;color:#00FFFF;text-align: right;line-height:50px;">- -</p>
+          <!--<dv-digital-flop :config="bottomDataTotal3" class="dvDigitalFlop"/>-->
           <p class="right-p">间</p>
         </div>
       </div>

src/views/videoSurveillance/pageComponent/deptListComponent.vue

@@ -182,11 +182,19 @@
           let self = this;
           let list = this.forTreeId(response.data);
           this.$nextTick(()=>{
-            let checkData = list[0].childTreeList[0];
-            //写入楼层下数据
-            this.$set(this,'deptOptions',list)
-            //展开列表
-            this.$set(this,'defaultKey',[list[0].treeId,list[0].childTreeList[0].treeId]);
+            let checkData = []
+            if(obj.subName || obj.roomNum){
+              checkData = list[0].childTreeList[0].childTreeList[0];
+              //展开列表
+              self.$set(self,'defaultKey',[list[0].treeId,list[0].childTreeList[0].treeId]);
+              setTimeout(function(){
+                self.$set(self,'defaultKey',[list[0].treeId,list[0].childTreeList[0].childTreeList[0].treeId]);
+              },200)
+            }else{
+              checkData = list[0].childTreeList[0];
+              //展开列表
+              self.$set(self,'defaultKey',[list[0].treeId,list[0].childTreeList[0].treeId]);
+            }
             setTimeout(function(){
               //选中列表
               self.$refs.tree.setCurrentKey(checkData.treeId);
@@ -197,7 +205,7 @@
               self.laboratorySubPassOutGetCountByBuildId(1,checkData.treeId);
               //父级视屏数据
               self.getSubId(checkData);
-            },200);
+            },600);
           })
         })
       },