From b30a8a8a25b30658c987ddf5b2bb7bce9d9cde6f 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, 22 Nov 2023 10:44:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=9E=E4=BD=93=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=BA=8B=E4=BB=B6=E6=95=B0=E9=87=8F=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E5=AE=8C=E5=96=84=E4=B8=8B=E6=8B=89=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=92=8C=E5=88=97=E8=A1=A8=E4=BA=8B=E4=BB=B6=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E8=87=B4=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/entityExplorer/entityList/Row.vue | 5 +++- .../entityList/detailOverview/App.vue | 2 +- .../detailOverview/DetailOverview.vue | 9 ++++-- .../entityList/detailOverview/Domain.vue | 2 +- .../entityList/detailOverview/Ip.vue | 2 +- .../detailOverview/entityDetailMixin.js | 14 +++++++-- .../entityList/entityListMixin.js | 30 ++++++++++++++----- 7 files changed, 46 insertions(+), 18 deletions(-) diff --git a/src/views/entityExplorer/entityList/Row.vue b/src/views/entityExplorer/entityList/Row.vue index cac98838..e6d88e2d 100644 --- a/src/views/entityExplorer/entityList/Row.vue +++ b/src/views/entityExplorer/entityList/Row.vue @@ -188,7 +188,7 @@
- +
@@ -335,6 +335,9 @@ export default { }, getEntity (data) { this.entityData = { ...data } + }, + getEventNum (data) { + this.eventNum = data } } } diff --git a/src/views/entityExplorer/entityList/detailOverview/App.vue b/src/views/entityExplorer/entityList/detailOverview/App.vue index 1877644a..8da6ddb9 100644 --- a/src/views/entityExplorer/entityList/detailOverview/App.vue +++ b/src/views/entityExplorer/entityList/detailOverview/App.vue @@ -321,7 +321,7 @@ export default { getMillisecond, dateFormatByAppearance, getQueryParams (dateRangeValue) { - if (dateRangeValue) { + if (dateRangeValue && (!this.timeFilter.startTime || !this.timeFilter.endTime)) { // range取 config.js 中配置的值 const { startTime, endTime } = getNowTime(dateRangeValue) return { diff --git a/src/views/entityExplorer/entityList/detailOverview/DetailOverview.vue b/src/views/entityExplorer/entityList/detailOverview/DetailOverview.vue index 90748a1e..3bbb1893 100644 --- a/src/views/entityExplorer/entityList/detailOverview/DetailOverview.vue +++ b/src/views/entityExplorer/entityList/detailOverview/DetailOverview.vue @@ -1,13 +1,13 @@ @@ -33,6 +33,9 @@ export default { methods: { getEntity (data) { this.$emit('reloadEntity', data) + }, + getEventNum (data) { + this.$emit('eventNum', data) } } } diff --git a/src/views/entityExplorer/entityList/detailOverview/Domain.vue b/src/views/entityExplorer/entityList/detailOverview/Domain.vue index 2d1e011d..c70b2112 100644 --- a/src/views/entityExplorer/entityList/detailOverview/Domain.vue +++ b/src/views/entityExplorer/entityList/detailOverview/Domain.vue @@ -325,7 +325,7 @@ export default { getMillisecond, dateFormatByAppearance, getQueryParams (dateRangeValue) { - if (dateRangeValue) { + if (dateRangeValue && (!this.timeFilter.startTime || !this.timeFilter.endTime)) { // range取 config.js 中配置的值 const { startTime, endTime } = getNowTime(dateRangeValue) return { diff --git a/src/views/entityExplorer/entityList/detailOverview/Ip.vue b/src/views/entityExplorer/entityList/detailOverview/Ip.vue index 7d427044..58c178af 100644 --- a/src/views/entityExplorer/entityList/detailOverview/Ip.vue +++ b/src/views/entityExplorer/entityList/detailOverview/Ip.vue @@ -409,7 +409,7 @@ export default { getMillisecond, dateFormatByAppearance, getQueryParams (dateRangeValue) { - if (dateRangeValue) { + if (dateRangeValue && (!this.timeFilter.startTime || !this.timeFilter.endTime)) { // range取 config.js 中配置的值 const { startTime, endTime } = getNowTime(dateRangeValue) return { diff --git a/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js b/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js index 42384ffd..807c9b44 100644 --- a/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js +++ b/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js @@ -50,7 +50,8 @@ export default { isShowMoreApp: false, // related App 展示更多时 isShowMoreDomain: false, // related Domain 展示更多时 scoreDataState: false, // 性能数据加载情况，true 表示加载完成 - performanceScoreData: {} // 用来计算评分的性能数据 + performanceScoreData: {}, // 用来计算评分的性能数据 + eventNum: 0 // 性能事件和安全事件数量之和 } }, computed: { @@ -109,6 +110,13 @@ export default { if (n && this.scoreBaseState) { this.handleScoreData() } + }, + 'entityData.securityNum': { + handler (n) { + this.eventNum = 0 + this.eventNum = n + (this.entityData.performanceNum || 0) + this.$emit('eventNum', this.eventNum) + } } }, methods: { @@ -347,7 +355,7 @@ export default { queryEntityDetailPerformance () { this.loadingAlert = true - axios.get(this.performanceUrl, { params: this.getQueryParams(DEFAULT_TIME_FILTER_RANGE.entity.performanceEvent) }).then(response => { + axios.get(this.performanceUrl, { params: { ...this.getQueryParams(DEFAULT_TIME_FILTER_RANGE.entity.securityEvent), pageSize: -1 } }).then(response => { if (response.status === 200) { this.entityData.performanceNum = response.data.data.result.length this.performanceData = response.data.data.result @@ -359,7 +367,7 @@ export default { queryEntityDetailSecurity () { this.loadingSecurityEvents = true - axios.get(this.securityUrl, { params: this.getQueryParams(DEFAULT_TIME_FILTER_RANGE.entity.securityEvent) }).then(response => { + axios.get(this.securityUrl, { params: { ...this.getQueryParams(DEFAULT_TIME_FILTER_RANGE.entity.securityEvent), pageSize: -1 } }).then(response => { if (response.status === 200) { this.entityData.securityNum = response.data.data.result.length this.securityData = response.data.data.result diff --git a/src/views/entityExplorer/entityList/entityListMixin.js b/src/views/entityExplorer/entityList/entityListMixin.js index 3731a2b8..8173749a 100644 --- a/src/views/entityExplorer/entityList/entityListMixin.js +++ b/src/views/entityExplorer/entityList/entityListMixin.js @@ -292,17 +292,31 @@ export default { /** 获取事件数量 */ queryEventNum () { this.loadingEvent = true - const performance = axios.get(this.performanceEventUrl, { params: this.getQueryParams() }) - const security = axios.get(this.securityEventUrl, { params: this.getQueryParams() }) + // const performance = axios.get(this.performanceEventUrl, { params: this.getQueryParams() }) + // const security = axios.get(this.securityEventUrl, { params: this.getQueryParams() }) + // performance接口修改，暂时不能访问，故只调用security的，后续加上 this.eventNum = 0 - - Promise.all([performance, security]).then(response => { - this.eventNum = response[0].data.data.result.length + response[1].data.data.result.length - }).catch(e => { - this.eventNum = 0 + const param = { + params: { + ...this.getQueryParams(), + pageSize: -1 + } + } + axios.get(this.securityEventUrl, param).then(res => { + if (res.status === 200) { + this.eventNum = res.data.data.result.length + } }).finally(() => { this.loadingEvent = false }) + + // Promise.all([performance, security]).then(response => { + // this.eventNum = response[0].data.data.result.length + response[1].data.data.result.length + // }).catch(e => { + // this.eventNum = 0 + // }).finally(() => { + // this.loadingEvent = false + // }) }, handleScoreData () { this.score = computeScore(this.performanceScoreData, this.$store.getters.getScoreBase) @@ -335,7 +349,7 @@ export default { setTimeout(() => { this.queryEntityDetailTraffic() this.queryNetworkQuantity() - // this.queryEventNum() + this.queryEventNum() }) }, beforeUnmount () {