From 209d2cf4d53717dbcdae33951c453e9b4ac86c81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E5=87=AF?= <2448379534@qq.com> Date: Wed, 2 Sep 2026 10:42:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=8F=9C=E5=8D=95=E6=94=B9=E5=90=8D=EF=BC=8Ctabs?= =?UTF-8?q?=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Approval/ApprovalSearch.vue | 0 .../Approval/index.vue | 13 +++- .../components/monitorData/Export/index.vue | 26 ++++++-- .../conventionalHydropower.vue | 32 ---------- .../DataQueryMenuModule/monitoringDevices.vue | 60 +++++++++++++++++++ 5 files changed, 90 insertions(+), 41 deletions(-) rename frontend/src/views/{DataQueryMenuModule/components/conventionalHydropower => }/Approval/ApprovalSearch.vue (100%) rename frontend/src/views/{DataQueryMenuModule/components/conventionalHydropower => }/Approval/index.vue (97%) create mode 100644 frontend/src/views/DataQueryMenuModule/monitoringDevices.vue diff --git a/frontend/src/views/DataQueryMenuModule/components/conventionalHydropower/Approval/ApprovalSearch.vue b/frontend/src/views/Approval/ApprovalSearch.vue similarity index 100% rename from frontend/src/views/DataQueryMenuModule/components/conventionalHydropower/Approval/ApprovalSearch.vue rename to frontend/src/views/Approval/ApprovalSearch.vue diff --git a/frontend/src/views/DataQueryMenuModule/components/conventionalHydropower/Approval/index.vue b/frontend/src/views/Approval/index.vue similarity index 97% rename from frontend/src/views/DataQueryMenuModule/components/conventionalHydropower/Approval/index.vue rename to frontend/src/views/Approval/index.vue index 392ce217..23df81a1 100644 --- a/frontend/src/views/DataQueryMenuModule/components/conventionalHydropower/Approval/index.vue +++ b/frontend/src/views/Approval/index.vue @@ -1,5 +1,5 @@ @@ -361,7 +365,7 @@ const loadStationOptions = async (rvcds?: string[]) => { const initDone = ref(false); watch( () => JidiSelectEventStore.jidiData, - (val) => { + val => { if (initDone.value) return; const data = (val || []).filter((item: any) => item.wbsCode !== 'all'); if (data.length === 0) return; @@ -403,6 +407,12 @@ const loadLyOptions = async () => { lyLoading.value = false; } }; +const dataOptions = ref([ + { itemCode: 'month', dictName: '月度报表' }, + { itemCode: 'year', dictName: '年度报表' }, + { itemCode: 'day', dictName: '日度报表' }, + { itemCode: 'hour', dictName: '小时报表' } +]); const getExstatus = async (taskId, exportParams) => { let res1: any = await qgcExportstatus({ taskId: taskId }); if (res1.status == 'PROCESSING') { @@ -410,12 +420,16 @@ const getExstatus = async (taskId, exportParams) => { getExstatus(taskId, exportParams); }, 5000); } else if (res1.status == 'DONE') { - const blob = await qgcExportdownload({ taskId: taskId, ...exportParams }); + const blob: any = await qgcExportdownload({ + taskId: taskId, + ...exportParams + }); // 触发浏览器下载 const url = window.URL.createObjectURL(blob); const a = document.createElement('a'); a.href = url; - a.download = `export_${taskId}.zip`; + const matched = dataOptions.value.find((item:any) => item.itemCode == formData.timeDimension); + a.download =`${matched.dictName}.zip`; a.click(); window.URL.revokeObjectURL(url); exportLoading.value = false; @@ -474,7 +488,7 @@ const handleExport = async () => { } catch (e) { message.error('导出失败'); } finally { - exportLoading.value = false; + // exportLoading.value = false; } }; const dataFieldOption = ref([]); diff --git a/frontend/src/views/DataQueryMenuModule/conventionalHydropower.vue b/frontend/src/views/DataQueryMenuModule/conventionalHydropower.vue index 55acd99a..5a9941c5 100644 --- a/frontend/src/views/DataQueryMenuModule/conventionalHydropower.vue +++ b/frontend/src/views/DataQueryMenuModule/conventionalHydropower.vue @@ -11,12 +11,6 @@ - - - - - - @@ -26,9 +20,6 @@ - - - @@ -41,27 +32,12 @@ - - - - - - - - - - - - - - - @@ -69,23 +45,15 @@ import BasicData from './components/conventionalHydropower/BasicData/index.vue'; import shuiWenJianCe from './components/conventionalHydropower/shuiWenJianCe/index.vue'; import shuiZhiJianCe from './components/conventionalHydropower/shuiZhiJianCe/index.vue'; -import shengTaiLiuLiang from './components/conventionalHydropower/shengTaiLiuLiang/index.vue'; -import tempMit from './components/conventionalHydropower/tempMit/index.vue'; import qiXiDi from './components/conventionalHydropower/qiXiDi/index.vue'; import zhenXIZhiWuYuan from './components/conventionalHydropower/zhenXIZhiWuYuan/index.vue'; import rescueStation from './components/conventionalHydropower/rescueStation/index.vue'; -import guoYuSheShi from './components/conventionalHydropower/guoYuSheShi/index.vue'; import shuiShengShengTaiDiaoCha from './components/conventionalHydropower/shuiShengShengTaiDiaoCha/index.vue'; import aquaEco from './components/conventionalHydropower/aquaEco/index.vue'; import luShengShengTaiDiaoCha from './components/conventionalHydropower/luShengShengTaiDiaoCha/index.vue'; import terrEco from './components/conventionalHydropower/terrEco/index.vue'; -import shiPinJianKong from './components/conventionalHydropower/shiPinJianKong/index.vue'; import FishResource from './components/conventionalHydropower/FishResource/index.vue'; import zengZhiFangLiu from './components/conventionalHydropower/zengZhiFangLiu/index.vue'; -import sonarCam from './components/conventionalHydropower/sonarCam/index.vue'; -import fishSurvey from './components/conventionalHydropower/fishSurvey/index.vue'; -import aiBox from './components/conventionalHydropower/aiBox/index.vue'; -import Approval from './components/conventionalHydropower/Approval/index.vue'; import { ref } from 'vue'; const activeTab = ref('BasicData'); diff --git a/frontend/src/views/DataQueryMenuModule/monitoringDevices.vue b/frontend/src/views/DataQueryMenuModule/monitoringDevices.vue new file mode 100644 index 00000000..81a84378 --- /dev/null +++ b/frontend/src/views/DataQueryMenuModule/monitoringDevices.vue @@ -0,0 +1,60 @@ + + + +