diff --git a/src/views/charts2/charts/entityDetail/tabs/BehaviorPattern.vue b/src/views/charts2/charts/entityDetail/tabs/BehaviorPattern.vue index 1b75e727..b86aa43a 100644 --- a/src/views/charts2/charts/entityDetail/tabs/BehaviorPattern.vue +++ b/src/views/charts2/charts/entityDetail/tabs/BehaviorPattern.vue @@ -8,8 +8,8 @@
{{data.name}}
-
{{ unitConvert(data.value, unitTypes.number).join('')}}
-
{{ unitConvert(data.percent, unitTypes.percent).join('') }}
+
{{ valueToRangeValue(data.value, unitTypes.number).join('')}}
+
{{ valueToRangeValue(data.percent, unitTypes.percent).join('') }}
@@ -25,7 +25,7 @@ import * as echarts from 'echarts' import { pieChartOption4 } from '@/views/charts2/charts/options/echartOption' import { shallowRef, ref } from 'vue' import { entityDetailTabsName, chartColorForBehaviorPattern, unitTypes } from '@/utils/constants' -import unitConvert from '@/utils/unit-convert' +import { valueToRangeValue } from '@/utils/unit-convert' import axios from 'axios' import { api } from '@/utils/api' import { useRoute } from 'vue-router' @@ -74,7 +74,7 @@ export default { }, 200) }, methods: { - unitConvert, + valueToRangeValue, toUpperCaseByString, dateFormatByAppearance, initEcharts () { @@ -149,22 +149,18 @@ export default { if (!this.isNoData) { const data = res.data.result this.tableData = [] - let sum = 0 if (data && data[0]) { const dataObject = data[0] Object.keys(dataObject).forEach(key => { const value = Number(dataObject[key]) ? Number(dataObject[key]) : 0 - if (value !== 0) { - sum = sum + value + if (value !== 0 && key !== 'total') { this.tableData.push({ name: key, - value: value + value: value, + percent: dataObject.total ? value / dataObject.total : '-' }) } }) - this.tableData.forEach(item => { - item.percent = item.value / sum - }) this.tableData = this.tableData.sort(reverseSortBy('value')) this.$emit('checkTag', entityDetailTabsName.behaviorPattern, this.tableData.length) if (this.tableData.length === 0) { diff --git a/src/views/entityExplorer/entityList/detailOverview/App.vue b/src/views/entityExplorer/entityList/detailOverview/App.vue index 183a7a72..1877644a 100644 --- a/src/views/entityExplorer/entityList/detailOverview/App.vue +++ b/src/views/entityExplorer/entityList/detailOverview/App.vue @@ -172,7 +172,7 @@
-
{{dateFormatByAppearance(security.startTime) || '-'}}
+
{{security.startTime ? dateFormatByAppearance(Number(security.startTime)) : '-'}}
{{security.eventSeverity}}
diff --git a/src/views/entityExplorer/entityList/detailOverview/Domain.vue b/src/views/entityExplorer/entityList/detailOverview/Domain.vue index 6e1c37f3..2d1e011d 100644 --- a/src/views/entityExplorer/entityList/detailOverview/Domain.vue +++ b/src/views/entityExplorer/entityList/detailOverview/Domain.vue @@ -149,7 +149,7 @@
{{entityData.performanceNum}}
-
{{dateFormatByAppearance(performance.startTime) || '-'}}
+
{{performance.startTime ? dateFormatByAppearance(Number(performance.startTime)) : '-'}}
{{performance.eventSeverity}}
@@ -176,7 +176,7 @@
-
{{dateFormatByAppearance(getMillisecond(security.startTime)) || '-'}}
+
{{security.startTime ? dateFormatByAppearance(Number(security.startTime)) : '-'}}
{{security.eventSeverity}}
diff --git a/src/views/entityExplorer/entityList/detailOverview/Ip.vue b/src/views/entityExplorer/entityList/detailOverview/Ip.vue index b1ee8cc7..7d427044 100644 --- a/src/views/entityExplorer/entityList/detailOverview/Ip.vue +++ b/src/views/entityExplorer/entityList/detailOverview/Ip.vue @@ -185,7 +185,7 @@
{{entityData.performanceNum}}
-
{{dateFormatByAppearance(performance.startTime) || '-'}}
+
{{performance.startTime ? dateFormatByAppearance(Number(performance.startTime)) : '-'}}
{{performance.eventSeverity}}
@@ -212,7 +212,7 @@
-
{{dateFormatByAppearance(security.startTime) || '-'}}
+
{{security.startTime ? dateFormatByAppearance(Number(security.startTime)) : '-'}}
{{security.eventSeverity}}