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

Perf/alarm log status

See merge request yunteng/thingskit-front!1341

@@ -32,7 +32,8 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { alarmSchemasForm } from '../../config/detail.config';
   import { alarmSchemasForm } from '../../config/detail.config';
   import { clearOrAckAlarm } from '/@/api/device/deviceManager';
   import { clearOrAckAlarm } from '/@/api/device/deviceManager';
-  import { alarmLevel, statusType } from '../../config/detail.config';
+  import { alarmLevel } from '../../config/detail.config';
+  import { getAlarmStatus } from '/@/views/alarm/log/config/detail.config';
   export default defineComponent({
   export default defineComponent({
     name: 'AlarmDetailModal',
     name: 'AlarmDetailModal',
     components: {
     components: {
@@ -52,12 +53,12 @@
       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 || {};
+        const { deviceAlias, deviceName, severity, status, id, cleared, acknowledged } = data || {};
         await setFieldsValue({
         await setFieldsValue({
           ...data,
           ...data,
           deviceName: deviceAlias || deviceName,
           deviceName: deviceAlias || deviceName,
           severity: alarmLevel(severity),
           severity: alarmLevel(severity),
-          status: statusType(status),
+          status: getAlarmStatus({ cleared, acknowledged }),
         });
         });
         alarmId.value = id;
         alarmId.value = id;
         alarmStatus.value = status;
         alarmStatus.value = status;