From 3cbeca330ed1a8422a04f76c23ab28aeab65ccdd Mon Sep 17 00:00:00 2001 From: zhangyu Date: Wed, 16 Jun 2021 09:46:31 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E4=BF=AE=E6=94=B9=E5=A4=9A?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/common/project/topologyL5.vue | 47 ++++--------------- .../common/project/topologyPrev.vue | 47 ++++--------------- 2 files changed, 16 insertions(+), 78 deletions(-) diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue index bfaf34e16..8d091dfb6 100644 --- a/nezha-fronted/src/components/common/project/topologyL5.vue +++ b/nezha-fronted/src/components/common/project/topologyL5.vue @@ -822,13 +822,13 @@ export default { item.image = img ? img.image : imgDefault } if (item.type === 0) { - // promiseArr.push(this.$get('/monitor/module/stat', { id: item.data.moduleId })) + promiseArr.push(this.$get('stat/module/abnormal',{moduleId: item.data.moduleId})) item.data.state = {} item.data.state.asset = false item.data.state.endpoint = false item.data.state.alert = false } else { - // promiseArr.push({ type: 1 }) + promiseArr.push({ type: 1 }) item.data.state = {} item.data.state.asset = false item.data.state.endpoint = false @@ -850,27 +850,19 @@ export default { data.bkImage = undefined } Promise.all(promiseArr).then(res => { + console.log(res) res.forEach((response, index) => { const item = data.pens[index] if (item.type === 0) { - item.data.state = response.data - item.data.state.asset = false - item.data.state.endpoint = false - item.data.state.alert = false - if (item.data.state.assetStat.down > 0) { - item.data.state.asset = true - } - if (item.data.state.endpointStat.down > 0) { - item.data.state.endpoint = true - } - if (item.data.state.alertStat.P1 > 0 || item.data.state.alertStat.P3 > 0 || item.data.state.alertStat.P2 > 0) { - item.data.state.alert = true - } - item.data.state.error = item.data.state.asset || item.data.state.endpoint || item.data.state.alert + item.data.state.error = item.data.error = !res[index].data.list[0].state + item.data.state.asset = !!res[index].data.list[0].asset + item.data.state.alert = !!res[index].data.list[0].alert + item.data.state.endpoint = !!res[index].data.list[0].endpoint } }) self.saveData = { ...data } resolve(data) + }) }, 100) } @@ -1044,29 +1036,6 @@ export default { } return item.type === 0 }) - this.nodesArr.forEach(item=>{ - item.data.error = false - item.data.state = { - endpoint: false, - asset: false, - total: false, - other: false, - info: false, - alert: false, - main: false, - error: false - } - arr.push(this.$get('stat/module/abnormal',{moduleId: item.data.moduleId})) - }); - Promise.all(arr).then(res => { - this.nodesArr.forEach( (item, index) => { - item.data.state.error = item.data.error = !res[index].data.list[0].state - item.data.state.asset = !!res[index].data.list[0].asset - item.data.state.alert = !!res[index].data.list[0].alert - item.data.state.endpoint = !!res[index].data.list[0].endpoint - }) - this.nodesArr = JSON.parse(JSON.stringify(this.nodesArr)) - }) // 打开动画 是否更新顶部图标 this.nodesArr = JSON.parse(JSON.stringify(this.nodesArr)) }, diff --git a/nezha-fronted/src/components/common/project/topologyPrev.vue b/nezha-fronted/src/components/common/project/topologyPrev.vue index a3865a5e7..3c0523b46 100644 --- a/nezha-fronted/src/components/common/project/topologyPrev.vue +++ b/nezha-fronted/src/components/common/project/topologyPrev.vue @@ -822,13 +822,13 @@ item.image = img ? img.image : imgDefault } if (item.type === 0) { - // promiseArr.push(this.$get('/monitor/module/stat', { id: item.data.moduleId })) + promiseArr.push(this.$get('stat/module/abnormal',{moduleId: item.data.moduleId})) item.data.state = {} item.data.state.asset = false item.data.state.endpoint = false item.data.state.alert = false } else { - // promiseArr.push({ type: 1 }) + promiseArr.push({ type: 1 }) item.data.state = {} item.data.state.asset = false item.data.state.endpoint = false @@ -850,27 +850,19 @@ data.bkImage = undefined } Promise.all(promiseArr).then(res => { + console.log(res) res.forEach((response, index) => { const item = data.pens[index] if (item.type === 0) { - item.data.state = response.data - item.data.state.asset = false - item.data.state.endpoint = false - item.data.state.alert = false - if (item.data.state.assetStat.down > 0) { - item.data.state.asset = true - } - if (item.data.state.endpointStat.down > 0) { - item.data.state.endpoint = true - } - if (item.data.state.alertStat.P1 > 0 || item.data.state.alertStat.P3 > 0 || item.data.state.alertStat.P2 > 0) { - item.data.state.alert = true - } - item.data.state.error = item.data.state.asset || item.data.state.endpoint || item.data.state.alert + item.data.state.error = item.data.error = !res[index].data.list[0].state + item.data.state.asset = !!res[index].data.list[0].asset + item.data.state.alert = !!res[index].data.list[0].alert + item.data.state.endpoint = !!res[index].data.list[0].endpoint } }) self.saveData = { ...data } resolve(data) + }) }, 100) } @@ -1044,29 +1036,6 @@ } return item.type === 0 }) - this.nodesArr.forEach(item=>{ - item.data.error = false - item.data.state = { - endpoint: false, - asset: false, - total: false, - other: false, - info: false, - alert: false, - main: false, - error: false - } - arr.push(this.$get('stat/module/abnormal',{moduleId: item.data.moduleId})) - }); - Promise.all(arr).then(res => { - this.nodesArr.forEach( (item, index) => { - item.data.state.error = item.data.error = !res[index].data.list[0].state - item.data.state.asset = !!res[index].data.list[0].asset - item.data.state.alert = !!res[index].data.list[0].alert - item.data.state.endpoint = !!res[index].data.list[0].endpoint - }) - this.nodesArr = JSON.parse(JSON.stringify(this.nodesArr)) - }) // 打开动画 是否更新顶部图标 this.nodesArr = JSON.parse(JSON.stringify(this.nodesArr)) },