diff --git a/src/views/entityExplorer/entityList/detailOverview/App.vue b/src/views/entityExplorer/entityList/detailOverview/App.vue index 7a1e7c49..7133b57b 100644 --- a/src/views/entityExplorer/entityList/detailOverview/App.vue +++ b/src/views/entityExplorer/entityList/detailOverview/App.vue @@ -4,23 +4,23 @@
APP ID
-
{{$_.get(entity, 'category.appId', '-')}}
+
{{$_.get(entity, 'category.appId', '-') || '-'}}
{{$t('entities.category')}}
-
{{$_.get(entity, 'category.appCategory', '-')}}
+
{{$_.get(entity, 'category.appCategory', '-') || '-'}}
{{$t('entities.subcategory')}}
-
{{$_.get(entity, 'category.appSubcategory', '-')}}
+
{{$_.get(entity, 'category.appSubcategory', '-') || '-'}}
{{$t('entities.riskLevel')}}
-
{{appRisk(parseInt(entity.category.appRisk)) || '-'}}
+
{{$_.get(entity, 'category.appRisk') ? appRisk(parseInt(entity.category.appRisk)) : '-'}}
{{$t('overall.remark')}}
-
{{$_.get(entity, 'category.appDescription', '-')}}
+
{{$_.get(entity, 'category.appDescription', '-') || '-'}}
diff --git a/src/views/entityExplorer/entityList/detailOverview/Domain.vue b/src/views/entityExplorer/entityList/detailOverview/Domain.vue index 93382abe..81d1e7ad 100644 --- a/src/views/entityExplorer/entityList/detailOverview/Domain.vue +++ b/src/views/entityExplorer/entityList/detailOverview/Domain.vue @@ -4,31 +4,31 @@
{{$t('entities.category')}}
-
{{$_.get(entityData, 'category.categoryName', '-')}}
+
{{$_.get(entityData, 'category.categoryName', '-') || '-'}}
{{$t('entities.domainDetail.categoryGroup')}}
-
{{$_.get(entityData, 'category.categoryGroup', '-')}}
+
{{$_.get(entityData, 'category.categoryGroup', '-') || '-'}}
{{$t('entities.reputationLevel')}}
-
{{$_.get(entityData, 'category.reputationLevel', '-')}}
+
{{$_.get(entityData, 'category.reputationLevel', '-') || '-'}}
{{$t('entities.registration')}}
-
{{$_.get(entityData, 'whois.registrantCountry', '-')}}
+
{{$_.get(entityData, 'whois.registrantCountry', '-') || '-'}}
{{$t('entities.org')}}
-
{{$_.get(entityData, 'whois.registrantOrg', '-')}}
+
{{$_.get(entityData, 'whois.registrantOrg', '-') || '-'}}
{{$t('entities.icpCompanyName')}}
-
{{$_.get(entityData, 'icp.icpCompanyName', '-')}}
+
{{$_.get(entityData, 'icp.icpCompanyName', '-') || '-'}}
{{$t('entities.icpLicense')}}
-
{{$_.get(entityData, 'icp.icpSiteLicense', '-')}}
+
{{$_.get(entityData, 'icp.icpSiteLicense', '-') || '-'}}
diff --git a/src/views/entityExplorer/entityList/detailOverview/Ip.vue b/src/views/entityExplorer/entityList/detailOverview/Ip.vue index a9a9ced4..bc1cab9d 100644 --- a/src/views/entityExplorer/entityList/detailOverview/Ip.vue +++ b/src/views/entityExplorer/entityList/detailOverview/Ip.vue @@ -17,7 +17,7 @@
ASN
-
{{$_.get(entity, 'asn.asn', '-')}}
+
{{$_.get(entity, 'asn.asn', '-') || '-'}}
{{$t('entities.openPort')}}
diff --git a/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js b/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js index 71b99d1e..15dea666 100644 --- a/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js +++ b/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js @@ -8,6 +8,7 @@ import { metricOption } from '@/views/detections/options/detectionOptions' import { sortBy, reverseSortBy, computeScore } from '@/utils/tools' import { getSecond } from '@/utils/date-util' import { api } from '@/utils/api' +import i18n from '@/i18n' export default { props: { @@ -115,7 +116,7 @@ export default { ...this.chartOption, series: [ { - name: this.$t('entities.sentThroughput'), + name: i18n.global.t('entities.sentThroughput'), type: 'line', legendHoverLink: false, itemStyle: { @@ -135,7 +136,7 @@ export default { ...this.chartOption, series: [ { - name: this.$t('entities.receivedThroughput'), + name: i18n.global.t('entities.receivedThroughput'), type: 'line', legendHoverLink: false, itemStyle: { @@ -322,60 +323,6 @@ export default { } }, - queryEntityDetailLinkInUrl () { - this.loadingIn = true - if (this.linkInUrl) { - axios.get(this.linkInUrl, { params: this.getQueryParams() }).then(response => { - if (response.status === 200) { - if (!this.$_.isEmpty(response.data.data.result)) { - let sum = 0 - response.data.data.result.forEach(r => { - sum += parseFloat(r.bytes) - }) - const sorted = response.data.data.result.sort((r1, r2) => { - return parseFloat(r2.bytes) - parseFloat(r1.bytes) - }) - const sortedId = response.data.data.result.sort((r1, r2) => { - return parseFloat(r2.commonIngressLinkId) - parseFloat(r1.commonIngressLinkId) - }) - const max = parseFloat(sorted[0].bytes) - const maxId = parseFloat(sortedId[0].commonIngressLinkId) - this.entityData.linkInPercent = (parseFloat(max / sum)).toFixed(2) - this.entityData.linkInId = maxId - } - } - this.loadingIn = false - }) - } - }, - - queryEntityDetailLinkOutUrl () { - this.loadingOut = true - if (this.linkOutUrl) { - axios.get(this.linkOutUrl, { params: this.getQueryParams() }).then(response => { - if (response.status === 200) { - if (!this.$_.isEmpty(response.data.data.result)) { - let sum = 0 - response.data.data.result.forEach(r => { - sum += parseFloat(r.bytes) - }) - const sorted = response.data.data.result.sort((r1, r2) => { - return parseFloat(r2.bytes) - parseFloat(r1.bytes) - }) - const sortedId = response.data.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)).toFixed(2) - this.entityData.linkOutId = maxId - } - } - this.loadingOut = false - }) - } - }, - queryEntityDetailPerformance () { this.loadingAlert = true axios.get(this.performanceUrl, { params: this.getQueryParams() }).then(response => { @@ -442,7 +389,7 @@ export default { ...this.chartOption, series: [ { - name: this.$t('entities.sentThroughput'), + name: i18n.global.t('entities.sentThroughput'), type: 'line', legendHoverLink: false, itemStyle: { @@ -469,8 +416,6 @@ export default { this.queryEntityDetailPerformance() this.queryEntityDetailSecurity() this.queryEntityDetailNetworkQuantity() - this.queryEntityDetailLinkOutUrl() - this.queryEntityDetailLinkInUrl() if (this.entity.entityType === 'ip') { if (!this.entityData.dnsServerRole) { this.loadingDns = true diff --git a/src/views/entityExplorer/entityList/entityListMixin.js b/src/views/entityExplorer/entityList/entityListMixin.js index b1b56cce..5cd349b4 100644 --- a/src/views/entityExplorer/entityList/entityListMixin.js +++ b/src/views/entityExplorer/entityList/entityListMixin.js @@ -8,6 +8,7 @@ import { getSecond } from '@/utils/date-util' import { valueToRangeValue } from '@/utils/unit-convert' import { shallowRef } from 'vue' import { computeScore } from '@/utils/tools' +import i18n from '@/i18n' export default { props: { @@ -121,7 +122,7 @@ export default { } else if (t.legend === 'bytesSentRate') { this.entityData.bytesSentRate = _.nth(t.values, -3)[1] sentSeries = { - name: this.$t('entities.sentThroughput'), + name: i18n.global.t('entities.sentThroughput'), type: 'line', legendHoverLink: false, itemStyle: { @@ -136,7 +137,7 @@ export default { } else if (t.legend === 'bytesReceivedRate') { this.entityData.bytesReceivedRate = t.aggregation.last receivedSeries = { - name: this.$t('entities.receivedThroughput'), + name: i18n.global.t('entities.receivedThroughput'), type: 'line', legendHoverLink: false, itemStyle: {