diff --git a/src/assets/css/components/views/charts2/linkTrafficLine.scss b/src/assets/css/components/views/charts2/linkTrafficLine.scss index ba183453..5989b1e9 100644 --- a/src/assets/css/components/views/charts2/linkTrafficLine.scss +++ b/src/assets/css/components/views/charts2/linkTrafficLine.scss @@ -14,6 +14,7 @@ display: flex; flex-direction: column; flex: 1; + position: relative; padding: 20px 20px 0 20px; border-right: 1px solid #E2E5EC; .link-traffic-list-center:nth-of-type(1) { diff --git a/src/views/charts2/Chart.vue b/src/views/charts2/Chart.vue index 4d8918bf..a75b7c44 100644 --- a/src/views/charts2/Chart.vue +++ b/src/views/charts2/Chart.vue @@ -238,7 +238,7 @@ export default { computed: { // 排除某些不需要loading的图表,例如npm-tabs disableLoading () { - const disableChartTypes = [typeMapping.npm.npmTabs] + const disableChartTypes = [typeMapping.npm.npmTabs, typeMapping.linkMonitor.linkTrafficLine] return disableChartTypes.indexOf(this.chart.type) > -1 } }, diff --git a/src/views/charts2/charts/dnsInsight/DnsActiveMaliciousDomain.vue b/src/views/charts2/charts/dnsInsight/DnsActiveMaliciousDomain.vue index 70669b41..a27b8bd6 100644 --- a/src/views/charts2/charts/dnsInsight/DnsActiveMaliciousDomain.vue +++ b/src/views/charts2/charts/dnsInsight/DnsActiveMaliciousDomain.vue @@ -120,7 +120,7 @@ export default { startTime: getSecond(this.timeFilter.startTime), endTime: getSecond(this.timeFilter.endTime) } - + this.toggleLoading(true) get(api.dnsInsight.activeMaliciousDomain, params).then(res => { if (res.code === 200) { const data = res.data.result diff --git a/src/views/charts2/charts/dnsInsight/DnsEventChart.vue b/src/views/charts2/charts/dnsInsight/DnsEventChart.vue index 25db80c3..8f5173bc 100644 --- a/src/views/charts2/charts/dnsInsight/DnsEventChart.vue +++ b/src/views/charts2/charts/dnsInsight/DnsEventChart.vue @@ -61,6 +61,7 @@ export default { startTime: getSecond(this.timeFilter.startTime), endTime: getSecond(this.timeFilter.endTime) } + this.toggleLoading(true) get(api.dnsInsight.eventChart, params).then(res => { const data = res.data.result this.pieData = [] diff --git a/src/views/charts2/charts/dnsInsight/DnsEventChartByBar.vue b/src/views/charts2/charts/dnsInsight/DnsEventChartByBar.vue index c9b832d5..d92efcc5 100644 --- a/src/views/charts2/charts/dnsInsight/DnsEventChartByBar.vue +++ b/src/views/charts2/charts/dnsInsight/DnsEventChartByBar.vue @@ -83,8 +83,10 @@ export default { } }, eventsByTypeData () { + this.toggleLoading(false) if (this.series.length > 0) { this.init() + this.toggleLoading(true) } }, resize () { diff --git a/src/views/charts2/charts/dnsInsight/DnsEventChartByPie.vue b/src/views/charts2/charts/dnsInsight/DnsEventChartByPie.vue index f8c467b2..4aca060b 100644 --- a/src/views/charts2/charts/dnsInsight/DnsEventChartByPie.vue +++ b/src/views/charts2/charts/dnsInsight/DnsEventChartByPie.vue @@ -128,9 +128,11 @@ export default { } }, eventsByTypeData () { + this.toggleLoading(false) if (this.pieData.length > 0) { this.chartData = this.pieData this.init() + this.toggleLoading(true) } }, resize () { diff --git a/src/views/charts2/charts/dnsInsight/DnsRecentEvents.vue b/src/views/charts2/charts/dnsInsight/DnsRecentEvents.vue index 6d78a5dd..1fd6ee9f 100644 --- a/src/views/charts2/charts/dnsInsight/DnsRecentEvents.vue +++ b/src/views/charts2/charts/dnsInsight/DnsRecentEvents.vue @@ -205,6 +205,7 @@ export default { type: this.tableType, severity: this.tableSeverity } + this.toggleLoading(true) get(api.dnsInsight.recentEvents, params).then(res => { if (res.code === 200) { if (!res.data.result || res.data.result.length === 0) { diff --git a/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue b/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue index 3daeaecd..3cd14bd6 100644 --- a/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue +++ b/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue @@ -27,12 +27,6 @@ export default { data () { return { } - }, - methods: { - - }, - mounted () { - this.toggleLoading(false) } } diff --git a/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownLine.vue b/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownLine.vue index 29a7fa57..efd8f74d 100644 --- a/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownLine.vue +++ b/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownLine.vue @@ -1,5 +1,6 @@