7-12预警管控，粉尘监测提测bug修改提交

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

@@ -26,7 +26,7 @@ export const centerAreaListB1 = [
 //内外因火灾菜单列表
 export const typeMenuList = [{ name: '内因火灾' }, { name: '外因火灾' }, { name: '火灾指标' }];
 //瓦斯监测菜单列表
-export const typeMenuListGas = [{ name: '预警监测' }, { name: '预警指标' }];
+export const typeMenuListGas = [{ name: '预警监测' }, { name: '预警指标' },{ name: '瓦斯参数' },];
 //当前加载组件
 export const componentName = {
   fireWork: markRaw(defineAsyncComponent(() => import('./common/fireWork.vue'))),

src/views/vent/monitorManager/alarmMonitor/common/warnFire-bd.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="warnTargetFire-brt">
         <div class="top-area">
-            <a-table :columns="columns" :data-source="tableData" bordered :pagination="false" :scroll="{ y: 298 }">
+            <a-table :columns="columns" :data-source="tableData" bordered :pagination="false" :scroll="{ y: 376 }">
                 <template #bodyCell="{ column, text }">
                     <template v-if="column.dataIndex === 'name'">
                         <a href="javascript:;">{{ text }}</a>

src/views/vent/monitorManager/alarmMonitor/common/warnFire-brt.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="warnTargetFire-brt">
         <div class="top-area">
-            <a-table :columns="columns" :data-source="tableData" bordered :pagination="false" :scroll="{ y: 298 }">
+            <a-table :columns="columns" :data-source="tableData" bordered :pagination="false" :scroll="{ y: 376 }">
                 <template #bodyCell="{ column, text }">
                     <template v-if="column.dataIndex === 'name'">
                         <a href="javascript:;">{{ text }}</a>

src/views/vent/monitorManager/alarmMonitor/warn/dustWarn.vue

@@ -160,6 +160,7 @@ function topAreaClick(index) {
     echartDat.push({ id: '2', time: JSON.parse(choiceData[index].readData.expectInfo)['nowTime'], value: JSON.parse(choiceData[index].readData.expectInfo)['nowVal'] })
     let unique = uniqueObjects(echartDat, 'time');
     let setData = [...echartDatas.value, ...unique].sort((a,b)=>Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
+    console.log(setData,'setData----------')
     setData.forEach((m, n) => {
         echartDataFc.xData.push(m.time);
         if (unique.filter(t => t.time == m.time).length != 0 && m.id == '1') {
@@ -305,10 +306,10 @@ async function getWindDeviceList() {
                     label: '通信状态',
                     value: el.netStatus == '0' ? '断开' : '连接',
                     listR: [
-                        { id: 0, label: '安装位置', dw: '', value: el.strinstallpos },
-                        { id: 1, label: '粉尘浓度', dw: '(mg/m³)', value: el.dustval },
-                        { id: 2, label: '巷道湿度', dw: '(RH)', value: el.humidity },
-                        { id: 4, label: '巷道温度', dw: '(℃)', value: el.temperature },
+                        { id: 0, label: '安装位置', dw: '', value: el.strinstallpos || '-' },
+                        { id: 1, label: '粉尘浓度', dw: '(mg/m³)', value: el.dustval || '-' },
+                        { id: 2, label: '巷道湿度', dw: '(RH)', value: el.humidity || '-' },
+                        { id: 4, label: '巷道温度', dw: '(℃)', value: el.temperature || '-' },
                         { id: 3, label: '是否报警', dw: '', value: el.warnFlag == '0' ? '正常' : el.warnFlag == 1 ? '报警' : el.warnFlag == 2 ? '断开' : '未监测' },
                     ],
                 })
@@ -450,10 +451,11 @@ onUnmounted(() => {
                     margin: 5px 0px;
 
                     .content-title {
+                        width: 85%;
                         position: absolute;
-                        top: 3px;
+                        top: 2px;
                         left: 50%;
-                        transform: translate(-78%, 0);
+                        transform: translate(-55%, 0);
                         font-size: 14px;
                         color: #fff;
                     }
@@ -503,10 +505,11 @@ onUnmounted(() => {
                     margin: 5px 0px;
 
                     .content-title {
+                        width: 85%;
                         position: absolute;
-                        top: 3px;
+                        top: 2px;
                         left: 50%;
-                        transform: translate(-60%, 0);
+                        transform: translate(-50%, 0);
                         font-size: 14px;
                         color: #fff;
                     }

src/views/vent/monitorManager/alarmMonitor/warn/gasWarn.vue

@@ -19,7 +19,7 @@
             </div>
         </div>
         <div class="gas-content">
-            <div style="width:100%;height:100%" v-if="isShow">
+            <div style="width:100%;height:100%" v-if="isShow=='yjjc'">
                 <div class="top-area" v-if="topAreaListWs.length != 0">
                     <div class="title-t">
                         <div class="text-t">瓦斯抽采泵信息</div>
@@ -82,9 +82,12 @@
                     </div>
                 </div>
             </div>
-            <div style="width:100%;height:100%" v-else>
+            <div style="width:100%;height:100%" v-else-if="isShow=='yjzb'">
                 <warnTargetGas></warnTargetGas>
             </div>
+            <div style="width:100%;height:100%" v-else-if="isShow=='wscs'">
+                <gasParamter></gasParamter>
+            </div>
         </div>
     </div>
 </template>
@@ -96,6 +99,7 @@ import { useSystemSelect } from '/@/hooks/vent/useSystemSelect';
 import { useRouter } from 'vue-router';
 import CustomHeader from '/@/components/vent/customHeader.vue';
 import warnTargetGas from '../common/warnTargetGas.vue'
+import gasParamter from '../common/gasParamter.vue'
 import { typeMenuListGas } from '../common.data'
 
 const { options, optionValue, getSelectRow, getSysDataSource } = useSystemSelect('sys_surface_caimei'); // 参数为场景类型（设备类型管理中可以查询到）
@@ -110,7 +114,7 @@ let cardListWs = reactive<any[]>([]);
 let router = useRouter()
 //监测/指标激活索引
 let activeIndex = ref(0);
-let isShow = ref(true)
+let isShow = ref('')
 
 // https获取监测数据
 let timer: null | NodeJS.Timeout = null;
@@ -203,11 +207,15 @@ function btnClick(ind) {
     switch (ind) {
         case 0:
             activeIndex1.value = 0;
-            isShow.value = true
+            isShow.value = 'yjjc'
             break;
         case 1:
             activeIndex1.value = 0;
-            isShow.value = false
+            isShow.value = 'yjzb'
+            break;
+        case 2:
+            activeIndex1.value=0
+            isShow.value='wscs'
             break;
     }
 }
@@ -256,7 +264,7 @@ onUnmounted(() => {
             justify-content: space-between;
 
             .btn {
-                width: 50%;
+                width: 33.33%;
                 height: 100%;
                 font-size: 14px;
                 text-align: center;
@@ -265,7 +273,7 @@ onUnmounted(() => {
             }
 
             .btn1 {
-                width: 50%;
+                width: 33.33%;
                 height: 100%;
                 font-size: 14px;
                 color: #fff;

src/views/vent/monitorManager/deviceMonitor/components/device/modal/dust.modal.vue

@@ -26,7 +26,7 @@
             </div>
             <div class="item-container">
               <div class="title">粉尘浓度</div>
-              <div class="value"><span class="data">{{ dustMonitor.humidity ? dustMonitor.humidity : '-' }}</span>
+              <div class="value"><span class="data">{{ dustMonitor.dustval ? dustMonitor.dustval : '-' }}</span>
                 <span>mg/m³</span>
               </div>
             </div>
@@ -67,7 +67,7 @@
           <div class="dust-group">
             <div class="dust-item">
               <div class="title">粉尘浓度(实时)</div>
-              <div class="value">{{ dustMonitor.breathWeighted ? dustMonitor.breathWeighted : '-' }}<span>mg/m³</span>
+              <div class="value">{{ dustMonitor.dustval ? dustMonitor.dustval : '-' }}<span>mg/m³</span>
               </div>
             </div>
             <div class="dust-item">
@@ -81,7 +81,7 @@
             </div>
             <div class="dust-item">
               <div class="title">爆炸浓度(煤尘)</div>
-              <div class="value">{{ dustMonitor.dustval ? dustMonitor.dustval : '-' }}<span>mg/m³</span></div>
+              <div class="value">{{ dustMonitor.breathWeighted ? dustMonitor.breathWeighted : '-' }}<span>mg/m³</span></div>
             </div>
           </div>
         </div>