From cb83164317988104f30f6df7cdce8caecfafbe15 Mon Sep 17 00:00:00 2001 From: sige Date: Fri, 24 May 2024 10:42:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E6=A1=86=E7=A1=AE=E8=AE=A4=E5=92=8C?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE=E4=B8=8D?= =?UTF-8?q?=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Setting/components/History.vue | 29 ++++++++++++++----- src/components/dialogs/ClearRecordByKeysModal.vue | 35 +++++------------------ 2 files changed, 29 insertions(+), 35 deletions(-) diff --git a/src/components/Setting/components/History.vue b/src/components/Setting/components/History.vue index 2553de3..636517a 100644 --- a/src/components/Setting/components/History.vue +++ b/src/components/Setting/components/History.vue @@ -111,7 +111,12 @@
返回
- + + @@ -121,19 +126,28 @@ import Down from '@/assets/img/arrow/down.png' import Top from '@/assets/img/arrow/top.png' import Right from '@/assets/img/arrow/right.png' import Left from '@/assets/img/arrow/left.png' -import ClearRecordByKeysModal from 'cpns/dialogs/ClearRecordByKeysModal' import { useHistoryStore, useWebSocketStore, useSettingStore } from '@/store' -import { getDetailInfoById, exportDisinfectionRecordByKeyListJSON } from '@/mock/command' +import { getDetailInfoById, exportDisinfectionRecordByKeyListJSON, getAllLocalHistoryData } from '@/mock/command' +import MyModal from 'cpns/MyModal.vue'; +/** @var {Object} */ +const webSocketStore = useWebSocketStore(); +// 选中的数据 +const checkedItems = ref([]) +/** @var {Boolean} */ +const clearRecordByKeysModalVisible = ref(false); + +// clear record by keys +async function actionClearRecordByKeysExecute() { + await webSocketStore.call('cleanDisinfectionRecord',{keys:checkedItems.value}); + webSocketStore.sendCommandMsg(getAllLocalHistoryData); +} const showDetailVisible = ref(false) const historyStore = useHistoryStore() -const webSocketStore = useWebSocketStore() const settingStore = useSettingStore() // 清除记录对话框 const clearRecordByKeys = ref(null) -// 选中的数据 -const checkedItems = ref([]) // 历史数据列表 const historyDataList = computed(() => { return historyStore.historyDataList.sort((a, b) => b.localeCompare(a)); @@ -149,7 +163,8 @@ function actionOperationExecute( action ) { settingStore.updateExportLoading(true) webSocketStore.sendCommandMsg(exportDisinfectionRecordByKeyListJSON(checkedItems.value)); } else if ( 'delete' === action ) { - clearRecordByKeys.value.showDialog(); + // clearRecordByKeys.value.showDialog(); + clearRecordByKeysModalVisible.value = true; } } diff --git a/src/components/dialogs/ClearRecordByKeysModal.vue b/src/components/dialogs/ClearRecordByKeysModal.vue index d6c12a3..2ee1e9c 100644 --- a/src/components/dialogs/ClearRecordByKeysModal.vue +++ b/src/components/dialogs/ClearRecordByKeysModal.vue @@ -1,32 +1,10 @@