fix: 修复告警日志清除与处理逻辑

@@ -89,6 +89,8 @@ export interface AlarmLogItem {
   propagateRelationTypes?: any;
   propagateRelationTypes?: any;
   organizationId: string;
   organizationId: string;
   organizationName: string;
   organizationName: string;
+  cleared?: boolean;
+  acknowledged?: boolean;
 }
 }
 
 
 export interface Configuration {
 export interface Configuration {

@@ -133,7 +133,7 @@ export const alarmColumns: BasicColumn[] = [
     dataIndex: 'status',
     dataIndex: 'status',
     customRender({ record }: { record }) {
     customRender({ record }: { record }) {
       const flag = !!record.cleared;
       const flag = !!record.cleared;
-      return h(Tag, { color: flag ? 'red' : 'green' }, () => (flag ? '激活' : '清除'));
+      return h(Tag, { color: flag ? 'green' : 'red' }, () => (flag ? '清除' : '激活'));
     },
     },
     width: 90,
     width: 90,
   },
   },
@@ -253,3 +253,14 @@ export const alarmSchemasForm: FormSchema[] = [
     component: 'InputTextArea',
     component: 'InputTextArea',
   },
   },
 ];
 ];
+
+export function getAlarmStatus({
+  cleared,
+  acknowledged,
+}: Record<'cleared' | 'acknowledged', boolean>) {
+  const status = cleared ? '清除' : '激活';
+
+  const ackStatus = acknowledged ? '已确认' : '未确认';
+
+  return `${status}${ackStatus}`;
+}

@@ -9,24 +9,12 @@
       '清除已确认: 不需要做处理和清除',
       '清除已确认: 不需要做处理和清除',
     ] -->
     ] -->
       <Authority value="api:yt:alarm:single:handle">
       <Authority value="api:yt:alarm:single:handle">
-        <a-button
-          type="primary"
-          class="mr-4"
-          @click="handleAlarm"
-          v-if="alarmStatus !== AlarmStatus.ACTIVE_ACK && alarmStatus !== AlarmStatus.CLEARED_ACK"
-        >
+        <a-button type="primary" class="mr-4" @click="handleAlarm" v-if="!status.acknowledged">
           处理
           处理
         </a-button>
         </a-button>
       </Authority>
       </Authority>
       <Authority value="api:yt:alarm:single:clear">
       <Authority value="api:yt:alarm:single:clear">
-        <a-button
-          danger
-          type="primary"
-          @click="clearAlarm"
-          v-if="alarmStatus === AlarmStatus.ACTIVE_ACK"
-        >
-          清除
-        </a-button>
+        <a-button danger type="primary" @click="clearAlarm" v-if="!status.cleared"> 清除 </a-button>
       </Authority>
       </Authority>
     </div>
     </div>
   </BasicDrawer>
   </BasicDrawer>
@@ -35,12 +23,12 @@
 <script lang="ts">
 <script lang="ts">
   import { defineComponent, ref, unref } from 'vue';
   import { defineComponent, ref, unref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { alarmSchemasForm } from '../config/detail.config';
+  import { alarmSchemasForm, getAlarmStatus } from '../config/detail.config';
   import { clearOrAckAlarm } from '/@/api/device/deviceManager';
   import { clearOrAckAlarm } from '/@/api/device/deviceManager';
-  import { alarmLevel, statusType } from '/@/views/device/list/config/detail.config';
+  import { alarmLevel } from '/@/views/device/list/config/detail.config';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { AlarmStatus } from '/@/enums/alarmEnum';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
+  import { reactive } from 'vue';
   export default defineComponent({
   export default defineComponent({
     name: 'AlarmDetailDrawer',
     name: 'AlarmDetailDrawer',
     components: {
     components: {
@@ -58,18 +46,25 @@
         },
         },
       });
       });
       const alarmId = ref('');
       const alarmId = ref('');
-      const alarmStatus = ref('');
+
+      const status = reactive({
+        cleared: false,
+        acknowledged: false,
+      });
+
       const [registerDrawer, { closeDrawer }] = useDrawerInner(async (data) => {
       const [registerDrawer, { closeDrawer }] = useDrawerInner(async (data) => {
         await resetFields();
         await resetFields();
-        const { deviceAlias, deviceName, severity, status, details, id } = data || {};
+        const { deviceAlias, deviceName, severity, details, id, cleared, acknowledged } =
+          data || {};
+        Object.assign(status, { cleared, acknowledged });
         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 }),
           details: JSON.stringify(details),
           details: JSON.stringify(details),
         });
         });
-        alarmStatus.value = status;
+
         alarmId.value = id;
         alarmId.value = id;
       });
       });
       // 处理报警
       // 处理报警
@@ -85,12 +80,11 @@
         closeDrawer();
         closeDrawer();
       };
       };
       return {
       return {
+        status,
         registerDrawer,
         registerDrawer,
         registerForm,
         registerForm,
         clearAlarm,
         clearAlarm,
         handleAlarm,
         handleAlarm,
-        alarmStatus,
-        AlarmStatus,
       };
       };
     },
     },
   });
   });

@@ -109,6 +109,7 @@
     openDrawer(true, record);
     openDrawer(true, record);
   };
   };
   const handleSuccess = () => {
   const handleSuccess = () => {
+    clearSelectedRowKeys();
     reload();
     reload();
   };
   };
 
 
@@ -213,23 +214,14 @@
     const rowSelection = getRowSelection();
     const rowSelection = getRowSelection();
     const getRows: AlarmLogItem[] = getSelectRows();
     const getRows: AlarmLogItem[] = getSelectRows();
 
 
-    return (
-      !rowSelection.selectedRowKeys?.length ||
-      !getRows.every((item) => item.status === AlarmStatus.ACTIVE_ACK)
-    );
+    return !rowSelection.selectedRowKeys?.length || !getRows.every((item) => !item.cleared);
   });
   });
 
 
   const getCanBatchAck = computed(() => {
   const getCanBatchAck = computed(() => {
     const rowSelection = getRowSelection();
     const rowSelection = getRowSelection();
     const getRows: AlarmLogItem[] = getSelectRows();
     const getRows: AlarmLogItem[] = getSelectRows();
 
 
-    return (
-      !rowSelection.selectedRowKeys?.length ||
-      !getRows.every(
-        (item) =>
-          item.status === AlarmStatus.ACTIVE_UN_ACK || item.status === AlarmStatus.CLEARED_UN_ACK
-      )
-    );
+    return !rowSelection.selectedRowKeys?.length || !getRows.every((item) => !item.acknowledged);
   });
   });
 
 
   const { createMessage } = useMessage();
   const { createMessage } = useMessage();

@@ -235,7 +235,7 @@ export const alarmColumns: BasicColumn[] = [
   {
   {
     title: '状态',
     title: '状态',
     dataIndex: 'status',
     dataIndex: 'status',
-    format: (text) => statusType(text),
+    // format: (text) => statusType(text),
     width: 100,
     width: 100,
   },
   },
 ];
 ];
@@ -383,17 +383,6 @@ export const alarmLevel = (type: string): string => {
     return '不确定';
     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 '激活未确认';
-  }
-};
 
 
 export const customerForm: FormSchema[] = [
 export const customerForm: FormSchema[] = [
   {
   {