From e3f206b54147027ba2539af93fd33dabe453d4bb Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Mon, 29 Jan 2024 15:17:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8B=93=E6=89=91=E6=9E=B6=E6=9E=84?= =?UTF-8?q?=E5=9B=BE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../overview/components/Topology/index.vue | 38 ++++++++----------- .../monitor/topologyArchitecture/index.vue | 4 +- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/src/views/dashboard/overview/components/Topology/index.vue b/src/views/dashboard/overview/components/Topology/index.vue index 0e3e2bed..ec5cd6a5 100644 --- a/src/views/dashboard/overview/components/Topology/index.vue +++ b/src/views/dashboard/overview/components/Topology/index.vue @@ -39,7 +39,20 @@ const graphG6Dom = ref(undefined); // }); /**非网元元素 */ -const notNeNodes = ['5GC', 'DN', 'UE', 'Base', "lan"]; +const notNeNodes = [ + '5GC', + 'DN', + 'UE', + 'Base', + 'lan', + 'lan1', + 'lan2', + 'lan3', + 'lan4', + 'lan5', + 'lan6', + 'lan7', +]; /**图实例对象 */ const graphG6 = ref(null); @@ -108,19 +121,6 @@ function fnGraphEvent(graph: Graph) { }); } -/**注册自定义边或节点 */ -function registerEdgeNode() { - // 边 - edgeCubicAnimateLineDash(); - edgeCubicAnimateCircleMove(); - edgeLineAnimateState(); - // 节点 - nodeCircleAnimateShapeR(); - nodeCircleAnimateShapeStroke(); - nodeRectAnimateState(); - nodeImageAnimateState(); -} - /**图数据渲染 */ function handleRanderGraph( container: HTMLElement | undefined, @@ -129,9 +129,6 @@ function handleRanderGraph( if (!container) return; const { clientHeight, clientWidth } = container; - // 注册自定义边或节点 - registerEdgeNode(); - const graph = new Graph({ container: container, width: clientWidth, @@ -141,12 +138,7 @@ function handleRanderGraph( fitViewPadding: [40], autoPaint: true, modes: { - default: [ - 'drag-combo', - 'drag-canvas', - 'zoom-canvas', - 'collapse-expand-combo', - ], + default: ['drag-canvas', 'zoom-canvas'], }, groupByTypes: false, nodeStateStyles: { diff --git a/src/views/monitor/topologyArchitecture/index.vue b/src/views/monitor/topologyArchitecture/index.vue index c23f626b..4be3a9eb 100644 --- a/src/views/monitor/topologyArchitecture/index.vue +++ b/src/views/monitor/topologyArchitecture/index.vue @@ -29,7 +29,7 @@ const graphG6Dom = ref(undefined); /**图状态 */ const graphState = reactive>({ /**当前图组名 */ - group: '5GC System Architecture3', + group: '5GC System Architecture5', /**图数据 */ data: { combos: [], @@ -39,7 +39,7 @@ const graphState = reactive>({ }); /**非网元元素 */ -const notNeNodes = ['5GC', 'DN', 'UE', 'Base', "lan"]; +const notNeNodes = ['5GC', 'DN', 'UE', 'Base', "lan", "lan1", "lan2", "lan3", "lan4", "lan5", "lan6", "lan7"]; /**图实例对象 */ const graphG6 = ref(null);