dedsudiyu 2 years ago
parent
commit
fc8e069428

+ 1 - 1
src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -133,7 +133,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="index">
+                <div class="switch-for-big-box" v-for="(item,index) in checkedSubject.labHardwareVOList" :key="index" v-if="item.isPcfire != 1">
                   <div class="switch-for-min-box" v-if="item.hardwareTypeEnum.enumName == 'SWITCH'">
                     <p class="switch-for-min-title">电源控制</p>
                     <el-switch

+ 1 - 1
src/views/newEvacuationBigData.vue

@@ -29,7 +29,7 @@
             <p>智能控制</p>
           </div>
           <div class="control-max-box scrollbar-box" id="control-max-box">
-            <div class="control-for-box" v-for="(item,index) in controlList" :key="index">
+            <div class="control-for-box" v-for="(item,index) in controlList" :key="index" v-if="item.isPcfire != 1">
               <p class="control-for-title-p">{{item.name}}</p>
               <div class="control-for-img-box">
                 <img class="position-img" src="@/assets/ZDimages/bigData3_2/icon_znkz_bg.png">