活鸡兔井 粉尘监测报表 束管报表 色谱仪报表修改

.env.development

@@ -6,8 +6,8 @@ VITE_PUBLIC_PATH = /
 
 # 跨域代理，您可以配置多个 ,请注意，没有换行符
 #VITE_PROXY = [["/jeecgboot","http://localhost:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
-VITE_PROXY = [["/jeecgsystem","http://182.92.126.35:9999"],["/upload","http://182.92.126.35:9999/upload"],["/documents", "http://182.92.126.35:9050"],["/modelreq", "http://182.92.126.35:9999"],["/webRtc", "http://182.92.126.35:8051"]]
-# VITE_PROXY = [["/jeecgsystem","http://192.168.183.88:9999"],["/upload","http://192.168.183.88:9999/upload"],["/documents", "http://192.168.183.88:9050"],["/modelreq", "http://192.168.183.88:9999"],["/webRtc", "http://192.168.183.88:8051"]]
+# VITE_PROXY = [["/jeecgsystem","http://182.92.126.35:9999"],["/upload","http://182.92.126.35:9999/upload"],["/documents", "http://182.92.126.35:9050"],["/modelreq", "http://182.92.126.35:9999"],["/webRtc", "http://182.92.126.35:8051"]]
+VITE_PROXY = [["/jeecgsystem","http://192.168.183.88:9999"],["/upload","http://192.168.183.88:9999/upload"],["/documents", "http://192.168.183.88:9050"],["/modelreq", "http://192.168.183.88:9999"],["/webRtc", "http://192.168.183.88:8051"]]
 # VITE_PROXY = [["/jeecgsystem","http://10.10.150.72:9999"],["/upload","http://localhost:3300/upload"],["/documents", "http://10.10.150.72:9050"],["/modelreq", "http://10.10.150.72:9999"],["/webRtc", "http://192.168.183.216:8051"]]
 #VITE_PROXY = [["/jeecgsystem","http://192.168.1.8:9999"],["/upload","http://localhost:3300/upload"]]
 
@@ -30,6 +30,6 @@ VITE_GLOB_API_URL_PREFIX=
 #微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径
 #VITE_APP_SUB_APP = [["micro-need-air", "//10.10.150.72:8099/"], ["micro-vent-3dModal", "//localhost:8091/"], ["micro-fire-front", "//localhost:8090/"]]
 # VITE_APP_SUB_APP = [["micro-vent-3dModal", "//192.168.183.88:8091/", "micro-vent-3dModal"], ["micro-need-air", "//192.168.183.88:8093/", "micro-need-air"], ["micro-fire-front", "//localhost:8097/", "fire-Micro"]]
-# VITE_APP_SUB_APP = [["micro-vent-3dModal", "//192.168.183.154:8091/", "micro-vent-3dModal"], ["micro-need-air", "//192.168.183.88:8093/", "micro-need-air"], ["micro-fire-front", "//localhost:8097/", "fire-Micro"]]
-VITE_APP_SUB_APP = [["micro-vent-3dModal", "//182.92.126.35:8091/", "micro-vent-3dModal"], ["micro-need-air", "//182.92.126.35:8099/", "micro-need-air"], ["micro-fire-front", "//182.92.126.35:8097/", "fire-Micro"]]
+VITE_APP_SUB_APP = [["micro-vent-3dModal", "//192.168.183.154:8091/", "micro-vent-3dModal"], ["micro-need-air", "//192.168.183.88:8093/", "micro-need-air"], ["micro-fire-front", "//localhost:8097/", "fire-Micro"]]
+# VITE_APP_SUB_APP = [["micro-vent-3dModal", "//182.92.126.35:8091/", "micro-vent-3dModal"], ["micro-need-air", "//182.92.126.35:8099/", "micro-need-air"], ["micro-fire-front", "//182.92.126.35:8097/", "fire-Micro"]]
 # VITE_APP_SUB_APP = [["micro-vent-3dModal", "//localhost:8091/"], ["micro-need-air", "//localhost:8099/"], ["micro-fire-front", "//localhost:8090/"]]

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

@@ -3,6 +3,7 @@ import { defHttp } from '/@/utils/http/axios';
 enum Api {
   getBundleInfo = '/ventanaly-device/safety/reportLocalData/queryReportData',
   getFileList = '/ventanaly-device/safety/reportLocalData/list',
+  getFileListById = '/ventanaly-device/safety/reportLocalData/queryById',
 }
 /**
  *
@@ -10,3 +11,4 @@ enum Api {
  */
 export const getBundleInfoList = (params) => defHttp.post({ url: Api.getBundleInfo, params });
 export const getAllFileList = (params) => defHttp.get({ url: Api.getFileList, params });
+export const getAllFileListById = (params) => defHttp.get({ url: Api.getFileListById, params });

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

@@ -188,3 +188,183 @@ export const columns: BasicColumn[] = [
     align: 'center',
   },
 ];
+export const Hjtcolumns: BasicColumn[] = [
+  {
+    title: '序号',
+    width: 60,
+    align: 'center',
+    dataIndex: 'xh',
+    key: 'xh',
+  },
+  {
+    title: '管路编号',
+    dataIndex: 'glbh',
+    key: 'glbh',
+    width: 130,
+    align: 'center',
+  },
+  {
+    title: '管路名称',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+    width: 130,
+    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: '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: '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: '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: '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: '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: '备注',
+    children: [
+      {
+        title: '采空区米数',
+        dataIndex: 'remark',
+        key: 'remark',
+        width: 80,
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: '煤自燃阶段',
+    dataIndex: 'internalFireWarnLevel',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    width: 100,
+    align: 'center',
+  },
+];

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

@@ -10,7 +10,7 @@
         </ul>
       </div>
       <div class="table-container">
-        <a-table :columns="columns" :data-source="tableData" size="small" :scroll="{ y: 300 }" class="tableW">
+        <a-table :columns="computedColumns" :data-source="tableData" size="small" :scroll="{ y: 250 }" class="tableW">
           <template #bodyCell="{ column, record }">
             <template v-if="column.dataIndex === 'action'">
               <a class="action-link" @click="toDetail(record)">数据分析</a>
@@ -50,8 +50,8 @@
 
 <script setup lang="ts">
 import { ref, onMounted, computed, shallowRef, reactive, nextTick } from 'vue';
-import { columns } from './bundle-table.data';
-import { getBundleInfoList, getAllFileList } from './bundle-table.api';
+import { columns, Hjtcolumns } 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';
 import BlastDelta from './modal/blastDelta.vue';
@@ -82,6 +82,14 @@ let tableData = ref<any[]>([]);
 let modalVisible = ref(false);
 let selectedFileId = ref<string | null>(null);
 const posMonitor = shallowRef({});
+const computedColumns = computed(() => {
+  switch (sysOrgCode) {
+    case 'sdmtjtdltmkhjtj':
+      return Hjtcolumns; // 活鸡兔对应的列配置
+    default:
+      return columns; // 默认情况下返回的列配置
+  }
+});
 function updateChart(data: any) {
   const chartDom = document.getElementById('barChart');
   const myChart = echarts.init(chartDom);
@@ -98,50 +106,256 @@ 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 = computed(() => {
-  //   switch (sysOrgCode) {
-  //     case 'sdmtjtdltmk':
-  //       return data.map((item: any) => parseFloat(item.n2_max)); // 大柳塔对应的列配置
-  //     case 'sdmtjtswmk':
-  //       return data.map((item: any) => parseFloat(item.n2_max)); // 上湾对应的列配置
-  //     default:
-  //       return; // 默认情况下返回的列配置
-  //   }
-  // });
-  // const n2AveValues = computed(() => {
-  //   switch (sysOrgCode) {
-  //     case 'sdmtjtdltmk':
-  //       return data.map((item: any) => parseFloat(item.n2_ave)); // 大柳塔对应的列配置
-  //     case 'sdmtjtswmk':
-  //       return data.map((item: any) => parseFloat(item.n2_ave)); // 上湾对应的列配置
-  //     default:
-  //       return; // 默认情况下返回的列配置
-  //   }
-  // });
-  // const no2MaxValues = computed(() => {
-  //   switch (sysOrgCode) {
-  //     case 'sdmtjtdltmk':
-  //       return data.map((item: any) => parseFloat(item.no2_max)); // 大柳塔对应的列配置
-  //     case 'sdmtjtswmk':
-  //       return data.map((item: any) => parseFloat(item.no2_max)); // 上湾对应的列配置
-  //     default:
-  //       return; // 默认情况下返回的列配置
-  //   }
-  // });
-  // const no2AveValues = computed(() => {
-  //   switch (sysOrgCode) {
-  //     case 'sdmtjtdltmk':
-  //       return data.map((item: any) => parseFloat(item.no2_ave)); // 大柳塔对应的列配置
-  //     case 'sdmtjtswmk':
-  //       return data.map((item: any) => parseFloat(item.no2_ave)); // 上湾对应的列配置
-  //     default:
-  //       return; // 默认情况下返回的列配置
-  //   }
-  // });
   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 no2MaxValues = data.map((item: any) => parseFloat(item.no2_max));
+  const no2AveValues = data.map((item: any) => parseFloat(item.no2_ave));
+
+  const getSeriesConfig = (sysOrgCode) => {
+    switch (sysOrgCode) {
+      case 'sdmtjtdltmkhjtj':
+        return [
+          {
+            name: 'CO₂最大值',
+            data: co2MaxValues,
+            type: 'bar',
+          },
+          {
+            name: 'CO₂平均值',
+            data: co2AveValues,
+            type: 'bar',
+          },
+          {
+            name: 'CO最大值',
+            data: coMaxValues,
+            type: 'bar',
+          },
+          {
+            name: 'CO平均值',
+            data: coAveValues,
+            type: 'bar',
+          },
+          {
+            name: 'O₂最小值',
+            data: o2MinValues,
+            type: 'bar',
+          },
+          {
+            name: 'O₂平均值',
+            data: o2AveValues,
+            type: 'bar',
+          },
+          {
+            name: 'CH₄最大值',
+            data: ch4MaxValues,
+            type: 'bar',
+          },
+          {
+            name: 'CH₄平均值',
+            data: ch4AveValues,
+            type: 'bar',
+          },
+          {
+            name: 'N₂最大值',
+            data: n2MaxValues,
+            type: 'bar',
+          },
+          {
+            name: 'N₂平均值',
+            data: n2AveValues,
+            type: 'bar',
+          },
+          {
+            name: 'C₂H₂最大值',
+            data: c2h2MaxValues,
+            type: 'bar',
+          },
+          {
+            name: 'C₂H₂平均值',
+            data: c2h2AveValues,
+            type: 'bar',
+          },
+          {
+            name: 'C₂H₄最大值',
+            data: c2h4MaxValues,
+            type: 'bar',
+          },
+          {
+            name: 'C₂H₄平均值',
+            data: c2h4AveValues,
+            type: 'bar',
+          },
+        ];
+      case 'sdmtjtswmk':
+        return [
+          {
+            name: 'C₂H₂最大值',
+            data: c2h2MaxValues,
+            type: 'bar',
+          },
+          {
+            name: 'C₂H₂平均值',
+            data: c2h2AveValues,
+            type: 'bar',
+          },
+          {
+            name: 'C₂H₄最大值',
+            data: c2h4MaxValues,
+            type: 'bar',
+          },
+          {
+            name: 'C₂H₄平均值',
+            data: c2h4AveValues,
+            type: 'bar',
+          },
+          {
+            name: 'CH₄最大值',
+            data: ch4MaxValues,
+            type: 'bar',
+          },
+          {
+            name: 'CH₄平均值',
+            data: ch4AveValues,
+            type: 'bar',
+          },
+          {
+            name: 'CO₂最大值',
+            data: co2MaxValues,
+            type: 'bar',
+          },
+          {
+            name: 'CO₂平均值',
+            data: co2AveValues,
+            type: 'bar',
+          },
+          {
+            name: 'CO最大值',
+            data: coMaxValues,
+            type: 'bar',
+          },
+          {
+            name: 'CO平均值',
+            data: coAveValues,
+            type: 'bar',
+          },
+          {
+            name: 'O₂最小值',
+            data: o2MinValues,
+            type: 'bar',
+          },
+          {
+            name: 'O₂平均值',
+            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',
+          },
+        ];
+      default:
+        return [
+          {
+            name: 'C₂H₂最大值',
+            data: c2h2MaxValues,
+            type: 'bar',
+          },
+          {
+            name: 'C₂H₂平均值',
+            data: c2h2AveValues,
+            type: 'bar',
+          },
+          {
+            name: 'C₂H₄最大值',
+            data: c2h4MaxValues,
+            type: 'bar',
+          },
+          {
+            name: 'C₂H₄平均值',
+            data: c2h4AveValues,
+            type: 'bar',
+          },
+          {
+            name: 'CH₄最大值',
+            data: ch4MaxValues,
+            type: 'bar',
+          },
+          {
+            name: 'CH₄平均值',
+            data: ch4AveValues,
+            type: 'bar',
+          },
+          {
+            name: 'CO₂最大值',
+            data: co2MaxValues,
+            type: 'bar',
+          },
+          {
+            name: 'CO₂平均值',
+            data: co2AveValues,
+            type: 'bar',
+          },
+          {
+            name: 'CO最大值',
+            data: coMaxValues,
+            type: 'bar',
+          },
+          {
+            name: 'CO平均值',
+            data: coAveValues,
+            type: 'bar',
+          },
+          {
+            name: 'O₂最小值',
+            data: o2MinValues,
+            type: 'bar',
+          },
+          {
+            name: 'O₂平均值',
+            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',
+          // },
+        ];
+    }
+  };
+
+  const seriesConfig = getSeriesConfig(sysOrgCode);
 
   const option = {
     title: {
@@ -204,88 +418,7 @@ function updateChart(data: any) {
       bottom: '3%',
       containLabel: true,
     },
-    series: [
-      {
-        name: 'C₂H₂最大值',
-        data: c2h2MaxValues,
-        type: 'bar',
-      },
-      {
-        name: 'C₂H₂平均值',
-        data: c2h2AveValues,
-        type: 'bar',
-      },
-      {
-        name: 'C₂H₄最大值',
-        data: c2h4MaxValues,
-        type: 'bar',
-      },
-      {
-        name: 'C₂H₄平均值',
-        data: c2h4AveValues,
-        type: 'bar',
-      },
-      {
-        name: 'CH₄最大值',
-        data: ch4MaxValues,
-        type: 'bar',
-      },
-      {
-        name: 'CH₄平均值',
-        data: ch4AveValues,
-        type: 'bar',
-      },
-      {
-        name: 'CO₂最大值',
-        data: co2MaxValues,
-        type: 'bar',
-      },
-      {
-        name: 'CO₂平均值',
-        data: co2AveValues,
-        type: 'bar',
-      },
-      {
-        name: 'CO最大值',
-        data: coMaxValues,
-        type: 'bar',
-      },
-      {
-        name: 'CO平均值',
-        data: coAveValues,
-        type: 'bar',
-      },
-      {
-        name: 'O₂最小值',
-        data: o2MinValues,
-        type: 'bar',
-      },
-      {
-        name: 'O₂平均值',
-        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',
-      // },
-    ],
+    series: seriesConfig,
   };
   myChart.setOption(option);
 }
@@ -336,7 +469,24 @@ async function getTableList(params: any) {
     updateChart(contentArr);
   });
 }
-
+async function getTableListById(params: any) {
+  let res = await getAllFileListById({ ...params });
+  const content = res.content;
+  let contentArr = JSON.parse(content);
+  total.value = contentArr.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 = contentArr;
+  nextTick(() => {
+    updateChart(contentArr);
+  });
+}
 //获取所有文件列表
 async function getAllFile() {
   let res = await getAllFileList({ type: 'bundle' });
@@ -361,12 +511,12 @@ function handleFileClick(item: any) {
 }
 //查询
 function getSearch() {
-  const selectedFile = selectList.value.find((item) => item.fileId === formSearch.fileId);
+  // const selectedFile = selectList.value.find((item) => item.fileId === formSearch.fileId);
   const params = {
     fileId: formSearch.fileId,
-    fileName: selectedFile ? selectedFile.fileName : '',
+    // fileName: selectedFile ? selectedFile.fileName : '',
   };
-  getTableList(params);
+  getTableListById(params);
 }
 onMounted(() => {
   getTableList({ type: 'bundle' });

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

@@ -3,6 +3,7 @@ import { defHttp } from '/@/utils/http/axios';
 enum Api {
   getbunudleSpyInfo = '/ventanaly-device/safety/reportLocalData/queryReportData',
   getFileList = '/ventanaly-device/safety/reportLocalData/list',
+  getFileListById = '/ventanaly-device/safety/reportLocalData/queryById',
 }
 /**
  *
@@ -10,3 +11,4 @@ enum Api {
  */
 export const getbundleSpyInfoList = (params) => defHttp.post({ url: Api.getbunudleSpyInfo, params });
 export const getAllFileList = (params) => defHttp.get({ url: Api.getFileList, params });
+export const getAllFileListById = (params) => defHttp.get({ url: Api.getFileListById, params });

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

@@ -97,3 +97,132 @@ export const columns: BasicColumn[] = [
     align: 'center',
   },
 ];
+export const Hjtcolumns: BasicColumn[] = [
+  {
+    title: '序号',
+    width: 60,
+    align: 'center',
+    dataIndex: 'xh',
+    key: 'xh',
+  },
+  {
+    title: '采空区名称',
+    dataIndex: 'ckqmc',
+    key: 'ckqmc',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '检查地点',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '闭内',
+    children: [
+      {
+        title: 'CH₄(%)',
+        dataIndex: 'ch4_ave',
+        key: 'ch4_ave',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: 'O₂(%)',
+        dataIndex: 'o2_ave',
+        key: 'o2_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: '气温(℃)',
+        dataIndex: 'qw',
+        key: 'qw',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '水温(℃)',
+        dataIndex: 'sw',
+        key: 'sw',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '压差(Pa)',
+        dataIndex: 'yc',
+        key: 'yc',
+        width: 100,
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: '闭前',
+    children: [
+      {
+        title: 'CH₄(%)',
+        dataIndex: 'ch4_ave_bq',
+        key: 'ch4_ave_bq',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: 'O₂(%)',
+        dataIndex: 'o2_ave_bq',
+        key: 'o2_ave_bq',
+        width: 100,
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: '观测孔风流方向',
+    dataIndex: 'gckflfx',
+    key: 'gckflfx',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '密闭完好情况',
+    dataIndex: 'mbwhqk',
+    key: 'mbwhqk',
+    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

@@ -10,7 +10,7 @@
         </ul>
       </div>
       <div class="table-container">
-        <a-table :columns="columns" :data-source="tableData" size="small" :scroll="{ y: 300 }" class="tableW">
+        <a-table :columns="computedColumns" :data-source="tableData" size="small" :scroll="{ y: 300 }" class="tableW">
           <template #bodyCell="{ column, record }">
             <template v-if="column.dataIndex === 'action'">
               <a class="action-link" @click="toDetail(record)">数据分析</a>
@@ -44,8 +44,8 @@
 
 <script setup lang="ts">
 import { ref, onMounted, computed, reactive, shallowRef } from 'vue';
-import { columns } from './bundleSpy-table.data';
-import { getbundleSpyInfoList, getAllFileList } from './bundleSpy-table.api';
+import { columns, Hjtcolumns } from './bundleSpy-table.data';
+import { getbundleSpyInfoList, getAllFileList, getAllFileListById } from './bundleSpy-table.api';
 import customHeader from '/@/components/vent/customHeader.vue';
 import * as echarts from 'echarts';
 import BlastDelta from './modal/blastDelta.vue';
@@ -74,6 +74,15 @@ let tableData = ref<any[]>([]);
 let selectedFileId = ref<string | null>(null);
 let modalVisible = ref(false);
 const posMonitor = shallowRef({});
+const computedColumns = computed(() => {
+  switch (sysOrgCode) {
+    case 'sdmtjtdltmkhjtj':
+      return Hjtcolumns; // 活鸡兔对应的列配置
+    default:
+      return columns; // 默认情况下返回的列配置
+  }
+});
+
 //获取色谱仪报表
 async function getTableList(params: any) {
   let res = await getbundleSpyInfoList({ type: 'bundleSpy', ...params });
@@ -114,6 +123,22 @@ async function getTableList(params: any) {
   tableData.value = contentArr;
   updateChart(contentArr);
 }
+async function getTableListById(params: any) {
+  let res = await getAllFileListById({ ...params });
+  const content = res.content;
+  let contentArr = JSON.parse(content);
+  total.value = contentArr.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 = contentArr;
+  updateChart(contentArr);
+}
 
 //跳转到爆炸三角形
 function toDetail(record: any) {
@@ -134,7 +159,105 @@ function updateChart(data: any) {
   const o2AveValues = data.map((item: any) => parseFloat(item.o2_ave));
   const n2AveValues = data.map((item: any) => parseFloat(item.n2_ave));
   const c2h6AveValues = data.map((item: any) => parseFloat(item.c2h6_ave));
+  const ch4AveBqValues = data.map((item: any) => parseFloat(item.ch4_ave_bq));
+  const o2AveBqValues = data.map((item: any) => parseFloat(item.o2_ave_bq));
 
+  const getSeriesConfig = (sysOrgCode) => {
+    switch (sysOrgCode) {
+      case 'sdmtjtdltmkhjtj':
+        return [
+          {
+            name: 'CH₄闭内',
+            data: ch4AveValues,
+            yAxisIndex: 1,
+            type: 'bar',
+          },
+          {
+            name: 'O₂闭内',
+            data: ch4AveValues,
+            yAxisIndex: 1,
+            type: 'bar',
+          },
+          {
+            name: 'CO₂闭内',
+            data: co2AveValues,
+            yAxisIndex: 1,
+            type: 'bar',
+          },
+          {
+            name: 'CO闭内',
+            data: coAveValues,
+            yAxisIndex: 1,
+            type: 'bar',
+          },
+          {
+            name: 'CH₄闭前',
+            data: ch4AveBqValues,
+            yAxisIndex: 1,
+            type: 'bar',
+          },
+          {
+            name: 'O₂闭前',
+            data: o2AveBqValues,
+            yAxisIndex: 1,
+            type: 'bar',
+          },
+        ];
+      default:
+        return [
+          {
+            name: 'C₂H₂平均值',
+            data: c2h2AveValues,
+            type: 'bar',
+            yAxisIndex: 1,
+          },
+          {
+            name: 'C₂H₄平均值',
+            data: c2h4AveValues,
+            type: 'bar',
+            yAxisIndex: 1,
+          },
+          {
+            name: 'CH₄平均值',
+            data: ch4AveValues,
+            yAxisIndex: 1,
+            type: 'bar',
+          },
+          {
+            name: 'CO₂平均值',
+            data: co2AveValues,
+            yAxisIndex: 1,
+            type: 'bar',
+          },
+          {
+            name: 'CO平均值',
+            data: coAveValues,
+            yAxisIndex: 1,
+            type: 'bar',
+          },
+          {
+            name: 'O₂平均值',
+            data: o2AveValues,
+            yAxisIndex: 0,
+            type: 'bar',
+          },
+          {
+            name: 'N₂平均值',
+            data: n2AveValues,
+            yAxisIndex: 0,
+            type: 'bar',
+          },
+          {
+            name: 'C2H6平均值',
+            data: c2h6AveValues,
+            yAxisIndex: 1,
+            type: 'bar',
+          },
+        ];
+    }
+  };
+
+  const seriesConfig = getSeriesConfig(sysOrgCode);
   const option = {
     title: {
       text: '色谱仪报表分析',
@@ -207,56 +330,7 @@ function updateChart(data: any) {
       bottom: '3%',
       containLabel: true,
     },
-    series: [
-      {
-        name: 'C₂H₂平均值',
-        data: c2h2AveValues,
-        type: 'bar',
-        yAxisIndex: 1,
-      },
-      {
-        name: 'C₂H₄平均值',
-        data: c2h4AveValues,
-        type: 'bar',
-        yAxisIndex: 1,
-      },
-      {
-        name: 'CH₄平均值',
-        data: ch4AveValues,
-        yAxisIndex: 1,
-        type: 'bar',
-      },
-      {
-        name: 'CO₂平均值',
-        data: co2AveValues,
-        yAxisIndex: 1,
-        type: 'bar',
-      },
-      {
-        name: 'CO平均值',
-        data: coAveValues,
-        yAxisIndex: 1,
-        type: 'bar',
-      },
-      {
-        name: 'O₂平均值',
-        data: o2AveValues,
-        yAxisIndex: 0,
-        type: 'bar',
-      },
-      {
-        name: 'N₂平均值',
-        data: n2AveValues,
-        yAxisIndex: 0,
-        type: 'bar',
-      },
-      {
-        name: 'C2H6平均值',
-        data: c2h6AveValues,
-        yAxisIndex: 1,
-        type: 'bar',
-      },
-    ],
+    series: seriesConfig,
   };
   myChart.setOption(option);
 }
@@ -281,12 +355,12 @@ function handleFileClick(item: any) {
 }
 //查询
 function getSearch() {
-  const selectedFile = selectList.value.find((item) => item.fileId === formSearch.fileId);
+  // const selectedFile = selectList.value.find((item) => item.fileId === formSearch.fileId);
   const params = {
     fileId: formSearch.fileId,
-    fileName: selectedFile ? selectedFile.fileName : '',
+    // fileName: selectedFile ? selectedFile.fileName : '',
   };
-  getTableList(params);
+  getTableListById(params);
 }
 onMounted(() => {
   getTableList({ type: 'bundleSpy' });

src/views/vent/dust/dustMonitorTable/dsut-table.api.ts

@@ -3,6 +3,7 @@ import { defHttp } from '/@/utils/http/axios';
 enum Api {
   getDustInfo = '/ventanaly-device/safety/reportLocalData/queryReportData',
   getFileList = '/ventanaly-device/safety/reportLocalData/list',
+  getFileListById = '/ventanaly-device/safety/reportLocalData/queryById',
 }
 /**
  * 获取粉尘监测结果报表
@@ -10,3 +11,4 @@ enum Api {
  */
 export const getDustInfoList = (params) => defHttp.post({ url: Api.getDustInfo, params });
 export const getAllFileList = (params) => defHttp.get({ url: Api.getFileList, params });
+export const getAllFileListById = (params) => defHttp.get({ url: Api.getFileListById, params });

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

@@ -34,7 +34,7 @@ export const columns = [
     align: 'center',
   },
   {
-    title: '总尘(短时间监测浓度，单位：mg/m³)',
+    title: '总尘(短时间监测浓度,mg/m³)',
     width: 100,
     align: 'center',
     children: [
@@ -55,7 +55,7 @@ export const columns = [
     ],
   },
   {
-    title: '呼尘(短时间监测浓度，单位：mg/m³)',
+    title: '呼尘(短时间监测浓度,mg/m³)',
     width: 100,
     align: 'center',
     children: [
@@ -76,14 +76,14 @@ export const columns = [
     ],
   },
   {
-    title: '总尘(时间加权平均浓度，单位：mg/m³)',
+    title: '总尘(时间加权平均浓度,mg/m³)',
     dataIndex: 'zcjqpj',
     key: 'zcjqpj',
     width: 100,
     align: 'center',
   },
   {
-    title: '呼尘(时间加权平均浓度，单位：mg/m³)',
+    title: '呼尘(时间加权平均浓度,mg/m³)',
     dataIndex: 'hcjqpj',
     key: 'hcjqpj',
     width: 100,
@@ -256,6 +256,126 @@ export const Swcolumns = [
     align: 'center',
   },
 ];
+export const Hjtcolumns = [
+  {
+    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³)',
+    width: 100,
+    align: 'center',
+    children: [
+      {
+        title: '总尘',
+        dataIndex: 'sc_zcds',
+        key: 'sc_zcds',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '呼尘',
+        dataIndex: 'sc_hcds',
+        key: 'sc_hcds',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '正常生产时间',
+        dataIndex: 'sc_sj',
+        key: 'sc_sj',
+        width: 100,
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: '检修期间粉尘浓度(mg/m³)',
+    width: 100,
+    align: 'center',
+    children: [
+      {
+        title: '总尘',
+        dataIndex: 'jx_zcds',
+        key: 'jx_zcds',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '呼尘',
+        dataIndex: 'jx_hcds',
+        key: 'jx_hcds',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '停机检修时间',
+        dataIndex: 'jx_sj',
+        key: 'jx_sj',
+        width: 100,
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: '时间加权平均浓度(mg/m³)',
+    width: 100,
+    align: 'center',
+    children: [
+      {
+        title: '总尘',
+        dataIndex: 'zcjqpj',
+        key: 'zcjqpj',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '是否合格',
+        dataIndex: 'zcsfhgjqpj',
+        key: 'zcsfhgjqpj',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '呼尘',
+        dataIndex: 'hcjqpj',
+        key: 'hcjqpj',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '是否合格',
+        dataIndex: 'hcsfhgjqpj',
+        key: 'hcsfhgjqpj',
+        width: 100,
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: '采取措施',
+    dataIndex: 'smark',
+    key: 'smark',
+    width: 80,
+    align: 'center',
+  },
+];
 export const fieldMapping = {
   sc_zcds: '总尘-作业工序-生产(短时间监测浓度，mg/m³)',
   jx_zcds: '总尘-作业工序-检修(短时间监测浓度，mg/m³)',
@@ -280,6 +400,14 @@ export const fieldSwMapping = {
   zcjqpj: '总尘(时间加权平均浓度，mg/m³)',
   hcjqpj: '呼尘(时间加权平均浓度，mg/m³)',
 };
+export const fieldHjtMapping = {
+  sc_zcds: '总尘(生产期间粉尘浓度，mg/m³)',
+  sc_hcds: '呼尘(生产期间粉尘浓度，mg/m³)',
+  jx_zcds: '总尘(检修期间粉尘浓度，mg/m³)',
+  jx_hcds: '呼尘(检修期间粉尘浓度，mg/m³)',
+  zcjqpj: '总尘(时间加权平均浓度，mg/m³)',
+  hcjqpj: '呼尘(时间加权平均浓度，mg/m³)',
+};
 
 export const dataColumns = [
   {
@@ -307,7 +435,7 @@ export const dataColumns = [
   {
     width: 100,
     align: 'center',
-    title: '检测地点',
+    title: '监测地点',
     dataIndex: 'jcdd',
     key: 'jcdd',
   },
@@ -338,7 +466,7 @@ export const dataDltColumns = [
   {
     width: 100,
     align: 'center',
-    title: '检测地点',
+    title: '监测地点',
     dataIndex: 'jcdd',
     key: 'jcdd',
   },
@@ -369,7 +497,7 @@ export const dataSwColumns = [
   {
     width: 100,
     align: 'center',
-    title: '检测地点',
+    title: '监测地点',
     dataIndex: 'jcdd',
     key: 'jcdd',
   },
@@ -381,6 +509,37 @@ export const dataSwColumns = [
     key: 'fczl',
   },
 ];
+export const dataHjtColumns = [
+  {
+    title: '监测字段',
+    align: 'center',
+    dataIndex: 'key',
+    key: 'key',
+    width: 200,
+    customRender: ({ text }) => fieldHjtMapping[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: 'fczl',
+    key: 'fczl',
+  },
+];
 
 export const AllDataColumns = [
   {
@@ -415,7 +574,7 @@ export const AllDataColumns = [
   {
     width: 100,
     align: 'center',
-    title: '检测地点',
+    title: '监测地点',
     dataIndex: 'jcdd',
     key: 'jcdd',
   },
@@ -446,7 +605,7 @@ export const AllDataDltColumns = [
   {
     width: 100,
     align: 'center',
-    title: '检测地点',
+    title: '监测地点',
     dataIndex: 'jcdd',
     key: 'jcdd',
   },
@@ -484,7 +643,7 @@ export const AllDataSwColumns = [
   {
     width: 100,
     align: 'center',
-    title: '检测地点',
+    title: '监测地点',
     dataIndex: 'jcdd',
     key: 'jcdd',
   },
@@ -496,3 +655,34 @@ export const AllDataSwColumns = [
     key: 'fczl',
   },
 ];
+export const AllDataHjtColumns = [
+  {
+    title: '监测字段',
+    align: 'center',
+    dataIndex: 'key',
+    key: 'key',
+    width: 200,
+    customRender: ({ text }) => fieldHjtMapping[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: 'fczl',
+    key: 'fczl',
+  },
+];

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" :pagination="false" :scroll="{ y: 250 }" class="tableW">
+        <a-table :columns="computedColumns" :data-source="tableData" size="small" :pagination="false" :scroll="{ y: 330 }" class="tableW">
           <template #bodyCell="{ record, column }">
             <template v-if="record[column.dataIndex] === null">
               <span>-</span>
@@ -66,14 +66,17 @@ import {
   columns,
   Dltcolumns,
   Swcolumns,
+  Hjtcolumns,
   dataColumns,
   dataDltColumns,
   dataSwColumns,
+  dataHjtColumns,
   AllDataColumns,
   AllDataDltColumns,
   AllDataSwColumns,
+  AllDataHjtColumns,
 } from './dust-table.data';
-import { getDustInfoList, getAllFileList } from './dsut-table.api';
+import { getDustInfoList, getAllFileList, getAllFileListById } from './dsut-table.api';
 import customHeader from '/@/components/vent/customHeader.vue';
 import { result } from 'lodash-es';
 // import { nextTick } from 'process';
@@ -105,6 +108,8 @@ const computedColumns = computed(() => {
       return Dltcolumns; // 大柳塔对应的列配置
     case 'sdmtjtswmk':
       return Swcolumns; // 上湾对应的列配置
+    case 'sdmtjtdltmkhjtj':
+      return Hjtcolumns; // 活鸡兔对应的列配置
     default:
       return columns; // 默认情况下返回的列配置
   }
@@ -117,6 +122,8 @@ const AllDataComputedColumns = computed(() => {
       return AllDataDltColumns; // 大柳塔对应的列配置
     case 'sdmtjtswmk':
       return AllDataSwColumns; // 上湾对应的列配置
+    case 'sdmtjtdltmkhjtj':
+      return AllDataHjtColumns; // 活鸡兔对应的列配置
     default:
       return AllDataColumns; // 默认情况下返回的列配置
   }
@@ -129,6 +136,8 @@ const DataComputedColumns = computed(() => {
       return dataDltColumns; // 大柳塔对应的列配置
     case 'sdmtjtswmk':
       return dataSwColumns; // 上湾对应的列配置
+    case 'sdmtjtdltmkhjtj':
+      return dataHjtColumns; // 活鸡兔对应的列配置
     default:
       return dataColumns; // 默认情况下返回的列配置
   }
@@ -146,6 +155,18 @@ async function getTableList(params: any) {
     workPlaceChange(selectedWorkplace.value);
   }
 }
+async function getTableListById(params: any) {
+  let res = await getAllFileListById({ ...params });
+  const content = res.content;
+  let contentArr = JSON.parse(content);
+  tableData.value = contentArr;
+  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 字段进行分组
@@ -185,6 +206,14 @@ function processTableData(data: any) {
       { key: 'zcjqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
       { key: 'hcjqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
     ];
+    const HjtMaxValues = [
+      { key: 'sc_zcds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
+      { key: 'sc_hcds', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
+      { key: 'jx_zcds', 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 },
+    ];
     items.forEach((item: any) => {
       maxValues.forEach((maxValue) => {
         if (item[maxValue.key] > maxValue.value) {
@@ -212,6 +241,15 @@ function processTableData(data: any) {
           maxValue.gzcs = item.gzcs;
         }
       });
+      HjtMaxValues.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;
+        }
+      });
     });
     switch (sysOrgCode) {
       case 'sdmtjtbetmk':
@@ -220,6 +258,8 @@ function processTableData(data: any) {
         return DltMaxValues; // 大柳塔对应的列配置
       case 'sdmtjtswmk':
         return SwMaxValues; // 上湾对应的列配置
+      case 'sdmtjtdltmkhjtj':
+        return HjtMaxValues; // 活鸡兔对应的列配置
       default:
         return maxValues; // 默认情况下返回的列配置
     }
@@ -255,6 +295,14 @@ function processTableData(data: any) {
     { key: 'zcjqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
     { key: 'hcjqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
   ];
+  const overallHjtMaxValues = [
+    { 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: '' },
+  ];
   data.forEach((item: any) => {
     overallMaxValues.forEach((maxValue) => {
       if (item[maxValue.key] > maxValue.value) {
@@ -283,6 +331,15 @@ function processTableData(data: any) {
         maxValue.gzcs = item.gzcs;
       }
     });
+    overallHjtMaxValues.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 = computed(() => {
     switch (sysOrgCode) {
@@ -292,6 +349,8 @@ function processTableData(data: any) {
         return overallDltMaxValues; // 大柳塔对应的列配置
       case 'sdmtjtswmk':
         return overallSwMaxValues; // 上湾对应的列配置
+      case 'sdmtjtdltmkhjtj':
+        return overallHjtMaxValues; // 活鸡兔对应的列配置
       default:
         return overallMaxValues; // 默认情况下返回的列配置
     }
@@ -318,12 +377,13 @@ function handleFileClick(item: any) {
   getSearch();
 }
 function getSearch() {
-  const selectedFile = selectList.value.find((item) => item.fileId === formSearch.fileId);
+  // const selectedFile = selectList.value.find((item) => item.fileId === formSearch.fileId);
   const params = {
-    fileId: formSearch.fileId,
-    fileName: selectedFile ? selectedFile.fileName : '',
+    id: formSearch.fileId,
+    // fileName: selectedFile ? selectedFile.fileName : '',
   };
-  getTableList(params);
+  getTableListById(params);
+  // getTableList(params);
 }
 function workPlaceChange(value: any) {
   selectedWorkplace.value = value;

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

@@ -37,7 +37,7 @@
 <script setup lang="ts">
 import { ref, onMounted, reactive, computed, watch, nextTick } from 'vue';
 import { dsutColumns, dsutDltColumns, dustSwColumns } from './comment.data';
-import { getInfoList, getAllFileList } from './comment.api';
+import { getInfoList, getAllFileList, getFileListById } from './comment.api';
 import { useGlobSetting } from '/@/hooks/setting';
 const emit = defineEmits(['locate']);
 const props = defineProps({