提交新版本

src/views/vent/dust/dustHome/dustHome.api.ts

@@ -7,7 +7,8 @@ enum Api {
   getDustInfos = '/dust/dustDisasterApi/getDustInfos',
   historyAndForecast = '/dust/dustDisasterApi/historyAndForecast',
   realData = '/fire/show/realData',
-  getGzmMaxBySensorType='/dust/dustDisasterApi/getGzmMaxBySensorType'
+  getGzmMaxBySensorType='/dust/dustDisasterApi/getGzmMaxBySensorType',
+  dustCoalSeam='/dust/dustDisasterApi/dustCoalSeam'
 }
 /**
  * 粉尘工作面监测图表数据
@@ -50,3 +51,8 @@ export const realData = (params) => defHttp.post({ url: Api.realData, params });
  * @param params
  */
 export const getGzmMaxBySensorType = () => defHttp.get({ url: Api.getGzmMaxBySensorType, });
+/**
+ * 粉尘静态指标下拉选项数据
+ * @param params
+ */
+export const dustCoalSeam = () => defHttp.get({ url: Api.dustCoalSeam, });

src/views/vent/dust/dustHome/index.vue

@@ -106,7 +106,8 @@ import {
   historyAndForecast,
   realData,
   getDustWarningCntByType,
-  getGzmMaxBySensorType
+  getGzmMaxBySensorType,
+  dustCoalSeam
 } from './dustHome.api';
 //GIs按钮切换显示与隐藏
 let toggleOpen = ref(false)
@@ -145,11 +146,7 @@ let pwData = reactive<any[]>([]);
 // ]);
 
 //粉尘静态指标数据
-let selectListJt = reactive<any[]>([
-  { label: '8#煤层', value: '0' },
-  // { label: '9#煤层', value: '1' },
-  // { label: '10#煤层', value: '0' },
-]);
+let selectListJt = reactive<any[]>([]);
 let jtzbCode = ref('0');
 
 //隐藏和显示左右侧区域
@@ -168,6 +165,7 @@ function getMonitor() {
     await getFireAreaInfoList();
     await getRealDataList();
     // await getGzmMaxBySensorTypeList()
+    await dustCoalSeamList()
     if (timer) {
       timer = null;
     }
@@ -315,12 +313,17 @@ async function getRealDataList() {
 //     })
 //   }
 // }
-
+async function dustCoalSeamList(){
+  selectListJt.length=0
+  let res=await dustCoalSeam()
+  selectListJt.push({label:res,value:res})
+}
 onMounted(() => {
   getDustWarningCntByTypeList()
   getFireAreaInfoList();
   getRealDataList();
   // getGzmMaxBySensorTypeList()
+  dustCoalSeamList()
   getMonitor();
 });
 onUnmounted(() => {

src/views/vent/fire/fireDistributionPoint/index.vue

@@ -17,7 +17,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { ref, reactive, onMounted,onUnmounted } from 'vue';
+import { ref, reactive, onMounted, onUnmounted } from 'vue';
 import basicSensor from '../../common/basicSensor.vue';
 import { getFireAreaInfo, getZcHfWd, getHeadingFace, getDsWd, getMainTrafficYw } from './firePoint.api'
 
@@ -85,9 +85,10 @@ async function getFireAreaInfos() {
 async function getZcHfWdList() {
   let res = await getZcHfWd()
   if (res.length != 0) {
-    sensorList.length=0
+    sensorList.length = 0
     res.forEach(el => {
-      sensorList.push({ name: el.nodePlacement, status: el.detectValue + ' ('+ el.unit + ')', warn: el.warningMsg, times: el.dateTime })
+      let dw = el.unit != 'null' && el.unit != null ? `(${el.unit})` : ''
+      sensorList.push({ name: el.nodePlacement, status: el.detectValue + dw, warn: el.warningMsg, times: el.dateTime })
     })
   }
 }
@@ -96,9 +97,9 @@ async function getZcHfWdList() {
 async function getHeadingFaceList() {
   let res = await getHeadingFace()
   if (res.length != 0) {
-    sensorList1.length=0
+    sensorList1.length = 0
     res.forEach(el => {
-      sensorList1.push({ name: el.name, nd: el.co || '-' , status: el.wd || '-' , warn: el.warningMsg, times: el.dateTime })
+      sensorList1.push({ name: el.name, nd: el.co || '-', status: el.wd || '-', warn: el.warningMsg, times: el.dateTime })
     })
   }
 }
@@ -107,9 +108,11 @@ async function getHeadingFaceList() {
 async function getMainTrafficYwList() {
   let res = await getMainTrafficYw()
   if (res.length != 0) {
-    sensorList2.length=0
+    sensorList2.length = 0
     res.forEach(el => {
-      sensorList2.push({ name: el.nodePlacement, status:el.detectValue + ' ('+ el.unit + ')', warn: el.warningMsg, times: el.dateTime })
+      let dw = el.unit != 'null' && el.unit != null ? `(${el.unit})` : ''
+      el.detectValue = el.sensorType == 'M0104' ? '0ppm' : el.sensorType == 'K0007' ? el.detectValue == '0' ? '无烟雾' : el.detectValue == '1' ? '有烟雾' : '-' : '-'
+      sensorList2.push({ name: el.nodePlacement, status: el.detectValue + dw, warn: el.warningMsg, times: el.dateTime })
     })
   }
 }
@@ -118,9 +121,10 @@ async function getMainTrafficYwList() {
 async function getDsWdList() {
   let res = await getDsWd()
   if (res.length != 0) {
-    sensorList3.length=0
+    sensorList3.length = 0
     res.forEach(el => {
-      sensorList3.push({ name: el.nodePlacement, status: el.detectValue + ' ('+ el.unit + ')', warn: el.warningMsg, times: el.dateTime })
+      let dw = el.unit != 'null' && el.unit != null ? `(${el.unit})` : ''
+      sensorList3.push({ name: el.nodePlacement, status: el.detectValue + dw, warn: el.warningMsg, times: el.dateTime })
     })
   }
 }
@@ -128,7 +132,7 @@ async function getDsWdList() {
 onMounted(() => {
   getFireAreaInfos()
   getMonitor()
-  
+
 })
 
 onUnmounted(() => {
@@ -150,7 +154,7 @@ onUnmounted(() => {
   margin: 0 10px;
   background: #282828;
 
-  
+
 
   .fireDis-right-box {
     display: flex;