ZC

src/layout/components/Navbar.vue

@@ -4,8 +4,8 @@
     <div class="left-logo-box">
       <!--<img src="@/assets/ZDimages/icon_logo.png">-->
       <img :src="circularLogo">
-      <!--<p>实验室安全智能监测与控制系统</p>-->
-      <p>危化品智能存储管理系统</p>
+      <p>实验室安全智能监测与控制系统</p>
+      <!--<p>危化品智能存储管理系统</p>-->
     </div>
     <!--<breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>-->
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
@@ -14,9 +14,9 @@
         <img src="@/assets/ZDimages/top_nav_icon_02.png">
       </div>
       <!--按钮首页-->
-      <!--<div @click="goPage('home')" v-if="userType!='22'&&initPage== 'true'">-->
-        <!--<img src="@/assets/ZDimages/top_nav_icon_01.png">-->
-      <!--</div>-->
+      <div @click="goPage('home')" v-if="userType!='22'&&initPage== 'true'">
+        <img src="@/assets/ZDimages/top_nav_icon_01.png">
+      </div>
     </div>
     <div class="right-menu">
       <!--<template v-if="device!=='mobile'">-->

src/router/index.js

@@ -29,12 +29,12 @@ import Layout from '@/layout'
 export const constantRoutes = [
   {
     path: '/',
-    component: (resolve) => require(['@/views/loginOne'], resolve),//home loginOne
+    component: (resolve) => require(['@/views/home'], resolve),//home loginOne
     hidden: true
   },
   {
     path: '/login',
-    component: (resolve) => require(['@/views/loginOne'], resolve),
+    component: (resolve) => require(['@/views/login'], resolve),
     hidden: true
   },
   {

src/views/emergencyEvacuationBig.vue

@@ -117,6 +117,7 @@
   import flvjs from 'flv.js'
   import { evacuate, closure, lineEvacuate, IntelligentGuidance,getRedis,getDeviceList,textParseUrlIps,getCameraByFloor,startUrlJiNanDaXue,startUrl } from '@/api/executeThePlan.js'
   import mqtt from 'mqtt'
+  import { subjectInfo } from "@/api/laboratory/subject";
   export default {
     name: 'emergencyEvacuationBig',
     props:{
@@ -217,9 +218,20 @@
       },
       getCameraByFloor(){
         getCameraByFloor({floorId:5}).then(response => {
-          if(response.data[0]){
-            this.startUrl(response.data);
-          }
+          let videoList = response.data;
+          subjectInfo(this.subId,0).then(res => {
+            if (res.data.labHardwareVOList){
+              for(let i=0;i<res.data.labHardwareVOList.length;i++){
+                if(res.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'VIDEO_MONITOR'){
+                  videoList.push(res.data.labHardwareVOList[i].hardwareNUM);
+                }
+              }
+            }
+            videoList = [...new Set(videoList)]
+            if (videoList[0]){
+              this.startUrl(videoList);
+            }
+          })
         });
       },
       //文字转语音播放

src/views/emergencyEvacuationBigOne.vue

@@ -118,6 +118,7 @@
   import flvjs from 'flv.js'
   import { evacuate, closure, lineEvacuate, IntelligentGuidance,getRedis,getDeviceList,textParseUrlIps,getCameraByFloor,startUrlWC,startUrl } from '@/api/executeThePlan.js'
   import mqtt from 'mqtt'
+  import { subjectInfo } from "@/api/laboratory/subject";
   export default {
     name: 'emergencyEvacuationBig',
     props:{
@@ -219,9 +220,20 @@
       },
       getCameraByFloor(){
         getCameraByFloor({floorId:this.buttonId}).then(response => {
-          if(response.data[0]){
-            this.startUrl(response.data);
-          }
+          let videoList = response.data;
+          subjectInfo(this.subId,0).then(res => {
+            if (res.data.labHardwareVOList){
+              for(let i=0;i<res.data.labHardwareVOList.length;i++){
+                if(res.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'VIDEO_MONITOR'){
+                  videoList.push(res.data.labHardwareVOList[i].hardwareNUM);
+                }
+              }
+            }
+            videoList = [...new Set(videoList)]
+            if (videoList[0]){
+              this.startUrl(videoList);
+            }
+          })
         });
       },
       //文字转语音播放

src/views/homeNavbar.vue

@@ -3,8 +3,8 @@
     <div class="left-logo-box">
       <!--<img src="@/assets/ZDimages/icon_logo.png">-->
       <img :src="circularLogo">
-      <!--<p>实验室安全智能监测与控制系统</p>-->
-      <p>危化品智能存储管理系统</p>
+      <p>实验室安全智能监测与控制系统</p>
+      <!--<p>危化品智能存储管理系统</p>-->
     </div>
     <div class="nav-icon-max-box">
       <div @click="goPage('message')">