diff --git a/neutrino-proxy-admin/src/views/home/admin/components/TrafficSumChart.vue b/neutrino-proxy-admin/src/views/home/admin/components/TrafficSumChart.vue index d4efbdc8..f73e6d68 100644 --- a/neutrino-proxy-admin/src/views/home/admin/components/TrafficSumChart.vue +++ b/neutrino-proxy-admin/src/views/home/admin/components/TrafficSumChart.vue @@ -50,7 +50,6 @@ export default { this.chartDom = document.getElementById(this.chartId) this.myChart = echarts.init(this.chartDom) const seriesList = [] - const legendList = [] this.data.list && this.data.list.forEach((item, index) => { seriesList.push({ name: item.name, @@ -74,7 +73,6 @@ export default { }, smooth: true }) - legendList.push(item.name) }) const option = { @@ -87,13 +85,13 @@ export default { formatter: (value) => { let title = this.data.text + '
' value.forEach(item => { - title = title + item.marker + item.seriesName + ' : ' + this.data.list[item.seriesIndex].label[item.dataIndex] + '
' + title = title + item.marker + item.seriesName + ' : ' + getSizeDescByByteCount(item.data) + '
' }) return title } }, legend: { - data: legendList, + data: this.data.legendList, left: 'right' }, grid: { diff --git a/neutrino-proxy-admin/src/views/home/admin/index.vue b/neutrino-proxy-admin/src/views/home/admin/index.vue index 1255f477..852a96d8 100644 --- a/neutrino-proxy-admin/src/views/home/admin/index.vue +++ b/neutrino-proxy-admin/src/views/home/admin/index.vue @@ -70,37 +70,19 @@ export default { }) }, getChartData(last7dFlow) { - const title = [] - const downFlowDesc = [] - const totalFlowDesc = [] - const upFlowDesc = [] - last7dFlow.dataList.forEach(item => { - title.push(item.dateStr) - totalFlowDesc.push(item.totalFlowDesc) - downFlowDesc.push(item.downFlowDesc) - upFlowDesc.push(item.upFlowDesc) - }) const list = [] last7dFlow.seriesList.forEach(item => { - let label = [] - if (item.seriesName.indexOf('上') > -1) { - label = upFlowDesc - } else if (item.seriesName.indexOf('下') > -1) { - label = downFlowDesc - } else if (item.seriesName.indexOf('总') > -1) { - label = totalFlowDesc - } list.push({ name: item.seriesName, - value: item.seriesData, - label: label + value: item.seriesData }) }) return { text: '流量监控', subtext: `最近${last7dFlow.dataList.length || 0}天流量监控`, - title: title, - list: list + title: last7dFlow.xDate, + list: list, + legendList: last7dFlow.legendData } } }