diff --git a/WebRoot/images/newtopo/ADC-A106.png b/WebRoot/images/newtopo/ADC-A106.png index 5860daf..5978fc5 100644 Binary files a/WebRoot/images/newtopo/ADC-A106.png and b/WebRoot/images/newtopo/ADC-A106.png differ diff --git a/WebRoot/images/newtopo/ASEM-T102.png b/WebRoot/images/newtopo/ASEM-T102.png index 632bfda..09a9b37 100644 Binary files a/WebRoot/images/newtopo/ASEM-T102.png and b/WebRoot/images/newtopo/ASEM-T102.png differ diff --git a/WebRoot/images/newtopo/BlockRouter.png b/WebRoot/images/newtopo/BlockRouter.png index ab4c271..07e6ddd 100644 Binary files a/WebRoot/images/newtopo/BlockRouter.png and b/WebRoot/images/newtopo/BlockRouter.png differ diff --git a/WebRoot/images/newtopo/BusinessServers.png b/WebRoot/images/newtopo/BusinessServers.png index 9f88a51..aa0c970 100644 Binary files a/WebRoot/images/newtopo/BusinessServers.png and b/WebRoot/images/newtopo/BusinessServers.png differ diff --git a/WebRoot/images/newtopo/ISPnInlineDevice.png b/WebRoot/images/newtopo/ISPnInlineDevice.png index 660cf28..a856e2b 100644 Binary files a/WebRoot/images/newtopo/ISPnInlineDevice.png and b/WebRoot/images/newtopo/ISPnInlineDevice.png differ diff --git a/WebRoot/images/newtopo/ISPnInternet.png b/WebRoot/images/newtopo/ISPnInternet.png index 21d8880..644b10a 100644 Binary files a/WebRoot/images/newtopo/ISPnInternet.png and b/WebRoot/images/newtopo/ISPnInternet.png differ diff --git a/WebRoot/images/newtopo/ISPnNetwork.png b/WebRoot/images/newtopo/ISPnNetwork.png index ed809ad..0dad146 100644 Binary files a/WebRoot/images/newtopo/ISPnNetwork.png and b/WebRoot/images/newtopo/ISPnNetwork.png differ diff --git a/WebRoot/images/newtopo/ISPnRingNetworkCoreRouter.png b/WebRoot/images/newtopo/ISPnRingNetworkCoreRouter.png index 260f417..b05361b 100644 Binary files a/WebRoot/images/newtopo/ISPnRingNetworkCoreRouter.png and b/WebRoot/images/newtopo/ISPnRingNetworkCoreRouter.png differ diff --git a/WebRoot/images/newtopo/RCs.png b/WebRoot/images/newtopo/RCs.png index a7344b6..7e4d2ce 100644 Binary files a/WebRoot/images/newtopo/RCs.png and b/WebRoot/images/newtopo/RCs.png differ diff --git a/WebRoot/images/newtopo/legend.png b/WebRoot/images/newtopo/legend.png new file mode 100644 index 0000000..d2376d4 Binary files /dev/null and b/WebRoot/images/newtopo/legend.png differ diff --git a/WebRoot/images/newtopo/unknown.png b/WebRoot/images/newtopo/unknown.png index a21651f..ca1c75d 100644 Binary files a/WebRoot/images/newtopo/unknown.png and b/WebRoot/images/newtopo/unknown.png differ diff --git a/WebRoot/page/show/nodeGroup/newShowTopo.jsp b/WebRoot/page/show/nodeGroup/newShowTopo.jsp index e13885f..d4c20fe 100644 --- a/WebRoot/page/show/nodeGroup/newShowTopo.jsp +++ b/WebRoot/page/show/nodeGroup/newShowTopo.jsp @@ -80,6 +80,7 @@ function newNode(x, y, w, h, text,img){ node.setSize(w, h); node.fillColor='255,128,0'; node.fontColor='0,0,0'; + node.font='15px 微软雅黑'; node.addEventListener("click",function(node){ console.log('x ----- '+node.target.x+' y ------ '+node.target.y+' ---- '+node.target.text); }) @@ -107,7 +108,7 @@ function newLink(nodeA, nodeZ, text, dashedPattern,arrowsRadius){ function newFoldLink(nodeA, nodeZ, text, direction, dashedPattern){ var link = new JTopo.FoldLink(nodeA, nodeZ, text); link.direction = direction || 'horizontal'; -// link.arrowsRadius = 15; //箭头大小 + link.arrowsRadius = 15; //箭头大小 link.lineWidth = 2; // 线宽 link.bundleOffset = 40; // 折线拐角处的长度 link.bundleGap = 20; // 线条之间的间隔 @@ -157,8 +158,8 @@ function newFlexionalLink(nodeA, nodeZ, text, dashedPattern,direction){ //遍历创建节点对象 - /* var node${item.id} = newNode(${item.x},${item.y},${item.width},${item.height},'${item.text}${item.id}','${item.topoImg.name}'); */ - var node${item.id} = newNode(${item.x},${item.y},${item.width},${item.height},'${item.text}','${item.topoImg.name}'); + /* var node${item.id} = newNode(${item.x},${item.y},${item.width},${item.height},'${item.text}${item.id}','${item.topoImg.name}'); */ + var node${item.id} = newNode(${item.x},${item.y},${item.width},${item.height},'${item.text}','${item.topoImg.name}'); node${item.id}.status=${item.status}; node${item.id}.serializedProperties.push('status'); @@ -232,6 +233,8 @@ function newFlexionalLink(nodeA, nodeZ, text, dashedPattern,direction){ link${item.id}.strokeColor=classJson[i][key]; }else if(key=='lineWidth'){ link${item.id}.lineWidth=classJson[i][key]; + }else if(key='arrowsRadius'){ + link${item.id}.arrowsRadius=classJson[i][key]; } } }