diff --git a/src/utils/unit-convert.js b/src/utils/unit-convert.js index 0009cdb1..b4c23557 100644 --- a/src/utils/unit-convert.js +++ b/src/utils/unit-convert.js @@ -140,8 +140,8 @@ export function getUnitType (column) { } /* 单位转换,返回转换后的[value, unit],type=time时若value<1ms,返回<1ms,type=percent时若value<0.01%,返回<0.01% */ -export function valueToRangeValue (value, unitType) { - const values = unitConvert(value, unitType) +export function valueToRangeValue (value, unitType,sourceUnit, targetUnit, dot) { + const values = unitConvert(value, unitType,sourceUnit, targetUnit, dot) if (values[0] === '-') { return values } diff --git a/src/views/charts2/charts/entityDetail/EntityDetailSubscriberTopApp.vue b/src/views/charts2/charts/entityDetail/EntityDetailSubscriberTopApp.vue index be441953..7cb422d8 100644 --- a/src/views/charts2/charts/entityDetail/EntityDetailSubscriberTopApp.vue +++ b/src/views/charts2/charts/entityDetail/EntityDetailSubscriberTopApp.vue @@ -22,12 +22,12 @@
{{appData.app}}
-
{{appData.up ? unitConvert(appData.up, unitTypes.byte,null,null,1).join('') : '-'}}
+
{{appData.up ? valueToRangeValue(appData.up, unitTypes.byte,null,null,1).join('') : '-'}}
-
{{appData.down ? unitConvert(appData.down, unitTypes.byte,null,null,1).join('') : '-'}}
+
{{appData.down ? valueToRangeValue(appData.down, unitTypes.byte,null,null,1).join('') : '-'}}
@@ -46,7 +46,7 @@ import { ref, shallowRef } from 'vue' import ChartNoData from '@/views/charts/charts/ChartNoData' import chartMixin from '@/views/charts2/chart-mixin' import ChartError from '@/components/common/Error' -import unitConvert from '@/utils/unit-convert' +import unitConvert,{valueToRangeValue} from '@/utils/unit-convert' import { unitTypes } from '@/utils/constants' import { overwriteUrl, urlParamsHandler, reverseSortBy } from '@/utils/tools' import axios from 'axios' @@ -144,6 +144,7 @@ export default { } ], unitConvert, + valueToRangeValue, unitTypes, isNoData: false, showError: false, @@ -420,6 +421,7 @@ export default { } // 检测时发现该方法占用较大内存,且未被释放 this.unitConvert = null + this.valueToRangeValue = null } } diff --git a/src/views/charts2/charts/options/echartOption.js b/src/views/charts2/charts/options/echartOption.js index dc5d1923..54447d43 100644 --- a/src/views/charts2/charts/options/echartOption.js +++ b/src/views/charts2/charts/options/echartOption.js @@ -739,7 +739,7 @@ export const entityDetailSubscriberTopApp = { show: true, trigger: 'axis', formatter: function (param) { - return `${param[0].name}: ${unitConvert(param[0].value[0], 'percent',null,null,1).join(' ')}` + return `${param[0].name}: ${valueToRangeValue(param[0].value[0], unitTypes.percent,null,null,1).join(' ')}` }, className: 'nz-chart-tooltip', extraCssText: 'box-shadow: 0 0 3px rgba(0, 0, 0, 0.3);max-width: 400px !important' @@ -792,7 +792,7 @@ export const entityDetailSubscriberTopApp = { position: 'right', valueAnimation: true, formatter: function (param, index, callback) { - return `${valueToRangeValue(param.value[0], unitTypes.percent).join(' ')}` + return `${valueToRangeValue(param.value[0], unitTypes.percent,null,null,1).join(' ')}` } } }]