预警bug修改提交

src/views/vent/monitorManager/alarmMonitor/alarm.data.ts

@@ -581,7 +581,7 @@ export const fireMonitor = [
     title: 'CO最大值(ppm)',
     code: '',
     level: null,
-    value: '-',
+    value: '0',
   },
   // {
   //   title: 'CH₄最大值(%)',

src/views/vent/monitorManager/alarmMonitor/fire/dustPage.vue

@@ -38,7 +38,7 @@ let choiceData = reactive<any[]>([])
 //粉尘图表数据
 let echartDataFc = reactive({
     maxData: {
-        lengedData: '粉尘浓度',
+        lengedData: '粉尘浓度(mg/m³)',
         data: []
     },
     minData: {
@@ -86,7 +86,7 @@ watch(() => props.listData, (val) => {
                 title: el.strinstallpos,
                 content: [
                     { ids: 0, label: '温度(°C)', value: el.readData.temperature || '--', },
-                    { ids: 1, label: '粉尘浓度(%)', value: el.readData.dustval || '--', },
+                    { ids: 1, label: '粉尘浓度(mg/m³)', value: el.readData.dustval || '--', },
                     { ids: 2, label: '喷雾水压', value: el.readData.waterPressure || '--', },
                     { ids: 3, label: '喷雾状态', value: el.readData.atomizingState || '--', },
                 ],

src/views/vent/monitorManager/alarmMonitor/fire/gasPage.vue

@@ -82,6 +82,7 @@ watch(() => props.listData, (val) => {
         })
 
         val.common.gas.forEach(el => {
+            el.strinstallpos=el.strinstallpos.indexOf('&')==-1 ? el.strinstallpos : el.strinstallpos.substring(0,el.strinstallpos.indexOf('&'))
             cardListWs.push({
                 label: '甲烷',
                 value: el.readData.gasC || '--',

src/views/vent/monitorManager/alarmMonitor/index.vue

@@ -254,7 +254,7 @@
               <div class="detail-box">
                 <div class="detail-item" v-for="(item, index) in gasMonitor" :key="index">
                   <div class="">{{ item.label }}</div>
-                  <div class="value">{{ item.value || item.value == 0 ? item.value : '-' }}</div>
+                  <div class="value">{{ item.value != 0 ? item.value : '-' }}</div>
                 </div>
               </div>
             </div>
@@ -266,7 +266,7 @@
               <div class="detail-box">
                 <div class="detail-item" v-for="(item, index) in gasMonitor" :key="index">
                   <div class="">{{ item.label }}</div>
-                  <div class="value">{{ item.value || item.value == 0 ? item.value1 : '-' }}</div>
+                  <div class="value">{{ item.value1 != 0 ? item.value1 : '-' }}</div>
                 </div>
               </div>
             </div>
@@ -448,6 +448,7 @@ async function getList() {
     gasData.sums1 += el.pumpNumber
     gasMonitor.push({ label: el.systemname, value: el.gasNumber, value1: el.pumpNumber })
   })
+  
 }
 
 onMounted(async () => {