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

src/views/vent/bundle/bundleMonitorTable/bundle-table.data.ts

@@ -847,3 +847,173 @@ export const Bltcolumns: BasicColumn[] = [
     align: 'center',
   },
 ];
+export const Sgtcolumns: BasicColumn[] = [
+  {
+    title: '设备号',
+    width: 60,
+    align: 'center',
+    dataIndex: 'sbh',
+    key: 'sbh',
+  },
+  {
+    title: '设备安装地点',
+    width: 100,
+    align: 'center',
+    dataIndex: 'sbazdd',
+    key: 'sbazdd',
+  },
+  {
+    title: '管路编号',
+    dataIndex: 'glbh',
+    key: 'glbh',
+    width: 80,
+    align: 'center',
+  },
+  {
+    title: '取样地点',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '报警合计',
+    dataIndex: 'bjhj',
+    key: 'bjhj',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: 'O₂(%)',
+    children: [
+      {
+        title: '最小值',
+        dataIndex: 'o2_min',
+        key: 'o2_min',
+        width: 80,
+        align: 'center',
+      },
+      {
+        title: '平均值',
+        dataIndex: 'o2_ave',
+        key: 'o2_ave',
+        width: 80,
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: 'CO₂(%)',
+    children: [
+      {
+        title: '最大值',
+        dataIndex: 'co2_max',
+        key: 'co2_max',
+        width: 80,
+        align: 'center',
+      },
+      {
+        title: '平均值',
+        dataIndex: 'co2_ave',
+        key: 'co2_ave',
+        width: 80,
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: 'CO(PPM)',
+    children: [
+      {
+        title: '最大值',
+        dataIndex: 'co_max',
+        key: 'co_max',
+        width: 80,
+        align: 'center',
+      },
+      {
+        title: '平均值',
+        dataIndex: 'co_ave',
+        key: 'co_ave',
+        width: 80,
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: 'CH₄(%)',
+    children: [
+      {
+        title: '最大值',
+        dataIndex: 'ch4_max',
+        key: 'ch4_max',
+        width: 80,
+        align: 'center',
+      },
+      {
+        title: '平均值',
+        dataIndex: 'ch4_ave',
+        key: 'ch4_ave',
+        width: 80,
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: 'C₂H₂(PPM)',
+    children: [
+      {
+        title: '最大值',
+        dataIndex: 'c2h2_max',
+        key: 'c2h2_max',
+        width: 80,
+        align: 'center',
+      },
+      {
+        title: '平均值',
+        dataIndex: 'c2h2_ave',
+        key: 'c2h2_ave',
+        width: 80,
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: 'C₂H₄(PPM)',
+    children: [
+      {
+        title: '最大值',
+        dataIndex: 'c2h4_max',
+        key: 'c2h4_max',
+        width: 80,
+        align: 'center',
+      },
+      {
+        title: '平均值',
+        dataIndex: 'c2h4_ave',
+        key: 'c2h4_ave',
+        width: 80,
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: '备注',
+    dataIndex: 'smark',
+    key: 'smark',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '煤自燃阶段',
+    dataIndex: 'internalFireWarnLevel',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    width: 100,
+    align: 'center',
+  },
+];

src/views/vent/bundle/bundleMonitorTable/index.vue

@@ -50,7 +50,7 @@
 
 <script setup lang="ts">
 import { ref, onMounted, computed, shallowRef, reactive, nextTick } from 'vue';
-import { columns, Hjtcolumns, Bdcolumns, Bltcolumns } from './bundle-table.data';
+import { columns, Hjtcolumns, Bdcolumns, Bltcolumns, Sgtcolumns } from './bundle-table.data';
 import { getBundleInfoList, getAllFileList, getAllFileListById } from './bundle-table.api';
 import customHeader from '/@/components/vent/customHeader.vue';
 // import { blastDelta } from './modal/blastDelta.vue';
@@ -90,8 +90,10 @@ const computedColumns = computed(() => {
       return Bdcolumns; // 保德对应的列配置
     case 'sdmtjtbltmk':
       return Bltcolumns; // 补连塔对应的列配置
+    case 'sdmtjtsgtmk':
+      return Sgtcolumns; // 石圪台对应的列配置
     default:
-      return columns; // 默认情况下返回的列配置
+      return Sgtcolumns; // 默认情况下返回的列配置
   }
 });
 function updateChart(data: any) {

src/views/vent/bundleSpy/bundleSpyTable/bundleSpy-table.data.ts

@@ -356,3 +356,287 @@ export const Bdcolumns: BasicColumn[] = [
     align: 'center',
   },
 ];
+export const Bltcolumns: BasicColumn[] = [
+  {
+    title: '编号',
+    width: 60,
+    align: 'center',
+    dataIndex: 'xh',
+    key: 'xh',
+  },
+  {
+    title: '采样区域',
+    width: 60,
+    align: 'center',
+    dataIndex: 'cyqy',
+    key: 'cyqy',
+  },
+  {
+    title: '采空区',
+    dataIndex: 'ckq',
+    key: 'ckq',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '采样地点',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '水温(℃)',
+    dataIndex: 'sw',
+    key: 'sw',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '气温(℃)',
+    dataIndex: 'qw',
+    key: 'qw',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '气流状态',
+    dataIndex: 'qlzt',
+    key: 'qlzt',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '压差(Pa)',
+    dataIndex: 'yc',
+    key: 'yc',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '气体分析结果表',
+    children: [
+      {
+        title: '便携仪O₂(%)',
+        dataIndex: 'o2_bxyy',
+        key: 'o2_bxyy',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '色谱仪O₂(%)',
+        dataIndex: 'o2_ave',
+        key: 'o2_ave',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '便携仪CO(CO%)',
+        dataIndex: 'co_bxy',
+        key: 'co_bxy',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '色谱仪CO(%)',
+        dataIndex: 'co_ave',
+        key: 'co_ave',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '二氧化碳(CO₂%)',
+        dataIndex: 'co2_ave',
+        key: 'co2_ave',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: 'N₂(%)',
+        dataIndex: 'n2_ave',
+        key: 'n2_ave',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: 'CH₄(%)',
+        dataIndex: 'ch4_ave',
+        key: 'ch4_ave',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: 'C2H6(%)',
+        dataIndex: 'c2h6_ave',
+        key: 'c2h6_ave',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: 'C₂H₄(%)',
+        dataIndex: 'c2h4_ave',
+        key: 'c2h4_ave',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: 'C₂H₂(%)',
+        dataIndex: 'c2h2_ave',
+        key: 'c2h2_ave',
+        width: 100,
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: '采样日期',
+    dataIndex: 'cyfxsj',
+    key: 'cyfxsj',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '采样时间',
+    dataIndex: 'cyfxsj2',
+    key: 'cyfxsj2',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '采样人',
+    dataIndex: 'cyr',
+    key: 'cyr',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '煤自燃阶段',
+    dataIndex: 'internalFireWarnLevel',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '进出风状态',
+    dataIndex: 'jcfzt',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    width: 100,
+    align: 'center',
+  },
+];
+export const Sgtcolumns: BasicColumn[] = [
+  {
+    title: '序号',
+    width: 60,
+    align: 'center',
+    dataIndex: 'xh',
+    key: 'xh',
+  },
+  {
+    title: '采样地点',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '采空区',
+    dataIndex: 'ckq',
+    key: 'ckq',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '采样时间',
+    dataIndex: 'cyfxsj',
+    key: 'cyfxsj',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: 'O₂(%)',
+    dataIndex: 'o2_ave',
+    key: 'o2_ave',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: 'N₂(%)',
+    dataIndex: 'n2_ave',
+    key: 'n2_ave',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: 'CO(%)',
+    dataIndex: 'co_ave',
+    key: 'co_ave',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: 'CO₂(%)',
+    dataIndex: 'co2_ave',
+    key: 'co2_ave',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: 'CH₄(%)',
+    dataIndex: 'ch4_ave',
+    key: 'ch4_ave',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: 'C2H6(%)',
+    dataIndex: 'c2h6_ave',
+    key: 'c2h6_ave',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: 'C₂H₄(%)',
+    dataIndex: 'c2h4_ave',
+    key: 'c2h4_ave',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: 'C₂H₂(%)',
+    dataIndex: 'c2h2_ave',
+    key: 'c2h2_ave',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '取样人',
+    dataIndex: 'qyr',
+    key: 'qyr',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '备注',
+    dataIndex: 'smark',
+    key: 'smark',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '煤自燃阶段',
+    dataIndex: 'internalFireWarnLevel',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    width: 100,
+    align: 'center',
+  },
+];

src/views/vent/bundleSpy/bundleSpyTable/index.vue

@@ -44,7 +44,7 @@
 
 <script setup lang="ts">
 import { ref, onMounted, computed, reactive, shallowRef } from 'vue';
-import { columns, Hjtcolumns, Bdcolumns } from './bundleSpy-table.data';
+import { columns, Hjtcolumns, Bdcolumns, Bltcolumns, Sgtcolumns } from './bundleSpy-table.data';
 import { getbundleSpyInfoList, getAllFileList, getAllFileListById } from './bundleSpy-table.api';
 import customHeader from '/@/components/vent/customHeader.vue';
 import * as echarts from 'echarts';
@@ -80,6 +80,10 @@ const computedColumns = computed(() => {
       return Hjtcolumns; // 活鸡兔对应的列配置
     case 'sdmtjtBdmk':
       return Bdcolumns; // 保德对应的列配置
+    case 'sdmtjtbltmk':
+      return Bltcolumns; // 补连塔对应的列配置
+    case 'sdmtjtsgtmk':
+      return Sgtcolumns; // 石圪台对应的列配置
     default:
       return Bdcolumns; // 默认情况下返回的列配置
   }
@@ -209,56 +213,56 @@ function updateChart(data: any) {
       case 'sdmtjtBdmk':
         return [
           {
-            name: 'O₂平均值',
+            name: 'O₂',
             data: o2AveValues,
             yAxisIndex: 0,
             type: 'bar',
           },
           {
-            name: 'N₂平均值',
+            name: 'N₂',
             data: n2AveValues,
             yAxisIndex: 0,
             type: 'bar',
           },
 
           {
-            name: 'CO平均值',
+            name: 'CO',
             data: coAveValues,
             yAxisIndex: 1,
             type: 'bar',
           },
           {
-            name: 'CO₂平均值',
+            name: 'CO₂',
             data: co2AveValues,
             yAxisIndex: 1,
             type: 'bar',
           },
           {
-            name: 'CH₄平均值',
+            name: 'CH₄',
             data: ch4AveValues,
             yAxisIndex: 1,
             type: 'bar',
           },
           {
-            name: 'C2H6平均值',
+            name: 'C2H6',
             data: c2h6AveValues,
             yAxisIndex: 1,
             type: 'bar',
           },
           {
-            name: 'C3H8平均值',
+            name: 'C3H8',
             data: c3h8AveValues,
             yAxisIndex: 1,
             type: 'bar',
           },
           {
-            name: 'C₂H₄平均值',
+            name: 'C₂H₄',
             data: c2h4AveValues,
             type: 'bar',
             yAxisIndex: 1,
           },
           {
-            name: 'C₂H₂平均值',
+            name: 'C₂H₂',
             data: c2h2AveValues,
             type: 'bar',
             yAxisIndex: 1,
@@ -267,49 +271,49 @@ function updateChart(data: any) {
       default:
         return [
           {
-            name: 'C₂H₂平均值',
+            name: 'C₂H₂',
             data: c2h2AveValues,
             type: 'bar',
             yAxisIndex: 1,
           },
           {
-            name: 'C₂H₄平均值',
+            name: 'C₂H₄',
             data: c2h4AveValues,
             type: 'bar',
             yAxisIndex: 1,
           },
           {
-            name: 'CH₄平均值',
+            name: 'CH₄',
             data: ch4AveValues,
             yAxisIndex: 1,
             type: 'bar',
           },
           {
-            name: 'CO₂平均值',
+            name: 'CO₂',
             data: co2AveValues,
             yAxisIndex: 1,
             type: 'bar',
           },
           {
-            name: 'CO平均值',
+            name: 'CO',
             data: coAveValues,
             yAxisIndex: 1,
             type: 'bar',
           },
           {
-            name: 'O₂平均值',
+            name: 'O₂',
             data: o2AveValues,
             yAxisIndex: 0,
             type: 'bar',
           },
           {
-            name: 'N₂平均值',
+            name: 'N₂',
             data: n2AveValues,
             yAxisIndex: 0,
             type: 'bar',
           },
           {
-            name: 'C2H6平均值',
+            name: 'C2H6',
             data: c2h6AveValues,
             yAxisIndex: 1,
             type: 'bar',

src/views/vent/dust/dustMonitorTable/dust-table.data.ts

@@ -511,6 +511,63 @@ export const Bltcolumns = [
     align: 'center',
   },
 ];
+export const Sgtcolumns = [
+  {
+    title: '序号',
+    width: 60,
+    align: 'center',
+    dataIndex: 'xh',
+  },
+  {
+    title: '测定地点',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+    width: 150,
+    align: 'center',
+  },
+  {
+    title: '作业环境(工序)',
+    dataIndex: 'scgy',
+    key: 'scgy',
+    width: 80,
+    align: 'center',
+  },
+  {
+    title: '粉尘浓度(mg/m³)',
+    width: 100,
+    align: 'center',
+    children: [
+      {
+        title: '全尘',
+        dataIndex: 'sc_zcds',
+        key: 'sc_zcds',
+        width: 80,
+        align: 'center',
+      },
+      {
+        title: '呼尘',
+        dataIndex: 'sc_hcds',
+        key: 'sc_hcds',
+        width: 80,
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: '测尘员',
+    dataIndex: 'ccr',
+    key: 'ccr',
+    width: 80,
+    align: 'center',
+  },
+  {
+    title: '备注',
+    dataIndex: 'smark',
+    key: 'smark',
+    width: 80,
+    align: 'center',
+  },
+];
 //监测字段
 export const fieldMapping = {
   sc_zcds: '总尘-作业工序-生产(短时间监测浓度，mg/m³)',
@@ -552,6 +609,10 @@ export const fieldBltMapping = {
   sc_zcds: '总尘(粉尘浓度，mg/m³)',
   sc_hcds: '呼尘(粉尘浓度，mg/m³)',
 };
+export const fieldSgtMapping = {
+  sc_zcds: '全尘(粉尘浓度，mg/m³)',
+  sc_hcds: '呼尘(粉尘浓度，mg/m³)',
+};
 // 检测地点
 export const dataColumns = [
   {
@@ -746,6 +807,37 @@ export const dataBltColumns = [
     key: 'scgy',
   },
 ];
+export const dataSgtColumns = [
+  {
+    title: '监测字段',
+    align: 'center',
+    dataIndex: 'key',
+    key: 'key',
+    width: 100,
+    customRender: ({ text }) => fieldBltMapping[text] || text,
+  },
+  {
+    title: '最大值',
+    dataIndex: 'value',
+    align: 'center',
+    width: 100,
+    key: 'value',
+  },
+  {
+    width: 100,
+    align: 'center',
+    title: '监测地点',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+  },
+  {
+    width: 100,
+    align: 'center',
+    title: '作业环境(工序)',
+    dataIndex: 'scgy',
+    key: 'scgy',
+  },
+];
 // 当日情况粉尘情况分析
 export const AllDataColumns = [
   {
@@ -954,3 +1046,34 @@ export const AllDataBltColumns = [
     key: 'scgy',
   },
 ];
+export const AllDataSgtColumns = [
+  {
+    title: '监测字段',
+    align: 'center',
+    dataIndex: 'key',
+    key: 'key',
+    width: 100,
+    customRender: ({ text }) => fieldBltMapping[text] || text,
+  },
+  {
+    title: '最大值',
+    dataIndex: 'value',
+    align: 'center',
+    width: 100,
+    key: 'value',
+  },
+  {
+    width: 100,
+    align: 'center',
+    title: '监测地点',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+  },
+  {
+    width: 100,
+    align: 'center',
+    title: '作业环境(工序)',
+    dataIndex: 'scgy',
+    key: 'scgy',
+  },
+];

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

@@ -69,18 +69,21 @@ import {
   Hjtcolumns,
   Bdcolumns,
   Bltcolumns,
+  Sgtcolumns,
   dataColumns,
   dataDltColumns,
   dataSwColumns,
   dataHjtColumns,
   dataBdColumns,
   dataBltColumns,
+  dataSgtColumns,
   AllDataColumns,
   AllDataDltColumns,
   AllDataSwColumns,
   AllDataHjtColumns,
   AllDataBdColumns,
   AllDataBltColumns,
+  AllDataSgtColumns,
 } from './dust-table.data';
 import { getDustInfoList, getAllFileList, getAllFileListById } from './dsut-table.api';
 import customHeader from '/@/components/vent/customHeader.vue';
@@ -125,6 +128,8 @@ const computedColumns = computed(() => {
       return Bdcolumns; // 保德对应的列配置
     case 'sdmtjtbltmk':
       return Bltcolumns; // 补连塔对应的列配置
+    case 'sdmtjtsgtmk':
+      return Sgtcolumns; // 石圪台对应的列配置
     default:
       return columns; // 默认情况下返回的列配置
   }
@@ -143,6 +148,8 @@ const AllDataComputedColumns = computed(() => {
       return AllDataBdColumns; // 保德对应的列配置
     case 'sdmtjtbltmk':
       return AllDataBltColumns; // 补连塔对应的列配置
+    case 'sdmtjtsgtmk':
+      return AllDataSgtColumns; // 石圪台对应的列配置
     default:
       return AllDataColumns; // 默认情况下返回的列配置
   }
@@ -161,6 +168,8 @@ const DataComputedColumns = computed(() => {
       return dataBdColumns; // 保德对应的列配置
     case 'sdmtjtbltmk':
       return dataBltColumns; // 补连塔对应的列配置
+    case 'sdmtjtsgtmk':
+      return dataSgtColumns; // 石圪台对应的列配置
     default:
       return dataColumns; // 默认情况下返回的列配置
   }
@@ -316,6 +325,8 @@ function processTableData(data: any) {
         return BdMaxValues; // 保德对应的列配置
       case 'sdmtjtbltmk':
         return BltMaxValues; // 补连塔对应的列配置
+      case 'sdmtjtsgtmk':
+        return BltMaxValues; // 石圪台对应的列配置
       default:
         return maxValues; // 默认情况下返回的列配置
     }
@@ -437,6 +448,8 @@ function processTableData(data: any) {
         return overallBdMaxValues; // 保德对应的列配置
       case 'sdmtjtbltmk':
         return overallBltMaxValues; // 补连塔对应的列配置
+      case 'sdmtjtsgtmk':
+        return overallBltMaxValues; // 石圪台对应的列配置
       default:
         return overallMaxValues; // 默认情况下返回的列配置
     }