zc

src/assets/styles/ZDelement.scss

@@ -65,6 +65,18 @@
   text-align: right;
 }
 /*===================================表格===================================*/
+.el-table{
+  .el-switch__label--right{
+    span{
+      margin-left:12px!important;
+    }
+  }
+  .el-switch__label--left{
+    span{
+      margin-left:24px!important;
+    }
+  }
+}
 .el-table--group::after, .el-table--border::after{
   width:0;
 }

src/views/comprehensive/laboratoryManagement/subject/addSubject.vue

@@ -74,16 +74,16 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="房间号" prop="room" class="form-item">
-        <el-input
-          style="width:320px;"
-          maxlength="30"
-          v-model="form.room"
-          placeholder="请输房间号"
-          clearable
-          size="small"
-        />
-      </el-form-item>
+      <!--<el-form-item label="房间号" prop="room" class="form-item">-->
+        <!--<el-input-->
+          <!--style="width:320px;"-->
+          <!--maxlength="30"-->
+          <!--v-model="form.room"-->
+          <!--placeholder="请输房间号"-->
+          <!--clearable-->
+          <!--size="small"-->
+        <!--/>-->
+      <!--</el-form-item>-->
       <!--<el-form-item label="详细位置" prop="layoutId" class="form-item">-->
         <!--<el-select v-model="form.layoutId"  placeholder="请选择详细位置" style="width:320px;">-->
           <!--<el-option-->
@@ -183,12 +183,12 @@
           </el-form-item>
         </div>
       </div>
-      <div class="title-box">
-        <p class="left-title">实验室简介</p>
-      </div>
-      <div class="rich-text">
-        <UEditor ref="UEditor" :content="form.content" :min-height="192" />
-      </div>
+      <!--<div class="title-box">-->
+        <!--<p class="left-title">实验室简介</p>-->
+      <!--</div>-->
+      <!--<div class="rich-text">-->
+        <!--<UEditor ref="UEditor" :content="form.content" :min-height="192" />-->
+      <!--</div>-->
 
       <div class="bottom-button-box">
         <p class="reset-button-one left-button" @click="backPage">取消</p>

src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -103,7 +103,7 @@
               <div class="sensor-for-max-box scrollbar-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="index">
+                     v-for="(item,index) in checkedSubject.sensorFunctionStatusList" :key="index" v-show="item.funNum != 'huoyan'">
                   <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'">
@@ -144,7 +144,7 @@
                   <i>当前位置：{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</i>
                 </el-tooltip>
               </p>
-              <div class="switch-for-max-box" v-show="checkedSubject.VOlist[0]" v-hasPermi="['laboratory:subcontrol:set']">
+              <div class="switch-for-max-box scrollbar-box" v-show="checkedSubject.VOlist[0]" v-hasPermi="['laboratory:subcontrol:set']">
                 <div class="switch-for-big-box" v-for="(item,index) in checkedSubject.VOlist" :key="index">
                   <div class="switch-for-min-box" v-if="item.hardwareTypeEnum.enumName == 'SWITCH'">
                     <div class="switch-for-min-box_t">
@@ -204,7 +204,7 @@
                   <i>当前位置：{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</i>
                 </el-tooltip>
               </p>
-              <div class="video-for-max-box" v-if="checkedSubject.videoData[0]">
+              <div class="video-for-max-box scrollbar-box" v-if="checkedSubject.videoData[0]">
                 <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(index)"></p>
@@ -328,7 +328,7 @@ import {
 import { listData} from "@/api/system/dict/data";
 import { filterDept } from "@/api/medicUniversity-3_1/index";
 import addSubject from "./addSubject.vue";
-import deviceList from "./deviceList.vue";
+import deviceList from "./deviceList_SuZhouDX.vue";
 import admissionConfiguration from "./admissionConfiguration.vue";
 import associationConfiguration from "./associationConfiguration.vue";
 import infoPage from "./infoPage.vue";
@@ -746,7 +746,6 @@ export default {
               row.dictLabel=self.fanList[b].dictLabel
             }
           }
-          console.log(self.checkedSubject.VOlist)
         }
       });
     },
@@ -763,7 +762,7 @@ export default {
           this.msgSuccess("操作成功")
           //如果是开启的时候调用
           if(row.state.code==4 && row.hardwareTypeEnum.hardwareTypeCode==2){
-            self.subjectTriggerModes(row)
+            // self.subjectTriggerModes(row)
           }else{
             //row.state.code = row.state.code==3?4:(row.state.code==4?3:'')
           }
@@ -1077,7 +1076,7 @@ export default {
           }else{
 
             //硬件
-             //console.log("硬件",data);
+            //  console.log("硬件",data);
             for (let i = 0; i < data.data.length; i++) {
               if (self.checkedSubject.VOlist) {
                 for (let k = 0; k < self.checkedSubject.VOlist.length; k++) {
@@ -1089,11 +1088,12 @@ export default {
                     } else if (data.data[i].hardwareOperate == 'OFFLINE') {
                       self.checkedSubject.VOlist[k].state.code = 0;
                     }
-                  }
-                  if(self.checkedSubject.VOlist[k].hardwareTypeEnum.hardwareTypeCode == '2'){
-                    for(let b=0;b<self.fanList.length;b++){
-                      if(self.fanList[b].dictValue==self.checkedSubject.VOlist[k].triggerModes){
-                        self.checkedSubject.VOlist[k].dictLabel=self.fanList[b].dictLabel
+                    if(self.checkedSubject.VOlist[k].hardwareTypeEnum.hardwareTypeCode == '2'){
+                      for(let b=0;b<self.fanList.length;b++){
+                        if(self.fanList[b].dictValue==self.checkedSubject.VOlist[k].triggerModes){
+                          self.checkedSubject.VOlist[k].dictLabel=self.fanList[b].dictLabel
+                          self.subjectTriggerModes(self.checkedSubject.VOlist[k])
+                        }
                       }
                     }
                   }
@@ -1391,6 +1391,9 @@ export default {
           }
         }
         .bottom-switch-box{
+          overflow: hidden;
+          display: flex;
+          flex-direction: column;
           background: #fff;
           width:424px;
           flex: 1;
@@ -1488,6 +1491,9 @@ export default {
           }
         }
         .bottom-video-box{
+          overflow: hidden;
+          display: flex;
+          flex-direction: column;
           background: #fff;
           width:424px;
           border-radius: 0 10px 10px 10px;