From 03393edb2262052c826d22a454c9fa7e05353994 Mon Sep 17 00:00:00 2001
From: duanhao <dh14779715518@163.com>
Date: Tue, 12 Aug 2025 15:31:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../socialGroups/components/communityNode.vue | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/src/views/LinkPrediction/socialGroups/components/communityNode.vue b/src/views/LinkPrediction/socialGroups/components/communityNode.vue
index 8dc70fb..ab35166 100644
--- a/src/views/LinkPrediction/socialGroups/components/communityNode.vue
+++ b/src/views/LinkPrediction/socialGroups/components/communityNode.vue
@@ -44,15 +44,10 @@ const initChart = async () => {
 
   //处理社团节点
   const nodes = Object.values(communityNodeList).map((item) => ({
-<<<<<<< HEAD
     id: (item.id),
     name: (item.id),
     symbol:  imageSelect(item),
     symbolSize: 30,
-=======
-    id: item.id,
-    name: item.id,
->>>>>>> 1ef73f96a73e8d1be02a31f0935a064f0ed5836d
     isIncludePredictNodes: item.isIncludePredictNodes,
     nodesNum: item.nodesNum,
     neighbors: item.neighbors.map((nei) => ({ ...nei, name: parseInt(nei.id) })),
@@ -88,27 +83,9 @@ const initChart = async () => {
   const data = { nodes, links }
 
   const categories = [
-<<<<<<< HEAD
     { name: "普通社团", category: 0, icon: `image://${new URL(normalGroupNodeImg, import.meta.url)}`},
     { name: "含预测节点社团", category: 1, icon:  `image://${new URL(predictionNodeImg, import.meta.url)}`},
     { name: "紧密团体关系", category: 2, icon:  `image://${new URL('@/assets/images/linkPrediction/icon/tight-community-legend-icon.png', import.meta.url)}`}
-=======
-    {
-      name: "普通社团",
-      category: 0,
-      icon: `image://${new URL("@/assets/images/linkPrediction/icon/node-legend-icon.png", import.meta.url)}`
-    },
-    {
-      name: "含预测节点社团",
-      category: 1,
-      icon: `image://${new URL("@/assets/images/linkPrediction/icon/community-legend-icon.png", import.meta.url)}`
-    },
-    {
-      name: "紧密团体关系",
-      category: 2,
-      icon: `image://${new URL("@/assets/images/linkPrediction/icon/tight-community-legend-icon.png", import.meta.url)}`
-    }
->>>>>>> 1ef73f96a73e8d1be02a31f0935a064f0ed5836d
   ]
   const option = {
     //图例配置