From ce133cf0aa1e80c98243675d46d2986e4f40c49c Mon Sep 17 00:00:00 2001 From: chenjinsong <523037378@qq.com> Date: Thu, 31 Mar 2022 14:49:32 +0800 Subject: [PATCH] =?UTF-8?q?CN-457=20fix:=20chart=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/charts/PanelChart.vue | 4 ++-- src/views/charts/charts/ChartMap.vue | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/views/charts/PanelChart.vue b/src/views/charts/PanelChart.vue index d0ec2020..47b4afb4 100644 --- a/src/views/charts/PanelChart.vue +++ b/src/views/charts/PanelChart.vue @@ -183,13 +183,13 @@ export default { this.queryTimeRange = { startTime: getSecond(this.chartTimeFilter.startTime), endTime: getSecond(this.chartTimeFilter.endTime) } } const chartParams = this.chartInfo.params - if (isAlarmInfo && JSON.stringify(extraParams) === '{}') { + if (this.isAlarmInfo && JSON.stringify(extraParams) === '{}') { extraParams = { pageNo: 1, pageSize: 9 } } - if (isDetectionService || isDetectionSecurity) { + if (this.isDetectionService || this.isDetectionSecurity) { extraParams = { pageNo: 1, pageSize: 6 diff --git a/src/views/charts/charts/ChartMap.vue b/src/views/charts/charts/ChartMap.vue index 6d85bf21..fdbb15c5 100644 --- a/src/views/charts/charts/ChartMap.vue +++ b/src/views/charts/charts/ChartMap.vue @@ -371,7 +371,7 @@ export default { border: this.circleColor[d.dnsServerRole.toUpperCase()].border }) }) */ - const seriesData = data.map(r => ({ + imageSeries.data = data.map(r => ({ ...this.convertMapData(r), id: r.ipLocationId, dnsServerRole: r.dnsServerRole, @@ -380,7 +380,6 @@ export default { color: this.circleColor[r.dnsServerRole.toUpperCase()].background, border: this.circleColor[r.dnsServerRole.toUpperCase()].border })) - imageSeries.data = seriesData } } catch (e) { console.error(e)