diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue index ae738728..fe78956a 100644 --- a/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue +++ b/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue @@ -59,7 +59,7 @@ -
+
@@ -199,7 +199,9 @@ export default { } }) this.mpackets = mpackets - this.echartsInit(this.mpackets, show) + this.$nextTick(() => { + this.echartsInit(this.mpackets, show) + }) } else if (t.type === 'packets' && val === 'Packets/s') { const mpackets = _.cloneDeep(this.mpackets) mpackets[0].analysis = t.totalPacketsRate.analysis @@ -226,7 +228,9 @@ export default { } }) this.mpackets = mpackets - this.echartsInit(this.mpackets, show) + this.$nextTick(() => { + this.echartsInit(this.mpackets, show) + }) } else if (t.type === 'sessions' && val === 'Sessions/s') { const mpackets = _.cloneDeep(this.mpackets) mpackets[0].analysis = t.totalSessionsRate.analysis @@ -241,11 +245,14 @@ export default { } }) this.mpackets = mpackets - this.echartsInit(this.mpackets, show) + this.$nextTick(() => { + this.echartsInit(this.mpackets, show) + }) } }) } }).catch(e => { + console.error(e) this.isNoData = true }).finally(() => { this.toggleLoading(false) @@ -254,7 +261,7 @@ export default { echartsInit (echartsData, show) { const _this = this echartsData = echartsData.filter(t => t.show === true) - const dom = document.getElementById('chart') + const dom = document.getElementById('overviewLineChart') if (!this.myChart) { this.myChart = echarts.init(dom) } diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewPerformanceEvent.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewPerformanceEvent.vue index fee60b29..4940828a 100644 --- a/src/views/charts2/charts/networkOverview/NetworkOverviewPerformanceEvent.vue +++ b/src/views/charts2/charts/networkOverview/NetworkOverviewPerformanceEvent.vue @@ -4,12 +4,12 @@
-
+
-
+
{{$t('network.dashboards')}} @@ -63,6 +63,8 @@ export default { if (res.data.result.length === 0) { this.isNoData = true return + } else { + this.isNoData = false } res.data.result = res.data.result.map(t => { if (t.eventSeverity === 'critical') { @@ -82,11 +84,7 @@ export default { index: t.index } }) - if (res.data.result.length <= 0) { - this.chartOption.legend.show = false - } else { - this.chartOption.legend.show = true - } + this.chartOption.legend.show = res.data.result.length > 0 this.chartOption.series[0].data = res.data.result.sort((a, b) => { return a.index - b.index }) this.myChart.setOption(this.chartOption) } else { diff --git a/src/views/charts2/charts/npm/NpmLine.vue b/src/views/charts2/charts/npm/NpmLine.vue index 2d128e86..aa3decc4 100644 --- a/src/views/charts2/charts/npm/NpmLine.vue +++ b/src/views/charts2/charts/npm/NpmLine.vue @@ -43,15 +43,14 @@