增加查看区域信息公共方法ajaxAreaEffictiveInfo

修改contIp、contUrl、picUrl、picIp、voip列表中的区域ip
2018-06-05 17:52:26 +08:00
parent 8adaa4a9ec
commit 2b93917c27
13 changed files with 252 additions and 37 deletions
--- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
@@ -343,7 +343,11 @@
 									</td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isAreaEffective==1}">
+												<a areaEffectiveIds="${cfg.areaEffectiveIds }" compileId="${cfg.compileId }" href="javascript:void(0)" name="viewAreaInfo">
+													<spring:message code="yes"/>
+												</a>
+										</c:if>
 									</td>
 									<td>${cfg.requestName }</td>
 									<c:set var="classify"></c:set>
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
@@ -329,7 +329,11 @@
 									</td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isAreaEffective==1}">
+												<a areaEffectiveIds="${cfg.areaEffectiveIds }" compileId="${cfg.compileId }" href="javascript:void(0)" name="viewAreaInfo">
+													<spring:message code="yes"/>
+												</a>
+										</c:if>
 									</td>
 									<td>${cfg.requestName }</td>
 									<c:set var="classify"></c:set>
--- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
@@ -343,7 +343,11 @@
 									</td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isAreaEffective==1}">
+												<a areaEffectiveIds="${cfg.areaEffectiveIds }" compileId="${cfg.compileId }" href="javascript:void(0)" name="viewAreaInfo">
+													<spring:message code="yes"/>
+												</a>
+										</c:if>
 									</td>
 									<td>${cfg.requestName }</td>
 									<c:set var="classify"></c:set>
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
@@ -329,7 +329,11 @@
 									</td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isAreaEffective==1}">
+												<a areaEffectiveIds="${cfg.areaEffectiveIds }" compileId="${cfg.compileId }" href="javascript:void(0)" name="viewAreaInfo">
+													<spring:message code="yes"/>
+												</a>
+										</c:if>
 									</td>
 									<td>${cfg.requestName }</td>
 									<c:set var="classify"></c:set>
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
@@ -194,10 +194,10 @@
 								html+="<label><spring:message code='ip_type'/>：</label>";
 								html+="<label>"
 								if(item.ipType==4){
-									html+="<spring:message code='IPV4'/>";
+									html+="<spring:message code='ipv4'/>";
 								}
 								if(item.ipType==6){
-									html+="<spring:message code='IPV6'/>";
+									html+="<spring:message code='ipv6'/>";
 								}
 								if(item.ipType==46){
 									html+="<spring:message code='4over6'/>";
@@ -657,7 +657,11 @@
 									</td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
-										<c:if test="${indexCfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==1}">
+												<a areaEffectiveIds="${indexCfg.areaEffectiveIds }" compileId="${indexCfg.compileId }" href="javascript:void(0)" name="viewAreaInfo">
+													<spring:message code="yes"/>
+												</a>
+										</c:if>
 									</td>
 									<td>${indexCfg.requestName }</td>
 									<c:set var="classify"></c:set>
--- a/src/main/webapp/static/global/plugins/jquery-jbox/2.3/jquery.jBox-2.3.src.js
+++ b/src/main/webapp/static/global/plugins/jquery-jbox/2.3/jquery.jBox-2.3.src.js
@@ -608,7 +608,7 @@
 	if(lang.indexOf("zh")!=-1) {
 		
 		$.jBox.stateDefaults = { content: '', buttons: { '确定': 'ok' }, buttonsFocus: 0, submit: function (v, h, f) { return true; } };
-		$.jBox.languageDefaults = { close: '关闭', ok: '确定', yes: '是', no: '否', cancel: '取消' };
+		$.jBox.languageDefaults = { close: "", ok: '确定', yes: '是', no: '否', cancel: '取消' };
 	}else{
 		$.jBox.stateDefaults = { content: '', buttons: { 'ok': 'ok' }, buttonsFocus: 0, submit: function (v, h, f) { return true; } };
 		$.jBox.languageDefaults = { close: 'close', ok: 'ok', yes: 'yes', no: 'no', cancel: 'cancel' };
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
@@ -34,6 +34,19 @@
 		portRange:"Please enter a valid Integer",
 		portMaskRange:"Port must be a valid Integer and mask must between 0 and 65535.The correct pattern is \"port/mask\".",
 		chooseAreaOrIsp:"The region and the oprater must choose one",
-		areaControl:"Action drop and loop do not need area control"
+		areaControl:"Action drop and loop do not need area control",
+		ip_type: "ip type",
+		ip_pattern: "ip Pattern",
+		area: "area",
+		isp: "isp",
+		close_info: "close",
+		client_ip: "client ip",
+		ipv4: "ipv4",
+		ipv6: "ipv6",
+		over6: "4over6",
+		over4: "6over4",
+		all: "all",
+		ip_subnet: "Subnet",
+		ip_range: "ip Range"
 	});
 }(jQuery));
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
@@ -32,6 +32,19 @@
 		portRange:"Please enter a valid Integer",
 		portMaskRange:"Port must be a valid Integer and mask must between 0 and 65535.The correct pattern is \"port/mask\".",
 		chooseAreaOrIsp:"The region and the oprater must choose one",
-		areaControl:"Action drop and loop do not need area control"
+		areaControl:"Action drop and loop do not need area control",
+		ip_type: "ip type",
+		ip_pattern: "ip Pattern",
+		area: "area",
+		isp: "isp",
+		close_info: "close",
+		client_ip: "client ip",
+		ipv4: "ipv4",
+		ipv6: "ipv6",
+		over6: "4over6",
+		over4: "6over4",
+		all: "all",
+		ip_subnet: "Subnet",
+		ip_range: "ip Range"
 	});
 }(jQuery));
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
@@ -35,6 +35,20 @@
 		portRange:"端口必须为整数，非0数字不能以0开头",
 		portMaskRange:"端口必须为整数，掩码范围0-65535，非0数字不能以0开头。格式为\"端口/掩码\"",
 		chooseAreaOrIsp:"区域和运营商必选一个",
-		areaControl:"丢弃和回流动作不能区域管控"
+		areaControl:"丢弃和回流动作不能区域管控",
+		ip_type: "ip类型",
+		ip_pattern: "ip格式",
+		area: "区域",
+		isp: "运营商",
+		close_info: "关闭",
+		client_ip: "源IP",
+		ipv4: "ipv4",
+		ipv6: "ipv6",
+		over6: "4over6",
+		over4: "6over4",
+		all: "全部",
+		ip_subnet: "Subnet",
+		ip_subnet: "Subnet",
+		ip_range: "ip Range"
 	});
 }(jQuery));
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -247,6 +247,92 @@ $(function(){
 		}
 	});
   /*=====关键字与表达式处理 结束=====*/
+   
+   $("a[name=viewAreaInfo]").hover(function(){
+	   	var areaEffectiveIds=$(this).attr("areaEffectiveIds");
+		var compileId=$(this).attr("compileId");
+		$.ajax({
+			type:'post',
+			url:'ajaxAreaEffictiveInfo',
+			data:{"areaEffectiveIds":areaEffectiveIds,"compileId":compileId},
+			dataType:'json',
+			async:false,
+			success:function(data,textStatus){
+				if(textStatus=="success"){
+					var html = "";
+					var title="";
+					if(data.areaIsps.length > 0){
+						title=$.validator.messages.area+" "+$.validator.messages.isp;
+						html+="<table class='table table-striped table-bordered table-condensed' style='margin-left: 10px; width: 96%;'>";
+	      			  	html+="<thead>";
+	      			  		html+="<th>"+$.validator.messages.area+"</th>" +
+	      			  			  "<th>"+$.validator.messages.isp+"</th>";
+	      			   	html+="</thead>";
+	      			   	html+="<tbody>";
+	      			   	for(i=0;i<data.areaIsps.length;i++){
+	      			   		html+="<tr>";
+	      			   		html+="<td>"+data.areaIsps[i].areaName;
+	      					html+="</td>";
+	      					html+="<td>"+data.areaIsps[i].ispName;
+	      					html+="</td>";
+	      			   		html+="</tr>";
+	      			   	}
+	      			   	html+="</tbody>";
+	      			 	html+="</table>";
+					}
+					if(data.areaIps.length > 0){
+						title=$.validator.messages.area+" ip";
+						html+="<table class='table table-striped table-bordered table-condensed' style='margin-left: 10px; width: 96%;'>";
+						html+="<thead>";
+						html+="<th>"+$.validator.messages.ip_type+"</th>" +
+							  "<th>"+$.validator.messages.ip_pattern+"</th>" +
+							  "<th>"+$.validator.messages.client_ip+"</th>";
+						html+="</thead>";
+						html+="<tbody>";
+						for(i=0;i<data.areaIps.length;i++){
+							html+="<tr>";
+							html+="<td>";
+							if(data.areaIps[i].ipType==4){
+								html+=$.validator.messages.ipv4;
+							}
+							if(data.areaIps[i].ipType==6){
+								html+=$.validator.messages.ipv6;
+							}
+							if(data.areaIps[i].ipType==46){
+								html+=$.validator.messages.over4;
+							}
+							if(data.areaIps[i].ipType==64){
+								html+=$.validator.messages.over6;
+							}
+							if(data.areaIps[i].ipType==10){
+								html+=$.validator.messages.all;
+							}
+							html+="</td>";
+							html+="<td>";
+							if(data.areaIps[i].ipPattern==1){
+								html+=$.validator.messages.ip_subnet;
+							}
+							if(data.areaIps[i].ipPattern==2){
+								html+=$.validator.messages.ip_range;
+							}
+							if(data.areaIps[i].ipPattern==3){
+								html+="IP";
+							}
+							html+="</td>";
+							html+="<td>"+data.areaIps[i].srcIpAddress;
+							html+="</td>";
+							html+="</tr>";
+						}
+						html+="</tbody>";
+						html+="</table>";
+					}
+					top.$.jBox(html,{width: $(document).width()*0.4,height: 400,title:title, buttons:false});
+				}
+					 
+			}
+	  
+	  });
+   },function(){});
 });
 var switchIpType=function(obj){
 	var type=$(obj).val();
@@ -549,4 +635,4 @@ function exprTypeChecked(objNamePrefix,size){
 function validateDataIsLicit(){
 	var fdfz = $.trim($("#tags_1").val()).replace(/,/g,"");
    return isLicit(fdfz);
-}
+}