dedsudiyu 2 年之前
父節點
當前提交
24cb899a64

+ 6 - 5
src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -163,10 +163,10 @@
                     </el-switch>
                     <p class="switch-null-p" v-else>{{item.state.name}}</p>
                   </div>
-                  <div class="switch-for-min-box" v-if="item.hardwareTypeEnum.enumName == 'ONE_MACHINE'">
-                    <p class="switch-for-min-title">广播系统</p>
-                    <p class="switch-for-min-button" @click="handleAdd(item.subId)">播放文字</p>
-                  </div>
+                  <!--<div class="switch-for-min-box" v-if="item.hardwareTypeEnum.enumName == 'ONE_MACHINE'">-->
+                    <!--<p class="switch-for-min-title">广播系统</p>-->
+                    <!--<p class="switch-for-min-button" @click="handleAdd(item.subId)">播放文字</p>-->
+                  <!--</div>-->
                 </div>
               </div>
               <img class="null-data-img" src="@/assets/ZDimages/null-data.png" v-show="!checkedSubject.labHardwareVOList">
@@ -514,7 +514,8 @@ export default {
             if(response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'VIDEO_MONITOR'){
               list.push(response.data.labHardwareVOList[i].hardwareNUM);
             }
-            if(response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'SWITCH' || response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'AI_VENTILATION' || response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'ONE_MACHINE'){
+            // if(response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'SWITCH' || response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'AI_VENTILATION' || response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'ONE_MACHINE'){
+            if(response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'SWITCH' || response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'AI_VENTILATION'){
               listTwo.push(response.data.labHardwareVOList[i])
             }
           }

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

@@ -165,10 +165,10 @@
                     </el-switch>
                     <p class="switch-null-p" v-else>{{item.state.name}}</p>
                   </div>
-                  <div class="switch-for-min-box" v-if="item.hardwareTypeEnum.enumName == 'ONE_MACHINE'">
-                    <p class="switch-for-min-title">广播系统</p>
-                    <p class="switch-for-min-button" @click="handleAdd(item.subId)">播放文字</p>
-                  </div>
+                  <!--<div class="switch-for-min-box" v-if="item.hardwareTypeEnum.enumName == 'ONE_MACHINE'">-->
+                    <!--<p class="switch-for-min-title">广播系统</p>-->
+                    <!--<p class="switch-for-min-button" @click="handleAdd(item.subId)">播放文字</p>-->
+                  <!--</div>-->
                 </div>
               </div>
               <img class="null-data-img" src="@/assets/ZDimages/null-data.png" v-show="!checkedSubject.labHardwareVOList">
@@ -538,7 +538,8 @@ export default {
             if(response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'VIDEO_MONITOR'){
               list.push(response.data.labHardwareVOList[i].hardwareNUM);
             }
-            if(response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'SWITCH' || response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'AI_VENTILATION' || response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'ONE_MACHINE'){
+            // if(response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'SWITCH' || response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'AI_VENTILATION' || response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'ONE_MACHINE'){
+            if(response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'SWITCH' || response.data.labHardwareVOList[i].hardwareTypeEnum.enumName == 'AI_VENTILATION'){
               listTwo.push(response.data.labHardwareVOList[i])
             }
           }