Просмотр исходного кода

[Feat 0000] 对接首页部分模块、算法管理表单及火灾启封表格

houzekong 3 месяцев назад
Родитель
Сommit
19e20a1f65

+ 1 - 19
src/views/analysis/warningAnalysis/fireAreaJudgeAnalysis/fireAreaJudgeAnalysis.data.ts

@@ -83,26 +83,8 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '监测时长(天)',
-    dataIndex: 'daysMonitored',
+    dataIndex: 'monitorDays',
     width: 100,
-    // 自定义渲染函数,计算并显示天数差
-    customRender: ({ record }) => {
-      // 校验预警时间是否存在
-      if (!record?.updateTime) {
-        return '0';
-      }
-      const alarmDate = new Date(record.updateTime);
-      alarmDate.setHours(0, 0, 0, 0);
-      const alarmTime = alarmDate.getTime();
-      if (isNaN(alarmTime)) {
-        return '0';
-      }
-      const nowDate = new Date();
-      nowDate.setHours(0, 0, 0, 0);
-      const nowTime = nowDate.getTime();
-      const diffDays = Math.floor((nowTime - alarmTime) / 86400000);
-      return Math.max(diffDays, 0).toString();
-    },
   },
   {
     title: '风险分析',

+ 11 - 29
src/views/dashboard/basicInfo/closedStatistics/closed.data.ts

@@ -22,86 +22,68 @@ export const dataColumns: BasicColumn[] = [
     width: 100,
   },
   {
-    title: '拟建矿井',
+    title: '长期停建(失联)',
     dataIndex: 'mbStatusNum1',
     align: 'center',
     width: 100,
   },
   {
-    title: '正常建设',
+    title: '长期停建',
     dataIndex: 'mbStatusNum2',
     align: 'center',
     width: 100,
   },
   {
-    title: '自行停产',
+    title: '长期停产',
     dataIndex: 'mbStatusNum3',
     align: 'center',
     width: 100,
   },
   {
-    title: '正在关闭',
+    title: '停产整改',
     dataIndex: 'mbStatusNum4',
     align: 'center',
     width: 100,
   },
   {
-    title: '责令停产',
+    title: '自行停产',
     dataIndex: 'mbStatusNum5',
     align: 'center',
     width: 100,
   },
   {
-    title: '责令停止',
+    title: '正常建设',
     dataIndex: 'mbStatusNum6',
     align: 'center',
     width: 100,
   },
   {
-    title: '已关闭',
+    title: '责令停产',
     dataIndex: 'mbStatusNum7',
     align: 'center',
     width: 100,
   },
   {
-    title: '长期停产',
+    title: '拟建矿井',
     dataIndex: 'mbStatusNum8',
     align: 'center',
     width: 100,
   },
   {
-    title: '长期停建',
+    title: '自行停建',
     dataIndex: 'mbStatusNum9',
     align: 'center',
     width: 100,
   },
-  {
-    title: '停产整改',
-    dataIndex: 'mbStatusNum10',
-    align: 'center',
-    width: 100,
-  },
-  {
-    title: '长期停建(失联)',
-    dataIndex: 'mbStatusNum11',
-    align: 'center',
-    width: 100,
-  },
   {
     title: '停建整改',
-    dataIndex: 'mbStatusNum12',
-    align: 'center',
-    width: 100,
-  },
-  {
-    title: '自行停建',
-    dataIndex: 'mbStatusNum13',
+    dataIndex: 'mbStatusNum10',
     align: 'center',
     width: 100,
   },
   {
     title: '正在关闭',
-    dataIndex: 'mbStatusNum14',
+    dataIndex: 'mbStatusNum11',
     align: 'center',
     width: 100,
   },

+ 156 - 145
src/views/system/algorithm/algorithm.data.ts

@@ -151,32 +151,32 @@ export const schemasCoalAlarm: FormSchema[] = [
     // labelWidth: 110,
     component: 'Divider',
   },
-  {
-    field: 'fireWarn1CoRzl',
-    label: '预警等级(Ⅰ):',
-    labelWidth: 118,
-    component: 'Input',
-    slot: 'InputGreaterNumber',
-    /** 借用 */
-    groupName: '  CO日增率(%) <=',
-    colProps: { span: 12 },
-  },
-  // { field: 'fireWarn1CoRzl', label: '', show: false, component: 'Input' },
-  {
-    field: 'fireWarn1CoZf',
-    label: ' ',
-    suffix: '',
-    labelWidth: 118,
-    component: 'Input',
-    slot: 'InputGreaterNumber',
-    /** 借用 */
-    groupName: '  CO增幅(μ) <=',
-    colProps: { span: 12 },
-  },
-  // { field: 'fireWarn1CoZf', label: '', show: false, component: 'Input' },
+  // {
+  //   field: 'fireWarn1CoRzl',
+  //   label: '预警等级(Ⅰ):',
+  //   labelWidth: 118,
+  //   component: 'Input',
+  //   slot: 'InputGreaterNumber',
+  //   /** 借用 */
+  //   groupName: '  CO日增率(%) <=',
+  //   colProps: { span: 12 },
+  // },
+  // // { field: 'fireWarn1CoRzl', label: '', show: false, component: 'Input' },
+  // {
+  //   field: 'fireWarn1CoZf',
+  //   label: ' ',
+  //   suffix: '',
+  //   labelWidth: 118,
+  //   component: 'Input',
+  //   slot: 'InputGreaterNumber',
+  //   /** 借用 */
+  //   groupName: '  CO增幅(μ) <=',
+  //   colProps: { span: 12 },
+  // },
+  // // { field: 'fireWarn1CoZf', label: '', show: false, component: 'Input' },
   {
     field: 'fireWarn1CoNd',
-    label: ' ',
+    label: '预警等级(Ⅰ):',
     suffix: '',
     labelWidth: 118,
     component: 'Input',
@@ -210,34 +210,34 @@ export const schemasCoalAlarm: FormSchema[] = [
     colProps: { span: 12, style: 'margin-right: 1px' },
   },
   // { field: 'fireWarn1T', label: '', show: false, component: 'Input' },
-  {
-    field: 'fireWarn2CoRzl',
-    label: '预警等级(Ⅱ):',
-    labelWidth: 118,
-    component: 'Input',
-    slot: 'InputRangeNumber',
-    /** 借用 */
-    groupName: '< CO日增率(%) <=',
-    colProps: { span: 12 },
-  },
-  { field: 'fireWarn2CoRzlStart', label: '', show: false, component: 'Input' },
-  { field: 'fireWarn2CoRzlEnd', label: '', show: false, component: 'Input' },
-  {
-    field: 'fireWarn2CoZf',
-    label: ' ',
-    suffix: '',
-    labelWidth: 118,
-    component: 'Input',
-    slot: 'InputRangeNumber',
-    /** 借用 */
-    groupName: '< CO增幅(μ) <=',
-    colProps: { span: 12 },
-  },
-  { field: 'fireWarn2CoZfStart', label: '', show: false, component: 'Input' },
-  { field: 'fireWarn2CoZfEnd', label: '', show: false, component: 'Input' },
+  // {
+  //   field: 'fireWarn2CoRzl',
+  //   label: '预警等级(Ⅱ):',
+  //   labelWidth: 118,
+  //   component: 'Input',
+  //   slot: 'InputRangeNumber',
+  //   /** 借用 */
+  //   groupName: '< CO日增率(%) <=',
+  //   colProps: { span: 12 },
+  // },
+  // { field: 'fireWarn2CoRzlStart', label: '', show: false, component: 'Input' },
+  // { field: 'fireWarn2CoRzlEnd', label: '', show: false, component: 'Input' },
+  // {
+  //   field: 'fireWarn2CoZf',
+  //   label: ' ',
+  //   suffix: '',
+  //   labelWidth: 118,
+  //   component: 'Input',
+  //   slot: 'InputRangeNumber',
+  //   /** 借用 */
+  //   groupName: '< CO增幅(μ) <=',
+  //   colProps: { span: 12 },
+  // },
+  // { field: 'fireWarn2CoZfStart', label: '', show: false, component: 'Input' },
+  // { field: 'fireWarn2CoZfEnd', label: '', show: false, component: 'Input' },
   {
     field: 'fireWarn2CoNd',
-    label: ' ',
+    label: '预警等级(Ⅱ):',
     suffix: '',
     labelWidth: 118,
     component: 'Input',
@@ -261,53 +261,53 @@ export const schemasCoalAlarm: FormSchema[] = [
   },
   { field: 'fireWarn2TStart', label: '', show: false, component: 'Input' },
   { field: 'fireWarn2TEnd', label: '', show: false, component: 'Input' },
-  {
-    field: 'fireWarn2CoO2Ratio',
-    label: ' ',
-    suffix: '',
-    labelWidth: 118,
-    component: 'Input',
-    slot: 'InputRangeNumber',
-    /** 借用 */
-    groupName: '<  100 x ΔCO / ΔO2  =',
-    colProps: { span: 12, style: 'margin-right: 1px' },
-  },
-  { field: 'fireWarn2CoO2RatioStart', label: '', show: false, component: 'Input' },
-  { field: 'fireWarn2CoO2RatioEnd', label: '', show: false, component: 'Input' },
-  {
-    field: 'fireWarn3CoRzl',
-    label: '预警等级(Ⅲ):',
-    labelWidth: 118,
-    component: 'Input',
-    slot: 'InputRangeNumber',
-    /** 借用 */
-    groupName: '< CO日增率(%) <=',
-    colProps: { span: 12 },
-  },
-  { field: 'fireWarn3CoRzlStart', label: '', show: false, component: 'Input' },
-  { field: 'fireWarn3CoRzlEnd', label: '', show: false, component: 'Input' },
-  {
-    field: 'fireWarn3CoZf',
-    label: ' ',
-    suffix: '',
-    labelWidth: 118,
-    component: 'Input',
-    slot: 'InputRangeNumber',
-    /** 借用 */
-    groupName: '< CO增幅(μ) <=',
-    colProps: { span: 12 },
-  },
-  { field: 'fireWarn3CoZfStart', label: '', show: false, component: 'Input' },
-  { field: 'fireWarn3CoZfEnd', label: '', show: false, component: 'Input' },
+  // {
+  //   field: 'fireWarn2CoO2Ratio',
+  //   label: ' ',
+  //   suffix: '',
+  //   labelWidth: 118,
+  //   component: 'Input',
+  //   slot: 'InputRangeNumber',
+  //   /** 借用 */
+  //   groupName: '<  100 x ΔCO / ΔO2  =',
+  //   colProps: { span: 12, style: 'margin-right: 1px' },
+  // },
+  // { field: 'fireWarn2CoO2RatioStart', label: '', show: false, component: 'Input' },
+  // { field: 'fireWarn2CoO2RatioEnd', label: '', show: false, component: 'Input' },
+  // {
+  //   field: 'fireWarn3CoRzl',
+  //   label: '预警等级(Ⅲ):',
+  //   labelWidth: 118,
+  //   component: 'Input',
+  //   slot: 'InputRangeNumber',
+  //   /** 借用 */
+  //   groupName: '< CO日增率(%) <=',
+  //   colProps: { span: 12 },
+  // },
+  // { field: 'fireWarn3CoRzlStart', label: '', show: false, component: 'Input' },
+  // { field: 'fireWarn3CoRzlEnd', label: '', show: false, component: 'Input' },
+  // {
+  //   field: 'fireWarn3CoZf',
+  //   label: ' ',
+  //   suffix: '',
+  //   labelWidth: 118,
+  //   component: 'Input',
+  //   slot: 'InputRangeNumber',
+  //   /** 借用 */
+  //   groupName: '< CO增幅(μ) <=',
+  //   colProps: { span: 12 },
+  // },
+  // { field: 'fireWarn3CoZfStart', label: '', show: false, component: 'Input' },
+  // { field: 'fireWarn3CoZfEnd', label: '', show: false, component: 'Input' },
   {
     field: 'fireWarn3CoNd',
-    label: ' ',
+    label: '预警等级(Ⅲ):',
     suffix: '',
     labelWidth: 118,
     component: 'Input',
     slot: 'InputRangeNumber',
     /** 借用 */
-    groupName: '<= CO浓度(ppm) <=',
+    groupName: '< CO浓度(ppm) <=',
     colProps: { span: 12 },
   },
   { field: 'fireWarn3CoNdStart', label: '', show: false, component: 'Input' },
@@ -325,19 +325,19 @@ export const schemasCoalAlarm: FormSchema[] = [
   },
   { field: 'fireWarn3TStart', label: '', show: false, component: 'Input' },
   { field: 'fireWarn3TEnd', label: '', show: false, component: 'Input' },
-  {
-    field: 'fireWarn3CoO2Ratio',
-    label: ' ',
-    suffix: '',
-    labelWidth: 118,
-    component: 'Input',
-    slot: 'InputRangeNumber',
-    /** 借用 */
-    groupName: '<  100 x ΔCO / ΔO2  =',
-    colProps: { span: 12 },
-  },
-  { field: 'fireWarn3CoO2RatioStart', label: '', show: false, component: 'Input' },
-  { field: 'fireWarn3CoO2RatioEnd', label: '', show: false, component: 'Input' },
+  // {
+  //   field: 'fireWarn3CoO2Ratio',
+  //   label: ' ',
+  //   suffix: '',
+  //   labelWidth: 118,
+  //   component: 'Input',
+  //   slot: 'InputRangeNumber',
+  //   /** 借用 */
+  //   groupName: '<  100 x ΔCO / ΔO2  =',
+  //   colProps: { span: 12 },
+  // },
+  // { field: 'fireWarn3CoO2RatioStart', label: '', show: false, component: 'Input' },
+  // { field: 'fireWarn3CoO2RatioEnd', label: '', show: false, component: 'Input' },
   {
     field: 'fireWarn3C2h4',
     label: ' ',
@@ -350,31 +350,42 @@ export const schemasCoalAlarm: FormSchema[] = [
     colProps: { span: 12 },
   },
   {
-    field: 'fireWarn4CoRzl',
-    label: '预警等级(Ⅳ):',
-    labelWidth: 118,
-    component: 'Input',
-    slot: 'InputLowerNumber',
-    /** 借用 */
-    groupName: '< CO日增率(%)  ',
-    colProps: { span: 12 },
-  },
-  // { field: 'fireWarn4CoRzl', label: '', show: false, component: 'Input' },
-  {
-    field: 'fireWarn4CoZf',
+    field: 'fireWarn3C2h2',
     label: ' ',
     suffix: '',
     labelWidth: 118,
     component: 'Input',
     slot: 'InputLowerNumber',
     /** 借用 */
-    groupName: '< CO增幅(μ)  ',
-    colProps: { span: 12 },
-  },
+    groupName: '= C2H2(ppm)  ',
+    colProps: { span: 12 },
+  },
+  // {
+  //   field: 'fireWarn4CoRzl',
+  //   label: '预警等级(Ⅳ):',
+  //   labelWidth: 118,
+  //   component: 'Input',
+  //   slot: 'InputLowerNumber',
+  //   /** 借用 */
+  //   groupName: '< CO日增率(%)  ',
+  //   colProps: { span: 12 },
+  // },
+  // // { field: 'fireWarn4CoRzl', label: '', show: false, component: 'Input' },
+  // {
+  //   field: 'fireWarn4CoZf',
+  //   label: ' ',
+  //   suffix: '',
+  //   labelWidth: 118,
+  //   component: 'Input',
+  //   slot: 'InputLowerNumber',
+  //   /** 借用 */
+  //   groupName: '< CO增幅(μ)  ',
+  //   colProps: { span: 12 },
+  // },
   // { field: 'fireWarn4CoZf', label: '', show: false, component: 'Input' },
   {
     field: 'fireWarn4CoNd',
-    label: ' ',
+    label: '预警等级(Ⅳ):',
     suffix: '',
     labelWidth: 118,
     component: 'Input',
@@ -396,30 +407,30 @@ export const schemasCoalAlarm: FormSchema[] = [
     colProps: { span: 12 },
   },
   // { field: 'fireWarn4T', label: '', show: false, component: 'Input' },
-  {
-    field: 'fireWarn4CoO2Ratio',
-    label: ' ',
-    suffix: '',
-    labelWidth: 118,
-    component: 'Input',
-    slot: 'InputRangeNumber',
-    /** 借用 */
-    groupName: '<  100 x ΔCO / ΔO2  =',
-    colProps: { span: 12 },
-  },
-  { field: 'fireWarn4CoO2RatioStart', label: '', show: false, component: 'Input' },
-  { field: 'fireWarn4CoO2RatioEnd', label: '', show: false, component: 'Input' },
-  {
-    field: 'fireWarn4C2h4',
-    label: ' ',
-    suffix: '',
-    labelWidth: 118,
-    component: 'Input',
-    slot: 'InputLowerNumber',
-    /** 借用 */
-    groupName: '< C2H4(ppm)  ',
-    colProps: { span: 12 },
-  },
+  // {
+  //   field: 'fireWarn4CoO2Ratio',
+  //   label: ' ',
+  //   suffix: '',
+  //   labelWidth: 118,
+  //   component: 'Input',
+  //   slot: 'InputRangeNumber',
+  //   /** 借用 */
+  //   groupName: '<  100 x ΔCO / ΔO2  =',
+  //   colProps: { span: 12 },
+  // },
+  // { field: 'fireWarn4CoO2RatioStart', label: '', show: false, component: 'Input' },
+  // { field: 'fireWarn4CoO2RatioEnd', label: '', show: false, component: 'Input' },
+  // {
+  //   field: 'fireWarn4C2h4',
+  //   label: ' ',
+  //   suffix: '',
+  //   labelWidth: 118,
+  //   component: 'Input',
+  //   slot: 'InputLowerNumber',
+  //   /** 借用 */
+  //   groupName: '< C2H4(ppm)  ',
+  //   colProps: { span: 12 },
+  // },
   {
     field: 'fireWarn4C2h2',
     label: ' ',
@@ -429,7 +440,7 @@ export const schemasCoalAlarm: FormSchema[] = [
     slot: 'InputLowerNumber',
     /** 借用 */
     groupName: '< C2H2(ppm)  ',
-    colProps: { span: 12, style: 'margin-right: 1px' },
+    colProps: { span: 12 },
   },
   {
     field: 'm3',
@@ -465,7 +476,7 @@ export const schemasCoalAlarm: FormSchema[] = [
     component: 'Input',
     slot: 'InputGreaterNumber',
     /** 借用 */
-    groupName: '  不含甲烷、乙烯、CO浓度(%) <',
+    groupName: '不含甲烷,乙烯,CO浓度(%) <',
     colProps: { span: 12 },
   },
   {