更新

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

@@ -89,50 +89,74 @@ export const manageAutoColumns1: BasicColumn[] = [
 //安全监控预警历史
 export const safetyColumns: BasicColumn[] = [
   {
-    title: '地址',
+    title: '地点',
     dataIndex: 'devicename',
     align: 'center',
   },
-  // {
-  //   title: '报警等级',
-  //   dataIndex: 'alarmLevel',
-  //   customRender: ({ record }) => {
-  //     return render.renderDict(record.alarmLevel, 'leveltype');
-  //   },
-  //   width: 100,
-  //   align: 'center',
-  // },
-  {
-    title: '设备类型',
+    {
+    title: '类型',
     dataIndex: 'valuename',
     align: 'center',
   },
-   {
-    title: '报警类型',
-    dataIndex: 'wardescrip',
+    {
+    title: '单位',
+    dataIndex: 'valueUnit',
     align: 'center',
   },
-  {
-    title: '报警等级',
-    dataIndex: 'aqjkExceptionType',
+    {
+    title: '报警时刻',
+    dataIndex: 'starttime',
     align: 'center',
   },
-  {
-    title: '报警开始时间',
-    dataIndex: 'starttime',
+    {
+    title: '解除时刻',
+    dataIndex: 'endtime',
     align: 'center',
   },
    {
-    title: '报警时长',
+    title: '累计时间',
     dataIndex: 'warntime',
     align: 'center',
   },
+   {
+    title: '报警次数',
+    dataIndex: 'alarmNum',
+    align: 'center',
+  },
+   {
+    title: '最小值',
+    dataIndex: 'minValue',
+    align: 'center',
+  },
+   {
+    title: '最小值时刻',
+    dataIndex: 'minValueTime',
+    align: 'center',
+  },
+    {
+    title: '最大值',
+    dataIndex: 'maxValue',
+    align: 'center',
+  },
+   {
+    title: '最大值时刻',
+    dataIndex: 'maxValueTime',
+    align: 'center',
+  },
+   {
+    title: '原因',
+    dataIndex: 'wardescrip',
+    align: 'center',
+  },
   // {
-  //   title: '报警结束时间',
-  //   dataIndex: 'endtime',
+  //   title: '报警等级',
+  //   dataIndex: 'alarmLevel',
+  //   customRender: ({ record }) => {
+  //     return render.renderDict(record.alarmLevel, 'leveltype');
+  //   },
+  //   width: 100,
   //   align: 'center',
   // },
-
 ];
 export const unsafetySchema: FormSchema[] = [
   {

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

@@ -107,7 +107,7 @@ let statisticsList = reactive<any[]>([
 const activeKey = ref('safety');
 const alarmHistory = ref();
 const deviceColumns = getTableHeaderColumns('alarm_history') as [];
-const dataColumns = ref<any>(deviceColumns);
+const dataColumns = ref<any>(safetyColumns);
 const searchFormSchema = ref<any>(safetySchema);
 const paramType = ref('aqjkAlarmLog');