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

src/components/chart/BarAndLine.vue

@@ -65,6 +65,7 @@
       const chartData = props.chartsColumnsType ? getTableHeaderColumns(props.chartsColumnsType) : [];
       let chartsColumns = (props.chartsColumns.length > 0 ? props.chartsColumns : chartData) as ChartColumn[];
       let tempYmax: number[] = [];
+      let tempYmin: number[] = [];
       // let groupedByColumns = {};
       const option = reactive({
         name: '',
@@ -130,8 +131,11 @@
             // console.log('nnn', option.series[index].data);
             // 这里动态计算echarts y轴最大值
             const max = Math.max(...option.series[index].data);
+            const min = Math.min(...option.series[index].data);
             const digitCount = max.toFixed(0).length;
-            let yMax = 0;
+            const minDigitCount = min.toFixed(0).length;
+            let yMax = 0,
+              yMin = 0;
             if (digitCount < 2) {
               if (max < 0.5) {
                 yMax = 1;
@@ -172,9 +176,52 @@
               }
             }
 
+            if (minDigitCount < 2) {
+              if (min > 0.5) {
+                yMin = 0.5;
+              } else if (min > 1.5) {
+                yMin = 1.0;
+              } else if (min > 10) {
+                yMin = 5;
+              } else {
+                yMin = 15;
+              }
+            } else if (minDigitCount < 3) {
+              const n = Number((Number(min.toFixed(0)) / 10).toFixed(0));
+              if (n > 1) {
+                yMin = (n - 1) * 10;
+              } else {
+                yMin = 10;
+              }
+            } else if (digitCount < 4) {
+              const n = Number((Number(min.toFixed(0)) / 100).toFixed(0));
+              if (n > 1) {
+                yMin = (n - 1) * 100;
+              } else {
+                yMin = 100;
+              }
+            } else if (digitCount < 5) {
+              const n = Number((Number(min.toFixed(0)) / 1000).toFixed(0));
+              if (n > 1) {
+                yMin = (n - 1) * 1000;
+              } else {
+                yMin = 1000;
+              }
+            } else if (digitCount < 6) {
+              const n = Number((Number(min.toFixed(0)) / 10000).toFixed(0));
+              if (n > 1) {
+                yMin = (n - 1) * 10000;
+              } else {
+                yMin = 10000;
+              }
+            }
+
             if (yMax != 0 && yMax !== propType?.ymax) {
               propType.ymax = yMax;
             }
+            if (yMin != 0 && yMin !== propType?.yMin) {
+              propType.ymin = yMin;
+            }
             return true;
           });
           // 根据sort分组
@@ -192,17 +239,28 @@
           for (let sortId in groupedBy) {
             const group = groupedBy[sortId];
             let ymax = group[0].ymax;
+            let ymin = group[0].ymin;
             for (let i = 1; i < group.length; i++) {
               if (group[i].ymax > ymax) {
                 ymax = group[i].ymax;
               }
             }
+            for (let i = 1; i < group.length; i++) {
+              if (group[i].ymin < ymin) {
+                ymin = group[i].ymin;
+              }
+            }
             if (!tempYmax[index] || tempYmax[index] != ymax) {
               tempYmax[index] = ymax;
               isFresh = true;
             }
+            if (!tempYmin[index] || tempYmin[index] != ymin) {
+              tempYmin[index] = ymin;
+              isFresh = true;
+            }
             for (let i = 0; i < group.length; i++) {
               group[i].ymax = ymax;
+              group[i].ymin = ymin;
               newChartsColumns.push(group[i]);
             }
             ++index;

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

@@ -1769,3 +1769,187 @@ export const Jinjiecolumns: BasicColumn[] = [
     align: 'center',
   },
 ];
+export const Hlgcolumns: BasicColumn[] = [
+  {
+    title: '设备名称',
+    width: 100,
+    align: 'center',
+    dataIndex: 'sbmc',
+    key: 'sbmc',
+  },
+  {
+    title: '设备号',
+    width: 80,
+    align: 'center',
+    dataIndex: 'sbbh',
+    key: 'sbbh',
+  },
+  {
+    title: '管路名称',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '管路编号',
+    dataIndex: 'glbh',
+    key: 'glbh',
+    width: 80,
+    align: 'center',
+  },
+  {
+    title: '分析次数',
+    dataIndex: 'fxcs',
+    key: 'fxcs',
+    width: 80,
+    align: 'center',
+  },
+
+  {
+    title: 'CO(PPM)',
+    children: [
+      {
+        title: '最大值',
+        dataIndex: 'co_max',
+        key: 'co_max',
+        width: 80,
+        align: 'center',
+      },
+      {
+        title: '平均值',
+        dataIndex: 'co_ave',
+        key: 'co_ave',
+        width: 80,
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: '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₂(%)',
+    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: '煤自燃阶段',
+    dataIndex: 'internalFireWarnLevel',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    width: 100,
+    align: 'center',
+  },
+];

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

@@ -61,6 +61,7 @@ import {
   wlmlcolumns,
   Cctkcolumns,
   Jinjiecolumns,
+  Hlgcolumns,
 } from './bundle-table.data';
 import { getBundleInfoList, getAllFileList, getAllFileListById } from './bundle-table.api';
 import customHeader from '/@/components/vent/customHeader.vue';
@@ -113,6 +114,8 @@ const computedColumns = computed(() => {
       return Cctkcolumns; // 乌兰木伦对应的列配置
     case 'sdmtjtjjmk':
       return Jinjiecolumns; // 锦界对应的列配置
+    case 'sdmtjthlgmk':
+      return Hlgcolumns; // 哈拉沟对应的列配置
     default:
       return columns; // 默认情况下返回的列配置
   }
@@ -712,6 +715,7 @@ function updateChart(data: any) {
           },
         ];
       case 'sdmtjtcctmk':
+      case 'sdmtjthlgmk':
         return [
           {
             name: 'O₂最小值',
@@ -1005,13 +1009,22 @@ function updateChart(data: any) {
         },
       },
     },
-    yAxis: {
-      type: 'value',
-      splitLine: { show: true, lineStyle: { color: 'rgba(28, 72, 105, 0.5)' } },
-      axisLabel: {
-        color: '#ffffff',
+    yAxis: [
+      {
+        type: 'value',
+        splitLine: { show: true, lineStyle: { color: 'rgba(28, 72, 105, 0.5)' } },
+        axisLabel: {
+          color: '#ffffff',
+        },
       },
-    },
+      {
+        type: 'value',
+        splitLine: { show: true, lineStyle: { color: 'rgba(21,80,126,.5)' } },
+        axisLabel: {
+          color: '#ffffff',
+        },
+      },
+    ],
     dataZoom: [
       {
         type: 'slider', // 会创建一个滑块来选择要显示的区域

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

@@ -1101,3 +1101,101 @@ export const Jinjiecolumns: BasicColumn[] = [
     align: 'center',
   },
 ];
+export const Hlgcolumns: BasicColumn[] = [
+  {
+    title: '序号',
+    width: 60,
+    align: 'center',
+    dataIndex: 'xh',
+    key: 'xh',
+  },
+  {
+    title: '地点名称',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '氧气(%)',
+    dataIndex: 'o2_ave',
+    key: 'o2_ave',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '氮气(%)',
+    dataIndex: 'n2_ave',
+    key: 'n2_ave',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '甲烷(%)',
+    dataIndex: 'ch4_ave',
+    key: 'ch4_ave',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '一氧化碳(%)',
+    dataIndex: 'co_ave',
+    key: 'co_ave',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '二氧化碳(%)',
+    dataIndex: 'co2_ave',
+    key: 'co2_ave',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '乙烷(%)',
+    dataIndex: 'c2h6_ave',
+    key: 'c2h6_ave',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '乙烯(%)',
+    dataIndex: 'c2h4_ave',
+    key: 'c2h4_ave',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '乙炔(%)',
+    dataIndex: 'c2h2_ave',
+    key: 'c2h2_ave',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '化验日期',
+    dataIndex: 'qyfxsj',
+    key: 'qyfxsj',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '备注',
+    dataIndex: 'smark',
+    key: 'smark',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '煤自燃阶段',
+    dataIndex: 'internalFireWarnLevel',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    width: 100,
+    align: 'center',
+  },
+];

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

@@ -44,7 +44,18 @@
 
 <script setup lang="ts">
 import { ref, onMounted, computed, reactive, shallowRef } from 'vue';
-import { columns, Hjtcolumns, Bdcolumns, Bltcolumns, Sgtcolumns, Yjlcolumns, Cctrkcolumns, Wlmlcolumns, Jinjiecolumns } from './bundleSpy-table.data';
+import {
+  columns,
+  Hjtcolumns,
+  Bdcolumns,
+  Bltcolumns,
+  Sgtcolumns,
+  Yjlcolumns,
+  Cctrkcolumns,
+  Wlmlcolumns,
+  Jinjiecolumns,
+  Hlgcolumns,
+} from './bundleSpy-table.data';
 import { getbundleSpyInfoList, getAllFileList, getAllFileListById } from './bundleSpy-table.api';
 import customHeader from '/@/components/vent/customHeader.vue';
 import * as echarts from 'echarts';
@@ -92,6 +103,8 @@ const computedColumns = computed(() => {
       return Wlmlcolumns; // 乌兰木伦对应的列配置
     case 'sdmtjtjjmk':
       return Jinjiecolumns; // 锦界对应的列配置
+    case 'sdmtjthlgmk':
+      return Hlgcolumns; // 哈拉沟对应的列配置
     default:
       return columns; // 默认情况下返回的列配置
   }
@@ -368,6 +381,7 @@ function updateChart(data: any) {
           },
         ];
       case 'sdmtjtwlmlmk':
+      case 'sdmtjthlgmk':
         return [
           {
             name: 'O₂',

src/views/vent/comment/history/history.api.ts

@@ -36,7 +36,7 @@ export const list = (deviceCode: string, deviceInfo: any, formData: any, paginat
         column: 'createTime',
         startTime: formData.ttime_begin,
         endTime: formData.ttime_end,
-        deviceId: formData.gdeviceid,
+        deviceId: formData.gdeviceids,
         strtype: deviceCode,
         interval: intervalMap.get(formData['skip']) || '1h',
         isEmployee: deviceCode.startsWith('vehicle') ? false : true,

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

@@ -46,11 +46,12 @@ export const getDefaultSchemas: (dictOptions: any[], deviceOptions: any[]) => Fo
     field: 'gdeviceids',
     component: 'Select',
     required: true,
-    defaultValue: [get(deviceOptions, '[0].value', '')],
+    defaultValue:
+      get(deviceOptions, '[0].stationtype', 'redis') === 'redis' ? get(deviceOptions, '[0].value', '') : [get(deviceOptions, '[0].value', '')],
     componentProps: {
       options: deviceOptions,
       // onChange: (e, option) => {
-      mode: 'multiple',
+      mode: get(deviceOptions, '[0].stationtype', 'redis') === 'redis' ? undefined : 'multiple',
       maxTagCount: 'responsive',
       //   nextTick(async () => {
       //     await getDataSource();

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

@@ -911,6 +911,90 @@ export const Jinjiecolumns = [
     align: 'center',
   },
 ];
+export const Hlgcolumns = [
+  {
+    title: '序号',
+    width: 60,
+    align: 'center',
+    dataIndex: 'xh',
+  },
+  {
+    title: '测尘地点',
+    dataIndex: 'ccdd',
+    key: 'ccdd',
+    width: 150,
+    align: 'center',
+  },
+  {
+    title: '作业环境(工序)',
+    dataIndex: 'zyhj',
+    key: 'zyhj',
+    width: 80,
+    align: 'center',
+  },
+  {
+    title: '检修班工作8h粉尘浓度',
+    width: 100,
+    align: 'center',
+    children: [
+      {
+        title: '检修4h粉尘浓度(mg/m³)',
+        align: 'center',
+        children: [
+          { title: '总尘', dataIndex: 'jx4h_zc', key: 'jx4h_zc', width: 80, align: 'center' },
+          { title: '呼尘', dataIndex: 'jx4h_hc', key: 'jx4h_hc', width: 80, align: 'center' },
+        ],
+      },
+      {
+        title: '生产4h粉尘浓度(mg/m³)',
+        align: 'center',
+        children: [
+          { title: '总尘', dataIndex: 'sc4h_zc', key: 'sc4h_zc', width: 80, align: 'center' },
+          { title: '呼尘', dataIndex: 'sc4h_hc', key: 'sc4h_hc', width: 80, align: 'center' },
+        ],
+      },
+      {
+        title: '检修班工作8h时间加权平均粉尘浓度(mg/m³)',
+        align: 'center',
+        children: [
+          { title: '总尘', dataIndex: 'jx8h_zc', key: 'jx8h_zc', width: 80, align: 'center' },
+          { title: '呼尘', dataIndex: 'jx8h_hc', key: 'jx8h_hc', width: 80, align: 'center' },
+        ],
+      },
+    ],
+  },
+  {
+    title: '生产班工作8h粉尘浓度',
+    width: 100,
+    align: 'center',
+    children: [
+      {
+        title: '生产班工作8h时间加权平均粉尘浓度(mg/m³)',
+        align: 'center',
+        children: [
+          { title: '总尘', dataIndex: 'sc8h_zc', key: 'sc8h_zc', width: 80, align: 'center' },
+          { title: '呼尘', dataIndex: 'sc8h_hc', key: 'sc8h_hc', width: 80, align: 'center' },
+        ],
+      },
+    ],
+  },
+  {
+    title: '除尘风机降尘率(%)',
+    width: 80,
+    align: 'center',
+    children: [
+      { title: '总尘', dataIndex: 'jccfjjcl_zc', key: 'jccfjjcl_zc', width: 80, align: 'center' },
+      { title: '呼尘', dataIndex: 'jccfjjcl_hc', key: 'jccfjjcl_hc', width: 80, align: 'center' },
+    ],
+  },
+  {
+    title: '测尘员',
+    dataIndex: 'smark',
+    key: 'smark',
+    width: 80,
+    align: 'center',
+  },
+];
 //监测字段
 export const fieldMapping = {
   sc_zcds: '总尘-作业工序-生产(短时间监测浓度，mg/m³)',
@@ -974,6 +1058,16 @@ export const fieldJinjieMapping = {
   sc_zcds: '总粉尘(粉尘浓度，mg/m³)',
   sc_hcds: '呼吸性粉尘(粉尘浓度，mg/m³)',
 };
+export const fieldHlgMapping = {
+  jx4h_zc: '检修4h粉尘浓度(mg/m³)-总尘',
+  jx4h_hc: '检修4h粉尘浓度(mg/m³)-呼尘',
+  sc4h_zc: '生产4h粉尘浓度(mg/m³)-总尘',
+  sc4h_hc: '生产4h粉尘浓度(mg/m³)-呼尘',
+  jx8h_zc: '检修班工作8h时间加权平均粉尘浓度(mg/m³)-总尘',
+  jx8h_hc: '检修班工作8h时间加权平均粉尘浓度(mg/m³)-呼尘',
+  sc8h_zc: '生产班工作8h时间加权平均粉尘浓度(mg/m³)-总尘',
+  sc8h_hc: '生产班工作8h时间加权平均粉尘浓度(mg/m³)-呼尘',
+};
 // 检测地点
 export const dataColumns = [
   {
@@ -1323,6 +1417,37 @@ export const dataJinjieColumns = [
     key: 'zyhj',
   },
 ];
+export const dataHlgColumns = [
+  {
+    title: '监测字段',
+    align: 'center',
+    dataIndex: 'key',
+    key: 'key',
+    width: 200,
+    customRender: ({ text }) => fieldHlgMapping[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: 'zyhj',
+    key: 'zyhj',
+  },
+];
 // 当日情况粉尘情况分析
 export const AllDataColumns = [
   {
@@ -1686,3 +1811,34 @@ export const AllDataJinjieColumns = [
     key: 'zyhj',
   },
 ];
+export const AllDataHlgColumns = [
+  {
+    title: '监测字段',
+    align: 'center',
+    dataIndex: 'key',
+    key: 'key',
+    width: 200,
+    customRender: ({ text }) => fieldHlgMapping[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: 'zyhj',
+    key: 'zyhj',
+  },
+];

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

@@ -75,6 +75,7 @@ import {
   Cctrkcolumns,
   Cctkcolumns,
   Jinjiecolumns,
+  Hlgcolumns,
   dataColumns,
   dataDltColumns,
   dataSwColumns,
@@ -86,6 +87,7 @@ import {
   dataCctrkColumns,
   dataWlmlColumns,
   dataJinjieColumns,
+  dataHlgColumns,
   AllDataColumns,
   AllDataDltColumns,
   AllDataSwColumns,
@@ -97,6 +99,7 @@ import {
   AllDataCctrkColumns,
   AllDataWlmlColumns,
   AllDataJinjieColumns,
+  AllDataHlgColumns,
 } from './dust-table.data';
 import { getDustInfoList, getAllFileList, getAllFileListById } from './dsut-table.api';
 import customHeader from '/@/components/vent/customHeader.vue';
@@ -152,7 +155,9 @@ const computedColumns = computed(() => {
     case 'sdmtjtcctmk':
       return Wlmlcolumns; // 寸草塔一矿对应的列配置
     case 'sdmtjtjjmk':
-      return Jinjiecolumns; // 锦界对应的列配置
+      return Jinjiecolumns; // 锦界对应的列配置v
+    case 'sdmtjthlgmk':
+      return Hlgcolumns; // 哈拉沟对应的列配置
     default:
       return columns; // 默认情况下返回的列配置
   }
@@ -183,6 +188,8 @@ const AllDataComputedColumns = computed(() => {
       return AllDataWlmlColumns; // 寸草塔一矿对应的列配置
     case 'sdmtjtjjmk':
       return AllDataJinjieColumns; // 锦界对应的列配置
+    case 'sdmtjthlgmk':
+      return AllDataHlgColumns; // 哈拉沟对应的列配置
     default:
       return AllDataColumns; // 默认情况下返回的列配置
   }
@@ -213,6 +220,8 @@ const DataComputedColumns = computed(() => {
       return dataWlmlColumns; // 寸草塔一矿对应的列配置
     case 'sdmtjtjjmk':
       return dataJinjieColumns; // 锦界对应的列配置
+    case 'sdmtjthlgmk':
+      return dataHlgColumns; // 哈拉沟对应的列配置
     default:
       return dataColumns; // 默认情况下返回的列配置
   }
@@ -314,6 +323,16 @@ function processTableData(data: any) {
       { key: 'sc_zcds', value: -Infinity, gz: '', jcdd: '', scgy: '' },
       { key: 'sc_hcds', value: -Infinity, gz: '', jcdd: '', scgy: '' },
     ];
+    const HlgMaxValues = [
+      { key: 'jx4h_zc', value: -Infinity, gz: '', jcdd: '', zyhj: '', gzcs: workplace },
+      { key: 'jx4h_hc', value: -Infinity, gz: '', jcdd: '', zyhj: '', gzcs: workplace },
+      { key: 'sc4h_zc', value: -Infinity, gz: '', jcdd: '', zyhj: '', gzcs: workplace },
+      { key: 'sc4h_hc', value: -Infinity, gz: '', jcdd: '', zyhj: '', gzcs: workplace },
+      { key: 'jx8h_zc', value: -Infinity, gz: '', jcdd: '', zyhj: '', gzcs: workplace },
+      { key: 'jx8h_hc', value: -Infinity, gz: '', jcdd: '', zyhj: '', gzcs: workplace },
+      { key: 'sc8h_zc', value: -Infinity, gz: '', jcdd: '', zyhj: '', gzcs: workplace },
+      { key: 'sc8h_hc', value: -Infinity, gz: '', jcdd: '', zyhj: '', gzcs: workplace },
+    ];
     items.forEach((item: any) => {
       maxValues.forEach((maxValue) => {
         if (item[maxValue.key] > maxValue.value) {
@@ -373,7 +392,7 @@ function processTableData(data: any) {
           maxValue.value = item[maxValue.key];
           maxValue.gz = item.gz;
           maxValue.jcdd = item.jcdd;
-          maxValue.scgy = item.zyjh;
+          maxValue.scgy = item.zyhj;
           maxValue.gzcs = item.gzcs;
         }
       });
@@ -391,7 +410,16 @@ function processTableData(data: any) {
           maxValue.value = item[maxValue.key];
           maxValue.gz = item.gz;
           maxValue.jcdd = item.jcdd;
-          maxValue.scgy = item.zyjh;
+          maxValue.scgy = item.zyhj;
+        }
+      });
+      HlgMaxValues.forEach((maxValue) => {
+        if (item[maxValue.key] > maxValue.value) {
+          maxValue.value = item[maxValue.key];
+          maxValue.gz = item.gz;
+          maxValue.jcdd = item.jcdd;
+          maxValue.zyhj = item.zyhj;
+          maxValue.gzcs = item.jcdd;
         }
       });
     });
@@ -420,6 +448,8 @@ function processTableData(data: any) {
         return WlmlMaxValues; // 寸草塔一矿对应的列配置
       case 'sdmtjtjjmk':
         return WlmlMaxValues; // 锦界对应的列配置
+      case 'sdmtjthlgmk':
+        return HlgMaxValues; // 锦界对应的列配置
       default:
         return maxValues; // 默认情况下返回的列配置
     }
@@ -485,6 +515,16 @@ function processTableData(data: any) {
     { key: 'sc_zcds', value: -Infinity, gz: '', jcdd: '', scgy: '' },
     { key: 'sc_hcds', value: -Infinity, gz: '', jcdd: '', scgy: '' },
   ];
+  const overallHlgMaxValues = [
+    { key: 'jx4h_zc', value: -Infinity, gz: '', jcdd: '', zyhj: '' },
+    { key: 'jx4h_hc', value: -Infinity, gz: '', jcdd: '', zyhj: '' },
+    { key: 'sc4h_zc', value: -Infinity, gz: '', jcdd: '', zyhj: '' },
+    { key: 'sc4h_hc', value: -Infinity, gz: '', jcdd: '', zyhj: '' },
+    { key: 'jx8h_zc', value: -Infinity, gz: '', jcdd: '', zyhj: '' },
+    { key: 'jx8h_hc', value: -Infinity, gz: '', jcdd: '', zyhj: '' },
+    { key: 'sc8h_zc', value: -Infinity, gz: '', jcdd: '', zyhj: '' },
+    { key: 'sc8h_hc', value: -Infinity, gz: '', jcdd: '', zyhj: '' },
+  ];
   data.forEach((item: any) => {
     overallMaxValues.forEach((maxValue) => {
       if (item[maxValue.key] > maxValue.value) {
@@ -563,7 +603,15 @@ function processTableData(data: any) {
         maxValue.value = item[maxValue.key];
         maxValue.gz = item.gz;
         maxValue.jcdd = item.jcdd;
-        maxValue.scgy = item.zyjh;
+        maxValue.scgy = item.zyhj;
+      }
+    });
+    overallHlgMaxValues.forEach((maxValue) => {
+      if (item[maxValue.key] > maxValue.value) {
+        maxValue.value = item[maxValue.key];
+        maxValue.gz = item.gz;
+        maxValue.jcdd = item.jcdd;
+        maxValue.zyhj = item.zyhj;
       }
     });
   });
@@ -593,6 +641,8 @@ function processTableData(data: any) {
         return overallWlmlMaxValues; // 寸草塔一矿对应的列配置
       case 'sdmtjtjjmk':
         return overallWlmlMaxValues; // 锦界对应的列配置
+      case 'sdmtjthlgmk':
+        return overallHlgMaxValues; // 锦界对应的列配置
       default:
         return overallMaxValues; // 默认情况下返回的列配置
     }

src/views/vent/home/configurable/components/detail/CustomChart.vue

@@ -567,6 +567,12 @@
         yAxis: yAxis.map((e, i) => {
           return {
             ...e,
+            min: (value) => {
+              return parseInt(value.min * 0.8);
+            },
+            max: (value) => {
+              return parseInt(value.max * 1.2);
+            },
             splitLine: {
               lineStyle: {
                 opacity: i === 0 ? 0.1 : 0,

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

@@ -257,6 +257,21 @@
     await getForm().setFieldsValue({
       gdeviceids: props.deviceId ? [props.deviceId] : deviceOptions.value[0] ? [deviceOptions.value[0]['value']] : [''],
     });
+    if (stationType.value !== 'redis') {
+      await getForm().updateSchema({
+        field: 'gdeviceids',
+        defaultValue: [props.deviceId ? props.deviceId : deviceOptions.value[0] ? deviceOptions.value[0]['value'] : ''],
+        componentProps: {
+          mode: 'multiple',
+          maxTagCount: 'responsive',
+        },
+      });
+    } else {
+      await getForm().updateSchema({
+        field: 'gdeviceids',
+        defaultValue: props.deviceId ? props.deviceId : deviceOptions.value[0] ? deviceOptions.value[0]['value'] : '',
+      });
+    }
   }
 
   function resetFormParam() {
@@ -380,15 +395,12 @@
                   label: computed(() => `${deviceKide.value.startsWith('location') ? '查询人员' : '查询设备'}`),
                   field: 'gdeviceids',
                   component: 'Select',
-                  defaultValue: props.deviceId ? [props.deviceId] : deviceOptions.value[0] ? [deviceOptions.value[0]['value']] : [''],
                   required: true,
                   componentProps: {
                     showSearch: true,
                     filterOption: (input: string, option: any) => {
                       return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
                     },
-                    mode: 'multiple',
-                    maxTagCount: 'responsive',
                     options: deviceOptions,
                     onChange: (e, option) => {
                       if (option && (option['strinstallpos'] || option['strtype'] || option['devicekind']))
@@ -508,8 +520,6 @@
   onMounted(async () => {
     await getDeviceList();
     if (deviceOptions.value[0]) {
-      stationType.value = deviceOptions.value[0]['stationtype'];
-      historyType.value = deviceOptions.value[0]['strtype'] || deviceOptions.value[0]['devicekind'];
       nextTick(async () => {
         await getDataSource();
       });