From 0fc7b528d47f2a981aa0e154d3c8d5bde088529b Mon Sep 17 00:00:00 2001 From: sjl <1716605279@qq.com> Date: Tue, 30 Dec 2025 10:02:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PreviewFile/index.vue | 1 + src/components/table/header/index.vue | 10 + src/layouts/admin/components/logo.vue | 6 +- .../admin/components/navBar/classic.vue | 8 +- src/utils/fileDownLoad.ts | 10 +- .../electricalEnergy/components1/online.vue | 3 +- .../pqs/supervise/electricalEnergy/index.vue | 2 +- .../supervise/technology/components/alarm.vue | 8 +- .../technology/components/earlyWarn.vue | 21 +- src/views/pqs/supervise/technology/detail.vue | 2 + .../components/sensitiveUserPopup.vue | 219 ++++++++++-------- .../components/terminainal/detail.vue | 4 +- .../analyse/eventwaveform/index.vue | 2 +- .../voltageSags/analyse/impactscope/index.vue | 4 +- 14 files changed, 186 insertions(+), 114 deletions(-) diff --git a/src/components/PreviewFile/index.vue b/src/components/PreviewFile/index.vue index 47d6e744..414467ce 100644 --- a/src/components/PreviewFile/index.vue +++ b/src/components/PreviewFile/index.vue @@ -41,6 +41,7 @@ if (VITE_FLAG) { xls: currentRoute.value.href?.split('?')[1].split('.')[1] == 'xls' ? true : false }) } else { + console.log('🚀 ~ urlKey:', urlKey) setTimeout(async () => { const previewUrl = await previewFile(currentRoute.value?.href?.split('?')[1]) url.value = previewUrl diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue index 75201ea0..4083d5d2 100644 --- a/src/components/table/header/index.vue +++ b/src/components/table/header/index.vue @@ -232,6 +232,16 @@ const onResetForm = () => { //时间重置成默认值 datePickerRef.value?.setTheDate(3) + if(props.showTimeAll){ + timeAll.value = false + delete tableStore.table.params.searchBeginTime + delete tableStore.table.params.searchEndTime + delete tableStore.table.params.startTime + delete tableStore.table.params.endTime + delete tableStore.table.params.timeFlag + delete tableStore.table.params.interval + } + if (props.datePicker && timeAll.value) { tableStore.table.params.searchBeginTime = datePickerRef.value.timeValue[0] tableStore.table.params.searchEndTime = datePickerRef.value.timeValue[1] diff --git a/src/layouts/admin/components/logo.vue b/src/layouts/admin/components/logo.vue index e83e3949..b3a110da 100644 --- a/src/layouts/admin/components/logo.vue +++ b/src/layouts/admin/components/logo.vue @@ -1,6 +1,6 @@