From 14916c59d9f4a51789f2fc532462e11344bbc24f Mon Sep 17 00:00:00 2001 From: geting <13585118195@163.com> Date: Mon, 4 Nov 2024 14:04:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/backend/statAnalysis/powerCurveAnalysis.vue | 5 +---- ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue | 2 +- .../src/views/backend/statAnalysis/trendComparison.vue | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue b/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue index f6260cc3..265434bd 100644 --- a/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue +++ b/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue @@ -141,7 +141,6 @@ const queryWindTurbines = () => { iotModelId: item.modelId, } }) - // console.log(statAnalysisSelectOptions.deviceId) } }) } @@ -229,7 +228,7 @@ const statAnalysisOperate = () => { attributes: ['iGenPower', 'iWindSpeed'], }, ], - interval: statAnalysisInterval.value, + interval: statAnalysisInterval.value || '5m', startTime: new Date(statAnalysisTime.value[0]).getTime(), endTime: new Date(statAnalysisTime.value[1]).getTime(), } @@ -239,7 +238,6 @@ const historyDataReq = (data: any) => { historyReq(data).then((res) => { if (res.code == 200) { const resData = res.data[statAnalysisDeviceId.value] - console.log(resData) if (resData) { const iGenPower = resData['iGenPower']['values'] const iWindSpeed = resData['iWindSpeed']['values'] @@ -251,7 +249,6 @@ const historyDataReq = (data: any) => { data: seriesData, } option.series.push(series) - console.log('🚀 ~ historyReq ~ option:', option) chart.value.setOption(option) } diff --git a/ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue b/ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue index c479354a..1a44d68a 100644 --- a/ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue +++ b/ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue @@ -364,7 +364,7 @@ const statAnalysisOperate = () => { attributes: [statAnalysisSelect.attributeCode], }, ], - interval: statAnalysisSelect.interval, + interval: statAnalysisSelect.interval || '5m', startTime: new Date(time[0]).getTime(), endTime: new Date(time[1]).getTime(), } diff --git a/ui/dasadmin/src/views/backend/statAnalysis/trendComparison.vue b/ui/dasadmin/src/views/backend/statAnalysis/trendComparison.vue index c263d2cd..76ad75bb 100644 --- a/ui/dasadmin/src/views/backend/statAnalysis/trendComparison.vue +++ b/ui/dasadmin/src/views/backend/statAnalysis/trendComparison.vue @@ -339,10 +339,11 @@ const statAnalysisOperate = () => { }, []) const requestData = { devices: devices, - interval: statAnalysisInterval.value, + interval: statAnalysisInterval.value || '5m', startTime: new Date(statAnalysisTime.value[0]).getTime(), endTime: new Date(statAnalysisTime.value[1]).getTime(), } + historyDataReq(requestData) } const calculate: any = reactive([{ max: '', min: '', average: '' }]) @@ -371,7 +372,6 @@ const historyDataReq = (data: any) => { show: true, trigger: 'axis', formatter: function (params: any) { - console.log(params) return params .map((item: any) => { return `${item.marker} ${item.seriesName} (${timestampToTime(xData[item.dataIndex])}): ${item.data}`