diff --git a/src/api/harmonic-boot/newEnergyAnalysis.ts b/src/api/harmonic-boot/newEnergyAnalysis.ts new file mode 100644 index 00000000..20365014 --- /dev/null +++ b/src/api/harmonic-boot/newEnergyAnalysis.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 根据监测点ID获取有功功率趋势 +export function getDataByLineId(data: any) { + return request({ + url: '/harmonic-boot/powerStatistics/getDataByLineId', + method: 'POST', + data: data + }) +} +// 根据监测点ID、有功功率趋势区间字段、时间获取该有功功率趋势下指标越限列表 +export function getTargetLimitById(data: any) { + return request({ + url: '/harmonic-boot/powerStatistics/getTargetLimitById', + method: 'POST', + data: data + }) +} +// 点击越限列表时间查询指标的详细数据 +export function getTargetByTime(data: any) { + return request({ + url: '/harmonic-boot/powerStatistics/getTargetByTime', + method: 'POST', + data: data + }) +} diff --git a/src/components/PreviewFile/index.vue b/src/components/PreviewFile/index.vue index d1884de0..7136b5f5 100644 --- a/src/components/PreviewFile/index.vue +++ b/src/components/PreviewFile/index.vue @@ -21,8 +21,8 @@ import VueOfficeExcel from '@vue-office/excel' import VueOfficePdf from '@vue-office/pdf' const { push, options, currentRoute } = useRouter() // const url = 'http://192.168.1.22:9009/excelreport' + currentRoute.value.href?.split('?')[1] -// http://192.168.1.22:9009/excelreport/onlineReport/%E7%94%B5%E8%83%BD%5B%E5%91%8A%5D2024%E5%B9%B41%E5%8F%B7-%E5%BC%A0%E5%AE%B6%E5%8F%A3%E5%9C%B0%E5%B8%82%20%E7%94%B5%E8%83%BD%E8%B4%A8%E9%87%8F%E6%8A%80%E6%9C%AF%E7%9B%91%E7%9D%A3%E5%91%8A%E8%AD%A6%E5%8D%95.docx?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minio%2F20240807%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20240807T021320Z&X-Amz-Expires=604800&X-Amz-SignedHeaders=host&X-Amz-Signature=0173318ad09fa6cc9067123b6997f423c692c820ef9e185ca7dda300e5f7853c -const url = '/api-docx/excelreport' + cuwrrentRoute.value.href?.split('?')[1] +const url = '/api-docx/excelreport' + currentRoute.value?.href?.split('?')[1] + onMounted(() => { console.log() }) diff --git a/src/views/LN/newEnergy/highAndLowPressure/index.vue b/src/views/LN/newEnergy/highAndLowPressure/index.vue index 742e93ee..03ebb3c9 100644 --- a/src/views/LN/newEnergy/highAndLowPressure/index.vue +++ b/src/views/LN/newEnergy/highAndLowPressure/index.vue @@ -214,12 +214,15 @@ const map = (res: any) => { } }, - data: res.map((item: any) => { - return { - ...item, - value: [item.lng, item.lat, item.lowPressure] - } - }), + data: + res.length == 0 + ? [] + : res.map((item: any) => { + return { + ...item, + value: [item.lng, item.lat, item.lowPressure || 0] + } + }), // data:[], barSize: 1, minHeight: 1, @@ -244,12 +247,15 @@ const map = (res: any) => { } }, - data: res.map((item: any) => { - return { - ...item, - value: [item.lng - 0.07, item.lat, item.highPressure] - } - }), + data: + res.length == 0 + ? [] + : res.map((item: any) => { + return { + ...item, + value: [item.lng - 0.07, item.lat, item.highPressure || 0] + } + }), // [ // { diff --git a/src/views/LN/newEnergy/newEnergyAnalysis/components/timePopUpBox.vue b/src/views/LN/newEnergy/newEnergyAnalysis/components/timePopUpBox.vue index 8d663776..5ca692e8 100644 --- a/src/views/LN/newEnergy/newEnergyAnalysis/components/timePopUpBox.vue +++ b/src/views/LN/newEnergy/newEnergyAnalysis/components/timePopUpBox.vue @@ -6,7 +6,7 @@ {{ props.timePopUpBox.num }} - + @@ -43,8 +43,8 @@ const props = withDefaults(defineProps(), { }) const popupEditRef = ref() const tableStore = new TableStore({ - url: '/user-boot/function/getRouteMenu', - method: 'GET', + url: '/harmonic-boot/powerStatistics/getTargetByTime', + method: 'POST', column: [ { title: '指标', field: 'name' }, { @@ -84,6 +84,13 @@ const tableStore = new TableStore({ ] } ], + beforeSearchFun: () => { + tableStore.table.params.field = props.timePopUpBox.field + tableStore.table.params.lineId = 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 }, diff --git a/src/views/LN/newEnergy/newEnergyAnalysis/index.vue b/src/views/LN/newEnergy/newEnergyAnalysis/index.vue index a227e653..d147a525 100644 --- a/src/views/LN/newEnergy/newEnergyAnalysis/index.vue +++ b/src/views/LN/newEnergy/newEnergyAnalysis/index.vue @@ -55,23 +55,23 @@
-

有功功率趋势分析

+

功率区间

- 图例:  - 稳态越限  + 稳态越限图例:  + 越限  合格
- + {{ item.quantity }} @@ -84,14 +84,14 @@
- + {{ item.quantity }} @@ -104,33 +104,115 @@
- +
-
+

功率区间稳态越限详情

+
- - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +