Merge branch 'local_devbranch_byft' into 'main_dev'

perf: 优化告警记录表格列表顺序展示和表格查询

See merge request yunteng/thingskit-front!1041

-import { alarmLevel, statusType } from '/@/views/device/list/config/detail.config';
+import { alarmLevel } from '/@/views/device/list/config/detail.config';
 import { FormSchema } from '/@/components/Form';
 import { BasicColumn } from '/@/components/Table';
 import moment from 'moment';
 import { findDictItemByCode } from '/@/api/system/dict';
-import { AlarmStatus, AlarmStatusMean } from '/@/enums/alarmEnum';
+import { AlarmStatus } from '/@/enums/alarmEnum';
+import { Tag } from 'ant-design-vue';
+import { h } from 'vue';
 
 export const alarmSearchSchemas: FormSchema[] = [
   {
     field: 'status',
     label: '告警状态',
-    component: 'Select',
+    component: 'Cascader',
     colProps: { span: 6 },
     componentProps: {
       options: [
         {
-          label: AlarmStatusMean[AlarmStatus.CLEARED_UN_ACK],
-          value: AlarmStatus.CLEARED_UN_ACK,
+          value: '0',
+          label: '清除',
+          children: [
+            {
+              value: AlarmStatus.CLEARED_UN_ACK,
+              label: '清除未确认',
+            },
+            {
+              value: AlarmStatus.CLEARED_ACK,
+              label: '清除已确认',
+            },
+          ],
         },
         {
-          label: AlarmStatusMean[AlarmStatus.ACTIVE_UN_ACK],
-          value: AlarmStatus.ACTIVE_UN_ACK,
-        },
-        {
-          label: AlarmStatusMean[AlarmStatus.CLEARED_ACK],
-          value: AlarmStatus.CLEARED_ACK,
-        },
-        {
-          label: AlarmStatusMean[AlarmStatus.ACTIVE_ACK],
-          value: AlarmStatus.ACTIVE_ACK,
+          value: '1',
+          label: '激活',
+          children: [
+            {
+              value: AlarmStatus.ACTIVE_UN_ACK,
+              label: '激活未确认',
+            },
+            {
+              value: AlarmStatus.ACTIVE_ACK,
+              label: '激活已确认',
+            },
+          ],
         },
       ],
+      // options: [
+      //   {
+      //     label: AlarmStatusMean[AlarmStatus.CLEARED_UN_ACK],
+      //     value: AlarmStatus.CLEARED_UN_ACK,
+      //   },
+      //   {
+      //     label: AlarmStatusMean[AlarmStatus.ACTIVE_UN_ACK],
+      //     value: AlarmStatus.ACTIVE_UN_ACK,
+      //   },
+      //   {
+      //     label: AlarmStatusMean[AlarmStatus.CLEARED_ACK],
+      //     value: AlarmStatus.CLEARED_ACK,
+      //   },
+      //   {
+      //     label: AlarmStatusMean[AlarmStatus.ACTIVE_ACK],
+      //     value: AlarmStatus.ACTIVE_ACK,
+      //   },
+      // ],
     },
   },
   {
@@ -103,16 +135,29 @@ export const alarmSearchSchemas: FormSchema[] = [
     colProps: { span: 6 },
   },
 ];
+
+const handleAlarmStatus = (status: string) => {
+  return status.split('_').includes('ACTIVE');
+};
+
+const handleAlarmAckStatus = (status: string) => {
+  return status.split('_').includes('ACK');
+};
+
 export const alarmColumns: BasicColumn[] = [
   {
-    title: '告警时间',
-    dataIndex: 'createdTime',
-    width: 120,
+    title: '告警状态',
+    dataIndex: 'status',
+    customRender({ record }: { record }) {
+      const flag = handleAlarmStatus(record.status);
+      return h(Tag, { color: flag ? 'red' : 'green' }, () => (flag ? '激活' : '清除'));
+    },
+    width: 90,
   },
   {
     title: '告警设备',
     dataIndex: 'deviceName',
-    width: 100,
+    width: 180,
     customRender: ({ record }) => {
       const { deviceAlias, deviceName } = record || {};
       return deviceAlias || deviceName;
@@ -121,12 +166,12 @@ export const alarmColumns: BasicColumn[] = [
   {
     title: '告警场景',
     dataIndex: 'type',
-    width: 160,
+    width: 180,
   },
   {
     title: '告警级别',
     dataIndex: 'severity',
-    width: 160,
+    width: 90,
     format: (text) => alarmLevel(text),
   },
   {
@@ -136,10 +181,18 @@ export const alarmColumns: BasicColumn[] = [
     width: 160,
   },
   {
-    title: '状态',
-    dataIndex: 'status',
-    format: (text) => statusType(text),
-    width: 160,
+    title: '确认状态',
+    dataIndex: 'ackStatus',
+    customRender({ record }: { record }) {
+      const flag = handleAlarmAckStatus(record.status);
+      return h(Tag, { color: flag ? 'blue' : 'orange' }, () => (flag ? '已确认' : '未确认'));
+    },
+    width: 110,
+  },
+  {
+    title: '告警时间',
+    dataIndex: 'createdTime',
+    width: 130,
   },
 ];
 

@@ -85,6 +85,16 @@
         useTable({
           title: '告警记录列表',
           api: getDeviceAlarm,
+          beforeFetch: (params) => {
+            const { status } = params;
+            const obj = {
+              ...params,
+              ...{
+                status: status ? status.at(-1) : null,
+              },
+            };
+            return obj;
+          },
           columns: alarmColumns,
           rowKey: 'id',
           useSearchForm: true,
@@ -120,25 +130,25 @@
         reload();
       };
 
-      const findName = (item: any, curr: any) => {
-        return item.attribute.find((item) => item.identifier === curr.key)?.name;
+      const findName = (item: Recordable, curr: Recordable) => {
+        return item.attribute.find((item) => item.identifier === curr?.key)?.name;
       };
 
-      const findLogin = (curr: any) => {
+      const findLogin = (curr: Recordable) => {
         return [...operationNumber_OR_TIME, ...operationString, ...operationBoolean].find(
-          (item) => item.value === curr.logic
+          (item) => item.value === curr?.logic
         )?.symbol;
       };
 
-      const findAttribute = (item: any, curr: any) => {
-        item.attribute.find((findItem) => findItem.identifier === curr.key);
+      const findAttribute = (item: Recordable, curr: Recordable) => {
+        item.attribute.find((findItem) => findItem.identifier === curr?.key);
       };
 
-      const findValue = (item: any, curr: any) => {
+      const findValue = (item: Recordable, curr: Recordable) => {
         return {
           ['触发属性']: findName(item, curr),
-          ['触发条件']: `${findLogin(curr)}${curr.logicValue}`,
-          ['触发值']: `${curr.realValue}${
+          ['触发条件']: `${findLogin(curr)}${curr?.logicValue}`,
+          ['触发值']: `${curr?.realValue}${
             findAttribute(item, curr)?.detail?.dataType?.specs?.unit?.key ?? ''
           }`,
         };
@@ -151,56 +161,62 @@
         const { details } = record;
         if (!details) return;
         const deviceIdKeys = Object.keys(details);
-        const detailObject = deviceIdKeys.map((key) => ({ label: key, value: details[key] }));
         const dataFormat = await handleAlarmDetailFormat(deviceIdKeys);
-        const dataFormats = detailObject.reduce((acc: Recordable[], curr: Recordable) => {
-          let currentObj: Recordable = {};
-          dataFormat.forEach((item) => {
-            if (item.tbDeviceId === curr.label) {
-              const { triggerData, conditionData } = curr.value;
-              if (triggerData || conditionData) {
-                for (let currItem in curr.value) {
-                  const value = findValue(item, curr.value[currItem]);
-                  currentObj = {
-                    [item.name]: {
-                      [handleAlarmText(currItem)]: value,
-                    },
-                  };
-                  acc.push(currentObj);
-                }
-              } else {
-                const value = findValue(item, curr.value);
-                currentObj = {
-                  [item.name]: value,
-                };
-                acc.push(currentObj);
-              }
+        const mapDataFormat = deviceIdKeys.map((deviceKey: string) => {
+          const findDataFormat = dataFormat.find(
+            (dataItem: Recordable) => dataItem.tbDeviceId === deviceKey
+          );
+          const dataKeys = Object.keys(details[deviceKey]);
+          const data: any = dataKeys.map((dataItem: string) => {
+            if (dataItem !== 'triggerData' && dataItem !== 'conditionData') {
+              return findValue(findDataFormat, details[deviceKey]);
+            } else {
+              return {
+                [handleAlarmText(dataItem)]: findValue(
+                  findDataFormat,
+                  details[deviceKey][dataItem]
+                ),
+              };
             }
           });
-          return [...acc];
-        }, []);
+          const objectDataFormat = data.reduce((acc: Recordable, curr: Recordable) => {
+            return {
+              ...acc,
+              ...curr,
+            };
+          });
+          return {
+            [findDataFormat.name]: objectDataFormat,
+          };
+        });
+        const objectDataFormats = mapDataFormat.reduce((acc: Recordable, curr: Recordable) => {
+          return {
+            ...acc,
+            ...curr,
+          };
+        });
         Modal.info({
           title: '告警详情',
           width: 600,
           centered: true,
           maskClosable: true,
-          content: h(JsonPreview, { data: JSON.parse(JSON.stringify(dataFormats)), deep: 4 }),
+          content: h(JsonPreview, { data: JSON.parse(JSON.stringify(objectDataFormats)), deep: 4 }),
         });
       };
       const handleAlarmDetailFormat = async (keys: string[]) => {
-        const temp: any = [];
+        const temp: Recordable = [];
         for (let item of keys) {
           if (item === 'key' || item === 'data') return []; //旧数据则终止
           const deviceDetailRes = await getDeviceDetail(item);
           const { deviceProfileId } = deviceDetailRes;
           if (!deviceProfileId) return [];
           const attributeRes = await getAttribute(deviceProfileId);
-          const dataFormat: any = handleDataFormat(deviceDetailRes, attributeRes);
+          const dataFormat: Recordable = handleDataFormat(deviceDetailRes, attributeRes);
           temp.push(dataFormat);
         }
         return temp;
       };
-      const handleDataFormat = (deviceDetail: any, attributes: any) => {
+      const handleDataFormat = (deviceDetail: Recordable, attributes: Recordable) => {
         const { name, tbDeviceId, alias } = deviceDetail;
         const attribute = attributes.map((item) => ({
           identifier: item.identifier,

@@ -81,24 +81,24 @@
         reload();
       };
       const findName = (item: any, curr: any) => {
-        return item.attribute.find((item) => item.identifier === curr.key)?.name;
+        return item.attribute.find((item) => item.identifier === curr?.key)?.name;
       };
 
       const findLogin = (curr: any) => {
         return [...operationNumber_OR_TIME, ...operationString, ...operationBoolean].find(
-          (item) => item.value === curr.logic
+          (item) => item.value === curr?.logic
         )?.symbol;
       };
 
       const findAttribute = (item: any, curr: any) => {
-        item.attribute.find((findItem) => findItem.identifier === curr.key);
+        item.attribute.find((findItem) => findItem.identifier === curr?.key);
       };
 
       const findValue = (item: any, curr: any) => {
         return {
           ['触发属性']: findName(item, curr),
-          ['触发条件']: `${findLogin(curr)}${curr.logicValue}`,
-          ['触发值']: `${curr.realValue}${
+          ['触发条件']: `${findLogin(curr)}${curr?.logicValue}`,
+          ['触发值']: `${curr?.realValue}${
             findAttribute(item, curr)?.detail?.dataType?.specs?.unit?.key ?? ''
           }`,
         };
@@ -111,40 +111,46 @@
         const { details } = record;
         if (!details) return;
         const deviceIdKeys = Object.keys(details);
-        const detailObject = deviceIdKeys.map((key) => ({ label: key, value: details[key] }));
         const dataFormat = await handleAlarmDetailFormat(deviceIdKeys);
-        const dataFormats = detailObject.reduce((acc: Recordable[], curr: Recordable) => {
-          let currentObj: Recordable = {};
-          dataFormat.forEach((item) => {
-            if (item.tbDeviceId === curr.label) {
-              const { triggerData, conditionData } = curr.value;
-              if (triggerData || conditionData) {
-                for (let currItem in curr.value) {
-                  const value = findValue(item, curr.value[currItem]);
-                  currentObj = {
-                    [item.name]: {
-                      [handleAlarmText(currItem)]: value,
-                    },
-                  };
-                  acc.push(currentObj);
-                }
-              } else {
-                const value = findValue(item, curr.value);
-                currentObj = {
-                  [item.name]: value,
-                };
-                acc.push(currentObj);
-              }
+        const mapDataFormat = deviceIdKeys.map((deviceKey: string) => {
+          const findDataFormat = dataFormat.find(
+            (dataItem: Recordable) => dataItem.tbDeviceId === deviceKey
+          );
+          const dataKeys = Object.keys(details[deviceKey]);
+          const data: any = dataKeys.map((dataItem: string) => {
+            if (dataItem !== 'triggerData' && dataItem !== 'conditionData') {
+              return findValue(findDataFormat, details[deviceKey]);
+            } else {
+              return {
+                [handleAlarmText(dataItem)]: findValue(
+                  findDataFormat,
+                  details[deviceKey][dataItem]
+                ),
+              };
             }
           });
-          return [...acc];
-        }, []);
+          const objectDataFormat = data.reduce((acc: Recordable, curr: Recordable) => {
+            return {
+              ...acc,
+              ...curr,
+            };
+          });
+          return {
+            [findDataFormat.name]: objectDataFormat,
+          };
+        });
+        const objectDataFormats = mapDataFormat.reduce((acc: Recordable, curr: Recordable) => {
+          return {
+            ...acc,
+            ...curr,
+          };
+        });
         Modal.info({
           title: '告警详情',
           width: 600,
           centered: true,
           maskClosable: true,
-          content: h(JsonPreview, { data: JSON.parse(JSON.stringify(dataFormats)), deep: 4 }),
+          content: h(JsonPreview, { data: JSON.parse(JSON.stringify(objectDataFormats)), deep: 4 }),
         });
       };
       const handleAlarmDetailFormat = async (keys: string[]) => {