diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java index daf597c89..2cb2462a5 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java @@ -397,13 +397,12 @@ public class AvContentController extends BaseController { return "redirect:" + adminPath +"/ntc/av/picUrlList?functionId="+functionId; } /*****************************picUrl业务***************/ - /** * 1、effectiveIds分组展示 * 2、无effectiveIds查询area_ip,根据compileId查询展示 */ @ResponseBody - @RequestMapping(value = "/ajaxAreaEffictiveInfo") + @RequestMapping(value = "/area/ajaxAreaEffictiveInfo") public Map ajaxAreaEffictiveInfo(String areaEffectiveIds,Integer compileId) { Map data=new HashMap(); diff --git a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp index e68e51d08..b40a814f6 100644 --- a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp @@ -2,6 +2,7 @@ <%@ include file="/WEB-INF/include/taglib.jsp"%>

+
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp index 122cf0047..a3a2e7d06 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp @@ -344,7 +344,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp index 6702e324d..0bb35b3b9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp @@ -14,12 +14,28 @@ $(function(){ $("#serviceId").val($(".action:checked").attr("serviceId")); $("#cfgFrom").validate({ errorPlacement: function(error,element){ - $(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error); + if($(element).parents().hasClass("tagsinput")){ + $(element).parents(".col-md-6").next("div").append(error); + }else{ + $(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error); + } }, submitHandler: function(form){ - //loading('onloading...'); - $("input[name$='exprType']").attr("disabled",false); - form.submit(); + var flag = true; + $("input[name$='cfgKeywords']").each(function(){ + if($(this).val()==''){ + $(this).parents(".form-group").find( + "div[for='" + + $(this).attr("name") + + "']").html(""); + flag = false; + return; + } + }) + if(flag){ + $("input[name$='exprType']").attr("disabled",false); + form.submit(); + } }, errorContainer: "#messageBox", }); diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp index 2515aa737..bca8bc2dd 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp @@ -330,7 +330,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp index 176a775d3..fbe6b88bd 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp @@ -344,7 +344,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp index 230edd471..438e4ff47 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp @@ -14,12 +14,29 @@ $(function(){ $("#serviceId").val($(".action:checked").attr("serviceId")); $("#cfgFrom").validate({ errorPlacement: function(error,element){ - $(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error); + if($(element).parents().hasClass("tagsinput")){ + $(element).parents(".col-md-6").next("div").append(error); + }else{ + $(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error); + } }, submitHandler: function(form){ //loading('onloading...'); - $("input[name$='exprType']").attr("disabled",false); - form.submit(); + var flag = true; + $("input[name$='cfgKeywords']").each(function(){ + if($(this).val()==''){ + $(this).parents(".form-group").find( + "div[for='" + + $(this).attr("name") + + "']").html(""); + flag = false; + return; + } + }) + if(flag){ + $("input[name$='exprType']").attr("disabled",false); + form.submit(); + } }, errorContainer: "#messageBox", }); diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp index 450a93b1d..d6006ffa8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp @@ -330,7 +330,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp index ea0ee5b66..6eeb3cd73 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp @@ -658,7 +658,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp b/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp index a43410b83..e009343a8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp @@ -261,7 +261,11 @@ - + + + + + ${cfg.requestName } diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 28fece2af..250f07669 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -247,92 +247,19 @@ $(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+=""; - html+=""; - html+="" + - ""; - html+=""; - html+=""; - for(i=0;i 0){ - title=$.validator.messages.area+" ip"; - html+="
"+$.validator.messages.area+""+$.validator.messages.isp+"
"; - html+=""; - html+="" + - "" + - ""; - html+=""; - html+=""; - for(i=0;i"+$("#keywordError").text()+""); + flag = false; + return; } - - }); - },function(){}); + } + })*/ + }); var switchIpType=function(obj){ var type=$(obj).val(); @@ -570,7 +497,89 @@ var more=function(obj){ } } - +var viewAreaInfo=function(path,areaEffectiveIds,compileId){ + $.ajax({ + type:'post', + url:path+'/ntc/av/area/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+="
"+$.validator.messages.ip_type+""+$.validator.messages.ip_pattern+""+$.validator.messages.client_ip+"
"; + html+=""; + html+="" + + ""; + html+=""; + html+=""; + for(i=0;i 0){ + title=$.validator.messages.area+" ip"; + html+="
"+$.validator.messages.area+""+$.validator.messages.isp+"
"; + html+=""; + html+="" + + "" + + ""; + html+=""; + html+=""; + for(i=0;i
"+$.validator.messages.ip_type+""+$.validator.messages.ip_pattern+""+$.validator.messages.client_ip+"