Merge branch 'ft_modify_alarm_log' into 'main_dev'

feat: 告警记录新增告警设备和告警级别筛选

See merge request yunteng/thingskit-front!603

@@ -2,6 +2,7 @@ import { alarmLevel, statusType } from '/@/views/device/list/config/detail.confi
 import { FormSchema } from '/@/components/Form';
 import { FormSchema } from '/@/components/Form';
 import { BasicColumn } from '/@/components/Table';
 import { BasicColumn } from '/@/components/Table';
 import moment from 'moment';
 import moment from 'moment';
+import { findDictItemByCode } from '/@/api/system/dict';
 
 
 export enum AlarmStatus {
 export enum AlarmStatus {
   CLEARED_UN_ACK = 'CLEARED_UNACK',
   CLEARED_UN_ACK = 'CLEARED_UNACK',
@@ -68,6 +69,44 @@ export const alarmSearchSchemas: FormSchema[] = [
     },
     },
   },
   },
   {
   {
+    field: 'deviceName',
+    label: '告警设备',
+    component: 'Input',
+    colProps: { span: 6 },
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入告警设备',
+    },
+    dynamicRules: () => {
+      return [
+        {
+          required: false,
+          validator: (_, value) => {
+            if (String(value).length > 255) {
+              return Promise.reject('字数不超过255个字');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
+  },
+  {
+    field: 'severity',
+    label: '告警级别',
+    component: 'ApiSelect',
+    colProps: { span: 6 },
+    componentProps: {
+      placeholder: '请选择告警级别',
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'severity_type',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
+    },
+  },
+  {
     field: 'alarmTime',
     field: 'alarmTime',
     label: '告警时间',
     label: '告警时间',
     component: 'RangePicker',
     component: 'RangePicker',

@@ -11,6 +11,7 @@ import { TypeEnum } from './data';
 import { PageEnum } from '/@/enums/pageEnum';
 import { PageEnum } from '/@/enums/pageEnum';
 import { useGo } from '/@/hooks/web/usePage';
 import { useGo } from '/@/hooks/web/usePage';
 import { useAuthDeviceDetail } from '../hook/useAuthDeviceDetail';
 import { useAuthDeviceDetail } from '../hook/useAuthDeviceDetail';
+import { findDictItemByCode } from '/@/api/system/dict';
 
 
 // 设备详情的描述
 // 设备详情的描述
 export const descSchema = (emit: EmitType): DescItem[] => {
 export const descSchema = (emit: EmitType): DescItem[] => {
@@ -144,7 +145,22 @@ export const alarmSearchSchemas: FormSchema[] = [
     componentProps: {
     componentProps: {
       showTime: { defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')] },
       showTime: { defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')] },
     },
     },
+    colProps: { span: 7 },
+  },
+  {
+    field: 'severity',
+    label: '告警级别',
+    component: 'ApiSelect',
     colProps: { span: 6 },
     colProps: { span: 6 },
+    componentProps: {
+      placeholder: '请选择告警级别',
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'severity_type',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
+    },
   },
   },
 ];
 ];
 export const alarmColumns: BasicColumn[] = [
 export const alarmColumns: BasicColumn[] = [