Merge branch 'web-v2' into nhkd-web

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

@@ -127,10 +127,10 @@
             </div>
             <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="index">
+              <div class="switch-for-max-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'">
-                    <p class="switch-for-min-title">电源控制</p>
+                    <p class="switch-for-min-title">{{item.hardwareName}}</p>
                     <el-switch
                       v-if="item.state.code == 3||item.state.code == 4"
                       class="switch"
@@ -145,7 +145,7 @@
                     <p class="switch-null-p" v-else>{{item.state.name}}</p>
                   </div>
                   <div class="switch-for-min-box" v-if="item.hardwareTypeEnum.enumName == 'AI_VENTILATION'">
-                    <p class="switch-for-min-title">智能通风</p>
+                    <p class="switch-for-min-title">{{item.hardwareName}}</p>
                     <el-switch
                       v-if="item.state.code == 3||item.state.code == 4"
                       class="switch"
@@ -165,8 +165,8 @@
                   <!--</div>-->
                 </div>
               </div>
-              <img class="null-data-img" src="@/assets/ZDimages/null-data.png" v-show="!checkedSubject.labHardwareVOList">
-              <p class="null-text-p" v-show="!checkedSubject.labHardwareVOList">暂无物联控制信息，请在更多操作-物联设备配置中进行添加</p>
+              <img class="null-data-img" src="@/assets/ZDimages/null-data.png" v-show="!checkedSubject.VOlist[0]">
+              <p class="null-text-p" v-show="!checkedSubject.VOlist[0]">暂无物联控制信息，请在更多操作-物联设备配置中进行添加</p>
             </div>
             <div class="bottom-video-box" v-if="rightButtonType == 3">
               <p class="top-title">当前位置：{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</p>
@@ -774,7 +774,17 @@ export default {
     subjectInfo(id){
       let type = 1; //硬件 //0全部
       subjectInfo(id,type).then(response => {
-        this.$set(this,'checkedSubject',response.data);
+        let obj = JSON.parse(JSON.stringify(response.data));
+        obj.VOlist = [];
+        if(response.data.labHardwareVOList){
+          for(let i=0;i<response.data.labHardwareVOList.length;i++){
+            if(response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'SWITCH'||
+              response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'AI_VENTILATION'){
+              obj.VOlist.push(response.data.labHardwareVOList[i]);
+            }
+          }
+        }
+        this.$set(this,'checkedSubject',obj);
         this.$set(this.checkedSubject,'videoData',[]);
         this.rightButtonType = 1;
       })
@@ -935,15 +945,15 @@ export default {
             //硬件
             // console.log("硬件",data);
             for (let i = 0; i < data.data.length; i++) {
-              if (self.checkedSubject.labHardwareVOList) {
-                for (let k = 0; k < self.checkedSubject.labHardwareVOList.length; k++) {
-                  if (self.checkedSubject.labHardwareVOList[k].id == data.data[i].num) {
+              if (self.checkedSubject.VOlist) {
+                for (let k = 0; k < self.checkedSubject.VOlist.length; k++) {
+                  if (self.checkedSubject.VOlist[k].id == data.data[i].num) {
                     if (data.data[i].hardwareOperate == 'CLOSE') {
-                      self.checkedSubject.labHardwareVOList[k].state.code = 4;
+                      self.checkedSubject.VOlist[k].state.code = 4;
                     } else if (data.data[i].hardwareOperate == 'OPEN') {
-                      self.checkedSubject.labHardwareVOList[k].state.code = 3;
+                      self.checkedSubject.VOlist[k].state.code = 3;
                     } else if (data.data[i].hardwareOperate == 'OFFLINE') {
-                      self.checkedSubject.labHardwareVOList[k].state.code = 0;
+                      self.checkedSubject.VOlist[k].state.code = 0;
                     }
                   }
                 }

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

@@ -104,7 +104,7 @@
         </div>
         <div class="things-box" v-for="(item,index) in newData.labHardwareVOListTwo" :key="item.id" v-if="item.hardwareTypeEnum.enumName == 'SWITCH'">
           <div class="things-for-box">
-            <p class="left-title">电源控制</p>
+            <p class="left-title">{{item.hardwareName}}</p>
             <el-switch
               v-if="item.state.code == 3||item.state.code == 4"
               class="switch"
@@ -121,7 +121,7 @@
         </div>
         <div class="things-box" v-for="(item,index) in newData.labHardwareVOListTwo" :key="item.id" v-if="item.hardwareTypeEnum.enumName == 'AI_VENTILATION'">
           <div class="things-for-box">
-            <p class="left-title">智能通风</p>
+            <p class="left-title">{{item.hardwareName}}</p>
             <el-switch
               v-if="item.state.code == 3||item.state.code == 4"
               class="switch"
@@ -669,10 +669,15 @@
         .things-for-box{
           display: flex;
           .left-title{
+            width: 110px;
             font-size:14px;
             color:#333;
             line-height:30px;
-            margin-right:30px;
+            margin-right:10px;
+            display:block;
+            overflow:hidden;
+            text-overflow:ellipsis;
+            white-space:nowrap;
           }
           .switch{