Merge branch 'ft' into 'main_dev'

feat: 设备告警，新增告警详情显示

See merge request yunteng/thingskit-front!823

@@ -169,12 +169,12 @@ export const alarmColumns: BasicColumn[] = [
   {
   {
     title: '告警时间',
     title: '告警时间',
     dataIndex: 'createdTime',
     dataIndex: 'createdTime',
-    width: 120,
+    width: 180,
   },
   },
   {
   {
     title: '告警设备',
     title: '告警设备',
     dataIndex: 'deviceName',
     dataIndex: 'deviceName',
-    width: 100,
+    width: 120,
   },
   },
   {
   {
     title: '告警场景',
     title: '告警场景',
@@ -184,14 +184,20 @@ export const alarmColumns: BasicColumn[] = [
   {
   {
     title: '告警级别',
     title: '告警级别',
     dataIndex: 'severity',
     dataIndex: 'severity',
-    width: 160,
+    width: 90,
     format: (text) => alarmLevel(text),
     format: (text) => alarmLevel(text),
   },
   },
   {
   {
+    title: '告警详情',
+    dataIndex: 'details',
+    slots: { customRender: 'details' },
+    width: 160,
+  },
+  {
     title: '状态',
     title: '状态',
     dataIndex: 'status',
     dataIndex: 'status',
     format: (text) => statusType(text),
     format: (text) => statusType(text),
-    width: 160,
+    width: 100,
   },
   },
 ];
 ];
 
 
@@ -263,14 +269,6 @@ export const alarmSchemasForm: FormSchema[] = [
       disabled: true,
       disabled: true,
     },
     },
   },
   },
-  {
-    field: 'details',
-    label: '详情',
-    component: 'InputTextArea',
-    componentProps: {
-      maxLength: 255,
-    },
-  },
 ];
 ];
 // 子设备
 // 子设备
 export const childDeviceSchemas: FormSchema[] = [
 export const childDeviceSchemas: FormSchema[] = [

@@ -54,10 +54,6 @@
         await resetFields();
         await resetFields();
         await setFieldsValue({
         await setFieldsValue({
           ...data,
           ...data,
-          details: JSON.stringify(data?.details?.data).slice(
-            1,
-            JSON.stringify(data?.details?.data).length - 1
-          ),
           severity: alarmLevel(data.severity),
           severity: alarmLevel(data.severity),
           status: statusType(data.status),
           status: statusType(data.status),
         });
         });

@@ -12,17 +12,31 @@
           ]"
           ]"
         />
         />
       </template>
       </template>
+      <template #details="{ record }">
+        <a-button type="link" class="ml-2" @click="handleViewAlarmDetails(record)">
+          查看告警详情
+        </a-button>
+      </template>
     </BasicTable>
     </BasicTable>
     <AlarmDetailModal @register="registerDetailModal" @success="handleSuccess" />
     <AlarmDetailModal @register="registerDetailModal" @success="handleSuccess" />
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent } from 'vue';
+  import { defineComponent, h, nextTick } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { alarmColumns, alarmSearchSchemas } from '../../config/detail.config';
   import { alarmColumns, alarmSearchSchemas } from '../../config/detail.config';
   import { getDeviceAlarm } from '/@/api/device/deviceManager';
   import { getDeviceAlarm } from '/@/api/device/deviceManager';
   import AlarmDetailModal from '../modal/AlarmDetailModal.vue';
   import AlarmDetailModal from '../modal/AlarmDetailModal.vue';
   import { useModal } from '/@/components/Modal';
   import { useModal } from '/@/components/Modal';
+  import { Modal } from 'ant-design-vue';
+  import { JsonPreview } from '/@/components/CodeEditor';
+  import { getDeviceDetail } from '/@/api/device/deviceManager';
+  import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
+  import {
+    operationNumber_OR_TIME,
+    operationString,
+    operationBoolean,
+  } from '/@/views/rule/linkedge/config/formatData';
   export default defineComponent({
   export default defineComponent({
     name: 'DeviceManagement',
     name: 'DeviceManagement',
     components: {
     components: {
@@ -66,11 +80,81 @@
       const handleSuccess = () => {
       const handleSuccess = () => {
         reload();
         reload();
       };
       };
+      const handleViewAlarmDetails = async (record: Recordable) => {
+        await nextTick();
+        const { details } = record;
+        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: any, curr: any) => {
+          dataFormat.forEach((item) => {
+            if (item.tbDeviceId === curr.label) {
+              const findName = item.attribute.find(
+                (item) => item.identifier === curr.value.key
+              )?.name;
+              const findLogin = [
+                ...operationNumber_OR_TIME,
+                ...operationString,
+                ...operationBoolean,
+              ].find((item) => item.value === curr.value.logic)?.symbol;
+              const value = {
+                ['触发属性']: findName,
+                ['触发条件']: `${findLogin}${curr.value.logicValue}`,
+                ['触发值']: curr.value.realValue,
+              };
+              const data = {
+                [item.name]: value,
+              };
+              acc.push(data);
+            }
+          });
+          return [...acc];
+        }, []);
+        const objectFormat = dataFormats.reduce((acc: any, curr: any) => {
+          return {
+            ...acc,
+            ...curr,
+          };
+        }, {});
+        Modal.info({
+          title: '告警详情',
+          width: 600,
+          centered: true,
+          maskClosable: true,
+          content: h(JsonPreview, { data: JSON.parse(JSON.stringify(objectFormat)) }),
+        });
+      };
+      const handleAlarmDetailFormat = async (keys: string[]) => {
+        const temp: any = [];
+        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);
+          temp.push(dataFormat);
+        }
+        return temp;
+      };
+      const handleDataFormat = (deviceDetail: any, attributes: any) => {
+        const { name, tbDeviceId } = deviceDetail;
+        const attribute = attributes.map((item) => ({
+          identifier: item.identifier,
+          name: item.name,
+        }));
+        return {
+          name,
+          tbDeviceId,
+          attribute,
+        };
+      };
       return {
       return {
         registerTable,
         registerTable,
         registerDetailModal,
         registerDetailModal,
         handleDetail,
         handleDetail,
         handleSuccess,
         handleSuccess,
+        handleViewAlarmDetails,
       };
       };
     },
     },
   });
   });

@@ -164,26 +164,26 @@ export const genActionData = (actionData) => {
 };
 };
 
 
 export const operationNumber_OR_TIME = [
 export const operationNumber_OR_TIME = [
-  { label: '等于', value: Number_Operation.EQUAL },
-  { label: '不等于', value: Number_Operation.NOT_EQUAL },
-  { label: '小于', value: Number_Operation.LESS },
-  { label: '小于等于', value: Number_Operation.LESS_OR_EQUAL },
-  { label: '大于', value: Number_Operation.GREATER },
-  { label: '大于等于', value: Number_Operation.GREATER_OR_EQUAL },
+  { label: '等于', value: Number_Operation.EQUAL, symbol: '=' },
+  { label: '不等于', value: Number_Operation.NOT_EQUAL, symbol: '!=' },
+  { label: '小于', value: Number_Operation.LESS, symbol: '<' },
+  { label: '小于等于', value: Number_Operation.LESS_OR_EQUAL, symbol: '<=' },
+  { label: '大于', value: Number_Operation.GREATER, symbol: '>' },
+  { label: '大于等于', value: Number_Operation.GREATER_OR_EQUAL, symbol: '>=' },
 ];
 ];
 
 
 export const operationString = [
 export const operationString = [
-  { label: '等于', value: String_Operation.EQUAL },
-  { label: '不等于', value: String_Operation.NOT_EQUAL },
-  { label: '开始于', value: String_Operation.BEGAN_IN },
-  { label: '结束于', value: String_Operation.END_IN },
-  { label: '包含', value: String_Operation.INCLUDE },
-  { label: '不包含', value: String_Operation.NOT_INCLUDE },
+  { label: '等于', value: String_Operation.EQUAL, symbol: '=' },
+  { label: '不等于', value: String_Operation.NOT_EQUAL, symbol: '!=' },
+  { label: '开始于', value: String_Operation.BEGAN_IN, symbol: '开始于' },
+  { label: '结束于', value: String_Operation.END_IN, symbol: '结束于' },
+  { label: '包含', value: String_Operation.INCLUDE, symbol: '包含' },
+  { label: '不包含', value: String_Operation.NOT_INCLUDE, symbol: '不包含' },
 ];
 ];
 
 
 export const operationBoolean = [
 export const operationBoolean = [
-  { label: '等于', value: Boolean_Operation.EQUAL },
-  { label: '不等于', value: Boolean_Operation.NOT_EQUAL },
+  { label: '等于', value: Boolean_Operation.EQUAL, symbol: '=' },
+  { label: '不等于', value: Boolean_Operation.NOT_EQUAL, symbol: '!=' },
 ];
 ];
 
 
 export const scheduleOptions = [
 export const scheduleOptions = [