更新

src/views/vent/monitorManager/warningMonitor/alarm.data.ts

@@ -90,7 +90,7 @@ export const manageAutoColumns1: BasicColumn[] = [
 export const safetyColumns: BasicColumn[] = [
   {
     title: '地址',
-    dataIndex: 'devName',
+    dataIndex: 'devicename',
     align: 'center',
   },
   // {
@@ -104,18 +104,28 @@ export const safetyColumns: BasicColumn[] = [
   // },
   {
     title: '设备类型',
-    dataIndex: 'deviceKind',
+    dataIndex: 'valuename',
     align: 'center',
   },
-  {
+   {
     title: '报警类型',
-    dataIndex: 'warnLevel',
+    dataIndex: 'wardescrip',
+    align: 'center',
+  },
+  {
+    title: '报警等级',
+    dataIndex: 'aqjkExceptionType',
     align: 'center',
   },
   {
     title: '报警开始时间',
     dataIndex: 'starttime',
     align: 'center',
+  },
+   {
+    title: '报警时长',
+    dataIndex: 'warntime',
+    align: 'center',
   },
   // {
   //   title: '报警结束时间',
@@ -274,30 +284,30 @@ export const safetySchema: FormSchema[] = [
     component: 'Input',
     colProps: { span: 3 },
   },
-  {
-    label: '报警类型',
-    field: 'warnLevel',
-    defaultValue: false,
-    component: 'JDictSelectTag',
-     componentProps: () => {
-      return {
-        dictCode: 'aqjkAlarmType',
-      };
-    },
-    colProps: { span: 4 },
-  },
-  {
-    label: '设备类型',
-    field: 'deviceKind',
-    defaultValue: false,
-    component: 'JDictSelectTag',
-     componentProps: () => {
-      return {
-        dictCode: 'aqjkAlarmDevType',
-      };
-    },
-    colProps: { span: 4 },
-  },
+  // {
+  //   label: '报警类型',
+  //   field: 'warnLevel',
+  //   defaultValue: '',
+  //   component: 'JDictSelectTag',
+  //    componentProps: () => {
+  //     return {
+  //       dictCode: 'aqjkAlarmType',
+  //     };
+  //   },
+  //   colProps: { span: 4 },
+  // },
+  // {
+  //   label: '设备类型',
+  //   field: 'deviceKind',
+  //   defaultValue: '',
+  //   component: 'JDictSelectTag',
+  //    componentProps: () => {
+  //     return {
+  //       dictCode: 'aqjkAlarmDevType',
+  //     };
+  //   },
+  //   colProps: { span: 4 },
+  // },
   {
     label: '矿编码',
     field: 'orgcode',

src/views/vent/monitorManager/warningMonitor/index.vue

@@ -109,7 +109,7 @@ const alarmHistory = ref();
 const deviceColumns = getTableHeaderColumns('alarm_history') as [];
 const dataColumns = ref<any>(deviceColumns);
 const searchFormSchema = ref<any>(safetySchema);
-const paramType = ref('alarmLog');
+const paramType = ref('aqjkAlarmLog');