[Mod 0000] 字段修改及页面入口调整

src/layouts/default/header/components/user-dropdown/index.vue

@@ -13,9 +13,9 @@
       <Menu @click="handleMenuClick">
         <MenuItem itemKey="doc" :text="t('layout.header.dropdownItemDoc')" icon="ion:document-text-outline" v-if="getShowDoc" />
         <MenuDivider v-if="getShowDoc" />
-        <MenuItem itemKey="account" :text="t('layout.header.dropdownItemSwitchAccount')" icon="ant-design:setting-outlined" />
+        <!-- <MenuItem itemKey="account" :text="t('layout.header.dropdownItemSwitchAccount')" icon="ant-design:setting-outlined" /> -->
         <MenuItem itemKey="password" :text="t('layout.header.dropdownItemSwitchPassword')" icon="ant-design:edit-outlined" />
-        <MenuItem itemKey="depart" :text="t('layout.header.dropdownItemSwitchDepart')" icon="ant-design:cluster-outlined" />
+        <!-- <MenuItem itemKey="depart" :text="t('layout.header.dropdownItemSwitchDepart')" icon="ant-design:cluster-outlined" /> -->
         <MenuItem itemKey="cache" :text="t('layout.header.dropdownItemRefreshCache')" icon="ion:sync-outline" />
         <!-- <MenuItem
             v-if="getUseLockPage"

src/views/analysis/warningAnalysis/airLeakStatus/airLeakStatus.data.ts

@@ -86,61 +86,61 @@ export const columns: BasicColumn[] = [
 ];
 
 // 历史数据相关
-export const historyColumns: BasicColumn[] = [
-  {
-    title: '序号',
-    align: 'center',
-    width: 80,
-    customRender: ({ index }: { index: number }) => `${index + 1}`,
-  },
-  {
-    title: '区域',
-    dataIndex: 'areaName',
-    width: 100,
-  },
-  {
-    title: '煤矿名称',
-    dataIndex: 'mineName',
-    width: 200,
-  },
-  {
-    title: '密闭名称',
-    dataIndex: 'devicePos',
-    width: 100,
-  },
-  {
-    title: '所属煤层',
-    dataIndex: 'coalSeamName',
-    width: 100,
-  },
-  {
-    title: '自燃倾向性',
-    dataIndex: 'coalSeamLevel',
-    width: 100,
-  },
-  {
-    title: '密闭内压力',
-    dataIndex: 'sourcePressure',
-    width: 100,
-  },
-  {
-    title: '密闭外压力',
-    dataIndex: 'sourcePressure',
-    width: 100,
-  },
-  {
-    title: '是否漏风',
-    dataIndex: 'leakage',
-    width: 100,
-  },
-  {
-    title: '预警时间',
-    dataIndex: 'createTime',
-    width: 100,
-  },
-  {
-    title: '解决时间',
-    dataIndex: 'endTime',
-    width: 100,
-  },
-];
+// export const historyColumns: BasicColumn[] = [
+//   {
+//     title: '序号',
+//     align: 'center',
+//     width: 80,
+//     customRender: ({ index }: { index: number }) => `${index + 1}`,
+//   },
+//   {
+//     title: '区域',
+//     dataIndex: 'areaName',
+//     width: 100,
+//   },
+//   {
+//     title: '煤矿名称',
+//     dataIndex: 'mineName',
+//     width: 200,
+//   },
+//   {
+//     title: '密闭名称',
+//     dataIndex: 'devicePos',
+//     width: 100,
+//   },
+//   {
+//     title: '所属煤层',
+//     dataIndex: 'coalSeamName',
+//     width: 100,
+//   },
+//   {
+//     title: '自燃倾向性',
+//     dataIndex: 'coalSeamLevel',
+//     width: 100,
+//   },
+//   {
+//     title: '密闭内压力',
+//     dataIndex: 'sourcePressure',
+//     width: 100,
+//   },
+//   {
+//     title: '密闭外压力',
+//     dataIndex: 'sourcePressure',
+//     width: 100,
+//   },
+//   {
+//     title: '是否漏风',
+//     dataIndex: 'leakage',
+//     width: 100,
+//   },
+//   {
+//     title: '预警时间',
+//     dataIndex: 'createTime',
+//     width: 100,
+//   },
+//   {
+//     title: '解决时间',
+//     dataIndex: 'endTime',
+//     width: 100,
+//   },
+// ];

src/views/analysis/warningAnalysis/airLeakStatus/index.vue

@@ -125,7 +125,6 @@
   const { tableContext, onExportXls } = useListPage({
     tableProps: {
       columns,
-      // columns: historyColumns,
       api: (params) => {
         if (!goafId.value) {
           message.info('请先选择煤矿及老空区');

src/views/monitor/sealedMonitor/monitor.data.ts

@@ -78,38 +78,115 @@ export const columns: BasicColumn[] = [
   },
   {
     title: 'CO(ppm)',
-    dataIndex: 'coVal',
     width: 100,
+    children: [
+      {
+        title: '闭内',
+        dataIndex: 'coVal',
+        width: 100,
+      },
+      {
+        title: '闭外',
+        dataIndex: 'coValOut',
+        width: 100,
+      },
+    ],
   },
   {
     title: 'CO2(%)',
-    dataIndex: 'co2Val',
     width: 100,
+    children: [
+      {
+        title: '闭内',
+        dataIndex: 'co2Val',
+        width: 100,
+      },
+      {
+        title: '闭外',
+        dataIndex: 'co2ValOut',
+        width: 100,
+      },
+    ],
   },
   {
     title: 'CH4(%)',
-    dataIndex: 'ch4Val',
     width: 100,
+    children: [
+      {
+        title: '闭内',
+        dataIndex: 'ch4Val',
+        width: 100,
+      },
+      {
+        title: '闭外',
+        dataIndex: 'ch4ValOut',
+        width: 100,
+      },
+    ],
   },
   {
     title: 'C2H2(ppm)',
-    dataIndex: 'c2h2Val',
     width: 100,
+    children: [
+      {
+        title: '闭内',
+        dataIndex: 'c2h2Val',
+        width: 100,
+      },
+      {
+        title: '闭外',
+        dataIndex: 'c2h2ValOut',
+        width: 100,
+      },
+    ],
   },
   {
     title: 'C2H4(ppm)',
-    dataIndex: 'c2h4Val',
     width: 100,
+    children: [
+      {
+        title: '闭内',
+        dataIndex: 'c2h4Val',
+        width: 100,
+      },
+      {
+        title: '闭外',
+        dataIndex: 'c2h4ValOut',
+        width: 100,
+      },
+    ],
   },
   {
     title: 'O2(%)',
-    dataIndex: 'o2Val',
     width: 100,
+    children: [
+      {
+        title: '闭内',
+        dataIndex: 'o2Val',
+        width: 100,
+      },
+      {
+        title: '闭外',
+        dataIndex: 'o2ValOut',
+        width: 100,
+      },
+    ],
   },
   {
     title: '温度(℃)',
-    dataIndex: 'temperature',
     width: 100,
+    children: [
+      {
+        title: '闭内',
+        dataIndex: 'temperature',
+        width: 100,
+      },
+      {
+        title: '闭外',
+        dataIndex: 'temperatureOut',
+        width: 100,
+      },
+    ],
   },
   {
     title: '压差(Pa)',
@@ -117,13 +194,21 @@ export const columns: BasicColumn[] = [
     width: 100,
   },
   {
-    title: '自然发火隐患等级',
+    title: '闭内自然发火隐患等级',
     dataIndex: 'fireAlarm',
     width: 100,
     customRender({ record }) {
       return alarmCellRender(record.fireAlarm, (r) => riskMap[r.alarmName] || r.alarmName);
     },
   },
+  {
+    title: '闭外自然发火隐患等级',
+    dataIndex: 'fireAlarmOut',
+    width: 100,
+    customRender({ record }) {
+      return alarmCellRender(record.fireAlarmOut, (r) => riskMap[r.alarmName] || r.alarmName);
+    },
+  },
   {
     title: '是否漏风',
     dataIndex: 'leakageAlarm',
@@ -409,38 +494,115 @@ export const historicalColumns: BasicColumn[] = [
   },
   {
     title: 'CO(ppm)',
-    dataIndex: 'coVal',
     width: 100,
+    children: [
+      {
+        title: '闭内',
+        dataIndex: 'coVal',
+        width: 100,
+      },
+      {
+        title: '闭外',
+        dataIndex: 'coValOut',
+        width: 100,
+      },
+    ],
   },
   {
     title: 'CO2(%)',
-    dataIndex: 'co2Val',
     width: 100,
+    children: [
+      {
+        title: '闭内',
+        dataIndex: 'co2Val',
+        width: 100,
+      },
+      {
+        title: '闭外',
+        dataIndex: 'co2ValOut',
+        width: 100,
+      },
+    ],
   },
   {
     title: 'CH4(%)',
-    dataIndex: 'ch4Val',
     width: 100,
+    children: [
+      {
+        title: '闭内',
+        dataIndex: 'ch4Val',
+        width: 100,
+      },
+      {
+        title: '闭外',
+        dataIndex: 'ch4ValOut',
+        width: 100,
+      },
+    ],
   },
   {
     title: 'C2H2(ppm)',
-    dataIndex: 'c2h2Val',
     width: 100,
+    children: [
+      {
+        title: '闭内',
+        dataIndex: 'c2h2Val',
+        width: 100,
+      },
+      {
+        title: '闭外',
+        dataIndex: 'c2h2ValOut',
+        width: 100,
+      },
+    ],
   },
   {
     title: 'C2H4(ppm)',
-    dataIndex: 'c2h4Val',
     width: 100,
+    children: [
+      {
+        title: '闭内',
+        dataIndex: 'c2h4Val',
+        width: 100,
+      },
+      {
+        title: '闭外',
+        dataIndex: 'c2h4ValOut',
+        width: 100,
+      },
+    ],
   },
   {
     title: 'O2(%)',
-    dataIndex: 'o2Val',
     width: 100,
+    children: [
+      {
+        title: '闭内',
+        dataIndex: 'o2Val',
+        width: 100,
+      },
+      {
+        title: '闭外',
+        dataIndex: 'o2ValOut',
+        width: 100,
+      },
+    ],
   },
   {
     title: '温度(℃)',
-    dataIndex: 'temperature',
     width: 100,
+    children: [
+      {
+        title: '闭内',
+        dataIndex: 'temperature',
+        width: 100,
+      },
+      {
+        title: '闭外',
+        dataIndex: 'temperatureOut',
+        width: 100,
+      },
+    ],
   },
   {
     title: '压差(Pa)',