瓦斯监测日报表修改-提交

src/views/vent/gas/gasReport/index.vue

@@ -31,7 +31,7 @@
               <div class="item-text">上报地点：</div>
               <a-select v-model:value="searchData.strInstallPos" style="width: 220px" placeholder="请选择上报地点">
                 <a-select-option v-for="item in addressList" :key="item" :value="item.value">{{ item.label
-                  }}</a-select-option>
+                }}</a-select-option>
               </a-select>
             </div>
           </a-col>
@@ -77,24 +77,25 @@
         <template #bodyCell="{ column, text }">
           <template
             v-if="column.dataIndex == 'o2Night1' || column.dataIndex == 'o2Night2' || column.dataIndex == 'o2Early1' || column.dataIndex == 'o2Early2' || column.dataIndex == 'o2Noon1' || column.dataIndex == 'o2Noon2'">
-            <div :style="{ color: Number(text) >= 18 && Number(text) <= 20.9 ? '#ff2313' : '#0ae715' }">{{ text }}</div>
+            <div :style="{ color: Number(text) >= 18 && Number(text) <= 20.9 ? '#0ae715' : '#ff2313' }">{{ text }}
+            </div>
           </template>
           <template
             v-if="column.dataIndex == 'coNight1' || column.dataIndex == 'coNight2' || column.dataIndex == 'coEarly1' || column.dataIndex == 'coEarly2' || column.dataIndex == 'coNoon1' || column.dataIndex == 'coNoon2'">
-            <div :style="{ color: Number(text) >= 0 && Number(text) <= 23 ? '#ff2313' : '#0ae715' }">{{ text }}</div>
+            <div :style="{ color: Number(text) >= 0 && Number(text) <= 23 ? '#0ae715' : '#ff2313' }">{{ text }}</div>
           </template>
           <template
             v-if="column.dataIndex == 'tNight1' || column.dataIndex == 'tNight2' || column.dataIndex == 'tEarly1' || column.dataIndex == 'tEarly2' || column.dataIndex == 'tNoon1' || column.dataIndex == 'tNoon2'">
-            <div :style="{ color: Number(text) >= 3 && Number(text) <= 25 ? '#ff2313' : '#0ae715' }">{{ text }}</div>
+            <div :style="{ color: Number(text) >= 3 && Number(text) <= 25 ? '#0ae715' : '#ff2313' }">{{ text }}</div>
           </template>
           <template
             v-if="column.dataIndex == 'co2Night1' || column.dataIndex == 'co2Night2' || column.dataIndex == 'co2Early1' || column.dataIndex == 'co2Early2' || column.dataIndex == 'co2Noon1' || column.dataIndex == 'co2Noon2'">
-            <div :style="{ color: Number(text) >= 0.04 && Number(text) <= 0.1 ? '#ff2313' : '#0ae715' }">{{ text }}
+            <div :style="{ color: Number(text) >= 0.04 && Number(text) <= 0.1 ? '#0ae715' : '#ff2313' }">{{ text }}
             </div>
           </template>
           <template
             v-if="column.dataIndex == 'ch4Night1' || column.dataIndex == 'ch4Night2' || column.dataIndex == 'ch4Early1' || column.dataIndex == 'ch4Early2' || column.dataIndex == 'ch4Noon1' || column.dataIndex == 'ch4Noon2'">
-            <div :style="{ color: Number(text) >= 0 && Number(text) <= 0.1 ? '#ff2313' : '#0ae715' }">{{ text }}</div>
+            <div :style="{ color: Number(text) >= 0 && Number(text) <= 0.1 ? '#0ae715' : '#ff2313' }">{{ text }}</div>
           </template>
 
         </template>
@@ -138,6 +139,14 @@ function onChange(val, time) {
 async function getTableList() {
   let res = await getList({ pageNo: pagination.current, pageSize: pagination.pageSize, ...searchData });
   console.log(res, '瓦斯日报列表数据-----------');
+  res.records.forEach(el => {
+    el.jwSdzNight1 = el.jwSdzNight1 != null ? el.jwSdzNight1 : '-'
+    el.jwSdzNight2 = el.jwSdzNight2 != null ? el.jwSdzNight2 : '-'
+    el.jwSdzEarly1 = el.jwSdzEarly1 != null ? el.jwSdzEarly1 : '-'
+    el.jwSdzEarly2 = el.jwSdzEarly2 != null ? el.jwSdzEarly2 : '-'
+    el.jwSdzNoon1 = el.jwSdzNoon1 != null ? el.jwSdzNoon1 : '-'
+    el.jwSdzNoon2 = el.jwSdzNoon2 != null ? el.jwSdzNoon2 : '-'
+  })
   tableData.value = res.records;
   pagination.total = res.total;
 }

src/views/vent/monitorManager/deviceMonitor/components/device/device.data.ts

@@ -73,7 +73,7 @@ export function getMonitorComponent() {
       FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.sw.vue'));
       break;
     default:
-      FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.hlg.vue'));
+      FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.vue'));
     // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.sw.vue'));
     // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.vue'));
     // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal-Gx.vue'));