fix: 临时去掉实体详情的安全、性能事件相关接口请求,并修改测试用例
This commit is contained in:
@@ -1300,7 +1300,7 @@ export function numberWithCommas (num) {
|
|||||||
if (num) {
|
if (num) {
|
||||||
return num.toString().replace(/\B(?<!\.\d*)(?=(\d{3})+(?!\d))/g, ',')
|
return num.toString().replace(/\B(?<!\.\d*)(?=(\d{3})+(?!\d))/g, ',')
|
||||||
} else {
|
} else {
|
||||||
return '-'
|
return (num === '0' || num === 0) ? num : '-'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ export default {
|
|||||||
{ name: entityDetailTabsName.relatedEntity, label: i18n.global.t('entities.relatedEntity'), icon: 'cn-icon cn-icon-domain-name-resolution', tag: 0 },
|
{ name: entityDetailTabsName.relatedEntity, label: i18n.global.t('entities.relatedEntity'), icon: 'cn-icon cn-icon-domain-name-resolution', tag: 0 },
|
||||||
{ name: entityDetailTabsName.openPort, label: i18n.global.t('entities.openPort'), icon: 'cn-icon cn-icon-open-port', tag: 0 },
|
{ name: entityDetailTabsName.openPort, label: i18n.global.t('entities.openPort'), icon: 'cn-icon cn-icon-open-port', tag: 0 },
|
||||||
// { name: entityDetailTabsName.digitalCertificate, label: i18n.global.t('entities.digitalCertificate'), icon: 'cn-icon cn-icon-digital-certificate', tag: 0 },
|
// { name: entityDetailTabsName.digitalCertificate, label: i18n.global.t('entities.digitalCertificate'), icon: 'cn-icon cn-icon-digital-certificate', tag: 0 },
|
||||||
{ name: entityDetailTabsName.securityEvent, label: i18n.global.t('overall.securityEvent'), icon: 'cn-icon cn-icon-security-event', tag: 30 },
|
{ name: entityDetailTabsName.securityEvent, label: i18n.global.t('overall.securityEvent'), icon: 'cn-icon cn-icon-security-event', tag: 0 },
|
||||||
{ name: entityDetailTabsName.performanceEvent, label: i18n.global.t('overall.performanceEvent'), icon: 'cn-icon cn-icon-a-PerformanceEvent', tag: 0 }
|
{ name: entityDetailTabsName.performanceEvent, label: i18n.global.t('overall.performanceEvent'), icon: 'cn-icon cn-icon-a-PerformanceEvent', tag: 0 }
|
||||||
])
|
])
|
||||||
if (entityType !== 'app') {
|
if (entityType !== 'app') {
|
||||||
@@ -116,10 +116,10 @@ export default {
|
|||||||
const url = this.getUrlByEntityType(this.entity.entityType)
|
const url = this.getUrlByEntityType(this.entity.entityType)
|
||||||
const informationAggregation = axios.get(`${api.entity.informationAggregation}/${this.entity.entityType}?resource=${this.entity.entityName}&pageSize=100&pageNo=1`, { params: params })
|
const informationAggregation = axios.get(`${api.entity.informationAggregation}/${this.entity.entityType}?resource=${this.entity.entityName}&pageSize=100&pageNo=1`, { params: params })
|
||||||
const openPort = axios.get(url, { params: params })
|
const openPort = axios.get(url, { params: params })
|
||||||
const security = axios.get(`${api.entity.security}/${this.entity.entityType}`, { params: params })
|
// const security = axios.get(`${api.entity.security}/${this.entity.entityType}`, { params: params })
|
||||||
const performance = axios.get(`${api.entity.performance}/${this.entityType}`, { params: params })
|
// const performance = axios.get(`${api.entity.performance}/${this.entityType}`, { params: params })
|
||||||
|
|
||||||
Promise.all([informationAggregation, openPort, security, performance]).then(response => {
|
Promise.all([informationAggregation, openPort]).then(response => {
|
||||||
if (response[0].status === 200) {
|
if (response[0].status === 200) {
|
||||||
const list = []
|
const list = []
|
||||||
response[0].data.data.result.forEach(r => {
|
response[0].data.data.result.forEach(r => {
|
||||||
@@ -152,10 +152,12 @@ export default {
|
|||||||
this.initSetTag(entityDetailTabsName.openPort, response[1].data.data.result.length)
|
this.initSetTag(entityDetailTabsName.openPort, response[1].data.data.result.length)
|
||||||
}
|
}
|
||||||
if (response[2].status === 200) {
|
if (response[2].status === 200) {
|
||||||
this.initSetTag(entityDetailTabsName.securityEvent, response[2].data.data.result.length)
|
// this.initSetTag(entityDetailTabsName.securityEvent, response[2].data.data.result.length)
|
||||||
|
this.initSetTag(entityDetailTabsName.securityEvent, 0)
|
||||||
}
|
}
|
||||||
if (response[3].status === 200) {
|
if (response[3].status === 200) {
|
||||||
this.initSetTag(entityDetailTabsName.performanceEvent, response[3].data.data.result.length)
|
// this.initSetTag(entityDetailTabsName.performanceEvent, response[3].data.data.result.length)
|
||||||
|
this.initSetTag(entityDetailTabsName.performanceEvent, 0)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -84,7 +84,14 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted () {
|
mounted () {
|
||||||
this.initData()
|
// this.initData()
|
||||||
|
this.isNoData = true
|
||||||
|
this.$emit('checkTag', entityDetailTabsName.performanceEvent, 0)
|
||||||
|
this.toggleLoading(true)
|
||||||
|
const timer = setTimeout(() => {
|
||||||
|
this.toggleLoading(false)
|
||||||
|
clearInterval(timer)
|
||||||
|
}, 200)
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
unitConvert,
|
unitConvert,
|
||||||
|
|||||||
@@ -109,7 +109,14 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted () {
|
mounted () {
|
||||||
this.initData()
|
// this.initData()
|
||||||
|
this.isNoData = true
|
||||||
|
this.$emit('checkTag', entityDetailTabsName.securityEvent, 0)
|
||||||
|
this.toggleLoading(true)
|
||||||
|
const timer = setTimeout(() => {
|
||||||
|
this.toggleLoading(false)
|
||||||
|
clearInterval(timer)
|
||||||
|
}, 200)
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
unitConvert,
|
unitConvert,
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ function getRgb (str) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
describe('views/charts2/charts/entityDetail/tabs/SecurityEvent.vue测试', () => {
|
describe('views/charts2/charts/entityDetail/tabs/SecurityEvent.vue测试', () => {
|
||||||
test('实体详情tabs-安全事件:信息展示,severity严重程度与色块验证', async () => {
|
/* test('实体详情tabs-安全事件:信息展示,severity严重程度与色块验证', async () => {
|
||||||
init()
|
init()
|
||||||
axios.get.mockResolvedValue(mockData.common)
|
axios.get.mockResolvedValue(mockData.common)
|
||||||
const wrapper = mount(SecurityEvent, {
|
const wrapper = mount(SecurityEvent, {
|
||||||
@@ -58,7 +58,7 @@ describe('views/charts2/charts/entityDetail/tabs/SecurityEvent.vue测试', () =>
|
|||||||
expect(victimIp3.text()).toEqual('116.178.217.93')
|
expect(victimIp3.text()).toEqual('116.178.217.93')
|
||||||
resolve()
|
resolve()
|
||||||
}, 200))
|
}, 200))
|
||||||
})
|
}) */
|
||||||
test('实体详情tabs-安全事件:请求无数据', async () => {
|
test('实体详情tabs-安全事件:请求无数据', async () => {
|
||||||
init()
|
init()
|
||||||
axios.get.mockResolvedValue(mockData.empty)
|
axios.get.mockResolvedValue(mockData.empty)
|
||||||
|
|||||||
Reference in New Issue
Block a user