diff options
| -rw-r--r-- | src/utils/static-data.js | 12 | ||||
| -rw-r--r-- | src/views/charts2/Panel.vue | 4 | ||||
| -rw-r--r-- | src/views/charts2/charts/dnsInsight/DnsTrafficLine.vue | 14 | ||||
| -rw-r--r-- | src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue | 2 | ||||
| -rw-r--r-- | src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue | 14 | ||||
| -rw-r--r-- | src/views/charts2/charts/npm/NpmTrafficLine.vue | 2 |
6 files changed, 34 insertions, 14 deletions
diff --git a/src/utils/static-data.js b/src/utils/static-data.js index 958625f4..894661af 100644 --- a/src/utils/static-data.js +++ b/src/utils/static-data.js @@ -80,15 +80,15 @@ export const dataForNetworkOverviewLine = { options2: [ { value: 'Average', - label: 'Average' + label: 'overall.average' }, { value: '95th Percentile', - label: '95th Percentile' + label: ['overall.percentileNumber', { number: 95 }] }, { value: 'Maximum', - label: 'Maximum' + label: 'overall.maximum' } ], tabsTemplate: [ @@ -200,15 +200,15 @@ export const dataForDnsTrafficLine = { options2: [ { value: 'Average', - label: 'Average' + label: 'overall.average' }, { value: '95th Percentile', - label: '95th Percentile' + label: ['overall.percentileNumber', { number: 95 }] }, { value: 'Maximum', - label: 'Maximum' + label: 'overall.maximum' } ], tabs: [ diff --git a/src/views/charts2/Panel.vue b/src/views/charts2/Panel.vue index 422de46c..b3df377b 100644 --- a/src/views/charts2/Panel.vue +++ b/src/views/charts2/Panel.vue @@ -1,7 +1,7 @@ <template> <div class="panel-box2" :class="{'panel-box2--entity-detail': entity && entity.entityType}"> <div class="panel__header" v-if="!entity"> - <div class="panel__title">{{panelName?panelName:(panel.i18n ? $t(panel.i18n) : panel.name)}} + <div class="panel__title">{{panelName ? panelName:(panel.i18n ? $t(panel.i18n) : panel.name)}} <div v-if="showScore" class="score"> <div class="circle-icon" v-if="score <= 2 || score === '-'" :class="{'data-score-red': score <= 2 || score === '-'}" ></div> <div class="circle-icon" v-else-if="score <= 4" :class="{'data-score-yellow': score <= 4}" ></div> @@ -31,7 +31,7 @@ @change="metricChange" > <template #prefix> - <span class="select-prefix">Metric:</span> + <span class="select-prefix">{{$t('detections.metric')}}:</span> </template> <el-option v-for="item in metricOptions" :key="item.value" :label="item.label" :value="item.value"></el-option> </el-select> diff --git a/src/views/charts2/charts/dnsInsight/DnsTrafficLine.vue b/src/views/charts2/charts/dnsInsight/DnsTrafficLine.vue index b21980f0..fe6da368 100644 --- a/src/views/charts2/charts/dnsInsight/DnsTrafficLine.vue +++ b/src/views/charts2/charts/dnsInsight/DnsTrafficLine.vue @@ -43,7 +43,7 @@ </div> </div>--> <div class="line-select-reference-line"> - <span>{{$t('network.referenceLine')}}:</span> + <span>{{$t('network.referenceLine')}} : </span> <div class="line-select__operation"> <el-select size="mini" @@ -54,7 +54,9 @@ :popper-append-to-body="false" @change="referenceSelectChange" > - <el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value"></el-option> + <el-option :key="options2[0].value" :label="$t(options2[0].label)" :value="options2[0].value"></el-option> + <el-option :key="options2[1].value" :label="$t(options2[1].label[0], options2[1].label[1])" :value="options2[1].value"></el-option> + <el-option :key="options2[2].value" :label="$t(options2[2].label)" :value="options2[2].value"></el-option> </el-select> </div> </div> @@ -255,6 +257,14 @@ export default { label: { formatter (params) { const arr = unitConvert(params.value, unitTypes.number).join('') + const referIndex = _this.options2.findIndex(o => o.value === _this.lineRefer) + if (referIndex > -1) { + if (referIndex === 1) { + return _this.$t(_this.options2[1].label[0], _this.options2[1].label[1]) + '(' + arr + echartsData[0].unitType + ')' + } else { + return _this.$t(_this.options2[referIndex].label) + '(' + arr + echartsData[0].unitType + ')' + } + } return _this.lineRefer + '(' + arr + echartsData[0].unitType + ')' }, position: 'insideStartTop', diff --git a/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue b/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue index ca9f3b8a..224273ed 100644 --- a/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue +++ b/src/views/charts2/charts/linkMonitor/LinkTrafficLine.vue @@ -37,7 +37,7 @@ </div> <div class="line-select line-header-right"> <div class="line-select-metric"> - <span>{{$t('network.metric')}}:</span> + <span>{{$t('detections.metric')}}:</span> <div class="line-select__operation"> <el-select size="mini" diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue index 9cf53792..fce9d764 100644 --- a/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue +++ b/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue @@ -32,7 +32,7 @@ </div> <div class="line-select line-header-right"> <div class="line-select-reference-line"> - <span>{{ $t('network.referenceLine') }}:</span> + <span>{{ $t('network.referenceLine') }} : </span> <div class="line-select__operation"> <el-select size="mini" @@ -43,7 +43,9 @@ :popper-append-to-body="false" @change="referenceSelectChange" > - <el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value"></el-option> + <el-option :key="options2[0].value" :label="$t(options2[0].label)" :value="options2[0].value"></el-option> + <el-option :key="options2[1].value" :label="$t(options2[1].label[0], options2[1].label[1])" :value="options2[1].value"></el-option> + <el-option :key="options2[2].value" :label="$t(options2[2].label)" :value="options2[2].value"></el-option> </el-select> </div> </div> @@ -274,6 +276,14 @@ export default { label: { formatter (params) { const arr = valueToRangeValue(params.value, unitTypes.number).join('') + const referIndex = _this.options2.findIndex(o => o.value === _this.lineRefer) + if (referIndex > -1) { + if (referIndex === 1) { + return _this.$t(_this.options2[1].label[0], _this.options2[1].label[1]) + '(' + arr + echartsData[0].unitType + ')' + } else { + return _this.$t(_this.options2[referIndex].label) + '(' + arr + echartsData[0].unitType + ')' + } + } return _this.lineRefer + '(' + arr + echartsData[0].unitType + ')' }, position: 'insideStartTop', diff --git a/src/views/charts2/charts/npm/NpmTrafficLine.vue b/src/views/charts2/charts/npm/NpmTrafficLine.vue index fbf93612..162c132f 100644 --- a/src/views/charts2/charts/npm/NpmTrafficLine.vue +++ b/src/views/charts2/charts/npm/NpmTrafficLine.vue @@ -3,7 +3,7 @@ <div class="npm-traffic-line-header"> <div class="npm-traffic-line-title"></div> <div class="line-select-metric"> - <span>{{$t('network.metric')}}:</span> + <span>{{$t('detections.metric')}}:</span> <div class="line-select__operation"> <el-select size="mini" |
