diff --git a/src/mixins/relatedServer.js b/src/mixins/relatedServer.js index 88abf64e..e0d86def 100644 --- a/src/mixins/relatedServer.js +++ b/src/mixins/relatedServer.js @@ -43,7 +43,7 @@ export default { if (this.$refs[value + index]) { // 每条数据的宽度 const width = this.$refs[value + index].offsetWidth + 35 - if (width) { + if (width > 35 && width !== 0) { sum += width if (flag && sum >= relatedServerWidth && num === 1) { flag = false diff --git a/src/views/entityExplorer/entityList/detailOverview/App.vue b/src/views/entityExplorer/entityList/detailOverview/App.vue index 9a438d14..e3a5ae9e 100644 --- a/src/views/entityExplorer/entityList/detailOverview/App.vue +++ b/src/views/entityExplorer/entityList/detailOverview/App.vue @@ -55,7 +55,7 @@
- {{entityData.domainCount}} + {{relationshipDataOne.length}} {{$t('entities.relatedDomains')}}
@@ -74,7 +74,7 @@
- {{entityData.ipCount}} + {{relationshipDataTow.length}} {{$t('entities.relatedServerIp')}}
@@ -113,10 +113,14 @@
{{$t('entities.outLinkTrafficPercentage')}} + {{entityData.linkOutId ? entityData.linkOutId : '-'}}, + {{$t('entities.percentage')}} {{entityData.linkOutPercent ? unitConvert(entityData.linkOutPercent, unitTypes.percent).join(' ') + '%' : '-'}}
{{$t('entities.inLinkTrafficPercentage')}} + {{entityData.linkInId ? entityData.linkInId : '-'}}, + {{$t('entities.percentage')}} {{entityData.linkInPercent ? unitConvert(entityData.linkInPercent, unitTypes.percent).join(' ') + '%' : '-'}}
diff --git a/src/views/entityExplorer/entityList/detailOverview/Domain.vue b/src/views/entityExplorer/entityList/detailOverview/Domain.vue index 1640f9ad..e54d4bbd 100644 --- a/src/views/entityExplorer/entityList/detailOverview/Domain.vue +++ b/src/views/entityExplorer/entityList/detailOverview/Domain.vue @@ -63,7 +63,7 @@
- {{entityData.appCount}} + {{relationshipDataOne.length}} {{$t('entities.relatedApp')}}
@@ -82,10 +82,10 @@
- {{entityData.ipCount}} + {{relationshipDataTow.length}} {{$t('entities.relatedServerIp')}}
-
+
{{item.ip}}
@@ -121,10 +121,14 @@
{{$t('entities.outLinkTrafficPercentage')}} + {{entityData.linkOutId ? entityData.linkOutId : '-'}}, + {{$t('entities.percentage')}} {{entityData.linkOutPercent ? unitConvert(entityData.linkOutPercent, unitTypes.percent).join(' ') + '%' : '-'}}
{{$t('entities.inLinkTrafficPercentage')}} + {{entityData.linkInId ? entityData.linkInId : '-'}}, + {{$t('entities.percentage')}} {{entityData.linkInPercent ? unitConvert(entityData.linkInPercent, unitTypes.percent).join(' ') + '%' : '-'}}
@@ -294,7 +298,7 @@ export default { this.singleValues.chartDatas.splice(3, 1, this.$_.get(n, 'sequenceGapLossPercent')) this.singleValues.chartDatas.splice(4, 1, this.$_.get(n, 'pktRetransPercent')) this.getRelatedServerDataOne(this.relatedServerAppUrl, 'relatedDomain') - this.getRelatedServerDataTow(this.relatedServerIpUrl, 'relatedServerDomain') + this.getRelatedServerDataTow(this.relatedServerIpUrl, 'relatedDomainIp') } } }, diff --git a/src/views/entityExplorer/entityList/detailOverview/Ip.vue b/src/views/entityExplorer/entityList/detailOverview/Ip.vue index 73ae07e7..f53cdbfd 100644 --- a/src/views/entityExplorer/entityList/detailOverview/Ip.vue +++ b/src/views/entityExplorer/entityList/detailOverview/Ip.vue @@ -47,7 +47,7 @@
- {{entityData.domainCount}} + {{relationshipDataOne.length}} {{$t('entities.relatedDomains')}}
@@ -66,7 +66,7 @@
- {{entityData.appCount}} + {{relationshipDataTow.length}} {{$t('entities.relatedApp')}}
@@ -105,10 +105,14 @@
{{$t('entities.outLinkTrafficPercentage')}} + {{entityData.linkOutId ? entityData.linkOutId : '-'}}, + {{$t('entities.percentage')}} {{entityData.linkOutPercent ? unitConvert(entityData.linkOutPercent, unitTypes.percent).join(' ') + '%' : '-'}}
{{$t('entities.inLinkTrafficPercentage')}} + {{entityData.linkInId ? entityData.linkInId : '-'}}, + {{$t('entities.percentage')}} {{entityData.linkInPercent ? unitConvert(entityData.linkInPercent, unitTypes.percent).join(' ') + '%' : '-'}}
diff --git a/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js b/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js index 2eda0558..459236bf 100644 --- a/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js +++ b/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js @@ -148,10 +148,23 @@ export default { queryEntityDetailLinkInUrl () { if (this.linkInUrl) { get(this.linkInUrl, this.getQueryParams()).then(response => { - if (response.code === 200 && response.data.aggregation) { - const sum = response.data.aggregation.sum - const max = response.data.aggregation.max - this.entityData.linkInPercent = (parseFloat(max / sum) * 100).toFixed(2) + if (response.code === 200) { + if (!this.$_.isEmpty(response.data.result)) { + let sum = 0 + response.data.result.forEach(r => { + sum += parseFloat(r.bytes) + }) + const sorted = response.data.result.sort((r1, r2) => { + return parseFloat(r2.bytes) - parseFloat(r1.bytes) + }) + const sortedId = response.data.result.sort((r1, r2) => { + return parseFloat(r2.commonEgressLinkId) - parseFloat(r1.commonEgressLinkId) + }) + const max = parseFloat(sorted[0].bytes) + const maxId = parseFloat(sortedId[0].commonEgressLinkId) + this.entityData.linkInPercent = (parseFloat(max / sum) * 100).toFixed(2) + this.entityData.linkInId = maxId + } } }) } @@ -169,8 +182,13 @@ export default { const sorted = response.data.result.sort((r1, r2) => { return parseFloat(r2.bytes) - parseFloat(r1.bytes) }) + const sortedId = response.data.result.sort((r1, r2) => { + return parseFloat(r2.commonEgressLinkId) - parseFloat(r1.commonEgressLinkId) + }) const max = parseFloat(sorted[0].bytes) + const maxId = parseFloat(sortedId[0].commonEgressLinkId) this.entityData.linkOutPercent = (parseFloat(max / sum) * 100).toFixed(2) + this.entityData.linkOutId = maxId } } })