解决冲突

This commit is contained in:
duanhao 2025-08-12 15:31:53 +08:00
parent 348a54991e
commit 03393edb22

View File

@ -44,15 +44,10 @@ const initChart = async () => {
// //
const nodes = Object.values(communityNodeList).map((item) => ({ const nodes = Object.values(communityNodeList).map((item) => ({
<<<<<<< HEAD
id: (item.id), id: (item.id),
name: (item.id), name: (item.id),
symbol: imageSelect(item), symbol: imageSelect(item),
symbolSize: 30, symbolSize: 30,
=======
id: item.id,
name: item.id,
>>>>>>> 1ef73f96a73e8d1be02a31f0935a064f0ed5836d
isIncludePredictNodes: item.isIncludePredictNodes, isIncludePredictNodes: item.isIncludePredictNodes,
nodesNum: item.nodesNum, nodesNum: item.nodesNum,
neighbors: item.neighbors.map((nei) => ({ ...nei, name: parseInt(nei.id) })), neighbors: item.neighbors.map((nei) => ({ ...nei, name: parseInt(nei.id) })),
@ -88,27 +83,9 @@ const initChart = async () => {
const data = { nodes, links } const data = { nodes, links }
const categories = [ const categories = [
<<<<<<< HEAD
{ name: "普通社团", category: 0, icon: `image://${new URL(normalGroupNodeImg, import.meta.url)}`}, { name: "普通社团", category: 0, icon: `image://${new URL(normalGroupNodeImg, import.meta.url)}`},
{ name: "含预测节点社团", category: 1, icon: `image://${new URL(predictionNodeImg, 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: 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 = { const option = {
// //