diff --git a/src/assets/css/components/views/charts2/networkOverviewDdosDetection.scss b/src/assets/css/components/views/charts2/networkOverviewDdosDetection.scss index 849c355d..836fe876 100644 --- a/src/assets/css/components/views/charts2/networkOverviewDdosDetection.scss +++ b/src/assets/css/components/views/charts2/networkOverviewDdosDetection.scss @@ -21,6 +21,9 @@ padding: 0 20px; display: flex; flex-direction: column; + .panel-chart__no-data { + height: calc(100% - 46px); + } .ddos-detection-type { display: flex; justify-content: space-between; diff --git a/src/assets/css/components/views/charts2/networkOverviewPerformanceEvent.scss b/src/assets/css/components/views/charts2/networkOverviewPerformanceEvent.scss index 001dd581..e0409c80 100644 --- a/src/assets/css/components/views/charts2/networkOverviewPerformanceEvent.scss +++ b/src/assets/css/components/views/charts2/networkOverviewPerformanceEvent.scss @@ -18,45 +18,44 @@ } .performance-event-value { width: 100%; - height: calc(100% - 36px); + height: calc(100% - 81px); + .performance-event-pie-hr { + height: 1px; + width: 310px; + margin: auto; + background: #E2E5EC; + } .performance-event-pie { - height: calc(100% - 47px); + height: 50%; width: 100%; .chart-drawing { - height: 50%; + height: 100%; width: 100%; } - .performance-event-pie-hr { - height: 1px; - width: 310px; - margin: auto; - background: #E2E5EC; - } - } - .pie-button.el-button { - width: 96px; - } - .el-button { - width: 117px; - min-height: 28px; - background: #FBFBFB; - border: 1px solid #C5C5C5; - box-shadow: 0 2px 4px 0 rgba(51,51,51,0.02); - border-radius: 4px; - padding: 8px 5px; - margin-left: 30px; - span { - font-size: 12px; - color: #575757; - font-weight: 500; - i { - transform: rotate(-90deg); - color: #575757; - font-size: 12px; - margin-left: 4px; - } - } } } - + .pie-button.el-button { + width: 96px; + } + .el-button { + width: 117px; + min-height: 28px; + background: #FBFBFB; + border: 1px solid #C5C5C5; + box-shadow: 0 2px 4px 0 rgba(51,51,51,0.02); + border-radius: 4px; + padding: 8px 5px; + margin-left: 30px; + span { + font-size: 12px; + color: #575757; + font-weight: 500; + i { + transform: rotate(-90deg); + color: #575757; + font-size: 12px; + margin-left: 4px; + } + } + } } diff --git a/src/views/charts2/charts/NetworkOverviewDdosDetection.vue b/src/views/charts2/charts/NetworkOverviewDdosDetection.vue index 22b39429..1b7c3dbe 100644 --- a/src/views/charts2/charts/NetworkOverviewDdosDetection.vue +++ b/src/views/charts2/charts/NetworkOverviewDdosDetection.vue @@ -2,7 +2,8 @@
{{$t('network.ddosDetection')}}
-
+ +
{{$t('network.numberOfAttacks')}}
{{$_.get(ddosData, 'attackerCount') || 0}}
@@ -25,14 +26,19 @@ import { api } from '@/utils/api' import { get } from '@/utils/http' import { getSecond } from '@/utils/date-util' +import ChartNoData from '@/views/charts/charts/ChartNoData' export default { name: 'NetworkOverviewDdosDetection', props: { timeFilter: Object }, + components: { + ChartNoData + }, data () { return { - ddosData: {} + ddosData: {}, + isNoData: false } }, methods: { @@ -43,6 +49,11 @@ export default { } get(api.netWorkOverview.ddosEventAnalysis, params).then(res => { if (res.code === 200) { + // res.data.result.length = 0 + if (res.data.result.length === 0) { + this.isNoData = true + return + } this.ddosData = res.data.result[0] } }) diff --git a/src/views/charts2/charts/NetworkOverviewLine.vue b/src/views/charts2/charts/NetworkOverviewLine.vue index 1b14bafd..0d53c6d4 100644 --- a/src/views/charts2/charts/NetworkOverviewLine.vue +++ b/src/views/charts2/charts/NetworkOverviewLine.vue @@ -1,60 +1,63 @@ @@ -69,12 +72,16 @@ import _ from 'lodash' import { get } from '@/utils/http' import { api } from '@/utils/api' import { getSecond } from '@/utils/date-util' +import ChartNoData from '@/views/charts/charts/ChartNoData' export default { name: 'NetworkOverviewLine', props: { chart: Object, timeFilter: Object }, + components: { + ChartNoData + }, setup () { return { myChart: shallowRef(null) @@ -132,7 +139,8 @@ export default { echartsType: 'Bits/s', echartsData: {}, dynamicVariable: '', - showMarkLine: true + showMarkLine: true, + isNoData: false } }, watch: { @@ -157,6 +165,11 @@ export default { } get(api.netWorkOverview.totalTrafficAnalysis, params).then((res) => { if (res.code === 200) { + // res.data.result.length = 0 + if (res.data.result.length === 0) { + this.isNoData = true + return + } res.data.result.forEach((t, i) => { if (t.type === 'bytes' && val === 'Bits/s') { this.mpackets[0].analysis = t.totalBitsRate.analysis diff --git a/src/views/charts2/charts/NetworkOverviewPerformanceEvent.vue b/src/views/charts2/charts/NetworkOverviewPerformanceEvent.vue index b82fe284..fcf640c7 100644 --- a/src/views/charts2/charts/NetworkOverviewPerformanceEvent.vue +++ b/src/views/charts2/charts/NetworkOverviewPerformanceEvent.vue @@ -3,12 +3,16 @@
{{$t('network.networkPerEvent')}}
-
-
-
+ +
+
+
+
+ +
- {{$t('network.dashboards')}}
+ {{$t('network.dashboards')}}
@@ -19,6 +23,7 @@ import { shallowRef } from 'vue' import { get } from '@/utils/http' import { api } from '@/utils/api' import { getSecond } from '@/utils/date-util' +import ChartNoData from '@/views/charts/charts/ChartNoData' export default { name: 'NetworkOverviewPerformanceEvent', setup () { @@ -30,9 +35,14 @@ export default { props: { timeFilter: Object }, + components: { + ChartNoData + }, data () { return { - timer: null + timer: null, + isNoData: false, + isNoData2: false } }, methods: { @@ -48,6 +58,11 @@ export default { this.chartOption = pieChartOption1 get(api.netWorkOverview.eventSeverity, params).then(res => { if (res.code === 200) { + // res.data.result.length = 0 + if (res.data.result.length === 0) { + this.isNoData = true + return + } res.data.result = res.data.result.map(t => { return { name: t.eventSeverity, @@ -69,6 +84,11 @@ export default { this.chartOption2 = pieChartOption2 get(api.netWorkOverview.eventType, params).then(res => { if (res.code === 200) { + // res.data.result.length = 0 + if (res.data.result.length === 0) { + this.isNoData2 = true + return + } res.data.result = res.data.result.map(t => { return { name: t.eventType, diff --git a/src/views/charts2/charts/NetworkOverviewTabs.vue b/src/views/charts2/charts/NetworkOverviewTabs.vue index 4fa01326..da3d6b79 100644 --- a/src/views/charts2/charts/NetworkOverviewTabs.vue +++ b/src/views/charts2/charts/NetworkOverviewTabs.vue @@ -66,7 +66,7 @@ -