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

fix: 告警处理新增批量清除按钮 See merge request yunteng/thingskit-front!893

Merge branch 'fix/DEFECT-1604' into 'main_dev'
fix: 告警处理新增批量清除按钮 See merge request yunteng/thingskit-front!893
xp.Huang
2 parents c063a424 d5de4423
Showing 2 changed files with 75 additions and 4 deletions
src/api/device/deviceManager.ts
src/views/alarm/log/index.vue
--- a/src/api/device/deviceManager.ts
View file @685d608
+++ b/src/api/device/deviceManager.ts
View file @685d608
@@ -30,6 +30,8 @@ enum DeviceManagerApi {
   ALARM_BATCH_ACK = '/alarm/batch/ack',
+  ALARM_BATCH_CLEAR = '/alarm/batch/clear',
+
   DEVICE_CREDENTIALS = '/device/credentials',
   COMMAND_ISSUANCE = '/rpc',
@@ -358,3 +360,13 @@ export const doBatchAckAlarm = (ids: string[]) => {
     { joinPrefix: false }
   );
 };
+
+export const doBatchClearAlarm = (ids: string[]) => {
+  return defHttp.post(
+    {
+      url: DeviceManagerApi.ALARM_BATCH_CLEAR,
+      data: { alarmIds: ids },
+    },
+    { joinPrefix: false }
+  );
+};
--- a/src/views/alarm/log/index.vue
View file @685d608
+++ b/src/views/alarm/log/index.vue
View file @685d608
@@ -19,7 +19,30 @@
         </a-button>
       </template>
       <template #toolbar>
-        <Button @click="handleBatchAck" type="primary" :disabled="getCanBatchAck">批量处理</Button>
+        <Tooltip>
+          <template #title>
+            <div>激活未确认: 可以处理，清除</div>
+            <div>激活已确认: 只可清除，已经处理</div>
+            <div>清除未确认: 只可处理，已经清除</div>
+            <div>清除已确认: 不需要做处理和清除</div>
+          </template>
+          <Button @click="handleBatchClear" type="primary" :disabled="getCanBatchClear">
+            <QuestionCircleOutlined class="cursor-pointer" />
+            <span>批量清除</span>
+          </Button>
+        </Tooltip>
+        <Tooltip>
+          <template #title>
+            <div>激活未确认: 可以处理，清除</div>
+            <div>激活已确认: 只可清除，已经处理</div>
+            <div>清除未确认: 只可处理，已经清除</div>
+            <div>清除已确认: 不需要做处理和清除</div>
+          </template>
+          <Button @click="handleBatchAck" type="primary" :disabled="getCanBatchAck">
+            <QuestionCircleOutlined class="cursor-pointer" />
+            <span>批量处理</span>
+          </Button>
+        </Tooltip>
       </template>
     </BasicTable>
     <AlarmDetailDrawer @register="registerDetailDrawer" @success="handleSuccess" />
@@ -29,10 +52,10 @@
   import { defineComponent, nextTick, h, computed } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { alarmColumns, alarmSearchSchemas } from './config/detail.config';
-  import { doBatchAckAlarm, getDeviceAlarm } from '/@/api/device/deviceManager';
+  import { doBatchAckAlarm, doBatchClearAlarm, getDeviceAlarm } from '/@/api/device/deviceManager';
   import { useDrawer } from '/@/components/Drawer';
   import AlarmDetailDrawer from './cpns/AlarmDetailDrawer.vue';
-  import { Modal, Button } from 'ant-design-vue';
+  import { Modal, Button, Tooltip } from 'ant-design-vue';
   import { JsonPreview } from '/@/components/CodeEditor';
   import { getDeviceDetail } from '/@/api/device/deviceManager';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
@@ -44,6 +67,7 @@
   import { AlarmLogItem } from '/@/api/device/model/deviceConfigModel';
   import { AlarmStatus } from '/@/enums/alarmEnum';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { QuestionCircleOutlined } from '@ant-design/icons-vue';
   export default defineComponent({
     name: 'AlarmCenter',
@@ -52,6 +76,8 @@
       BasicTable,
       TableAction,
       AlarmDetailDrawer,
+      QuestionCircleOutlined,
+      Tooltip,
     },
     setup() {
@@ -60,6 +86,7 @@
           title: '告警记录列表',
           api: getDeviceAlarm,
           columns: alarmColumns,
+          rowKey: 'id',
           useSearchForm: true,
           formConfig: {
             labelWidth: 120,
@@ -168,9 +195,30 @@
         };
       };
+      const getCanBatchClear = computed(() => {
+        const rowSelection = getRowSelection();
+        const getRows: AlarmLogItem[] = getSelectRows();
+
+        return (
+          !rowSelection.selectedRowKeys?.length ||
+          getRows.some(
+            (item) =>
+              item.status === AlarmStatus.CLEARED_ACK || item.status === AlarmStatus.CLEARED_UN_ACK
+          )
+        );
+      });
+
       const getCanBatchAck = computed(() => {
         const rowSelection = getRowSelection();
-        return !rowSelection.selectedRowKeys?.length;
+        const getRows: AlarmLogItem[] = getSelectRows();
+
+        return (
+          !rowSelection.selectedRowKeys?.length ||
+          getRows.some(
+            (item) =>
+              item.status === AlarmStatus.CLEARED_ACK || item.status === AlarmStatus.ACTIVE_ACK
+          )
+        );
       });
       const { createMessage } = useMessage();
@@ -183,6 +231,15 @@
         reload();
       };
+      const handleBatchClear = async () => {
+        const ids = getSelectRows<AlarmLogItem>().map((item) => item.id);
+        if (!ids.length) return;
+        await doBatchClearAlarm(ids);
+        createMessage.success('操作成功');
+        clearSelectedRowKeys();
+        reload();
+      };
+
       return {
         registerTable,
         registerDetailDrawer,
@@ -190,7 +247,9 @@
         handleSuccess,
         handleViewAlarmDetails,
         handleBatchAck,
+        handleBatchClear,
         getCanBatchAck,
+        getCanBatchClear,
       };
     },
   });