From 3ac62fc98cae893e80c820dfaa0df982c2ed4bad Mon Sep 17 00:00:00 2001 From: GGJ <357021191@qq.com> Date: Thu, 29 Aug 2024 15:58:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83=20=20=E6=9C=89=E5=8A=9F?= =?UTF-8?q?=E5=8A=9F=E7=8E=87=E8=B6=8B=E5=8A=BF=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/harmonic-boot/newEnergyAnalysis.ts | 18 + src/utils/request.ts | 4 +- .../components/timePopUpBox.vue | 18 +- .../LN/newEnergy/newEnergyAnalysis/index.vue | 360 +++++++++++------- 4 files changed, 251 insertions(+), 149 deletions(-) diff --git a/src/api/harmonic-boot/newEnergyAnalysis.ts b/src/api/harmonic-boot/newEnergyAnalysis.ts index 20365014..d44d4a46 100644 --- a/src/api/harmonic-boot/newEnergyAnalysis.ts +++ b/src/api/harmonic-boot/newEnergyAnalysis.ts @@ -24,3 +24,21 @@ export function getTargetByTime(data: any) { data: data }) } +// 导出报告参数 +export function exportExcelListTemplate(data: any) { + return request({ + url: '/harmonic-boot/powerStatistics/exportExcelListTemplate', + method: 'POST', + data: data, + responseType: 'blob' + }) +} +// 导出区间数据 +export function exportExcelRangTemplate(data: any) { + return request({ + url: '/harmonic-boot/powerStatistics/exportExcelRangTemplate', + method: 'POST', + data: data, + responseType: 'blob' + }) +} diff --git a/src/utils/request.ts b/src/utils/request.ts index a6fa5c30..a2ad59bf 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -107,7 +107,9 @@ function createAxios>( response.data.type === 'application/json' || Array.isArray(response.data) || response.data.size || - response.config.url == '/harmonic-boot/exportmodel/exportModelJB' + response.config.url == '/harmonic-boot/exportmodel/exportModelJB' || + response.config.url == '/harmonic-boot/powerStatistics/exportExcelListTemplate' || + response.config.url == '/harmonic-boot/powerStatistics/exportExcelRangTemplate' // || // response.data.type === 'application/octet-stream' || // response.data.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' diff --git a/src/views/LN/newEnergy/newEnergyAnalysis/components/timePopUpBox.vue b/src/views/LN/newEnergy/newEnergyAnalysis/components/timePopUpBox.vue index 5ca692e8..35599023 100644 --- a/src/views/LN/newEnergy/newEnergyAnalysis/components/timePopUpBox.vue +++ b/src/views/LN/newEnergy/newEnergyAnalysis/components/timePopUpBox.vue @@ -45,8 +45,9 @@ const popupEditRef = ref() const tableStore = new TableStore({ url: '/harmonic-boot/powerStatistics/getTargetByTime', method: 'POST', + showPage: false, column: [ - { title: '指标', field: 'name' }, + { title: '指标', field: 'anotherName' }, { title: '最小值', field: 'code', @@ -86,23 +87,12 @@ const tableStore = new TableStore({ ], beforeSearchFun: () => { tableStore.table.params.field = props.timePopUpBox.field - tableStore.table.params.lineId = props.timePopUpBox.lineId + tableStore.table.params.lineId = '6469e77fda42db12c7ca6620a092f03c' //props.timePopUpBox.lineId tableStore.table.params.searchBeginTime = props.timePopUpBox.time tableStore.table.params.searchEndTime = props.timePopUpBox.time tableStore.table.params.statisticalId = radio2.value }, - loadCallback: () => { - tableStore.table.data = [ - { name: '电压偏差(%)', num: 0.0 }, - { name: '谐波电压(%)', num: 0.0 }, - { name: '谐波电流(%)', num: 0.0 }, - { name: '三相电压不平衡度(%)', num: 0.0 }, - { name: '电压波动(%)', num: 0.0 }, - { name: '闪变(%)', num: 0.0 }, - { name: '间谐波电压含有率(%)', num: 0.0 }, - { name: '电流不平衡度', num: 0.0 } - ] - } + loadCallback: () => {} }) provide('tableStore', tableStore) diff --git a/src/views/LN/newEnergy/newEnergyAnalysis/index.vue b/src/views/LN/newEnergy/newEnergyAnalysis/index.vue index d147a525..d17c8b7f 100644 --- a/src/views/LN/newEnergy/newEnergyAnalysis/index.vue +++ b/src/views/LN/newEnergy/newEnergyAnalysis/index.vue @@ -10,44 +10,8 @@ - @@ -104,15 +68,22 @@ - +

有功率区间占比

+

功率区间稳态越限详情

- - + + - + @@ -226,13 +197,17 @@
报告参数 - 生成报表 + + 生成报表 +