新topo图

WebRoot/page/show/nodeGroup/newShowTopo.jsp

@@ -208,33 +208,40 @@ function newFlexionalLink(nodeA, nodeZ, text, dashedPattern,direction){
 	    	     
 		//遍历创建连线 连接节点
 		<c:forEach items="${requestScope.topoLineInfos}" var="item">
-			<c:choose>
-				<c:when test="${not empty item.topoLineInfoClass}">
-					var link${item.id};
-					var classJson=${item.topoLineInfoClass};
-					for(var i=0;i<classJson.length;i++){
-						for(var key in classJson[i]){
-							if(key=='newLineMethod'){
-								if(classJson[i][key]=='FoldLink'){
-									link${item.id}=newFoldLink(node${item.topoNodeInfo1.id},node${item.topoNodeInfo2.id},'${item.text}');
-								}else if(classJson[i][key]=='FlexionalLink'){
-									link${item.id}=newFlexionalLink(node${item.topoNodeInfo1.id},node${item.topoNodeInfo2.id},'${item.text}');
-								}
-							}else if(key=='offsetGap'){
-								link${item.id}.offsetGap=classJson[i][key];
-							}else if(key=='direction'){
-								link${item.id}.direction=classJson[i][key];
-							}else if(key=='nodeIndex'){
-								link${item.id}.nodeIndex=classJson[i][key];
+		<c:choose>
+			<c:when test="${not empty item.topoLineInfoClass}">
+				var link${item.id};
+				var classJson=${item.topoLineInfoClass};
+				for(var i=0;i<classJson.length;i++){
+					for(var key in classJson[i]){
+						if(key=='newLineMethod'){
+							if(classJson[i][key]=='FoldLink'){
+								link${item.id}=newFoldLink(node${item.topoNodeInfo1.id},node${item.topoNodeInfo2.id},'${item.text}');
+							}else if(classJson[i][key]=='FlexionalLink'){
+								link${item.id}=newFlexionalLink(node${item.topoNodeInfo1.id},node${item.topoNodeInfo2.id},'${item.text}');
+							}else{
+								var link${item.id} = newLink(node${item.topoNodeInfo1.id},node${item.topoNodeInfo2.id},'${item.text}');
 							}
+						}else if(key=='offsetGap'){
+							link${item.id}.offsetGap=classJson[i][key];
+						}else if(key=='direction'){
+							link${item.id}.direction=classJson[i][key];
+						}else if(key=='nodeIndex'){
+							link${item.id}.nodeIndex=classJson[i][key];
+						}else if(key=='strokeColor'){
+							link${item.id}.strokeColor=classJson[i][key];
+						}else if(key=='lineWidth'){
+							link${item.id}.lineWidth=classJson[i][key];
 						}
 					}
-				</c:when>
-				<c:otherwise>
-					var link${item.id} = newLink(node${item.topoNodeInfo1.id},node${item.topoNodeInfo2.id},'${item.text}');
-				</c:otherwise>
-			</c:choose>
-		</c:forEach>
+				}
+			</c:when>
+			<c:otherwise>
+				var link${item.id} = newLink(node${item.topoNodeInfo1.id},node${item.topoNodeInfo2.id},'${item.text}');
+			</c:otherwise>
+		</c:choose>
+	</c:forEach>
+
 
 		//缩放并居中显示
 		stage.centerAndZoom();

src/conf/myconfig.properties

@@ -35,48 +35,48 @@ defaultRoomMaxRows =20
 defaultRoomMaxCols =20
 detec.switch.str = switchport
 detec.systeminfo.str = systeminfo
-#超周期，默认紧急状态:0：紧急；1：非紧急
+#\u8d85\u5468\u671f\uff0c\u9ed8\u8ba4\u7d27\u6025\u72b6\u6001:0\uff1a\u7d27\u6025\uff1b1\uff1a\u975e\u7d27\u6025
 detec.timeout.police.emergent = 0
-#超周期，默认告警级别
+#\u8d85\u5468\u671f\uff0c\u9ed8\u8ba4\u544a\u8b66\u7ea7\u522b
 detec.timeout.police.level = 0
-#监测数据设置告警时，对于指定多个标识符（如多个盘符、多个CPU、多个网卡）的分隔符 --暂时未使用
+#\u76d1\u6d4b\u6570\u636e\u8bbe\u7f6e\u544a\u8b66\u65f6\uff0c\u5bf9\u4e8e\u6307\u5b9a\u591a\u4e2a\u6807\u8bc6\u7b26\uff08\u5982\u591a\u4e2a\u76d8\u7b26\u3001\u591a\u4e2aCPU\u3001\u591a\u4e2a\u7f51\u5361\uff09\u7684\u5206\u9694\u7b26 --\u6682\u65f6\u672a\u4f7f\u7528
 alarm.set.marker.separator=|
-#默认查询历史监测数据的时间：单位天
+#\u9ed8\u8ba4\u67e5\u8be2\u5386\u53f2\u76d1\u6d4b\u6570\u636e\u7684\u65f6\u95f4\uff1a\u5355\u4f4d\u5929
 default.search.history.detect.data.day=3
-#任务配置-总体比例图中,表格节点超过一页时的叠加单位,默认为5
+#\u4efb\u52a1\u914d\u7f6e-\u603b\u4f53\u6bd4\u4f8b\u56fe\u4e2d,\u8868\u683c\u8282\u70b9\u8d85\u8fc7\u4e00\u9875\u65f6\u7684\u53e0\u52a0\u5355\u4f4d,\u9ed8\u8ba4\u4e3a5
 #nmstaskmanager.resultchart.foldunit=5
 
-#工具管理:上传下载插件的路径„
+#\u5de5\u5177\u7ba1\u7406:\u4e0a\u4f20\u4e0b\u8f7d\u63d2\u4ef6\u7684\u8def\u5f84\u0084
 serverPath=/home/nms/apache-tomcat-7.0.59/webapps/NMSNMSA
 uploadFilePath=/download/
-#数据库类型：oracle/mysql
+#\u6570\u636e\u5e93\u7c7b\u578b\uff1aoracle/mysql
 db_type=mysql
 config.update.flag = 6
 
-#跳转系统的url
+#\u8df3\u8f6c\u7cfb\u7edf\u7684url
 system.url=http://10.0.6.247:3000/login
 target.system.user=admin
 target.system.pwd=12345678
 
 
-#监测入库总控线程是否启用，1：启用
+#\u76d1\u6d4b\u5165\u5e93\u603b\u63a7\u7ebf\u7a0b\u662f\u5426\u542f\u7528\uff0c1\uff1a\u542f\u7528
 flag.detect.insert.control=0
-#监测入库总控 轮询间隔 ，单位 s
+#\u76d1\u6d4b\u5165\u5e93\u603b\u63a7 \u8f6e\u8be2\u95f4\u9694 \uff0c\u5355\u4f4d s
 detect.insert.control.period=60
-#通知监测数据入库，释放锁超时时间，单位：s
+#\u901a\u77e5\u76d1\u6d4b\u6570\u636e\u5165\u5e93\uff0c\u91ca\u653e\u9501\u8d85\u65f6\u65f6\u95f4\uff0c\u5355\u4f4d\uff1as
 detect.insert.timeout=60
 
-#线程池大小
+#\u7ebf\u7a0b\u6c60\u5927\u5c0f
 executor_socket_thread_size =10
-#周期线程池大小
+#\u5468\u671f\u7ebf\u7a0b\u6c60\u5927\u5c0f
 executor_scheduled_thread_size=5
 dc.handshake.start=30
-#与dc握手间隔
+#\u4e0edc\u63e1\u624b\u95f4\u9694
 dc.handshake.period=300
-detec.timeout.check.period=900
-#是否启动监测超时检查入库
+detec.timeout.check.period=120
+#\u662f\u5426\u542f\u52a8\u76d1\u6d4b\u8d85\u65f6\u68c0\u67e5\u5165\u5e93
 flag_detec_timeout=1
-#邮件周期
+#\u90ae\u4ef6\u5468\u671f
 mailing_period=120
 
 consul.system.url=http://10.0.6.247:8787/thirdProjectLogin
@@ -84,7 +84,7 @@ nextval_function_name=nextval
 currval_function_name=currval
 
 nation.role.jsbh=224
-#若系统为rc系统，配置此配置，菜单显示为rc的菜单   值为分中心角色id
+#\u82e5\u7cfb\u7edf\u4e3arc\u7cfb\u7edf\uff0c\u914d\u7f6e\u6b64\u914d\u7f6e\uff0c\u83dc\u5355\u663e\u793a\u4e3arc\u7684\u83dc\u5355   \u503c\u4e3a\u5206\u4e2d\u5fc3\u89d2\u8272id
 #region.role.jsbh=21
 #\u5206\u4E2D\u5FC3\u7684id, \u56FD\u5BB6\u4E2D\u5FC3\u586B-1
 system.id=100003
@@ -103,4 +103,5 @@ nms.port.url=http\://192.168.11.64\:8080/galaxy-service/service/nms/v1/trafficNe
 nms.rule.url=http\://192.168.11.64\:8080/galaxy-service/service/nms/v1/saveNmsDiRule
 
 default.nodeGroupId=100000
-prefabricate.view=100000,100003,100004,100005,100006,100007,100033,100035,100037
+prefabricate.view=100000,100003,100004,100005,100006,100007,100033,100035,100037
+dc.notice=0