diff --git a/src/assets/css/components/views/entityExplorer/entityList/detail-overview.scss b/src/assets/css/components/views/entityExplorer/entityList/detail-overview.scss index b3e683ae..95bb4b9b 100644 --- a/src/assets/css/components/views/entityExplorer/entityList/detail-overview.scss +++ b/src/assets/css/components/views/entityExplorer/entityList/detail-overview.scss @@ -98,7 +98,7 @@ } .row__content { display: flex; - color: #3976CB; + color: #046ECA; word-wrap: break-word; max-width: 30%; diff --git a/src/utils/unit-convert.js b/src/utils/unit-convert.js index c949b5cf..2fd3e349 100644 --- a/src/utils/unit-convert.js +++ b/src/utils/unit-convert.js @@ -141,7 +141,7 @@ 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(Number(value), unitType) + const values = unitConvert(_.isString(value) ? Number(value) : value, unitType) if (values[0] || values[0] === 0) { switch (unitType) { case unitTypes.time: { @@ -168,6 +168,12 @@ export function valueToRangeValue (value, unitType) { } break } + case unitTypes.number: { + if (values[0] < 0.01) { + return ['<0.01', ''] + } + break + } default: break } } diff --git a/src/views/charts/charts/tools.js b/src/views/charts/charts/tools.js index 92201863..49c3f800 100644 --- a/src/views/charts/charts/tools.js +++ b/src/views/charts/charts/tools.js @@ -485,7 +485,7 @@ export function stackedLineTooltipFormatter (params) { str += '
' params.forEach((item, i) => { str += ` - ${unitConvert(item.data[1], item.value[2]).join(' ')} + ${valueToRangeValue(item.data[1], item.value[2]).join(' ')} ` }) str += '
' @@ -510,7 +510,7 @@ export function appStackedLineTooltipFormatter (params) { ` str += '' str += ` - ${unitConvert(item.data[1], item.value[2]).join(' ')} + ${valueToRangeValue(item.data[1], item.value[2]).join(' ')} ` str += '' }) diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue index d77c412f..f6ded490 100644 --- a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue +++ b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue @@ -21,7 +21,7 @@
-
{{unitConvert(app.rate, unitTypes.number).join(' ')}}
+
{{valueToRangeValue(app.rate, unitTypes.number).join(' ')}}
+{{unitConvert(app.value, unitTypes.percent).join('')}} @@ -39,8 +39,8 @@
Total
-
{{unitConvert(app.total, unitTypes.byte).join(' ')}}
-
{{unitConvert(app.total, unitTypes.number).join(' ')}}
+
{{valueToRangeValue(app.total, unitTypes.byte).join(' ')}}
+
{{valueToRangeValue(app.total, unitTypes.number).join(' ')}}
@@ -120,7 +120,7 @@ diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue index 72e4b40c..461d03d1 100644 --- a/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue +++ b/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue @@ -20,9 +20,9 @@
{{ $t(item.name) }}
- {{ unitConvert(item.analysis.avg, unitTypes.number)[0] }} + {{ valueToRangeValue(item.analysis.avg, unitTypes.number)[0] }} - {{ unitConvert(item.analysis.avg, unitTypes.number)[1] }} + {{ valueToRangeValue(item.analysis.avg, unitTypes.number)[1] }} {{ item.unitType }}
@@ -58,7 +58,7 @@ diff --git a/src/views/charts2/charts/npm/NpmNetworkQuantity.vue b/src/views/charts2/charts/npm/NpmNetworkQuantity.vue index 35438a04..9fdc244e 100644 --- a/src/views/charts2/charts/npm/NpmNetworkQuantity.vue +++ b/src/views/charts2/charts/npm/NpmNetworkQuantity.vue @@ -8,10 +8,10 @@
- {{ unitConvert(npm.Avg, unitTypes.time).join(' ') }} + {{ valueToRangeValue(npm.Avg, unitTypes.time).join(' ') }}
- {{unitConvert(npm.Avg, unitTypes.percent).join(' ')}} + {{valueToRangeValue(npm.Avg, unitTypes.percent).join(' ')}}
  @@ -36,17 +36,17 @@
- P95:{{ unitConvert(npm.P95, unitTypes.time).join(' ') }} + P95:{{ valueToRangeValue(npm.P95, unitTypes.time).join(' ') }} - P95:{{ unitConvert(npm.P95, unitTypes.percent).join(' ') }} + P95:{{ valueToRangeValue(npm.P95, unitTypes.percent).join(' ') }}
- P99:{{ unitConvert(npm.P99, unitTypes.time).join(' ') }} + P99:{{ valueToRangeValue(npm.P99, unitTypes.time).join(' ') }} - P99:{{ unitConvert(npm.P99, unitTypes.percent).join(' ') }} + P99:{{ valueToRangeValue(npm.P99, unitTypes.percent).join(' ') }}
@@ -63,7 +63,7 @@ import { getChainRatio, getQueryByFlag2, getQueryByType } from '@/utils/tools' import { useRoute } from 'vue-router' import { ref } from 'vue' import { unitTypes } from '@/utils/constants' -import unitConvert from '@/utils/unit-convert' +import unitConvert, { valueToRangeValue } from '@/utils/unit-convert' import axios from 'axios' import { dataForNpmNetworkQuantity } from '@/utils/static-data' export default { @@ -88,6 +88,7 @@ export default { return { unitTypes, unitConvert, + valueToRangeValue, npmNetworkName: dataForNpmNetworkQuantity.npmNetworkName, npmNetworkCycleData: [], npmNetworkLastCycleData: [], @@ -347,6 +348,7 @@ export default { clearTimeout(this.timer1) clearTimeout(this.timer2) 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 2d90c420..23193dc4 100644 --- a/src/views/charts2/charts/options/echartOption.js +++ b/src/views/charts2/charts/options/echartOption.js @@ -6,7 +6,7 @@ import { chartColor6, unitTypes } from '@/utils/constants' -import unitConvert from '@/utils/unit-convert' +import unitConvert, { valueToRangeValue } from '@/utils/unit-convert' import { axisFormatter } from '@/views/charts/charts/tools' import { xAxisTimeFormatter, xAxisTimeRich } from '@/utils/date-util' diff --git a/src/views/entityExplorer/entityList/Row.vue b/src/views/entityExplorer/entityList/Row.vue index 1f332332..c805fcb7 100644 --- a/src/views/entityExplorer/entityList/Row.vue +++ b/src/views/entityExplorer/entityList/Row.vue @@ -80,7 +80,7 @@ {{ $t('entities.sentThroughput') }} :   {{ - unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ') !=='- ' ? unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ') + 'ps' : '-' + valueToRangeValue(entityData.bytesSentRate, unitTypes.byte).join(' ') !=='- ' ? valueToRangeValue(entityData.bytesSentRate, unitTypes.byte).join(' ') + 'ps' : '-' }} @@ -110,7 +110,7 @@ {{ $t('entities.receivedThroughput') }} :   - {{ unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-' }} + {{ valueToRangeValue(entityData.bytesReceivedRate, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-' }}
diff --git a/src/views/entityExplorer/entityList/detailOverview/App.vue b/src/views/entityExplorer/entityList/detailOverview/App.vue index fc3cbcaa..85967016 100644 --- a/src/views/entityExplorer/entityList/detailOverview/App.vue +++ b/src/views/entityExplorer/entityList/detailOverview/App.vue @@ -31,13 +31,13 @@
{{$t('overall.peak')}}
- {{unitConvert(entityData.max, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.max, unitTypes.byte).join(' ') + '/s' : '-'}} + {{valueToRangeValue(entityData.max, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.max, unitTypes.byte).join(' ') + '/s' : '-'}}
{{$t('overall.mean')}}
- {{unitConvert(entityData.avg, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.avg, unitTypes.byte).join(' ') + '/s' : '-'}} + {{valueToRangeValue(entityData.avg, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.avg, unitTypes.byte).join(' ') + '/s' : '-'}}
@@ -45,7 +45,7 @@
{{$t('overall.sent')}}: - {{unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ') + 'ps' : '-'}} + {{valueToRangeValue(entityData.bytesSentRate, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesSentRate, unitTypes.byte).join(' ') + 'ps' : '-'}}
@@ -54,7 +54,7 @@
{{$t('overall.received')}}: - {{unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'}} + {{valueToRangeValue(entityData.bytesReceivedRate, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'}}
@@ -212,7 +212,7 @@ import { api } from '@/utils/api' import entityDetailMixin from './entityDetailMixin' import { unitTypes } from '@/utils/constants' -import unitConvert from '@/utils/unit-convert' +import { valueToRangeValue } from '@/utils/unit-convert' import Chart from '@/views/charts/Chart' import _ from 'lodash' import { get } from '@/utils/http' @@ -372,7 +372,7 @@ export default { entityCopy: { ..._.cloneDeep(props.entity) }, - unitConvert, + valueToRangeValue, entityData } } diff --git a/src/views/entityExplorer/entityList/detailOverview/Domain.vue b/src/views/entityExplorer/entityList/detailOverview/Domain.vue index 0a086854..6a89c475 100644 --- a/src/views/entityExplorer/entityList/detailOverview/Domain.vue +++ b/src/views/entityExplorer/entityList/detailOverview/Domain.vue @@ -39,13 +39,13 @@
{{$t('overall.peak')}}
- {{unitConvert(entityData.max, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.max, unitTypes.byte).join(' ') + '/s' : '-'}} + {{valueToRangeValue(entityData.max, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.max, unitTypes.byte).join(' ') + '/s' : '-'}}
-
{{$t('overall.mean')}}
+
{{$t('overall.average')}}
- {{unitConvert(entityData.avg, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.avg, unitTypes.byte).join(' ') + '/s' : '-'}} + {{valueToRangeValue(entityData.avg, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.avg, unitTypes.byte).join(' ') + '/s' : '-'}}
@@ -53,7 +53,7 @@
{{$t('overall.sent')}}: - {{unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ') + 'ps' : '-'}} + {{valueToRangeValue(entityData.bytesSentRate, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesSentRate, unitTypes.byte).join(' ') + 'ps' : '-'}}
@@ -62,7 +62,7 @@
{{$t('overall.received')}}: - {{unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'}} + {{valueToRangeValue(entityData.bytesReceivedRate, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'}}
@@ -216,7 +216,7 @@ import { api } from '@/utils/api' import entityDetailMixin from './entityDetailMixin' import { unitTypes } from '@/utils/constants' -import unitConvert from '@/utils/unit-convert' +import { valueToRangeValue } from '@/utils/unit-convert' import Chart from '@/views/charts/Chart' import _ from 'lodash' import { get } from '@/utils/http' @@ -397,7 +397,7 @@ export default { }, entityCopy, unitTypes, - unitConvert, + valueToRangeValue, entityData } } diff --git a/src/views/entityExplorer/entityList/detailOverview/Ip.vue b/src/views/entityExplorer/entityList/detailOverview/Ip.vue index 20f4f042..b374601a 100644 --- a/src/views/entityExplorer/entityList/detailOverview/Ip.vue +++ b/src/views/entityExplorer/entityList/detailOverview/Ip.vue @@ -44,7 +44,7 @@
{{$t('overall.dnsServerInfo.queryRate')}}
-
{{unitConvert(entityData.queryRate, unitTypes.byte).join(' ')}}ps
+
{{valueToRangeValue(entityData.queryRate, unitTypes.byte).join(' ')}}ps
@@ -62,21 +62,21 @@
{{$t('overall.peak')}}
- {{unitConvert(entityData.max, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.max, unitTypes.byte).join(' ') + '/s' : '-'}} + {{valueToRangeValue(entityData.max, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.max, unitTypes.byte).join(' ') + '/s' : '-'}}
-
{{$t('overall.mean')}}
+
{{$t('overall.average')}}
- {{unitConvert(entityData.avg, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.avg, unitTypes.byte).join(' ') + '/s' : '-'}} + {{valueToRangeValue(entityData.avg, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.avg, unitTypes.byte).join(' ') + '/s' : '-'}}
{{$t('overall.throughput')}}
-
{{$t('overall.sent')}}: - {{unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ') + 'ps' : '-'}} +
{{$t('overall.sent')}}: + {{valueToRangeValue(entityData.bytesSentRate, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesSentRate, unitTypes.byte).join(' ') + 'ps' : '-'}}
@@ -84,8 +84,8 @@
-
{{$t('overall.received')}}: - {{unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'}} +
{{$t('overall.received')}}: + {{valueToRangeValue(entityData.bytesReceivedRate, unitTypes.byte).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'}}
@@ -101,7 +101,7 @@
- Score:{{score}} + Score: {{score}}
@@ -240,7 +240,7 @@ import entityDetailMixin from './entityDetailMixin' import { api } from '@/utils/api' import { unitTypes } from '@/utils/constants' -import unitConvert from '@/utils/unit-convert' +import { valueToRangeValue } from '@/utils/unit-convert' import Chart from '@/views/charts/Chart' import _ from 'lodash' import { get } from '@/utils/http' @@ -468,7 +468,7 @@ export default { }, entityCopy, unitTypes, - unitConvert + valueToRangeValue } } } diff --git a/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js b/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js index f94d1a35..5aab867f 100644 --- a/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js +++ b/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js @@ -3,7 +3,6 @@ import { get } from '@/utils/http' import * as echarts from 'echarts' import { entityListLineOption } from '@/views/charts/charts/chart-options' import { riskLevelMapping, unitTypes } from '@/utils/constants' -import unitConvert from '@/utils/unit-convert' import { shallowRef, markRaw } from 'vue' import { metricOption } from '@/views/detections/options/detectionOptions' import { sortBy, reverseSortBy, computeScore } from '@/utils/tools' @@ -498,8 +497,7 @@ export default { }, setup () { return { - unitTypes, - unitConvert + unitTypes } }, mounted () { diff --git a/src/views/entityExplorer/entityList/entityListMixin.js b/src/views/entityExplorer/entityList/entityListMixin.js index 15839c6b..e663c50b 100644 --- a/src/views/entityExplorer/entityList/entityListMixin.js +++ b/src/views/entityExplorer/entityList/entityListMixin.js @@ -5,7 +5,7 @@ import * as echarts from 'echarts' import { entityListLineOption } from '@/views/charts/charts/chart-options' import { riskLevelMapping, unitTypes } from '@/utils/constants' import { getSecond } from '@/utils/date-util' -import unitConvert from '@/utils/unit-convert' +import { valueToRangeValue } from '@/utils/unit-convert' import { shallowRef } from 'vue' export default { @@ -20,7 +20,7 @@ export default { trafficUrl: '', chartOption: null, unitTypes, - unitConvert, + valueToRangeValue, echartsArray: [] } },