Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

src/views/vent/home/billboard/billboard.data.ts

@@ -452,10 +452,10 @@ export const SUMMARY_COLUMN = [
 export const WARNING_CONFIG = [
   { src: '', text: '监测总数', prop1: 'allNum', prop2: 'maxLevel', id: 'warning_cfg_000' },
   { src: SafetyIcon, text: '安全监测', prop1: 'synthesizeSWarnInfo.totalNum', prop2: 'synthesizeSWarnInfo.maxWarnLevel', id: 'warning_cfg_005' },
-  { src: VentIcon, text: '通风', prop1: 'ventSWarnInfo.totalNum', prop2: 'ventSWarnInfo.maxWarnLevel', id: 'warning_cfg_004' },
+  { src: VentIcon, text: '对射测风', prop1: 'ventSWarnInfo.totalNum', prop2: 'ventSWarnInfo.maxWarnLevel', id: 'warning_cfg_004' },
   { src: DustIcon, text: '粉尘', prop1: 'dustSWarnInfo.totalNum', prop2: 'dustSWarnInfo.maxWarnLevel', id: 'warning_cfg_003' },
   { src: GasIcon, text: '瓦斯', prop1: 'gasSWarnInfo.totalNum', prop2: 'gasSWarnInfo.maxWarnLevel', id: 'warning_cfg_001' },
-  { src: FireIcon, text: '火灾', prop1: 'fireSWarnInfo.totalNum', prop2: 'fireSWarnInfo.maxWarnLevel', id: 'warning_cfg_002' },
+  { src: FireIcon, text: '束管监测', prop1: 'fireSWarnInfo.totalNum', prop2: 'fireSWarnInfo.maxWarnLevel', id: 'warning_cfg_002' },
 ];
 
 // 粉尘预警相关的内容配置项

src/views/vent/home/configurable/configurable.api.ts

@@ -99,10 +99,10 @@ export const list = (params) => {
     if (res.sys_wind) {
       res.sys_wind.forEach((e) => {
         if (e.readData.m3) {
-          e.readData.m3 = Math.abs(parseFloat(e.readData.m3));
+          e.readData.m3 = e.readData.m3.replace('-', '');
         }
         if (e.readData.va) {
-          e.readData.va = Math.abs(parseFloat(e.readData.va));
+          e.readData.va = e.readData.va.replace('-', '');
         }
       });
     }