From f05fa2737556a0f320bdb2a37c3b825378edd69a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com> Date: Mon, 11 Mar 2024 10:55:56 +0800 Subject: [PATCH] =?UTF-8?q?CN-1551=20fix:=20=E4=BF=AE=E5=A4=8Delement-plus?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7=E5=AF=BC=E8=87=B4=E7=9A=84?= =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networkOverview/NetworkOverviewApps.vue | 13 ++++++++----- test/Test.test.js | 15 ++++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue index 2e408dde..7b7a8a65 100644 --- a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue +++ b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue @@ -464,7 +464,10 @@ export default { } } }, - addApp (pageNo, val, show) { + addApp (pageNo, val, show, index) { + if (!index) { + index = '0' + } this.showAddApp = true const params = { startTime: getSecond(this.timeFilter.startTime), @@ -484,7 +487,7 @@ export default { } else { params.pageNo = 1 } - if (parseFloat(this.appTypeTab) === 0) { + if (parseFloat(index) === 0) { params.type = 'overviewProvide' axios.get(api.dict, { params: params }).then(response => { const res = response.data @@ -508,7 +511,7 @@ export default { this.loading = false this.loadingBody = false }) - } else if (parseFloat(this.appTypeTab) === 1) { + } else if (parseFloat(index) === 1) { params.type = 'overviewApp' axios.get(api.dict, { params: params }).then(response => { const res = response.data @@ -547,10 +550,10 @@ export default { cancelApp () { this.showAddApp = false }, - appTypeTabChange () { + appTypeTabChange (n) { this.pageObj.pageNo = 1 this.searcherApp = '' - this.addApp() + this.addApp('', '', '', n.index) this.loadingBody = true window.addEventListener('scroll', this.scrollChange, true) this.timerScroll = setTimeout(() => { diff --git a/test/Test.test.js b/test/Test.test.js index f56d1fcc..6d415fcb 100644 --- a/test/Test.test.js +++ b/test/Test.test.js @@ -203,11 +203,16 @@ describe('单元测试demo', () => { } }) // 执行nextTick等待el-table渲染完成 - await wrapper.vm.$nextTick() - const textNode = await wrapper.get('[test-id="name0"]') - const textNode2 = await wrapper.get('[test-id="age1"]') - expect(textNode.text()).toBe('a') - expect(textNode2.text()).toBe('11') + // await wrapper.vm.$nextTick() + await new Promise(resolve => setTimeout(async () => { + const textNode = await wrapper.get('[test-id="name0"]') + const textNode2 = await wrapper.get('[test-id="age1"]') + await wrapper.vm.$nextTick(() => { + expect(textNode.text()).toBe('a') + expect(textNode2.text()).toBe('11') + }) + resolve() + }, 200)) }) test('js方法--getNameByEventType', async () => { expect(getNameByEventType('http error')).toBe('http error ratio')