保德色谱仪报表分析修改

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

@@ -89,7 +89,7 @@ const computedColumns = computed(() => {
     case 'sdmtjtBdmk':
       return Bdcolumns; // 保德对应的列配置
     default:
-      return Bdcolumns; // 默认情况下返回的列配置
+      return columns; // 默认情况下返回的列配置
   }
 });
 function updateChart(data: any) {

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

@@ -226,3 +226,133 @@ export const Hjtcolumns: BasicColumn[] = [
     align: 'center',
   },
 ];
+export const Bdcolumns: 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: '采样时间',
+    dataIndex: 'cysj',
+    key: 'cysj',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '分析时间',
+    dataIndex: 'fxsj',
+    key: 'fxsj',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '气体分析结果表',
+    children: [
+      {
+        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: '丙烷(C3H8%)',
+        dataIndex: 'c3h8_ave',
+        key: 'c3h8_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: 'zzfhl_ave',
+        key: 'zzfhl_ave',
+        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',
+  },
+];

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 } from './bundleSpy-table.data';
+import { columns, Hjtcolumns, Bdcolumns } from './bundleSpy-table.data';
 import { getbundleSpyInfoList, getAllFileList, getAllFileListById } from './bundleSpy-table.api';
 import customHeader from '/@/components/vent/customHeader.vue';
 import * as echarts from 'echarts';
@@ -78,8 +78,10 @@ const computedColumns = computed(() => {
   switch (sysOrgCode) {
     case 'sdmtjtdltmkhjtj':
       return Hjtcolumns; // 活鸡兔对应的列配置
+    case 'sdmtjtBdmk':
+      return Bdcolumns; // 保德对应的列配置
     default:
-      return columns; // 默认情况下返回的列配置
+      return Bdcolumns; // 默认情况下返回的列配置
   }
 });
 
@@ -159,6 +161,7 @@ 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 c3h8AveValues = data.map((item: any) => parseFloat(item.c3h8_ave));
   const ch4AveBqValues = data.map((item: any) => parseFloat(item.ch4_ave_bq));
   const o2AveBqValues = data.map((item: any) => parseFloat(item.o2_ave_bq));
 
@@ -203,6 +206,64 @@ function updateChart(data: any) {
             type: 'bar',
           },
         ];
+      case 'sdmtjtBdmk':
+        return [
+          {
+            name: 'O₂平均值',
+            data: o2AveValues,
+            yAxisIndex: 0,
+            type: 'bar',
+          },
+          {
+            name: 'N₂平均值',
+            data: n2AveValues,
+            yAxisIndex: 0,
+            type: 'bar',
+          },
+
+          {
+            name: 'CO平均值',
+            data: coAveValues,
+            yAxisIndex: 1,
+            type: 'bar',
+          },
+          {
+            name: 'CO₂平均值',
+            data: co2AveValues,
+            yAxisIndex: 1,
+            type: 'bar',
+          },
+          {
+            name: 'CH₄平均值',
+            data: ch4AveValues,
+            yAxisIndex: 1,
+            type: 'bar',
+          },
+          {
+            name: 'C2H6平均值',
+            data: c2h6AveValues,
+            yAxisIndex: 1,
+            type: 'bar',
+          },
+          {
+            name: 'C3H8平均值',
+            data: c3h8AveValues,
+            yAxisIndex: 1,
+            type: 'bar',
+          },
+          {
+            name: 'C₂H₄平均值',
+            data: c2h4AveValues,
+            type: 'bar',
+            yAxisIndex: 1,
+          },
+          {
+            name: 'C₂H₂平均值',
+            data: c2h2AveValues,
+            type: 'bar',
+            yAxisIndex: 1,
+          },
+        ];
       default:
         return [
           {
@@ -259,14 +320,6 @@ function updateChart(data: any) {
 
   const seriesConfig = getSeriesConfig(sysOrgCode);
   const option = {
-    title: {
-      text: '色谱仪报表分析',
-      textStyle: {
-        color: '#ffffff', // 设置标题颜色
-      },
-      left: 'center', // 水平居中
-      top: '0', // 设置标题距离顶部的距离
-    },
     tooltip: {
       trigger: 'axis',
       backgroundColor: 'rgba(28, 72, 105, 0.5)', // 设置 tooltip 背景为透明
@@ -281,7 +334,7 @@ function updateChart(data: any) {
       },
     },
     legend: {
-      top: '9%',
+      top: '5%',
       textStyle: {
         color: '#ffffffff',
       },