diff --git a/src/assets/css/components/views/charts2/networkOverviewTabs.scss b/src/assets/css/components/views/charts2/networkOverviewTabs.scss index 34d9ea22..efc343e8 100644 --- a/src/assets/css/components/views/charts2/networkOverviewTabs.scss +++ b/src/assets/css/components/views/charts2/networkOverviewTabs.scss @@ -52,6 +52,12 @@ display:flex; flex-direction:column; align-items: flex-start; + color: #778391; + font-weight: 400; + .data-column__span { + font-weight: bold; + color:#353636; + } .unit__span { color: #778391; font-weight: 400; diff --git a/src/utils/constants.js b/src/utils/constants.js index f437eae9..51a23026 100644 --- a/src/utils/constants.js +++ b/src/utils/constants.js @@ -247,18 +247,25 @@ export const networkOverviewTabs = [ export const metricOptions = [ { value: 'Bits/s', - label: 'Bits/s' + label: 'metric.bps' }, { value: 'Packets/s', - label: 'Packets/s' + label: 'metric.packets' }, { value: 'Sessions/s', - label: 'Sessions/s' + label: 'metric.sessions' } ] +export const metricType = { + Bits: 'Bits/s', + Packets: 'Packets/s', + Sessions: 'Sessions/s' + +} + export const operationType = { mainMenu: 0, // 菜单 secondMenu: 2, // 二级菜单 diff --git a/src/views/charts2/Panel.vue b/src/views/charts2/Panel.vue index b3df377b..f8ff9532 100644 --- a/src/views/charts2/Panel.vue +++ b/src/views/charts2/Panel.vue @@ -33,7 +33,7 @@ - +
- +
@@ -92,7 +92,7 @@ import chartMixin from '@/views/charts2/chart-mixin' import * as echarts from 'echarts' import { stackedLineChartOption } from '@/views/charts2/charts/options/echartOption' import unitConvert, { valueToRangeValue } from '@/utils/unit-convert' -import { unitTypes, chartColor3, chartColor4 } from '@/utils/constants.js' +import { unitTypes, chartColor3, chartColor4, metricType, metricOptions } from '@/utils/constants.js' import { ref, shallowRef } from 'vue' import { stackedLineTooltipFormatter } from '@/views/charts/charts/tools' import _ from 'lodash' @@ -104,7 +104,6 @@ import { useRoute } from 'vue-router' import { getLineType, getMarkLineByLineRefer, overwriteUrl, urlParamsHandler } from '@/utils/tools' import ChartError from '@/components/common/Error' import { dataForNetworkOverviewLine } from '@/utils/static-data' -import { metricOptions } from '@/utils/constants' export default { name: 'EntityDetailLine', @@ -542,7 +541,7 @@ export default { } } - if (val === 'Sessions/s') { + if (val === metricType.Sessions) { const tabs = _.cloneDeep(this.tabsTemplate) lineData.forEach((d, i) => { tabs[i].data = d.values @@ -552,7 +551,8 @@ export default { if (i !== 0) { e.show = false } - e.unitType = 'sessions/s' + const metric = metricOptions.find(item => item.value === metricType.Sessions) + e.unitType = metric ? this.$t(metric.label) : '' e.invertTab = false this.lineTab = 'total' this.legendSelectChange(e, 0) @@ -563,7 +563,11 @@ export default { this.echartsInit(this.tabs, true) }) } else { - const unit = val === 'Bits/s' ? 'bps' : 'packets/s' + let metric = metricOptions.find(item => item.value === val) + if (!metric) { + metric = metricOptions.find(item => item.value === metricType.Packets) + } + const unit = metric ? this.$t(metric.label) : '' this.legendInit(lineData, active, show, unit, n) } }, @@ -689,7 +693,7 @@ export default { this.chartOption = null const self = this self.timer = setTimeout(() => { - if (self.lineTab && self.metric !== 'Sessions/s') { + if (self.lineTab && self.metric !== metricType.Sessions) { const data = self.tabsTemplate.find(t => t.class === self.lineTab) self.activeChange(data, data.positioning) } else { diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue index ceec15b5..b56aae16 100644 --- a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue +++ b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue @@ -37,7 +37,7 @@
+0.00%
-
{{this.metric}}
+
{{$t(metricShow.label)}}
{{$t('network.total')}}
{{valueToRangeValue(app.total, unitTypes.byte).join(' ')}}
@@ -122,7 +122,7 @@