diff --git a/src/assets/css/components/views/charts2/linkTrafficSankey.scss b/src/assets/css/components/views/charts2/linkTrafficSankey.scss index b897fc32..838bf8e4 100644 --- a/src/assets/css/components/views/charts2/linkTrafficSankey.scss +++ b/src/assets/css/components/views/charts2/linkTrafficSankey.scss @@ -80,7 +80,7 @@ } .traffic-sankey__tooltip-left { .traffic-sankey__row-label { - margin-right: 5px; + margin-right: 20px; font-size: 12px; color: #575757; font-weight: 400; diff --git a/src/utils/api.js b/src/utils/api.js index d40943ea..f4bdeaf7 100644 --- a/src/utils/api.js +++ b/src/utils/api.js @@ -199,6 +199,8 @@ export const api = { }, linkMonitor: { links: '/interface/linkMonitor/links', + totalTrafficAnalysis: '/interface/link/overview/drilldown/totalTrafficAnalysis', + networkAnalysis: '/interface/link/overview/drilldown/networkAnalysis', linkTrafficDirection: '/interface/linkMonitor/linkTrafficDirection', quadrupleIngressAnalysis: '/interface/link/overview/quadrupleIngressAnalysis', // 入口 quadrupleEgressAnalysis: '/interface/link/overview/quadrupleEgressAnalysis' // 出口 diff --git a/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue b/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue index 0a041074..3daeaecd 100644 --- a/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue +++ b/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue @@ -1,9 +1,38 @@ diff --git a/src/views/charts2/charts/linkMonitor/LinkTrafficSankey.vue b/src/views/charts2/charts/linkMonitor/LinkTrafficSankey.vue index 5a18c7db..3d518e2a 100644 --- a/src/views/charts2/charts/linkMonitor/LinkTrafficSankey.vue +++ b/src/views/charts2/charts/linkMonitor/LinkTrafficSankey.vue @@ -48,8 +48,10 @@ export default { setup () { const { query } = useRoute() const tab = ref(query.tabIndex || 0) + const queryCondition = ref(query.queryCondition || '') return { tab, + queryCondition, myChart: shallowRef(null), myChart2: shallowRef(null) } @@ -88,6 +90,9 @@ export default { startTime: getSecond(this.timeFilter.startTime), endTime: getSecond(this.timeFilter.endTime) } + if (this.queryCondition) { + params.q = this.queryCondition + } let url = '' if (n == 0) { url = api.linkMonitor.quadrupleIngressAnalysis // 入口 @@ -268,30 +273,6 @@ export default { ` } - this.chartOption.series[0].levels = [ - { - depth: 0, - lineStyle: { - color: '#999' - } - }, { - depth: 1, - itemStyle: { - color: tab == 0 ? '#47D49C' : '' - }, - lineStyle: { - color: '#999' - } - }, { - depth: 2, - itemStyle: { - color: tab == 0 ? '' : '#47D49C' - }, - lineStyle: { - color: '#999' - } - } - ] this.chartOption.series[0].data = data this.chartOption.series[0].links = links if (tab == 0) { diff --git a/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownLine.vue b/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownLine.vue new file mode 100644 index 00000000..f603ddf6 --- /dev/null +++ b/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownLine.vue @@ -0,0 +1,413 @@ + + + diff --git a/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownList.vue b/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownList.vue new file mode 100644 index 00000000..3ec8fffc --- /dev/null +++ b/src/views/charts2/charts/linkMonitor/localComponents/LinkTrafficDrillDownList.vue @@ -0,0 +1,113 @@ + + + diff --git a/src/views/charts2/charts/options/echartOption.js b/src/views/charts2/charts/options/echartOption.js index e660fb0f..52fdb509 100644 --- a/src/views/charts2/charts/options/echartOption.js +++ b/src/views/charts2/charts/options/echartOption.js @@ -452,7 +452,11 @@ export const linksTrafficSankeyOption = { right: '7%', left: '3%', top: '0%', - bottom: '23%' + bottom: '23%', + label: { + color: 'rgba(0,0,0,0.7)', + fontSize: 12 + } // emphasis: { // focus: 'adjacency' // }