Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js

@@ -945,14 +945,14 @@ jQuery.validator.addMethod("addrPoolUnique",function(value, element) {
 // 策略分组管理asn号唯一
 jQuery.validator.addMethod("asnNoUnique",function(value, element) {
 	var ctx=$(element).attr("ctx");
-	var groupId= $("[name='groupId']").val();
-	var url = ctx+"/basics/policyGroup/checkAsnNo";
+	var id= $("[name='id']").val();
+	var url = ctx+"/basics/asnGroup/checkAsnNo";
 	var result = true;
 	$.ajax({
 		type:'post',
 		async:false,
 		url: url,
-		data:{"groupId":groupId,"asnNo":value},
+		data:{"id":id,"asnId":value},
 		success:function(data){
 			result = data;
 		}

src/main/webapp/static/pages/scripts/appNames.js

@@ -32,7 +32,7 @@ $(function(){
 			}
 		});
 	}
-	var asnNos=[];
+	/*var asnNos=[];
 	$(".configGroup").each(function(){
 		if($(this).attr("asnNo")&&$(this).attr("asnNo")!=''){
 			asnNos.push($(this).attr("asnNo"));
@@ -53,5 +53,5 @@ $(function(){
 				}
 			}
 		});
-	}
+	}*/
 });

src/main/webapp/static/pages/scripts/echart.js

@@ -282,11 +282,11 @@
     	var data=new Array();
     	var xData=new Array();
     	var drillData=new Array();
-    	var unit="bytes";
+    	var unit="Link Times";
     	$(rs).each(function(i, d) {
     		var inoctetsNum=d.linkNum;
-        	unit=changeUnit(inoctetsNum);
-        	inoctetsNum=changeNum(inoctetsNum);
+//        	unit=changeUnit(inoctetsNum);
+//        	inoctetsNum=changeNum(inoctetsNum);
     		/*var pktNum=new Array();
     		var byteLen=new Array();*/
     		xData.push(d.ipAddr);