From 931571cf9f01c18c06b53688eee11ee80ba668df Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Tue, 26 Mar 2024 00:08:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=9F=A5=E9=87=8D=E4=BB=BB=E5=8A=A1loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/content/Content.vue | 8 ++- .../content/modal/QueryRepeatedTasksModal.vue | 50 +++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 src/views/home/content/modal/QueryRepeatedTasksModal.vue diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue index 1574f02..665bc0b 100644 --- a/src/views/home/content/Content.vue +++ b/src/views/home/content/Content.vue @@ -18,6 +18,7 @@ import { computed, nextTick, onMounted, onUnmounted, onUpdated, reactive, ref, u import GeneratePackageModal from './modal/GeneratePackageModal.vue' import LoginSuccessModal from './modal/LoginSuccessModal.vue' import PackageSettingsModal from './modal/PackageSettingsModal.vue' +import QueryRepeatedTasksModal from './modal/QueryRepeatedTasksModal.vue' import type { PictureSortParam } from "/#/api" const deviceHeight = ref(600) @@ -33,6 +34,7 @@ const pagination = reactive({ const configStore = useConfig() const packageModalRef = ref(null) const generateModalRef = ref(null) +const queryRepeatedTasksModalRef = ref(null) const LoginSuccessModalRef = ref(null) const loading = ref(false) const message = useMessage() @@ -196,6 +198,7 @@ const gridHeight = computed(() => { async function oneCheck() { const asideVal = cloneDeep(configStore.getAsideValue) asideVal.izyear = dayjs(asideVal.izyear[0]).format("YYYY/MM/DD") + '-' + dayjs(asideVal.izyear[1]).format("YYYY/MM/DD") + const tasksLoadingModal = queryRepeatedTasksModalRef.value as any delete asideVal.izsimilarity if (checkDuplicateNo.value) { getCheckDuplicateStatus(checkDuplicateNo.value).then((res) => { @@ -213,14 +216,14 @@ async function oneCheck() { reset() loadMore() } else if (checkTaskStatus.value === 1) { - message.success("请等待,查重任务正在创建中..."); + tasksLoadingModal.showModal() return } } }) return } - message.success("请等待,查重任务正在创建中..."); + tasksLoadingModal.showModal() oneClickCheckTaskPackage(asideVal).then((res) => { if (res.code === "OK") { checkDuplicateNo.value = res.data.checkDuplicateNo @@ -458,6 +461,7 @@ function previewHandler(index: number, event: MouseEvent) { + diff --git a/src/views/home/content/modal/QueryRepeatedTasksModal.vue b/src/views/home/content/modal/QueryRepeatedTasksModal.vue new file mode 100644 index 0000000..f0f2a4a --- /dev/null +++ b/src/views/home/content/modal/QueryRepeatedTasksModal.vue @@ -0,0 +1,50 @@ + + + + + From 07622e3a5aa0258b1480945e08d626197eba5572 Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Tue, 26 Mar 2024 00:09:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E7=BB=84=E4=BB=B6=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/components.d.ts b/components.d.ts index 3b65693..06ebe68 100644 --- a/components.d.ts +++ b/components.d.ts @@ -21,8 +21,10 @@ declare module 'vue' { NDialogProvider: typeof import('naive-ui')['NDialogProvider'] NDivider: typeof import('naive-ui')['NDivider'] NDropdown: typeof import('naive-ui')['NDropdown'] + NEmpty: typeof import('naive-ui')['NEmpty'] NForm: typeof import('naive-ui')['NForm'] NFormItem: typeof import('naive-ui')['NFormItem'] + NGi: typeof import('naive-ui')['NGi'] NGrid: typeof import('naive-ui')['NGrid'] NGridItem: typeof import('naive-ui')['NGridItem'] NImage: typeof import('naive-ui')['NImage'] @@ -39,7 +41,11 @@ declare module 'vue' { NSpace: typeof import('naive-ui')['NSpace'] NSpin: typeof import('naive-ui')['NSpin'] NSwitch: typeof import('naive-ui')['NSwitch'] + NTabPane: typeof import('naive-ui')['NTabPane'] + NTabs: typeof import('naive-ui')['NTabs'] NTag: typeof import('naive-ui')['NTag'] + NTimeline: typeof import('naive-ui')['NTimeline'] + NTimelineItem: typeof import('naive-ui')['NTimelineItem'] NTooltip: typeof import('naive-ui')['NTooltip'] NUpload: typeof import('naive-ui')['NUpload'] NUploadDragger: typeof import('naive-ui')['NUploadDragger']