dedsudiyu 2 年之前
父節點
當前提交
7adcac515a

+ 1 - 1
src/router/index.js

@@ -72,7 +72,7 @@ export const constantRoutes = [
   },
   {
     path: '/emergencyEvacuationBig',
-    component: (resolve) => require(['@/views/emergencyEvacuationBig'], resolve),
+    component: (resolve) => require(['@/views/emergencyEvacuationBigOne'], resolve),
     hidden: true
   },
   {

+ 5 - 5
src/views/comprehensive/laboratoryManagement/subject/indexOne.vue

@@ -101,7 +101,7 @@
               <div class="sensor-for-max-box" v-if="checkedSubject.sensorFunctionStatusList[0]">
                 <div class="sensor-for-big-box"
                      :class="item.type == 1 ? 'sensor-color-a' : (item.type == 2 ? 'sensor-color-b' : 'sensor-color-c')"
-                     v-for="(item,index) in checkedSubject.sensorFunctionStatusList" :key="indexOne">
+                     v-for="(item,index) in checkedSubject.sensorFunctionStatusList" :key="index">
                   <div class="sensor-for-min-box">
                     <img src="@/assets/ZDimages/subject/icon_bj_wd.png" v-if="item.funNum == 'wendu'">
                     <img src="@/assets/ZDimages/subject/icon_bj_sd.png" v-if="item.funNum == 'shidu'">
@@ -132,7 +132,7 @@
             <div class="bottom-switch-box" v-if="rightButtonType == 2">
               <p class="top-title">当前位置:{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</p>
               <div class="switch-for-max-box" v-show="checkedSubject.labHardwareVOList" v-hasPermi="['laboratory:subcontrol:set']">
-                <div class="switch-for-big-box" v-for="(item,index) in checkedSubject.labHardwareVOList" :key="indexOne">
+                <div class="switch-for-big-box" v-for="(item,index) in checkedSubject.labHardwareVOList" :key="index">
                   <div class="switch-for-min-box" v-if="item.hardwareTypeEnum.enumName == 'SWITCH'">
                     <p class="switch-for-min-title">电源控制</p>
                     <el-switch
@@ -175,9 +175,9 @@
             <div class="bottom-video-box" v-if="rightButtonType == 3">
               <p class="top-title">当前位置:{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</p>
               <div class="video-for-max-box" v-if="checkedSubject.videoData[0]">
-                <div class="switch-for-big-box" v-for="(item,index) in checkedSubject.videoData" :key="indexOne">
+                <div class="switch-for-big-box" v-for="(item,index) in checkedSubject.videoData" :key="index">
                   <video :id="item.divId" ref="videoRef" autoplay controls  muted width="490px" height="262px"></video>
-                  <p class="el-icon-full-screen position-p" @click="videoFullScreen(indexOne)"></p>
+                  <p class="el-icon-full-screen position-p" @click="videoFullScreen(index)"></p>
                 </div>
               </div>
               <img class="null-data-img" src="@/assets/ZDimages/null-data.png" v-if="!checkedSubject.videoData[0]">
@@ -1014,7 +1014,7 @@ export default {
     },
     //视屏全屏方法
     videoFullScreen(index){
-      this.$refs.videoRef[indexOne].webkitRequestFullScreen();
+      this.$refs.videoRef[index].webkitRequestFullScreen();
     },
     //断开视频流
     videoOff(){

+ 5 - 5
src/views/comprehensive/laboratoryManagement/subject/indexTwo.vue

@@ -99,7 +99,7 @@
               <div class="sensor-for-max-box" v-if="checkedSubject.sensorFunctionStatusList[0]">
                 <div class="sensor-for-big-box"
                      :class="item.type == 1 ? 'sensor-color-a' : (item.type == 2 ? 'sensor-color-b' : 'sensor-color-c')"
-                     v-for="(item,index) in checkedSubject.sensorFunctionStatusList" :key="indexTwo">
+                     v-for="(item,index) in checkedSubject.sensorFunctionStatusList" :key="index">
                   <div class="sensor-for-min-box">
                     <img src="@/assets/ZDimages/subject/icon_bj_wd.png" v-if="item.funNum == 'wendu'">
                     <img src="@/assets/ZDimages/subject/icon_bj_sd.png" v-if="item.funNum == 'shidu'">
@@ -130,7 +130,7 @@
             <div class="bottom-switch-box" v-if="rightButtonType == 2">
               <p class="top-title">当前位置:{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</p>
               <div class="switch-for-max-box" v-show="checkedSubject.labHardwareVOList" v-hasPermi="['laboratory:subcontrol:set']">
-                <div class="switch-for-big-box" v-for="(item,index) in checkedSubject.labHardwareVOList" :key="indexTwo">
+                <div class="switch-for-big-box" v-for="(item,index) in checkedSubject.labHardwareVOList" :key="index">
                   <div class="switch-for-min-box" v-if="item.hardwareTypeEnum.enumName == 'SWITCH'">
                     <p class="switch-for-min-title">电源控制</p>
                     <el-switch
@@ -173,9 +173,9 @@
             <div class="bottom-video-box" v-if="rightButtonType == 3">
               <p class="top-title">当前位置:{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</p>
               <div class="video-for-max-box" v-if="checkedSubject.videoData[0]">
-                <div class="switch-for-big-box" v-for="(item,index) in checkedSubject.videoData" :key="indexTwo">
+                <div class="switch-for-big-box" v-for="(item,index) in checkedSubject.videoData" :key="index">
                   <video :id="item.divId" ref="videoRef" autoplay controls  muted width="490px" height="262px"></video>
-                  <p class="el-icon-full-screen position-p" @click="videoFullScreen(indexTwo)"></p>
+                  <p class="el-icon-full-screen position-p" @click="videoFullScreen(index)"></p>
                 </div>
               </div>
               <img class="null-data-img" src="@/assets/ZDimages/null-data.png" v-if="!checkedSubject.videoData[0]">
@@ -984,7 +984,7 @@ export default {
     },
     //视屏全屏方法
     videoFullScreen(index){
-      this.$refs.videoRef[indexTwo].webkitRequestFullScreen();
+      this.$refs.videoRef[index].webkitRequestFullScreen();
     },
     //断开视频流
     videoOff(){