Merge branch 'fix/DEFECT-1596' into 'main_dev'

fix: 修改告警记录别名显示和场景联动编辑回显问题

See merge request yunteng/thingskit-front!887

@@ -113,6 +113,10 @@ export const alarmColumns: BasicColumn[] = [
     title: '告警设备',
     title: '告警设备',
     dataIndex: 'deviceName',
     dataIndex: 'deviceName',
     width: 100,
     width: 100,
+    customRender: ({ record }) => {
+      const { deviceAlias, deviceName } = record || {};
+      return deviceAlias || deviceName;
+    },
   },
   },
   {
   {
     title: '告警场景',
     title: '告警场景',

@@ -46,14 +46,16 @@
       const alarmStatus = ref('');
       const alarmStatus = ref('');
       const [registerDrawer, { closeDrawer }] = useDrawerInner(async (data) => {
       const [registerDrawer, { closeDrawer }] = useDrawerInner(async (data) => {
         await resetFields();
         await resetFields();
+        const { deviceAlias, deviceName, severity, status, details, id } = data || {};
         await setFieldsValue({
         await setFieldsValue({
           ...data,
           ...data,
-          severity: alarmLevel(data.severity),
-          status: statusType(data.status),
-          details: JSON.stringify(data.details),
+          deviceName: deviceAlias || deviceName,
+          severity: alarmLevel(severity),
+          status: statusType(status),
+          details: JSON.stringify(details),
         });
         });
-        alarmStatus.value = data.status;
-        alarmId.value = data.id;
+        alarmStatus.value = status;
+        alarmId.value = id;
       });
       });
       // 处理报警
       // 处理报警
       const handleAlarm = async () => {
       const handleAlarm = async () => {

@@ -155,14 +155,14 @@
         return temp;
         return temp;
       };
       };
       const handleDataFormat = (deviceDetail: any, attributes: any) => {
       const handleDataFormat = (deviceDetail: any, attributes: any) => {
-        const { name, tbDeviceId } = deviceDetail;
+        const { name, tbDeviceId, alias } = deviceDetail;
         const attribute = attributes.map((item) => ({
         const attribute = attributes.map((item) => ({
           identifier: item.identifier,
           identifier: item.identifier,
           name: item.name,
           name: item.name,
           detail: item.detail,
           detail: item.detail,
         }));
         }));
         return {
         return {
-          name,
+          name: alias || name,
           tbDeviceId,
           tbDeviceId,
           attribute,
           attribute,
         };
         };

@@ -175,6 +175,10 @@ export const alarmColumns: BasicColumn[] = [
     title: '告警设备',
     title: '告警设备',
     dataIndex: 'deviceName',
     dataIndex: 'deviceName',
     width: 120,
     width: 120,
+    customRender: ({ record }) => {
+      const { deviceAlias, deviceName } = record || {};
+      return deviceAlias || deviceName;
+    },
   },
   },
   {
   {
     title: '告警场景',
     title: '告警场景',

@@ -52,13 +52,15 @@
       const alarmStatus = ref('');
       const alarmStatus = ref('');
       const [registerModal, { closeModal }] = useModalInner(async (data) => {
       const [registerModal, { closeModal }] = useModalInner(async (data) => {
         await resetFields();
         await resetFields();
+        const { deviceAlias, deviceName, severity, status, id } = data || {};
         await setFieldsValue({
         await setFieldsValue({
           ...data,
           ...data,
-          severity: alarmLevel(data.severity),
-          status: statusType(data.status),
+          deviceName: deviceAlias || deviceName,
+          severity: alarmLevel(severity),
+          status: statusType(status),
         });
         });
-        alarmId.value = data.id;
-        alarmStatus.value = data.status;
+        alarmId.value = id;
+        alarmStatus.value = status;
       });
       });
       // 处理报警
       // 处理报警
       const handleAlarm = async () => {
       const handleAlarm = async () => {

@@ -143,14 +143,14 @@
         return temp;
         return temp;
       };
       };
       const handleDataFormat = (deviceDetail: any, attributes: any) => {
       const handleDataFormat = (deviceDetail: any, attributes: any) => {
-        const { name, tbDeviceId } = deviceDetail;
+        const { name, alias, tbDeviceId } = deviceDetail;
         const attribute = attributes.map((item) => ({
         const attribute = attributes.map((item) => ({
           identifier: item.identifier,
           identifier: item.identifier,
           name: item.name,
           name: item.name,
           detail: item.detail,
           detail: item.detail,
         }));
         }));
         return {
         return {
-          name,
+          name: alias || name,
           tbDeviceId,
           tbDeviceId,
           attribute,
           attribute,
         };
         };

@@ -268,6 +268,7 @@
     //ft-add-2022-11-22
     //ft-add-2022-11-22
     const type = validate?.outTarget;
     const type = validate?.outTarget;
     if (type === 'DEVICE_OUT') {
     if (type === 'DEVICE_OUT') {
+      if (!validate.deviceType) return createMessage.error('请选择类型');
       if (!validate.deviceProfileId) return createMessage.error('请选择产品');
       if (!validate.deviceProfileId) return createMessage.error('请选择产品');
       if (validate.device == 'PART' && validate.deviceId == undefined)
       if (validate.device == 'PART' && validate.deviceId == undefined)
         return createMessage.error('请选择设备');
         return createMessage.error('请选择设备');