From 0d4dc15234fd05fde4257dba820f56910a191174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Wed, 30 Aug 2023 16:49:59 +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=E6=97=B6=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E5=85=A5=E5=8F=82=E8=A6=81=E6=B1=82=E4=B8=8D=E7=AC=A6=E5=AF=BC?=
=?UTF-8?q?=E8=87=B4=E7=9A=84=E6=8A=A5=E9=94=99=EF=BC=8C=E4=BB=A5=E5=8F=8A?=
=?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=88=97=E8=A1=A8domain=E5=AE=9E=E4=BD=93?=
=?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E4=BD=BF=E7=94=A8=E9=94=99=E8=AF=AF?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/entityExplorer/entityList/Row.vue | 4 ++--
.../entityExplorer/entityList/detailOverview/App.vue | 9 +++++----
.../entityExplorer/entityList/detailOverview/Domain.vue | 9 +++++----
.../entityExplorer/entityList/detailOverview/Ip.vue | 7 ++++---
4 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/views/entityExplorer/entityList/Row.vue b/src/views/entityExplorer/entityList/Row.vue
index 4585c5c3..1363ae5f 100644
--- a/src/views/entityExplorer/entityList/Row.vue
+++ b/src/views/entityExplorer/entityList/Row.vue
@@ -43,12 +43,12 @@
{{ $t('entities.category') }} :
- {{ entityData.category ? entityData.category.name : '-' }}
+ {{ entityData.category ? entityData.category.categoryGroup : '-' }}
{{ $t('entities.subcategory') }} :
- {{ entityData.category ? entityData.category.group : '-' }}
+ {{ entityData.category ? entityData.category.categoryName : '-' }}
diff --git a/src/views/entityExplorer/entityList/detailOverview/App.vue b/src/views/entityExplorer/entityList/detailOverview/App.vue
index f4d43005..673f35f6 100644
--- a/src/views/entityExplorer/entityList/detailOverview/App.vue
+++ b/src/views/entityExplorer/entityList/detailOverview/App.vue
@@ -217,7 +217,7 @@ import Chart from '@/views/charts/Chart'
import _ from 'lodash'
import axios from 'axios'
import relatedServer from '@/mixins/relatedServer'
-import { dateFormatByAppearance, getMillisecond } from '@/utils/date-util'
+import { dateFormatByAppearance, getMillisecond, getSecond } from '@/utils/date-util'
import Loading from '@/components/common/Loading'
import { ref } from 'vue'
@@ -320,9 +320,10 @@ export default {
dateFormatByAppearance,
getQueryParams () {
return {
- // startTime: getSecond(this.timeFilter.startTime),
- // endTime: getSecond(this.timeFilter.endTime),
- resource: this.entity.entityValue
+ startTime: getSecond(this.timeFilter.startTime),
+ endTime: getSecond(this.timeFilter.endTime),
+ resource: this.entity.entityValue,
+ appName: this.entity.entityValue
}
},
getPerformanceQueryParams () {
diff --git a/src/views/entityExplorer/entityList/detailOverview/Domain.vue b/src/views/entityExplorer/entityList/detailOverview/Domain.vue
index fbf8fa8e..475a7a0c 100644
--- a/src/views/entityExplorer/entityList/detailOverview/Domain.vue
+++ b/src/views/entityExplorer/entityList/detailOverview/Domain.vue
@@ -221,7 +221,7 @@ import Chart from '@/views/charts/Chart'
import _ from 'lodash'
import axios from 'axios'
import relatedServer from '@/mixins/relatedServer'
-import { dateFormatByAppearance, getMillisecond } from '@/utils/date-util'
+import { dateFormatByAppearance, getMillisecond, getSecond } from '@/utils/date-util'
import Loading from '@/components/common/Loading'
import { ref } from 'vue'
@@ -325,9 +325,10 @@ export default {
dateFormatByAppearance,
getQueryParams () {
return {
- // startTime: getSecond(this.timeFilter.startTime),
- // endTime: getSecond(this.timeFilter.endTime),
- resource: this.entity.entityValue
+ startTime: getSecond(this.timeFilter.startTime),
+ endTime: getSecond(this.timeFilter.endTime),
+ resource: this.entity.entityValue,
+ domain: this.entity.entityValue
}
},
getPerformanceQueryParams () {
diff --git a/src/views/entityExplorer/entityList/detailOverview/Ip.vue b/src/views/entityExplorer/entityList/detailOverview/Ip.vue
index a2556a06..fe6d40e2 100644
--- a/src/views/entityExplorer/entityList/detailOverview/Ip.vue
+++ b/src/views/entityExplorer/entityList/detailOverview/Ip.vue
@@ -405,9 +405,10 @@ export default {
dateFormatByAppearance,
getQueryParams () {
return {
- // startTime: getSecond(this.timeFilter.startTime),
- // endTime: getSecond(this.timeFilter.endTime),
- resource: this.entity.entityValue
+ startTime: getSecond(this.timeFilter.startTime),
+ endTime: getSecond(this.timeFilter.endTime),
+ resource: this.entity.entityValue,
+ ip: this.entity.entityValue
}
},
getPerformanceQueryParams () {