From ef3994e14ae3211f8ac10e280352dcc4d9f1b28b Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Mon, 20 Nov 2023 10:54:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=9E=E4=BD=93?=
=?UTF-8?q?=E4=B8=8B=E6=8B=89=E4=B8=AD=E4=BA=8B=E4=BB=B6=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9Bbehavior=20pattern=E7=9A=84=E7=99=BE?=
=?UTF-8?q?=E5=88=86=E6=AF=94=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../entityDetail/tabs/BehaviorPattern.vue | 18 +++++++-----------
.../entityList/detailOverview/App.vue | 2 +-
.../entityList/detailOverview/Domain.vue | 4 ++--
.../entityList/detailOverview/Ip.vue | 4 ++--
4 files changed, 12 insertions(+), 16 deletions(-)
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}}