Showing
1 changed file
with
7 additions
and
26 deletions
@@ -19,30 +19,12 @@ | @@ -19,30 +19,12 @@ | ||
19 | </Button> | 19 | </Button> |
20 | </template> | 20 | </template> |
21 | <template #toolbar> | 21 | <template #toolbar> |
22 | - <Tooltip> | ||
23 | - <template #title> | ||
24 | - <div>激活未确认: 可以处理,清除</div> | ||
25 | - <div>激活已确认: 只可清除,已经处理</div> | ||
26 | - <div>清除未确认: 只可处理,已经清除</div> | ||
27 | - <div>清除已确认: 不需要做处理和清除</div> | ||
28 | - </template> | ||
29 | - <Button @click="handleBatchClear" type="primary" :disabled="getCanBatchClear"> | ||
30 | - <QuestionCircleOutlined class="cursor-pointer" /> | ||
31 | - <span>批量清除</span> | ||
32 | - </Button> | ||
33 | - </Tooltip> | ||
34 | - <Tooltip> | ||
35 | - <template #title> | ||
36 | - <div>激活未确认: 可以处理,清除</div> | ||
37 | - <div>激活已确认: 只可清除,已经处理</div> | ||
38 | - <div>清除未确认: 只可处理,已经清除</div> | ||
39 | - <div>清除已确认: 不需要做处理和清除</div> | ||
40 | - </template> | ||
41 | - <Button @click="handleBatchAck" type="primary" :disabled="getCanBatchAck"> | ||
42 | - <QuestionCircleOutlined class="cursor-pointer" /> | ||
43 | - <span>批量处理</span> | ||
44 | - </Button> | ||
45 | - </Tooltip> | 22 | + <Button @click="handleBatchClear" type="primary" :disabled="getCanBatchClear"> |
23 | + <span>批量清除</span> | ||
24 | + </Button> | ||
25 | + <Button @click="handleBatchAck" type="primary" :disabled="getCanBatchAck"> | ||
26 | + <span>批量处理</span> | ||
27 | + </Button> | ||
46 | </template> | 28 | </template> |
47 | </BasicTable> | 29 | </BasicTable> |
48 | <AlarmDetailDrawer @register="registerDetailDrawer" @success="handleSuccess" /> | 30 | <AlarmDetailDrawer @register="registerDetailDrawer" @success="handleSuccess" /> |
@@ -55,7 +37,7 @@ | @@ -55,7 +37,7 @@ | ||
55 | import { doBatchAckAlarm, doBatchClearAlarm, getDeviceAlarm } from '/@/api/device/deviceManager'; | 37 | import { doBatchAckAlarm, doBatchClearAlarm, getDeviceAlarm } from '/@/api/device/deviceManager'; |
56 | import { useDrawer } from '/@/components/Drawer'; | 38 | import { useDrawer } from '/@/components/Drawer'; |
57 | import AlarmDetailDrawer from './cpns/AlarmDetailDrawer.vue'; | 39 | import AlarmDetailDrawer from './cpns/AlarmDetailDrawer.vue'; |
58 | - import { Modal, Button, Tooltip } from 'ant-design-vue'; | 40 | + import { Modal, Button } from 'ant-design-vue'; |
59 | import { JsonPreview } from '/@/components/CodeEditor'; | 41 | import { JsonPreview } from '/@/components/CodeEditor'; |
60 | import { getDeviceDetail } from '/@/api/device/deviceManager'; | 42 | import { getDeviceDetail } from '/@/api/device/deviceManager'; |
61 | import { getAttribute } from '/@/api/ruleengine/ruleengineApi'; | 43 | import { getAttribute } from '/@/api/ruleengine/ruleengineApi'; |
@@ -67,7 +49,6 @@ | @@ -67,7 +49,6 @@ | ||
67 | import { AlarmLogItem } from '/@/api/device/model/deviceConfigModel'; | 49 | import { AlarmLogItem } from '/@/api/device/model/deviceConfigModel'; |
68 | import { AlarmStatus } from '/@/enums/alarmEnum'; | 50 | import { AlarmStatus } from '/@/enums/alarmEnum'; |
69 | import { useMessage } from '/@/hooks/web/useMessage'; | 51 | import { useMessage } from '/@/hooks/web/useMessage'; |
70 | - import { QuestionCircleOutlined } from '@ant-design/icons-vue'; | ||
71 | 52 | ||
72 | const props = defineProps<{ | 53 | const props = defineProps<{ |
73 | deviceId?: string; | 54 | deviceId?: string; |