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

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

@@ -15,6 +15,27 @@ export const columns: BasicColumn[] = [
     align: 'center',
   },
   {
+    title: '设备名称',
+    dataIndex: 'sbmc',
+    key: 'sbmc',
+    width: 130,
+    align: 'center',
+  },
+  {
+    title: '设备编号',
+    dataIndex: 'sbbh',
+    key: 'sbbh',
+    width: 130,
+    align: 'center',
+  },
+  {
+    title: '管路编号',
+    dataIndex: 'glbh',
+    key: 'glbh',
+    width: 130,
+    align: 'center',
+  },
+  {
     title: '分析次数',
     dataIndex: 'fxcs',
     key: 'fxcs',
@@ -136,6 +157,44 @@ export const columns: BasicColumn[] = [
     ],
   },
   {
+    title: 'N₂(PPM)',
+    children: [
+      {
+        title: '最大值',
+        dataIndex: 'n2_max',
+        key: 'n2_max',
+        width: 80,
+        align: 'center',
+      },
+      {
+        title: '平均值',
+        dataIndex: 'n2_ave',
+        key: 'n2_ave',
+        width: 80,
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: 'NO₂(PPM)',
+    children: [
+      {
+        title: '最大值',
+        dataIndex: 'no2_max',
+        key: 'no2_max',
+        width: 80,
+        align: 'center',
+      },
+      {
+        title: '平均值',
+        dataIndex: 'no2_ave',
+        key: 'no2_ave',
+        width: 80,
+        align: 'center',
+      },
+    ],
+  },
+  {
     title: '煤自燃阶段',
     dataIndex: 'internalFireWarnLevel',
     width: 100,

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

@@ -29,11 +29,11 @@
             <div class="explain">测点共计{{ total }}个</div>
             <div class="progress-label">潜伏期阶段：{{ qfqCount }}</div>
             <Progress :percent="qfqPercent" size="default" strokeColor="green" :show-info="true" :format="() => qfqCount" />
-            <div class="progress-label">缓慢氧化阶段：{{ latentCount }}</div>
+            <div class="progress-label">缓慢氧化升温阶段：{{ latentCount }}</div>
             <Progress :percent="latentPercent" size="default" strokeColor="yellow" :show-info="true" :format="() => latentCount" />
-            <div class="progress-label">加速氧化阶段：{{ selfHeatingCount }}</div>
+            <div class="progress-label">加速氧化升温阶段：{{ selfHeatingCount }}</div>
             <Progress :percent="selfHeatingPercent" size="default" strokeColor="orange‌" :show-info="true" :format="() => selfHeatingCount" />
-            <div class="progress-label">剧烈氧化阶段：{{ combustionCount }}</div>
+            <div class="progress-label">剧烈氧化升温阶段：{{ combustionCount }}</div>
             <Progress :percent="combustionPercent" size="default" strokeColor="red" :show-info="true" :format="() => combustionCount" />
           </div>
         </div>
@@ -98,6 +98,10 @@ function updateChart(data: any) {
   const coAveValues = data.map((item: any) => parseFloat(item.co_ave));
   const o2MinValues = data.map((item: any) => parseFloat(item.o2_min));
   const o2AveValues = data.map((item: any) => parseFloat(item.o2_ave));
+  const n2MaxValues = data.map((item: any) => parseFloat(item.n2_max));
+  const n2AveValues = data.map((item: any) => parseFloat(item.n2_ave));
+  const no2MaxValues = data.map((item: any) => parseFloat(item.no2_max));
+  const no2AveValues = data.map((item: any) => parseFloat(item.no2_ave));
 
   const option = {
     title: {
@@ -221,6 +225,26 @@ function updateChart(data: any) {
         data: o2AveValues,
         type: 'bar',
       },
+      {
+        name: 'N₂最大值',
+        data: n2MaxValues,
+        type: 'bar',
+      },
+      {
+        name: 'N₂平均值',
+        data: n2AveValues,
+        type: 'bar',
+      },
+      {
+        name: 'NO₂最大值',
+        data: no2MaxValues,
+        type: 'bar',
+      },
+      {
+        name: 'NO₂平均值',
+        data: no2AveValues,
+        type: 'bar',
+      },
     ],
   };
   myChart.setOption(option);
@@ -235,39 +259,39 @@ async function getTableList(params: any) {
   let res = await getBundleInfoList({ type: 'bundle', ...params });
   const content = res.content;
   let contentArr = JSON.parse(content);
-  const contentNewArr = computed(() => {
-    return contentArr.map((item) => {
-      let internalFireWarnLevel = '';
+  // const contentNewArr = computed(() => {
+  //   return contentArr.map((item) => {
+  //     let internalFireWarnLevel = '';
 
-      const co = item.co_ave;
-      const co2 = item.co2_ave;
-      const c2h4 = item.c2h4_ave;
-      const c2h2 = item.c2h2_ave;
-      const coRatio = co / co2;
+  //     const co = item.co_ave;
+  //     const co2 = item.co2_ave;
+  //     const c2h4 = item.c2h4_ave;
+  //     const c2h2 = item.c2h2_ave;
+  //     const coRatio = co / co2;
 
-      if (co >= 0 && co <= 13.75) {
-        internalFireWarnLevel = '潜伏期阶段';
-      } else if (co > 13.75 && co < 67.2 && coRatio < 0.095) {
-        internalFireWarnLevel = '缓慢氧化升温阶段';
-      } else if ((co >= 67.2 && co < 1606.3) || (coRatio >= 0.095 && coRatio < 0.322) || c2h4 < 2) {
-        internalFireWarnLevel = '加速氧化阶段';
-      } else if (co >= 1606.3 || coRatio >= 0.322 || c2h4 >= 2 || c2h2 > 0) {
-        internalFireWarnLevel = '剧烈氧化阶段';
-      }
+  //     if (co >= 0 && co <= 13.75) {
+  //       internalFireWarnLevel = '潜伏期阶段';
+  //     } else if (co > 13.75 && co < 67.2 && coRatio < 0.095) {
+  //       internalFireWarnLevel = '缓慢氧化升温阶段';
+  //     } else if ((co >= 67.2 && co < 1606.3) || (coRatio >= 0.095 && coRatio < 0.322) || c2h4 < 2) {
+  //       internalFireWarnLevel = '加速氧化阶段';
+  //     } else if (co >= 1606.3 || coRatio >= 0.322 || c2h4 >= 2 || c2h2 > 0) {
+  //       internalFireWarnLevel = '剧烈氧化阶段';
+  //     }
 
-      return { ...item, internalFireWarnLevel };
-    });
-  });
+  //     return { ...item, internalFireWarnLevel };
+  //   });
+  // });
   total.value = contentArr.length;
-  qfqCount.value = contentNewArr.value.filter((item: any) => item.internalFireWarnLevel === '潜伏期阶段').length;
-  latentCount.value = contentNewArr.value.filter((item: any) => item.internalFireWarnLevel === '缓慢氧化升温阶段').length;
-  selfHeatingCount.value = contentNewArr.value.filter((item: any) => item.internalFireWarnLevel === '加速氧化阶段').length;
-  combustionCount.value = contentNewArr.value.filter((item: any) => item.internalFireWarnLevel === '剧烈氧化阶段').length;
+  qfqCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '潜伏期阶段').length;
+  latentCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '缓慢氧化升温阶段').length;
+  selfHeatingCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '加速氧化升温阶段').length;
+  combustionCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '剧烈氧化升温阶段').length;
   qfqPercent.value = (qfqCount.value / total.value) * 100;
   latentPercent.value = (latentCount.value / total.value) * 100;
   selfHeatingPercent.value = (selfHeatingCount.value / total.value) * 100;
   combustionPercent.value = (combustionCount.value / total.value) * 100;
-  tableData.value = contentNewArr.value;
+  tableData.value = contentArr;
   nextTick(() => {
     updateChart(contentArr);
   });

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

@@ -8,13 +8,6 @@ export const columns: BasicColumn[] = [
     key: 'xh',
   },
   {
-    title: '化验编号',
-    dataIndex: 'hybh',
-    key: 'hybh',
-    width: 100,
-    align: 'center',
-  },
-  {
     title: '采样地点',
     dataIndex: 'jcdd',
     key: 'jcdd',

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

@@ -24,11 +24,11 @@
             <div class="explain">测点共计{{ total }}个</div>
             <div class="progress-label">潜伏期阶段：{{ qfqCount }}</div>
             <Progress :percent="qfqPercent" size="default" strokeColor="green" :show-info="true" :format="() => qfqCount" />
-            <div class="progress-label">缓慢氧化阶段：{{ latentCount }}</div>
+            <div class="progress-label">缓慢氧化升温阶段：{{ latentCount }}</div>
             <Progress :percent="latentPercent" size="default" strokeColor="yellow" :show-info="true" :format="() => latentCount" />
-            <div class="progress-label">加速氧化阶段：{{ selfHeatingCount }}</div>
+            <div class="progress-label">加速氧化升温阶段：{{ selfHeatingCount }}</div>
             <Progress :percent="selfHeatingPercent" size="default" strokeColor="orange‌" :show-info="true" :format="() => selfHeatingCount" />
-            <div class="progress-label">剧烈氧化阶段：{{ combustionCount }}</div>
+            <div class="progress-label">剧烈氧化升温阶段：{{ combustionCount }}</div>
             <Progress :percent="combustionPercent" size="default" strokeColor="red" :show-info="true" :format="() => combustionCount" />
           </div>
         </div>
@@ -79,39 +79,39 @@ async function getTableList(params: any) {
   let res = await getbundleSpyInfoList({ type: 'bundleSpy', ...params });
   const content = res.content;
   let contentArr = JSON.parse(content);
-  const contentNewArr = computed(() => {
-    return contentArr.map((item) => {
-      let internalFireWarnLevel = '';
+  // const contentNewArr = computed(() => {
+  //   return contentArr.map((item) => {
+  //     let internalFireWarnLevel = '';
 
-      const co = item.co_ave;
-      const co2 = item.co2_ave;
-      const c2h4 = item.c2h4_ave;
-      const c2h2 = item.c2h2_ave;
-      const coRatio = co / co2;
+  //     const co = item.co_ave;
+  //     const co2 = item.co2_ave;
+  //     const c2h4 = item.c2h4_ave;
+  //     const c2h2 = item.c2h2_ave;
+  //     const coRatio = co / co2;
 
-      if (co >= 0 && co <= 13.75) {
-        internalFireWarnLevel = '潜伏期阶段';
-      } else if (co > 13.75 && co < 67.2 && coRatio < 0.095) {
-        internalFireWarnLevel = '缓慢氧化升温阶段';
-      } else if ((co >= 67.2 && co < 1606.3) || (coRatio >= 0.095 && coRatio < 0.322) || c2h4 < 2) {
-        internalFireWarnLevel = '加速氧化阶段';
-      } else if (co >= 1606.3 || coRatio >= 0.322 || c2h4 >= 2 || c2h2 > 0) {
-        internalFireWarnLevel = '剧烈氧化阶段';
-      }
+  //     if (co >= 0 && co <= 13.75) {
+  //       internalFireWarnLevel = '潜伏期阶段';
+  //     } else if (co > 13.75 && co < 67.2 && coRatio < 0.095) {
+  //       internalFireWarnLevel = '缓慢氧化升温阶段';
+  //     } else if ((co >= 67.2 && co < 1606.3) || (coRatio >= 0.095 && coRatio < 0.322) || c2h4 < 2) {
+  //       internalFireWarnLevel = '加速氧化阶段';
+  //     } else if (co >= 1606.3 || coRatio >= 0.322 || c2h4 >= 2 || c2h2 > 0) {
+  //       internalFireWarnLevel = '剧烈氧化阶段';
+  //     }
 
-      return { ...item, internalFireWarnLevel };
-    });
-  });
+  //     return { ...item, internalFireWarnLevel };
+  //   });
+  // });
   total.value = contentArr.length;
-  qfqCount.value = contentNewArr.value.filter((item: any) => item.internalFireWarnLevel === '潜伏期阶段').length;
-  latentCount.value = contentNewArr.value.filter((item: any) => item.internalFireWarnLevel === '缓慢氧化升温阶段').length;
-  selfHeatingCount.value = contentNewArr.value.filter((item: any) => item.internalFireWarnLevel === '加速氧化阶段').length;
-  combustionCount.value = contentNewArr.value.filter((item: any) => item.internalFireWarnLevel === '剧烈氧化阶段').length;
+  qfqCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '潜伏期阶段').length;
+  latentCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '缓慢氧化升温阶段').length;
+  selfHeatingCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '加速氧化升温阶段').length;
+  combustionCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '剧烈氧化升温阶段').length;
   qfqPercent.value = (qfqCount.value / total.value) * 100;
   latentPercent.value = (latentCount.value / total.value) * 100;
   selfHeatingPercent.value = (selfHeatingCount.value / total.value) * 100;
   combustionPercent.value = (combustionCount.value / total.value) * 100;
-  tableData.value = contentNewArr.value;
+  tableData.value = contentArr;
   updateChart(contentArr);
 }
 

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

@@ -10,7 +10,7 @@
         </ul>
       </div>
       <div class="table-container">
-        <a-table :columns="computedColumns" :data-source="tableData" size="small" :scroll="{ y: 250 }" class="tableW">
+        <a-table :columns="computedColumns" :data-source="tableData" size="small" :pagination="false" :scroll="{ y: 250 }" class="tableW">
           <template #bodyCell="{ record, column }">
             <template v-if="record[column.dataIndex] === null">
               <span>-</span>
@@ -22,7 +22,6 @@
             <a-tab-pane key="workplace" class="tab1" tab="监测地点粉尘情况分析">
               <div class="filter-container" v-if="workplaceList.length > 0">
                 <a-select
-                  v-if="sysOrgCode != 'sdmtjtdltmk'"
                   :key="DefaultValue"
                   :default-value="DefaultValue"
                   v-model="selectedWorkplace"
@@ -35,10 +34,24 @@
                   </a-select-option>
                 </a-select>
               </div>
-              <a-table :columns="DataComputedColumns" :data-source="filteredResultByWorkplace" size="small" :scroll="{ y: 260 }" class="tableW" />
+              <a-table
+                :columns="DataComputedColumns"
+                :data-source="filteredResultByWorkplace"
+                :pagination="false"
+                size="small"
+                :scroll="{ y: 285 }"
+                class="tableW"
+              />
             </a-tab-pane>
             <a-tab-pane key="overall" class="tab2" tab="当日粉尘情况分析">
-              <a-table :columns="AllDataComputedColumns" :data-source="AllMaxValues" size="small" :scroll="{ y: 300 }" class="tableW" />
+              <a-table
+                :columns="AllDataComputedColumns"
+                :data-source="AllMaxValues"
+                size="small"
+                :pagination="false"
+                :scroll="{ y: 330 }"
+                class="tableW"
+              />
             </a-tab-pane>
           </a-tabs>
         </div>

src/views/vent/monitorManager/comment/comment.data.ts

@@ -300,6 +300,82 @@ export const dsutColumns: BasicColumn[] = [
     ],
   },
 ];
+export const dsutDltColumns: BasicColumn[] = [
+  {
+    title: '序号',
+    width: 60,
+    align: 'center',
+    customRender: ({ index }: { index: number }) => `${index + 1}`,
+  },
+  {
+    title: '监测地点',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '粉尘种类',
+    dataIndex: 'fczl',
+    key: 'fczl',
+    width: 80,
+    align: 'center',
+  },
+  {
+    title: '总尘(短时间监测浓度，单位：mg/m³)',
+    align: 'center',
+    children: [
+      {
+        title: '作业工序-生产',
+        dataIndex: 'sc_zcds',
+        key: 'sc_zcds',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '作业工序-检修',
+        dataIndex: 'jx_zcds',
+        key: 'jx_zcds',
+        width: 100,
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: '呼尘(短时间监测浓度，单位：mg/m³)',
+    align: 'center',
+    children: [
+      {
+        title: '作业工序-生产',
+        dataIndex: 'sc_hcds',
+        key: 'sc_hcds',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '作业工序-检修',
+        dataIndex: 'jx_hcds',
+        key: 'jx_hcds',
+        width: 100,
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: '总尘(时间加权平均浓度，单位：mg/m³)',
+    dataIndex: 'zcjqpj',
+    key: 'zcjqpj',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '呼尘(时间加权平均浓度，单位：mg/m³)',
+    dataIndex: 'hcjqpj',
+    key: 'hcjqpj',
+    width: 100,
+    align: 'center',
+  },
+];
 export const bundleColumns: BasicColumn[] = [
   {
     title: '序号',
@@ -452,13 +528,6 @@ export const bundleSpycolumns: BasicColumn[] = [
     key: 'xh',
   },
   {
-    title: '化验编号',
-    dataIndex: 'hybh',
-    key: 'hybh',
-    width: 100,
-    align: 'center',
-  },
-  {
     title: '采样地点',
     dataIndex: 'jcdd',
     key: 'jcdd',
@@ -548,7 +617,7 @@ export const ColumnsReport: BasicColumn[] = [
     title: '序号',
     width: 60,
     align: 'center',
-    customRender: ({ index }: { index: number }) => `${index + 1}`
+    customRender: ({ index }: { index: number }) => `${index + 1}`,
   },
   {
     title: '监测地点',
@@ -612,124 +681,122 @@ export const ColumnsReport: BasicColumn[] = [
 ];
 export const columnsGas1: BasicColumn[] = [
   {
-      title: '序号',
-      width: 60,
-      align: 'center',
-      customRender: ({ index }: { index: number }) => `${index + 1}`
-  },
-  {
-      title: '监测地点',
-      dataIndex: 'jcdd',
-      key: 'jcdd',
-      width:180,
-      align: 'center',
-  },
-  {
-      title: '夜班',
-      children: [
-          {
-              title: 'CH₄‌(%)',
-              dataIndex: 'ch4Night',
-              key: 'ch4Night',
-              align: 'center',
-          },
-          {
-              title: 'CO₂‌(%)',
-              dataIndex: 'co2Night',
-              key: 'co2Night',
-              align: 'center',
-          },
-          {
-              title: 'CO(ppm)',
-              dataIndex: 'coNight',
-              key: 'coNight',
-              align: 'center',
-          },
-          {
-              title: 'O₂‌(%)',
-              dataIndex: 'o2Night',
-              key: 'o2Night',
-              align: 'center',
-          },
-          {
-              title: 'T(°C)',
-              dataIndex: 'tNight',
-              key: 'tNight',
-              align: 'center',
-          },
-      ]
-  },
-  {
-      title: '早班',
-      children: [
-          {
-              title: 'CH₄‌(%)',
-              dataIndex: 'ch4Early',
-              key: 'ch4Early',
-              align: 'center',
-          },
-          {
-              title: 'CO₂‌(%)',
-              dataIndex: 'co2Early',
-              key: 'co2Early',
-              align: 'center',
-          },
-          {
-              title: 'CO(ppm)',
-              dataIndex: 'coEarly',
-              key: 'coEarly',
-              align: 'center',
-          },
-          {
-              title: 'O₂‌(%)',
-              dataIndex: 'o2Early',
-              key: 'o2Early',
-              align: 'center',
-          },
-          {
-              title: 'T(°C)',
-              dataIndex: 'tEarly',
-              key: 'tEarly',
-              align: 'center',
-          },
-      ]
-
+    title: '序号',
+    width: 60,
+    align: 'center',
+    customRender: ({ index }: { index: number }) => `${index + 1}`,
   },
   {
-      title: '中班',
-      children: [
-          {
-              title: 'CH₄‌(%)',
-              dataIndex: 'ch4Noon',
-              key: 'ch4Noon',
-              align: 'center',
-          },
-          {
-              title: 'CO₂‌(%)',
-              dataIndex: 'co2Noon',
-              key: 'co2Noon',
-              align: 'center',
-          },
-          {
-              title: 'CO(ppm)',
-              dataIndex: 'coNoon',
-              key: 'coNoon',
-              align: 'center',
-          },
-          {
-              title: 'O₂‌(%)',
-              dataIndex: 'o2Noon',
-              key: 'o2Noon',
-              align: 'center',
-          },
-          {
-              title: 'T(°C)',
-              dataIndex: 'tNoon',
-              key: 'tNoon',
-              align: 'center',
-          },
-      ]
-
+    title: '监测地点',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+    width: 180,
+    align: 'center',
+  },
+  {
+    title: '夜班',
+    children: [
+      {
+        title: 'CH₄‌(%)',
+        dataIndex: 'ch4Night',
+        key: 'ch4Night',
+        align: 'center',
+      },
+      {
+        title: 'CO₂‌(%)',
+        dataIndex: 'co2Night',
+        key: 'co2Night',
+        align: 'center',
+      },
+      {
+        title: 'CO(ppm)',
+        dataIndex: 'coNight',
+        key: 'coNight',
+        align: 'center',
+      },
+      {
+        title: 'O₂‌(%)',
+        dataIndex: 'o2Night',
+        key: 'o2Night',
+        align: 'center',
+      },
+      {
+        title: 'T(°C)',
+        dataIndex: 'tNight',
+        key: 'tNight',
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: '早班',
+    children: [
+      {
+        title: 'CH₄‌(%)',
+        dataIndex: 'ch4Early',
+        key: 'ch4Early',
+        align: 'center',
+      },
+      {
+        title: 'CO₂‌(%)',
+        dataIndex: 'co2Early',
+        key: 'co2Early',
+        align: 'center',
+      },
+      {
+        title: 'CO(ppm)',
+        dataIndex: 'coEarly',
+        key: 'coEarly',
+        align: 'center',
+      },
+      {
+        title: 'O₂‌(%)',
+        dataIndex: 'o2Early',
+        key: 'o2Early',
+        align: 'center',
+      },
+      {
+        title: 'T(°C)',
+        dataIndex: 'tEarly',
+        key: 'tEarly',
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: '中班',
+    children: [
+      {
+        title: 'CH₄‌(%)',
+        dataIndex: 'ch4Noon',
+        key: 'ch4Noon',
+        align: 'center',
+      },
+      {
+        title: 'CO₂‌(%)',
+        dataIndex: 'co2Noon',
+        key: 'co2Noon',
+        align: 'center',
+      },
+      {
+        title: 'CO(ppm)',
+        dataIndex: 'coNoon',
+        key: 'coNoon',
+        align: 'center',
+      },
+      {
+        title: 'O₂‌(%)',
+        dataIndex: 'o2Noon',
+        key: 'o2Noon',
+        align: 'center',
+      },
+      {
+        title: 'T(°C)',
+        dataIndex: 'tNoon',
+        key: 'tNoon',
+        align: 'center',
+      },
+    ],
   },
   {
     title: '操作',
@@ -742,152 +809,150 @@ export const columnsGas1: BasicColumn[] = [
 
 export const columnsGas2: BasicColumn[] = [
   {
-      title: '序号',
-      width: 60,
-      align: 'center',
-      customRender: ({ index }: { index: number }) => `${index + 1}`
-  },
-  {
-      title: '监测地点',
-      dataIndex: 'jcdd',
-      key: 'jcdd',
-      width:130,
-      align: 'center',
-  },
-  {
-      title: '煤层',
-      dataIndex: 'mc',
-      width:80,
-      key: 'mc',
-      align: 'center',
-  },
-  {
-      title: '夜班',
-      children: [
-          {
-              title: 'CH₄‌(%)',
-              dataIndex: 'ch4Night',
-              key: 'ch4Night',
-              align: 'center',
-          },
-          {
-              title: 'CO₂‌(%)',
-              dataIndex: 'co2Night',
-              key: 'co2Night',
-              align: 'center',
-          },
-          {
-              title: 'CO(ppm)',
-              dataIndex: 'coNight',
-              key: 'coNight',
-              width:80,
-              align: 'center',
-          },
-          {
-              title: 'O₂‌(%)',
-              dataIndex: 'o2Night',
-              key: 'o2Night',
-              align: 'center',
-          },
-          {
-              title: 'T(°C)',
-              dataIndex: 'tNight',
-              key: 'tNight',
-              align: 'center',
-          },
-          {
-              title: '巡检员',
-              dataIndex: 'checkPersonNight',
-              key: 'checkPersonNight',
-              align: 'center',
-          },
-      ]
-  },
-  {
-      title: '早班',
-      children: [
-          {
-              title: 'CH₄‌(%)',
-              dataIndex: 'ch4Early',
-              key: 'ch4Early',
-              align: 'center',
-          },
-          {
-              title: 'CO₂‌(%)',
-              dataIndex: 'co2Early',
-              key: 'co2Early',
-              align: 'center',
-          },
-          {
-              title: 'CO(ppm)',
-              dataIndex: 'coEarly',
-              key: 'coEarly',
-              width:80,
-              align: 'center',
-          },
-          {
-              title: 'O₂‌(%)',
-              dataIndex: 'o2Early',
-              key: 'o2Early',
-              align: 'center',
-          },
-          {
-              title: 'T(°C)',
-              dataIndex: 'tEarly',
-              key: 'tEarly',
-              align: 'center',
-          },
-          {
-              title: '巡检员',
-              dataIndex: 'checkPersonEarly',
-              key: 'checkPersonEarly',
-              align: 'center',
-          },
-      ]
-
+    title: '序号',
+    width: 60,
+    align: 'center',
+    customRender: ({ index }: { index: number }) => `${index + 1}`,
   },
   {
-      title: '中班',
-      children: [
-          {
-              title: 'CH₄‌(%)',
-              dataIndex: 'ch4Noon',
-              key: 'ch4Noon',
-              align: 'center',
-          },
-          {
-              title: 'CO₂‌(%)',
-              dataIndex: 'co2Noon',
-              key: 'co2Noon',
-              align: 'center',
-          },
-          {
-              title: 'CO(ppm)',
-              dataIndex: 'coNoon',
-              key: 'coNoon',
-              width:80,
-              align: 'center',
-          },
-          {
-              title: 'O₂‌(%)',
-              dataIndex: 'o2Noon',
-              key: 'o2Noon',
-              align: 'center',
-          },
-          {
-              title: 'T(°C)',
-              dataIndex: 'tNoon',
-              key: 'tNoon',
-              align: 'center',
-          },
-          {
-              title: '巡检员',
-              dataIndex: 'checkPersonNoon',
-              key: 'checkPersonNoon',
-              align: 'center',
-          },
-      ]
-
+    title: '监测地点',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+    width: 130,
+    align: 'center',
+  },
+  {
+    title: '煤层',
+    dataIndex: 'mc',
+    width: 80,
+    key: 'mc',
+    align: 'center',
+  },
+  {
+    title: '夜班',
+    children: [
+      {
+        title: 'CH₄‌(%)',
+        dataIndex: 'ch4Night',
+        key: 'ch4Night',
+        align: 'center',
+      },
+      {
+        title: 'CO₂‌(%)',
+        dataIndex: 'co2Night',
+        key: 'co2Night',
+        align: 'center',
+      },
+      {
+        title: 'CO(ppm)',
+        dataIndex: 'coNight',
+        key: 'coNight',
+        width: 80,
+        align: 'center',
+      },
+      {
+        title: 'O₂‌(%)',
+        dataIndex: 'o2Night',
+        key: 'o2Night',
+        align: 'center',
+      },
+      {
+        title: 'T(°C)',
+        dataIndex: 'tNight',
+        key: 'tNight',
+        align: 'center',
+      },
+      {
+        title: '巡检员',
+        dataIndex: 'checkPersonNight',
+        key: 'checkPersonNight',
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: '早班',
+    children: [
+      {
+        title: 'CH₄‌(%)',
+        dataIndex: 'ch4Early',
+        key: 'ch4Early',
+        align: 'center',
+      },
+      {
+        title: 'CO₂‌(%)',
+        dataIndex: 'co2Early',
+        key: 'co2Early',
+        align: 'center',
+      },
+      {
+        title: 'CO(ppm)',
+        dataIndex: 'coEarly',
+        key: 'coEarly',
+        width: 80,
+        align: 'center',
+      },
+      {
+        title: 'O₂‌(%)',
+        dataIndex: 'o2Early',
+        key: 'o2Early',
+        align: 'center',
+      },
+      {
+        title: 'T(°C)',
+        dataIndex: 'tEarly',
+        key: 'tEarly',
+        align: 'center',
+      },
+      {
+        title: '巡检员',
+        dataIndex: 'checkPersonEarly',
+        key: 'checkPersonEarly',
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: '中班',
+    children: [
+      {
+        title: 'CH₄‌(%)',
+        dataIndex: 'ch4Noon',
+        key: 'ch4Noon',
+        align: 'center',
+      },
+      {
+        title: 'CO₂‌(%)',
+        dataIndex: 'co2Noon',
+        key: 'co2Noon',
+        align: 'center',
+      },
+      {
+        title: 'CO(ppm)',
+        dataIndex: 'coNoon',
+        key: 'coNoon',
+        width: 80,
+        align: 'center',
+      },
+      {
+        title: 'O₂‌(%)',
+        dataIndex: 'o2Noon',
+        key: 'o2Noon',
+        align: 'center',
+      },
+      {
+        title: 'T(°C)',
+        dataIndex: 'tNoon',
+        key: 'tNoon',
+        align: 'center',
+      },
+      {
+        title: '巡检员',
+        dataIndex: 'checkPersonNoon',
+        key: 'checkPersonNoon',
+        align: 'center',
+      },
+    ],
   },
   {
     title: '操作',

src/views/vent/monitorManager/comment/dustMonitorTable.vue

@@ -27,229 +27,229 @@
 </template>
 
 <script setup lang="ts">
-  import { ref, onMounted, reactive, computed, watch, nextTick } from 'vue';
-  import { dsutColumns } from './comment.data';
-  import { getInfoList, getAllFileList } from './comment.api';
-  const emit = defineEmits(['locate']);
-  const props = defineProps({
-    isShowAction: {
-      type: Boolean,
-      default: false,
-    },
-  });
-  let tableData = ref<any[]>([]);
-  let selectList = ref<any[]>([]);
-  let resultByWorkplace = ref<any[]>([]);
-  let AllMaxValues = ref<any[]>([]);
-  let filteredResultByWorkplace = ref<any[]>([]); //根据工作场所查询的数据
-  let workplaceList = ref<any[]>([]); //根据工作场所查询的数据
-  let selectedFileId = ref<string | null>(null);
-  let selectedWorkplace = ref<string | null>(null);
-  let DefaultValue = ref<string | null>(null);
-  let createBy = ref<any[]>([]);
-  let createTime = ref<any[]>([]);
-  let formSearch = reactive({
-    pageNum: 1,
-    pageSize: 1000,
-    fileId: '',
-    fileName: '',
-  });
-  const columns = ref([]);
-  watch(
-    () => props.isShowAction,
-    (value) => {
-      if (value) {
-        dsutColumns.push({
-          title: '操作',
-          dataIndex: 'operation',
-          width: 100,
-          align: 'center',
-        });
-        if (columns.value.length == 0) columns.value = dsutColumns;
-      } else {
-        if (columns.value.length == 0) columns.value = dsutColumns;
-      }
-    },
-    { immediate: true }
-  );
-  function handlerLocation(record) {
-    emit('locate', record);
-  }
-  //获取粉尘监测结果数据
-  async function getTableList(params: any) {
-    let res = await getInfoList({ type: 'smoke', ...params });
-    const content = res.content;
-    let contentArr = JSON.parse(content);
-    tableData.value = contentArr;
-    createBy.value = res.createBy;
-    createTime.value = res.createTime;
-    processTableData(contentArr);
-    if (workplaceList.value.length > 0) {
-      console.log(workplaceList.value, 'workplaceList');
-      DefaultValue.value = workplaceList.value[0];
-      workPlaceChange(selectedWorkplace.value);
+import { ref, onMounted, reactive, computed, watch, nextTick } from 'vue';
+import { dsutColumns, dsutDltColumns } from './comment.data';
+import { getInfoList, getAllFileList } from './comment.api';
+const emit = defineEmits(['locate']);
+const props = defineProps({
+  isShowAction: {
+    type: Boolean,
+    default: false,
+  },
+});
+let tableData = ref<any[]>([]);
+let selectList = ref<any[]>([]);
+let resultByWorkplace = ref<any[]>([]);
+let AllMaxValues = ref<any[]>([]);
+let filteredResultByWorkplace = ref<any[]>([]); //根据工作场所查询的数据
+let workplaceList = ref<any[]>([]); //根据工作场所查询的数据
+let selectedFileId = ref<string | null>(null);
+let selectedWorkplace = ref<string | null>(null);
+let DefaultValue = ref<string | null>(null);
+let createBy = ref<any[]>([]);
+let createTime = ref<any[]>([]);
+let formSearch = reactive({
+  pageNum: 1,
+  pageSize: 1000,
+  fileId: '',
+  fileName: '',
+});
+const columns = ref([]);
+watch(
+  () => props.isShowAction,
+  (value) => {
+    if (value) {
+      dsutDltColumns.push({
+        title: '操作',
+        dataIndex: 'operation',
+        width: 100,
+        align: 'center',
+      });
+      if (columns.value.length == 0) columns.value = dsutDltColumns;
+    } else {
+      if (columns.value.length == 0) columns.value = dsutDltColumns;
     }
+  },
+  { immediate: true }
+);
+function handlerLocation(record) {
+  emit('locate', record);
+}
+//获取粉尘监测结果数据
+async function getTableList(params: any) {
+  let res = await getInfoList({ type: 'smoke', ...params });
+  const content = res.content;
+  let contentArr = JSON.parse(content);
+  tableData.value = contentArr;
+  createBy.value = res.createBy;
+  createTime.value = res.createTime;
+  processTableData(contentArr);
+  if (workplaceList.value.length > 0) {
+    console.log(workplaceList.value, 'workplaceList');
+    DefaultValue.value = workplaceList.value[0];
+    workPlaceChange(selectedWorkplace.value);
   }
-  // 处理 tableData 数据
-  function processTableData(data: any) {
-    // 根据 gzcs 字段进行分组
-    const groupedData = data.reduce((acc: any, item: any) => {
-      const workplace = item.gzcs;
-      if (!acc[workplace]) {
-        acc[workplace] = [];
-      }
-      acc[workplace].push(item);
-      return acc;
-    }, {});
-
-    // 筛选每个工作场所下的最大值
-    const result = Object.keys(groupedData).flatMap((workplace) => {
-      const items = groupedData[workplace];
-      const maxValues = [
-        { key: 'sc_zcds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
-        { key: 'jx_zcds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
-        { key: 'sc_hcds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
-        { key: 'jx_hcds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
-        { key: 'zcjqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
-        { key: 'hcjqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
-        { key: 'zcrxd_ds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
-        { key: 'zcrxd_jqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
-        { key: 'hcrxd_ds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
-        { key: 'hcrxd_jqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
-      ];
-
-      items.forEach((item: any) => {
-        maxValues.forEach((maxValue) => {
-          if (item[maxValue.key] > maxValue.value) {
-            maxValue.value = item[maxValue.key];
-            maxValue.gz = item.gz;
-            maxValue.jcdd = item.jcdd;
-            maxValue.fczl = item.fczl;
-          }
-        });
-      });
-
-      return maxValues;
-    });
-
-    resultByWorkplace.value = result;
-    workplaceList.value = Array.from(new Set(resultByWorkplace.value.map((item) => item.gzcs)));
-    if (workplaceList.value.length > 0) {
-      selectedWorkplace.value = workplaceList.value[0];
-      workPlaceChange(selectedWorkplace.value);
+}
+// 处理 tableData 数据
+function processTableData(data: any) {
+  // 根据 gzcs 字段进行分组
+  const groupedData = data.reduce((acc: any, item: any) => {
+    const workplace = item.gzcs;
+    if (!acc[workplace]) {
+      acc[workplace] = [];
     }
-    // 筛选整个 tableData 下的最大值
-    const overallMaxValues = [
-      { key: 'sc_zcds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
-      { key: 'jx_zcds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
-      { key: 'sc_hcds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
-      { key: 'jx_hcds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
-      { key: 'zcjqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
-      { key: 'hcjqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
-      { key: 'zcrxd_ds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
-      { key: 'zcrxd_jqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
-      { key: 'hcrxd_ds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
-      { key: 'hcrxd_jqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
+    acc[workplace].push(item);
+    return acc;
+  }, {});
+
+  // 筛选每个工作场所下的最大值
+  const result = Object.keys(groupedData).flatMap((workplace) => {
+    const items = groupedData[workplace];
+    const maxValues = [
+      { key: 'sc_zcds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
+      { key: 'jx_zcds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
+      { key: 'sc_hcds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
+      { key: 'jx_hcds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
+      { key: 'zcjqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
+      { key: 'hcjqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
+      // { key: 'zcrxd_ds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
+      // { key: 'zcrxd_jqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
+      // { key: 'hcrxd_ds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
+      // { key: 'hcrxd_jqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
     ];
-    data.forEach((item: any) => {
-      overallMaxValues.forEach((maxValue) => {
+
+    items.forEach((item: any) => {
+      maxValues.forEach((maxValue) => {
         if (item[maxValue.key] > maxValue.value) {
           maxValue.value = item[maxValue.key];
           maxValue.gz = item.gz;
           maxValue.jcdd = item.jcdd;
           maxValue.fczl = item.fczl;
-          maxValue.gzcs = item.gzcs;
         }
       });
     });
 
-    AllMaxValues.value = overallMaxValues;
+    return maxValues;
+  });
+
+  resultByWorkplace.value = result;
+  workplaceList.value = Array.from(new Set(resultByWorkplace.value.map((item) => item.gzcs)));
+  if (workplaceList.value.length > 0) {
+    selectedWorkplace.value = workplaceList.value[0];
+    workPlaceChange(selectedWorkplace.value);
   }
-  //获取所有文件列表
-  async function getAllFile() {
-    let res = await getAllFileList({ type: 'smoke' });
-    selectList.value = res.records.map((item: any) => ({
-      fileId: item.fileId,
-      fileName: item.fileName,
-    }));
+  // 筛选整个 tableData 下的最大值
+  const overallMaxValues = [
+    { key: 'sc_zcds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
+    { key: 'jx_zcds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
+    { key: 'sc_hcds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
+    { key: 'jx_hcds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
+    { key: 'zcjqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
+    { key: 'hcjqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
+    // { key: 'zcrxd_ds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
+    // { key: 'zcrxd_jqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
+    // { key: 'hcrxd_ds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
+    // { key: 'hcrxd_jqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
+  ];
+  data.forEach((item: any) => {
+    overallMaxValues.forEach((maxValue) => {
+      if (item[maxValue.key] > maxValue.value) {
+        maxValue.value = item[maxValue.key];
+        maxValue.gz = item.gz;
+        maxValue.jcdd = item.jcdd;
+        maxValue.fczl = item.fczl;
+        maxValue.gzcs = item.gzcs;
+      }
+    });
+  });
+
+  AllMaxValues.value = overallMaxValues;
+}
+//获取所有文件列表
+async function getAllFile() {
+  let res = await getAllFileList({ type: 'smoke' });
+  selectList.value = res.records.map((item: any) => ({
+    fileId: item.fileId,
+    fileName: item.fileName,
+  }));
+  if (selectList.value.length > 0) {
+    formSearch.fileId = selectList.value[0].fileId;
+    getSearch();
+  }
+}
+//查询
+function getSearch() {
+  const selectedFile = selectList.value.find((item) => item.fileId === formSearch.fileId);
+  const params = {
+    fileId: formSearch.fileId,
+    fileName: selectedFile ? selectedFile.fileName : '',
+  };
+  getTableList(params);
+}
+function workPlaceChange(value: any) {
+  selectedWorkplace.value = value;
+  filteredResultByWorkplace.value = resultByWorkplace.value.filter((item) => item.gzcs === value);
+}
+
+onMounted(() => {
+  getTableList({ type: 'smoke' });
+  getAllFile().then(() => {
     if (selectList.value.length > 0) {
       formSearch.fileId = selectList.value[0].fileId;
+      selectedFileId.value = selectList.value[0].fileId;
       getSearch();
     }
-  }
-  //查询
-  function getSearch() {
-    const selectedFile = selectList.value.find((item) => item.fileId === formSearch.fileId);
-    const params = {
-      fileId: formSearch.fileId,
-      fileName: selectedFile ? selectedFile.fileName : '',
-    };
-    getTableList(params);
-  }
-  function workPlaceChange(value: any) {
-    selectedWorkplace.value = value;
-    filteredResultByWorkplace.value = resultByWorkplace.value.filter((item) => item.gzcs === value);
-  }
-
-  onMounted(() => {
-    getTableList({ type: 'smoke' });
-    getAllFile().then(() => {
-      if (selectList.value.length > 0) {
-        formSearch.fileId = selectList.value[0].fileId;
-        selectedFileId.value = selectList.value[0].fileId;
-        getSearch();
-      }
-    });
   });
+});
 </script>
 
 <style lang="less" scoped>
-  @ventSpace: zxm;
-  .dustMonitor {
-    .search-area {
-      margin: 15px;
+@ventSpace: zxm;
+.dustMonitor {
+  .search-area {
+    margin: 15px;
 
-      .area-item {
-        display: flex;
-        align-items: center;
+    .area-item {
+      display: flex;
+      align-items: center;
 
-        .item-text {
-          color: #fff;
-        }
+      .item-text {
+        color: #fff;
       }
     }
+  }
 
-    .zxm-picker,
-    .zxm-input {
-      border: 1px solid #3ad8ff77;
-      background-color: #ffffff00;
-      color: #fff;
-    }
+  .zxm-picker,
+  .zxm-input {
+    border: 1px solid #3ad8ff77;
+    background-color: #ffffff00;
+    color: #fff;
   }
+}
 
-  :deep(.@{ventSpace}-table-body) {
-    height: auto !important;
+:deep(.@{ventSpace}-table-body) {
+  height: auto !important;
 
-    tr > td {
-      background: #ffffff00 !important;
-    }
+  tr > td {
+    background: #ffffff00 !important;
+  }
 
-    tr.@{ventSpace}-table-row-selected {
-      td {
-        background: #007cc415 !important;
-      }
+  tr.@{ventSpace}-table-row-selected {
+    td {
+      background: #007cc415 !important;
     }
   }
+}
 
-  :deep(.jeecg-basic-table .@{ventSpace}-table-wrapper .@{ventSpace}-table-title) {
-    min-height: 0;
-  }
+:deep(.jeecg-basic-table .@{ventSpace}-table-wrapper .@{ventSpace}-table-title) {
+  min-height: 0;
+}
 
-  :deep(.@{ventSpace}-pagination) {
-    margin-right: 20px !important;
-  }
+:deep(.@{ventSpace}-pagination) {
+  margin-right: 20px !important;
+}
 
-  :deep(.zxm-table-thead > tr > th:last-child) {
-    border-right: 1px solid #91e9fe55 !important;
-  }
+:deep(.zxm-table-thead > tr > th:last-child) {
+  border-right: 1px solid #91e9fe55 !important;
+}
 </style>

src/views/vent/monitorManager/compressor/components/nitrogenHome_dltj.vue

@@ -10,7 +10,7 @@
       <fourBorderBg :class="`kyj${groupNum}`" :id="`nitrogenMonitor${groupNum}`">
         <!-- <div class="title">空压机{{ groupNum }} </div> -->
         <div class="title">
-          {{ monitorData ? monitorData['strname' + groupNum] : '-' }}
+          {{ monitorData ? monitorData['strname' + groupNum] : '注氮机' + groupNum }}
           （
           <span :style="{ color: monitorData && monitorData['Status' + groupNum] == '1' ? '#67fc00' : '#e9170b' }">
             {{ monitorData && monitorData['Status' + groupNum] == '1' ? '运行' : '停止' }}
@@ -108,7 +108,7 @@
           <div class="item item-l" v-for="groupNum in monitorDataGroupNum" :key="groupNum">
             <ventBox1>
               <template #title>
-                <div>{{ monitorData['strname' + groupNum] }}</div>
+                <div>{{ monitorData ? monitorData['strname' + groupNum] : '注氮机' + groupNum }}</div>
               </template>
               <template #container>
                 <div class="monitor-box">