From 41ec6a84d2f6c73d70c65ebb3c1e180eea082d23 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 15 Jun 2021 10:05:18 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-744=20fix:project=20topo=20=E5=9B=BE?= =?UTF-8?q?=E4=B8=AD=E5=90=84=E4=B8=AAmodule=20=E7=9A=84=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E5=AE=9E=E7=8E=B0=20=E4=B8=8E=20module=20?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/project/popData/alertTable.vue | 2 +- .../components/common/project/topologyL5.vue | 42 +- .../common/project/topologyPrev.vue | 3344 +++++++++-------- 3 files changed, 1704 insertions(+), 1684 deletions(-) diff --git a/nezha-fronted/src/components/common/project/popData/alertTable.vue b/nezha-fronted/src/components/common/project/popData/alertTable.vue index 7506b75b7..bf780760e 100644 --- a/nezha-fronted/src/components/common/project/popData/alertTable.vue +++ b/nezha-fronted/src/components/common/project/popData/alertTable.vue @@ -208,7 +208,7 @@ export default { delete this.searchLabel.startAt delete this.searchLabel.endAt } - this.$get(this.url + '?state=' + this.state, { ...this.searchLabel }).then(response => { + this.$get(this.url, { state: this.state, ...this.searchLabel }).then(response => { this.tools.loading = false if (response.code == 200) { this.nowTime = this.utcTimeToTimezoneStr(response.time) diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue index e73d705c7..bfaf34e16 100644 --- a/nezha-fronted/src/components/common/project/topologyL5.vue +++ b/nezha-fronted/src/components/common/project/topologyL5.vue @@ -1029,6 +1029,7 @@ export default { }, getNodesArr () { + const arr = [] if (!getTopology(this.topologyIndex)) return this.nodesArr = getTopology(this.topologyIndex).data.pens.filter(item => { if (!item.data) { @@ -1037,26 +1038,35 @@ export default { moduleName: '', show: false, error: false, - expressArr: [] + expressArr: [], + state:{} } } return item.type === 0 }) - // this.nodesArr=this.nodesArr.map(item=>{ - // if(!item.data){ - // item.data={ - // moduleId:'', - // moduleName:'', - // show:false, - // error:false, - // expressArr:[], - // } - // } - // return { - // rect:item.rect, - // data:item.data - // } - // }); + 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 b698d815b..a3865a5e7 100644 --- a/nezha-fronted/src/components/common/project/topologyPrev.vue +++ b/nezha-fronted/src/components/common/project/topologyPrev.vue @@ -335,1274 +335,1271 @@