Merge branch '3.3.2-dzxxp' into 3.3.4-kdyh

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

@@ -906,7 +906,9 @@ export default {
           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]);
+              if( response.data.labHardwareVOList[i].isPcfire == 0 ){
+                obj.VOlist.push(response.data.labHardwareVOList[i]);
+              }
             }
           }
         }