瀏覽代碼

[Style 0000] 文本及样式优化调整

houzekong 1 周之前
父節點
當前提交
9e12f5e2f2

+ 2 - 2
public/js/global.js

@@ -235,7 +235,7 @@ const __STATIC_ROUTES__ = [
           internalOrExternal: false,
           icon: '',
           componentName: 'index',
-          title: '闭内自发火隐患分级',
+          title: '闭内自发火隐患分级',
         },
         name: 'warningAnalysis-autoFire-analysis',
       },
@@ -247,7 +247,7 @@ const __STATIC_ROUTES__ = [
           internalOrExternal: false,
           icon: '',
           componentName: 'index',
-          title: '闭外自发火隐患分级',
+          title: '闭外自发火隐患分级',
         },
         name: 'warningAnalysis-autoFireOut-analysis',
       },

+ 1 - 1
src/layouts/default/feature/components/LeafPopup.vue

@@ -21,7 +21,7 @@
           <tr>
             <th>序号</th>
             <th class="w-200px">煤层名称</th>
-            <th>自发火倾向性</th>
+            <th>自发火倾向性</th>
           </tr>
         </thead>
         <tbody>

+ 1 - 1
src/views/analysis/warningAnalysis/airLeakStatus/airLeakStatus.data.ts

@@ -23,7 +23,7 @@ export const columns: BasicColumn[] = [
   {
     title: '老空区永久密闭名称',
     dataIndex: 'devicePos',
-    width: 100,
+    width: 200,
   },
   {
     title: '所属煤层',

+ 1 - 1
src/views/analysis/warningAnalysis/autoFireAnalysis/autoFireAnalysis.data.ts

@@ -38,7 +38,7 @@ export const columns: BasicColumn[] = [
   {
     title: '老空区永久密闭名称',
     dataIndex: 'devicePos',
-    width: 100,
+    width: 200,
   },
   {
     title: '所属煤层',

+ 1 - 1
src/views/analysis/warningAnalysis/autoFireOutAnalysis/autoFireOutAnalysis.data.ts

@@ -38,7 +38,7 @@ export const columns: BasicColumn[] = [
   {
     title: '老空区永久密闭名称',
     dataIndex: 'devicePos',
-    width: 100,
+    width: 200,
   },
   {
     title: '所属煤层',

+ 1 - 1
src/views/analysis/warningAnalysis/overlimitAlarm/overlimitAlarm.data.ts

@@ -38,7 +38,7 @@ export const columns: BasicColumn[] = [
   {
     title: '老空区永久密闭名称',
     dataIndex: 'devicePos',
-    width: 100,
+    width: 200,
   },
   {
     title: '所属煤层',

+ 1 - 1
src/views/analysis/warningAnalysis/pressureDiffAnalysis/pressureDiffAnalysis.data.ts

@@ -38,7 +38,7 @@ export const columns: BasicColumn[] = [
   {
     title: '老空区永久密闭名称',
     dataIndex: 'devicePos',
-    width: 100,
+    width: 200,
   },
   {
     title: '所属煤层',

+ 2 - 2
src/views/analysis/warningAnalysis/sealRiskJudgeAnalysis/sealRiskJudgeAnalysis.data.ts

@@ -33,12 +33,12 @@ export const columns: BasicColumn[] = [
   {
     title: '煤矿名称',
     dataIndex: 'mineName',
-    width: 160,
+    width: 200,
   },
   {
     title: '老空区永久密闭名称',
     dataIndex: 'devicePos',
-    width: 100,
+    width: 200,
   },
   {
     title: '所属煤层',

+ 17 - 1
src/views/dashboard/basicInfo/minesInfo/minesInfo.data.ts

@@ -69,7 +69,7 @@ export const columns: BasicColumn[] = [
     // },
   },
   {
-    title: '自燃倾向性',
+    title: '最高自燃倾向性',
     dataIndex: 'coalSeamLevel',
     width: 100,
   },
@@ -131,6 +131,10 @@ export const searchFormSchema: FormSchema[] = [
     label: '煤矿名称',
     component: 'MineCascader',
     colProps: { span: 6 },
+    componentProps: {
+      initFromStore: false,
+      syncToStore: false,
+    },
   },
   {
     field: 'mineNameAbbr',
@@ -201,3 +205,15 @@ export const searchFormSchema: FormSchema[] = [
     show: false,
   },
 ];
+
+// 3. 生成动态表格列(接收动态状态映射)
+export const coalSeamColumns: BasicColumn[] = [
+  {
+    title: '煤层名称',
+    dataIndex: 'coalSeamName',
+  },
+  {
+    title: '自燃倾向性',
+    dataIndex: 'coalSeamLevel',
+  },
+];

+ 1 - 1
src/views/dashboard/basicInfo/problemReport/problemReport.data.ts

@@ -107,7 +107,7 @@ export const searchFormSchema: FormSchema[] = [
   },
   {
     field: 'goafId',
-    label: '老空区永久密闭名称',
+    label: '密闭名称',
     component: 'Input',
     colProps: { span: 6 },
     groupName: '常规查询',

+ 67 - 67
src/views/monitor/sealedMonitor/monitor.data.ts

@@ -35,14 +35,14 @@ export const columns: BasicColumn[] = [
   //   width: 80,
   // },
   {
-    title: '矿名称',
+    title: '矿名称',
     dataIndex: 'mineName',
     width: 200,
   },
   {
     title: '老空区永久密闭名称',
     dataIndex: 'devicePos',
-    width: 100,
+    width: 200,
   },
   {
     title: '所属煤层',
@@ -76,6 +76,64 @@ export const columns: BasicColumn[] = [
     //   );
     // },
   },
+  {
+    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: 'sourcePressureAlarm',
+    width: 100,
+    customRender({ record }) {
+      return alarmCellRender(record.sourcePressureAlarm, (r) => riskMap[r.alarmName] || r.alarmName);
+    },
+  },
+  {
+    title: '是否漏风',
+    dataIndex: 'leakageAlarm',
+    width: 100,
+    customRender({ record }) {
+      // return alarmTextRender(record.leakageAlarm?.alarmLevel, record.leakageAlarm?.split('-')[0]);
+      return alarmCellRender(record.leakageAlarm, (r) => r.alarmName.split('-')[1]);
+    },
+  },
+  {
+    title: '密闭启封判定',
+    dataIndex: 'unsealAlarm',
+    width: 100,
+    customRender({ record }) {
+      return alarmCellRender(record.unsealAlarm);
+    },
+  },
+  {
+    title: '设备状态',
+    dataIndex: 'linkStatus',
+    width: 100,
+    customRender({ record }) {
+      return alarmCellRender(
+        record.linkStatus,
+        (r) => linkMap[r],
+        (r) => String(r)
+      );
+    },
+  },
+  {
+    title: '压差(Pa)',
+    dataIndex: 'sourcePressure',
+    width: 100,
+  },
   {
     title: 'CO(ppm)',
     width: 100,
@@ -188,64 +246,6 @@ export const columns: BasicColumn[] = [
       },
     ],
   },
-  {
-    title: '压差(Pa)',
-    dataIndex: 'sourcePressure',
-    width: 100,
-  },
-  {
-    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',
-    width: 100,
-    customRender({ record }) {
-      // return alarmTextRender(record.leakageAlarm?.alarmLevel, record.leakageAlarm?.split('-')[0]);
-      return alarmCellRender(record.leakageAlarm, (r) => r.alarmName.split('-')[1]);
-    },
-  },
-  {
-    title: '压差隐患等级',
-    dataIndex: 'sourcePressureAlarm',
-    width: 100,
-    customRender({ record }) {
-      return alarmCellRender(record.sourcePressureAlarm, (r) => riskMap[r.alarmName] || r.alarmName);
-    },
-  },
-  {
-    title: '密闭启封判定',
-    dataIndex: 'unsealAlarm',
-    width: 100,
-    customRender({ record }) {
-      return alarmCellRender(record.unsealAlarm);
-    },
-  },
-  {
-    title: '设备状态',
-    dataIndex: 'linkStatus',
-    width: 100,
-    customRender({ record }) {
-      return alarmCellRender(
-        record.linkStatus,
-        (r) => linkMap[r],
-        (r) => String(r)
-      );
-    },
-  },
   // {
   //   title: '爆炸危险性',
   //   dataIndex: 'explosionHazard',
@@ -483,15 +483,20 @@ export const historicalColumns: BasicColumn[] = [
     width: 200,
   },
   {
-    title: '密闭名称',
+    title: '老空区永久密闭名称',
     dataIndex: 'devicePos',
-    width: 100,
+    width: 200,
   },
   {
     title: '所属煤层',
     dataIndex: 'coalSeamName',
     width: 100,
   },
+  {
+    title: '压差(Pa)',
+    dataIndex: 'sourcePressure',
+    width: 100,
+  },
   {
     title: 'CO(ppm)',
     width: 100,
@@ -604,11 +609,6 @@ export const historicalColumns: BasicColumn[] = [
       },
     ],
   },
-  {
-    title: '压差(Pa)',
-    dataIndex: 'sourcePressure',
-    width: 100,
-  },
   // {
   //   title: '爆炸危险性',
   //   dataIndex: 'explosionHazard',

+ 3 - 3
src/views/system/algorithm/algorithm.data.ts

@@ -147,7 +147,7 @@ export const schemasCoalAlarm: FormSchema[] = [
   // { field: 'ycWarn4', label: '', show: false, component: 'Input' },
   {
     field: 'm2',
-    label: '煤自发火隐患分级预警模型',
+    label: '煤自发火隐患分级预警模型',
     // labelWidth: 110,
     component: 'Divider',
   },
@@ -759,7 +759,7 @@ export const schemasCoalExpression: FormSchema[] = [
   },
   {
     field: 'm2',
-    label: '闭内煤自发火隐患分级预警模型',
+    label: '闭内煤自发火隐患分级预警模型',
     // labelWidth: 110,
     component: 'Divider',
   },
@@ -797,7 +797,7 @@ export const schemasCoalExpression: FormSchema[] = [
   },
   {
     field: 'm3',
-    label: '闭外煤自发火隐患分级预警模型',
+    label: '闭外煤自发火隐患分级预警模型',
     // labelWidth: 110,
     component: 'Divider',
   },