Commit 18cd2f62f4a56e06fc44a936a223eaf5dd948d67

Authored by ww
1 parent b65ba073

fix: 修复打包引入错误

@@ -32,7 +32,8 @@ @@ -32,7 +32,8 @@
32 import { BasicForm, useForm } from '/@/components/Form'; 32 import { BasicForm, useForm } from '/@/components/Form';
33 import { alarmSchemasForm } from '../../config/detail.config'; 33 import { alarmSchemasForm } from '../../config/detail.config';
34 import { clearOrAckAlarm } from '/@/api/device/deviceManager'; 34 import { clearOrAckAlarm } from '/@/api/device/deviceManager';
35 - import { alarmLevel, statusType } from '../../config/detail.config'; 35 + import { alarmLevel } from '../../config/detail.config';
  36 + import { getAlarmStatus } from '/@/views/alarm/log/config/detail.config';
36 export default defineComponent({ 37 export default defineComponent({
37 name: 'AlarmDetailModal', 38 name: 'AlarmDetailModal',
38 components: { 39 components: {
@@ -52,12 +53,12 @@ @@ -52,12 +53,12 @@
52 const alarmStatus = ref(''); 53 const alarmStatus = ref('');
53 const [registerModal, { closeModal }] = useModalInner(async (data) => { 54 const [registerModal, { closeModal }] = useModalInner(async (data) => {
54 await resetFields(); 55 await resetFields();
55 - const { deviceAlias, deviceName, severity, status, id } = data || {}; 56 + const { deviceAlias, deviceName, severity, status, id, cleared, acknowledged } = data || {};
56 await setFieldsValue({ 57 await setFieldsValue({
57 ...data, 58 ...data,
58 deviceName: deviceAlias || deviceName, 59 deviceName: deviceAlias || deviceName,
59 severity: alarmLevel(severity), 60 severity: alarmLevel(severity),
60 - status: statusType(status), 61 + status: getAlarmStatus({ cleared, acknowledged }),
61 }); 62 });
62 alarmId.value = id; 63 alarmId.value = id;
63 alarmStatus.value = status; 64 alarmStatus.value = status;