From cb7a9f6d2345bdbe55b102781c3f053634de3729 Mon Sep 17 00:00:00 2001 From: chenjinsong <523037378@qq.com> Date: Wed, 24 Aug 2022 16:40:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20network=20overview=20app=E9=80=89?= =?UTF-8?q?=E9=A1=B9=E4=B8=AD=E5=8E=BB=E6=8E=89=E5=B7=B2=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networkOverview/NetworkOverviewApps.vue | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue index 673db4bd..c9e02310 100644 --- a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue +++ b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue @@ -373,6 +373,7 @@ export default { params.type = 'overviewProvide' get(api.dict, params).then(res => { if (res.code === 200) { + res.data.list = res.data.list.filter(l => !this.appData.some(pd => pd.type === 'provider' && pd.name === l.value)) this.pageObj.pages = res.data.pages res.data.list.forEach(t => { this.toSaveApp.forEach(e => { @@ -396,6 +397,7 @@ export default { } else if (this.appTypeTab == 1) { params.type = 'overviewApp' get(api.dict, params).then(res => { + res.data.list = res.data.list.filter(l => !this.appData.some(pd => pd.type === 'app' && pd.name === l.value)) if (res.code === 200) { this.pageObj.pages = res.data.pages res.data.list.forEach(t => { @@ -505,20 +507,29 @@ export default { this.appData.splice(index, 1) }) }, + deleteDuplicate (arr) { + const arr1 = [] + arr.forEach(a => { + if (!arr1.find(a1 => a.name === a1.name && a.type === a1.type)) { + arr1.push(a) + } + }) + return arr1 + }, save () { if (this.toSaveApp.length > 0) { const toSaveParams = this.chart.params.app ? this.chart.params : { app: [] } if (toSaveParams.app.some(p => p.user === parseInt(localStorage.getItem(storageKey.userId)))) { toSaveParams.app.forEach(p => { if (p.user === parseInt(localStorage.getItem(storageKey.userId))) { - p.list = [...p.list, ...this.toSaveApp] + p.list = this.deleteDuplicate([...p.list, ...this.toSaveApp]) } }) } else { const defaultApp = toSaveParams.app.find(p => p.user === 'default') toSaveParams.app.push({ user: parseInt(localStorage.getItem(storageKey.userId)), - list: [...defaultApp.list, ...this.toSaveApp] + list: this.deleteDuplicate([...defaultApp.list, ...this.toSaveApp]) }) } const toSaveChart = {