From 081a45f845528a67f35dcadafa6983ff6e39f8d6 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 5 Jan 2024 15:31:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8B=93=E6=89=91=E5=A4=9A=E4=B8=AAomc?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=97=B6=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/monitor/topology/index.vue | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/views/monitor/topology/index.vue b/src/views/monitor/topology/index.vue index 79c984e0..5c01a8d3 100644 --- a/src/views/monitor/topology/index.vue +++ b/src/views/monitor/topology/index.vue @@ -63,16 +63,16 @@ function fnGetList(refresh: boolean = false) { Array.isArray(res.data) && res.data.length > 0 ) { - let rootNode = 'OMC'; + // 根网管 + let rootNodeInfo = { neName: undefined }; const nodes = []; const edges = []; for (const item of res.data) { item.serverState = {}; + // 节点 const nodeIndex = nodes.findIndex(v => v.id === item.neName); if (nodeIndex === -1) { - // 根网管 if (item.neType === 'OMC') { - rootNode = item.neName; nodes.push({ id: item.neName, label: item.neName, @@ -95,6 +95,7 @@ function fnGetList(refresh: boolean = false) { height: 60, }, }); + !rootNodeInfo.neName && (rootNodeInfo = item); } else { nodes.push({ id: item.neName, @@ -111,16 +112,22 @@ function fnGetList(refresh: boolean = false) { }); } } - + // 边 if (item.neType !== 'OMC') { const edgeIndex = edges.findIndex(v => v.source === item.neName); if (edgeIndex === -1) { edges.push({ source: item.neName, - target: rootNode, - label: `${item.neType}-${rootNode}`, + target: rootNodeInfo.neName, + label: `${item.neName}-${rootNodeInfo.neName}`, }); } + } else { + edges.push({ + source: item.neName, + target: rootNodeInfo.neName, + label: `${item.neName}-${rootNodeInfo.neName}`, + }); } } graphG6Data.nodes = nodes;