1.解决部分日志页面验证错误也可查询问题

2.标题首字母css控制大写
3.增加日志查询IPv4与IPv6验证及格式提示

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

@@ -28,6 +28,11 @@ jQuery.validator.addMethod("ip", function(value, element) {
 	return this.optional(element) || (/^(\d+)\.(\d+)\.(\d+)\.(\d+)$/.test(value) && (RegExp.$1 <256 && RegExp.$2<256 && RegExp.$3<256 && RegExp.$4<256));   
 }, "请输入合法的IP地址");
 
+//IPv4  IPv6 
+jQuery.validator.addMethod("ipv4v6", function(value, element) {
+	return this.optional(element) || (/^(\d+)\.(\d+)\.(\d+)\.(\d+)$/.test(value) && (RegExp.$1 <256 && RegExp.$2<256 && RegExp.$3<256 && RegExp.$4<256))||/^\s*((([0-9A-Fa-f]{1,4}:){7}(([0-9A-Fa-f]{1,4})|:))|(([0-9A-Fa-f]{1,4}:){6}(:|(:[0-9A-Fa-f]{1,4})))|(([0-9A-Fa-f]{1,4}:){5}((:?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}((:?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}((:?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}((:?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:)(:[0-9A-Fa-f]{1,4}){0,4}((:?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(:(:[0-9A-Fa-f]{1,4}){0,5}((:)|((:[0-9A-Fa-f]{1,4}){1,2}))))(%.+)?\s*$/.test(value);   
+}, "请输入合法的IP地址如IPv4 0.0.0.0或IPv6 ::");
+
 jQuery.validator.addMethod("abc",function(value, element) {
 	return this.optional(element) || /^[a-zA-Z0-9_]*$/.test(value);
 },"请输入字母数字或下划线");

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js

@@ -51,6 +51,7 @@
 		ipv6: "ipv6",
 		over6: "4over6",
 		over4: "6over4",
+		ipv4v6:"Please enter a correct IPv4(0.0.0.0) or IPv6(::)",
 		all: "all",
 		ip_subnet: "Subnet",
 		ip_range: "ip Range",

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js

@@ -45,10 +45,11 @@
 		isp: "isp",
 		close_info: "close",
 		client_ip: "client ip",
-		ipv4: "ipv4",
-		ipv6: "ipv6",
+		ipv4: "IPv4",
+		ipv6: "IPv6",
 		over6: "4over6",
 		over4: "6over4",
+		ipv4v6:"IPv4(0.0.0.0) or IPv6(::)",
 		all: "all",
 		ip_subnet: "Subnet",
 		ip_range: "ip Range",

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js

@@ -52,6 +52,7 @@
 		ipv6: "ipv6",
 		over6: "4over6",
 		over4: "6over4",
+		ipv4v6:"请输入合法的IP地址如IPv4(0.0.0.0)或IPv6(::)",
 		all: "全部",
 		ip_subnet: "Subnet",
 		ip_subnet: "Subnet",

src/main/webapp/static/global/scripts/common.js

@@ -380,6 +380,15 @@ $(function(){
            },
            "doendDate": {
                compareDate: "[name=dobeginDate]"
+           },
+           "capIp":{
+        	   ipv4v6:true
+           },
+           "sIp":{
+        	   ipv4v6:true
+           },
+           "dIp":{
+        	   ipv4v6:true
            }
        },
        submitHandler: function(form){
@@ -389,6 +398,10 @@ $(function(){
    });
 });
 window.onload=function(){
+	//日志查询IP类型增加格式提示
+	$("#searchForm [name='capIp']").attr("placeholder","IPv4 0.0.0.0 or IPv6 ::");
+	$("#searchForm [name='sIp']").attr("placeholder","IPv4 0.0.0.0 or IPv6 ::");
+	$("#searchForm [name='dIp']").attr("placeholder","IPv4 0.0.0.0 or IPv6 ::");
 	// 动态调整日志页搜索框的样式，防止validate的错误提示导致样式错乱
 	var igHeight = $("#searchForm").find(".col-md-12").find(".pull-left").find(".input-group").height();
 	$("#searchForm").find(".col-md-12").find(".pull-left").find(".input-group").bind("DOMNodeInserted",function(e) {

src/main/webapp/static/pages/css/pageLogs.css

@@ -13,4 +13,8 @@ table.logTb td {
 	-khtml-text-overflow: ellipsis;
 	-moz-text-overflow: ellipsis;
 	-webkit-text-overflow: ellipsis;
-} 
+} 
+/*列表标题首字母大写  */
+table thead tr th{
+	text-transform: capitalize;
+}