'暂时存储'

@@ -2,7 +2,6 @@ import { formatToDateTime } from '/@/utils/dateUtil';
 import { FormSchema } from '/@/components/Form';
 import { FormSchema } from '/@/components/Form';
 import { BasicColumn } from '/@/components/Table';
 import { BasicColumn } from '/@/components/Table';
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
-import {} from '';
 
 
 export const columns: BasicColumn[] = [
 export const columns: BasicColumn[] = [
   {
   {
@@ -110,9 +109,7 @@ export const alarmSearchSchemas: FormSchema[] = [
     field: 'startTime',
     field: 'startTime',
     label: '      ',
     label: '      ',
     component: 'DatePicker',
     component: 'DatePicker',
-    componentProps: {
-      format: (value) => dayjs(value).valueOf(),
-    },
+    componentProps: {},
     colProps: { span: 6 },
     colProps: { span: 6 },
   },
   },
 ];
 ];
@@ -145,30 +142,6 @@ export const alarmColumns: BasicColumn[] = [
     width: 160,
     width: 160,
   },
   },
 ];
 ];
-const alarmLevel = (type: string): string => {
-  if (type === 'CRITICAL') {
-    return '危险';
-  } else if (type === 'MAJOR') {
-    return '重要';
-  } else if (type === 'MINOR') {
-    return '次要';
-  } else if (type === 'WARNING') {
-    return '警告';
-  } else {
-    return '不确定';
-  }
-};
-const statusType = (type: string): string => {
-  if (type === 'CLEARED_UNACK') {
-    return '清除未确认';
-  } else if (type === 'CLEARED_ACK') {
-    return '清除已确认';
-  } else if (type === 'ACTIVE_ACK') {
-    return '激活已确认';
-  } else {
-    return '激活未确认';
-  }
-};
 
 
 export const alarmSchemasForm: FormSchema[] = [
 export const alarmSchemasForm: FormSchema[] = [
   {
   {
@@ -277,3 +250,28 @@ export const childDeviceColumns: BasicColumn[] = [
     width: 160,
     width: 160,
   },
   },
 ];
 ];
+
+export const alarmLevel = (type: string): string => {
+  if (type === 'CRITICAL') {
+    return '危险';
+  } else if (type === 'MAJOR') {
+    return '重要';
+  } else if (type === 'MINOR') {
+    return '次要';
+  } else if (type === 'WARNING') {
+    return '警告';
+  } else {
+    return '不确定';
+  }
+};
+export const statusType = (type: string): string => {
+  if (type === 'CLEARED_UNACK') {
+    return '清除未确认';
+  } else if (type === 'CLEARED_ACK') {
+    return '清除已确认';
+  } else if (type === 'ACTIVE_ACK') {
+    return '激活已确认';
+  } else {
+    return '激活未确认';
+  }
+};

@@ -9,7 +9,7 @@
     <BasicForm @register="registerForm" />
     <BasicForm @register="registerForm" />
     <div class="flex justify-end">
     <div class="flex justify-end">
       <a-button type="primary" class="mr-4" @click="handleAlarm">处理</a-button>
       <a-button type="primary" class="mr-4" @click="handleAlarm">处理</a-button>
-      <a-button type="danger" @click="clearAlarm">清除</a-button>
+      <a-button danger type="primary" @click="clearAlarm">清除</a-button>
     </div>
     </div>
   </BasicModal>
   </BasicModal>
 </template>
 </template>
@@ -20,6 +20,7 @@
   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';
   export default defineComponent({
   export default defineComponent({
     name: 'AlarmDetailDrawer',
     name: 'AlarmDetailDrawer',
     components: {
     components: {
@@ -34,7 +35,11 @@
       const alarmId = ref('');
       const alarmId = ref('');
       const [registerModal, { closeModal }] = useModalInner(async (data) => {
       const [registerModal, { closeModal }] = useModalInner(async (data) => {
         await resetFields();
         await resetFields();
-        await setFieldsValue(data);
+        await setFieldsValue({
+          ...data,
+          severity: alarmLevel(data.severity),
+          status: statusType(data.status),
+        });
         alarmId.value = data.id;
         alarmId.value = data.id;
         console.log(data);
         console.log(data);
       });
       });