Merge branch 'perf/alarm-log-status' into 'v1.4.0_dev'

perf: 告警记录列表状态确认字段变更

See merge request yunteng/thingskit-front!1338

@@ -127,20 +127,12 @@ export const getAlarmSearchSchemas = (deviceAlaramDetailMode?: boolean): FormSch
   ];
   ];
 };
 };
 
 
-const handleAlarmStatus = (status: string) => {
-  return status.split('_').includes('ACTIVE');
-};
-
-const handleAlarmAckStatus = (status: string) => {
-  return status.split('_').includes('ACK');
-};
-
 export const alarmColumns: BasicColumn[] = [
 export const alarmColumns: BasicColumn[] = [
   {
   {
     title: '告警状态',
     title: '告警状态',
     dataIndex: 'status',
     dataIndex: 'status',
     customRender({ record }: { record }) {
     customRender({ record }: { record }) {
-      const flag = handleAlarmStatus(record.status);
+      const flag = !!record.cleared;
       return h(Tag, { color: flag ? 'red' : 'green' }, () => (flag ? '激活' : '清除'));
       return h(Tag, { color: flag ? 'red' : 'green' }, () => (flag ? '激活' : '清除'));
     },
     },
     width: 90,
     width: 90,
@@ -175,7 +167,7 @@ export const alarmColumns: BasicColumn[] = [
     title: '确认状态',
     title: '确认状态',
     dataIndex: 'ackStatus',
     dataIndex: 'ackStatus',
     customRender({ record }: { record }) {
     customRender({ record }: { record }) {
-      const flag = handleAlarmAckStatus(record.status);
+      const flag = !!record.acknowledged;
       return h(Tag, { color: flag ? 'blue' : 'orange' }, () => (flag ? '已确认' : '未确认'));
       return h(Tag, { color: flag ? 'blue' : 'orange' }, () => (flag ? '已确认' : '未确认'));
     },
     },
     width: 110,
     width: 110,