158分站更新

src/views/vent/safetyList/common/detail.vue

@@ -904,8 +904,12 @@ async function getStationList1() {
         v.linkIdC = v.linkId == '0' ? '未启用' : v.linkId == '1' ? '启用' : v.linkId == '2' ? '设备异常' : '';
         v.updateTime = v.time;
         v.gdmsC = v.gdms == '1' ? '直流供电' : v.gdms == '0' ? '交流供电' : '';
-        v.valueJc = `风向:${v.forward || ''},风量:${v.m3 || ''}m³/min,风速:${v.windSpeed || ''}m/s,气压:${v.pa || ''}Pa,压差:${v.difPress || ''
-          }Pa,温度:${v.temperature || ''}℃,湿度:${v.humidity || ''}%,断面积:${v.area || ''}㎡`;
+        v.gd5 = `温度:${v.temperature || ''}℃,湿度:${v.humidity || ''}%,绝压:${v.pa || ''}Pa,压差:${v.yacha || ''
+          }Pa,密度:${v.density || ''}kg/m³`;
+        v.common = `风向:${v.forward || ''},风量:${v.m3 || ''}m³/min,风速:${v.windSpeed || ''}m/s,气压:${v.pa || ''}Pa,压差:${v.difPress || ''
+          }Pa,温度:${v.temperature || ''}℃,湿度:${v.humidity || ''}%,断面积:${v.area || ''}㎡`
+
+        v.valueJc = v.deviceType == 'modelsensor_gd5' ? v.gd5 : v.common
       });
     });
   }
@@ -930,8 +934,12 @@ async function getStationListAll() {
       v.linkIdC = v.linkId == '0' ? '未启用' : v.linkId == '1' ? '启用' : v.linkId == '2' ? '设备异常' : '';
       v.updateTime = v.time;
       v.gdmsC = v.gdms == '1' ? '直流供电' : v.gdms == '0' ? '交流供电' : '';
-      v.valueJc = `风向:${v.forward || ''},风量:${v.m3 || ''}m³/min,风速:${v.windSpeed || ''}m/s,气压:${v.pa || ''}Pa,压差:${v.difPress || ''
-        }Pa,温度:${v.temperature || ''}℃,湿度:${v.humidity || ''}%,断面积:${v.area || ''}㎡`;
+      v.gd5 = `温度:${v.temperature || ''}℃,湿度:${v.humidity || ''}%,绝压:${v.pa || ''}Pa,压差:${v.yacha || ''
+        }Pa,密度:${v.density || ''}kg/m³`;
+      v.common = `风向:${v.forward || ''},风量:${v.m3 || ''}m³/min,风速:${v.windSpeed || ''}m/s,气压:${v.pa || ''}Pa,压差:${v.difPress || ''
+        }Pa,温度:${v.temperature || ''}℃,湿度:${v.humidity || ''}%,断面积:${v.area || ''}㎡`
+
+      v.valueJc = v.deviceType == 'modelsensor_gd5' ? v.gd5 : v.common
     });
   });
   tableData.value = res;