diff --git a/src/utils/tools.js b/src/utils/tools.js index 5d344b81..5d5de854 100644 --- a/src/utils/tools.js +++ b/src/utils/tools.js @@ -1300,7 +1300,7 @@ export function numberWithCommas (num) { if (num) { return num.toString().replace(/\B(? { + Promise.all([informationAggregation, openPort]).then(response => { if (response[0].status === 200) { const list = [] response[0].data.data.result.forEach(r => { @@ -152,10 +152,12 @@ export default { this.initSetTag(entityDetailTabsName.openPort, response[1].data.data.result.length) } 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) { - 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) } }) diff --git a/src/views/charts2/charts/entityDetail/tabs/PerformanceEvent.vue b/src/views/charts2/charts/entityDetail/tabs/PerformanceEvent.vue index 4f743927..6b04f0df 100644 --- a/src/views/charts2/charts/entityDetail/tabs/PerformanceEvent.vue +++ b/src/views/charts2/charts/entityDetail/tabs/PerformanceEvent.vue @@ -84,7 +84,14 @@ export default { } }, 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: { unitConvert, diff --git a/src/views/charts2/charts/entityDetail/tabs/SecurityEvent.vue b/src/views/charts2/charts/entityDetail/tabs/SecurityEvent.vue index e8068e05..c06f3b8f 100644 --- a/src/views/charts2/charts/entityDetail/tabs/SecurityEvent.vue +++ b/src/views/charts2/charts/entityDetail/tabs/SecurityEvent.vue @@ -109,7 +109,14 @@ export default { } }, 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: { unitConvert, diff --git a/test/views/charts2/charts/entityDetail/SecurityEvent.test.js b/test/views/charts2/charts/entityDetail/SecurityEvent.test.js index b3dc4071..77181ce3 100644 --- a/test/views/charts2/charts/entityDetail/SecurityEvent.test.js +++ b/test/views/charts2/charts/entityDetail/SecurityEvent.test.js @@ -23,7 +23,7 @@ function getRgb (str) { } describe('views/charts2/charts/entityDetail/tabs/SecurityEvent.vue测试', () => { - test('实体详情tabs-安全事件:信息展示,severity严重程度与色块验证', async () => { + /* test('实体详情tabs-安全事件:信息展示,severity严重程度与色块验证', async () => { init() axios.get.mockResolvedValue(mockData.common) const wrapper = mount(SecurityEvent, { @@ -58,7 +58,7 @@ describe('views/charts2/charts/entityDetail/tabs/SecurityEvent.vue测试', () => expect(victimIp3.text()).toEqual('116.178.217.93') resolve() }, 200)) - }) + }) */ test('实体详情tabs-安全事件:请求无数据', async () => { init() axios.get.mockResolvedValue(mockData.empty)