From 8b1f5164588647091da663dd0202808bbc142e60 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Mon, 26 Mar 2018 15:03:24 +0800
Subject: [PATCH] =?UTF-8?q?=EF=BC=881=EF=BC=89=E4=BF=AE=E5=A4=8D=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=8C=89=E9=92=AE=E5=8A=9F=E8=83=BD=20=EF=BC=882?=
 =?UTF-8?q?=EF=BC=89=E9=9A=90=E8=97=8Fseq=E4=B8=80=E5=88=97=20=EF=BC=883?=
 =?UTF-8?q?=EF=BC=89=E6=8F=8F=E8=BF=B0=E5=AD=97=E6=AE=B5=E5=8F=AF=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=EF=BC=8C=E5=8F=96=E6=B6=88=E4=BA=86=E9=9D=9E=E7=A9=BA?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/include/form/complexInfo.jsp | 2 +-
 src/main/webapp/WEB-INF/include/form/ipInfo.jsp      | 2 +-
 src/main/webapp/WEB-INF/include/form/stringInfo.jsp  | 2 +-
 src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp | 6 ------
 src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp | 6 +++---
 src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp      | 6 ------
 src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp      | 6 +++---
 src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp  | 6 ------
 src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp  | 6 +++---
 9 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
index c0c328a9a..f32c07523 100644
--- a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
@@ -4,7 +4,7 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="config_describe"/></label>
+            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
             <div class="col-md-6">
                 <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
             </div>
diff --git a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
index d7a425267..efc3aa2fd 100644
--- a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
@@ -4,7 +4,7 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="config_describe"/></label>
+            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
             <div class="col-md-6">
                 <input class="form-control" type="text" id="cfgDesc" name="cfgDesc" value="${_cfg.cfgDesc}">
             </div>
diff --git a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
index ec8061d3b..9da9b031a 100644
--- a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
@@ -4,7 +4,7 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="config_describe"/></label>
+            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
             <div class="col-md-6">
                 <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
             </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
index 1bd111e9e..10860cc04 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
@@ -14,9 +14,6 @@ $(function(){
 	});
 	$("#cfgFrom").validate({
 		rules: {
-			'cfgDesc':{
-				required:true
-			},
 			'keywords':{
 				required:true
 			},
@@ -34,9 +31,6 @@ $(function(){
 			}
 		},
 		messages: {
-			'cfgDesc':{
-				required:'<spring:message code="required"/>'
-			},
 			'keywords':{
 				required:'<spring:message code="required"/>'
 			},
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
index 7173e0660..72b2c4580 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
@@ -109,7 +109,7 @@
 								</div> --%>
 								<div class="pull-left">
 									 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
-									 <button type="button" class="btn btn-default" onClick="resetx()"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+									 <button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
 	                                 <button type="button" class="btn btn-default" id="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></button>
 								</div>
 								 <div class="pull-right">
@@ -248,7 +248,7 @@
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
-									<th><spring:message code="seq"/></th>
+									<%-- <th><spring:message code="seq"/></th> --%>
 									<th><spring:message code="config_describe"/></th>
 									<th><spring:message code="key_word"/></th>
 									<th><spring:message code="block_type"/></th>
@@ -271,7 +271,7 @@
 							<tbody>
 								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 									<tr>
-									<td>${status.index+1 }</td>
+									<%-- <td>${status.index+1 }</td> --%>
 									<td>${cfg.cfgDesc }</td>
 									<%-- <td>${cfg.district }</td> --%>
 									<td>${cfg.keywords }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
index 121e8a4db..dff2b7e1f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
@@ -62,9 +62,6 @@ $(function(){
 	}); 		
 	$("#ipCfgFrom").validate({
 		rules: {
-			cfgDesc: {
-				required: true,
-			},
 			ipType: {
 				required: true,
 			},
@@ -114,9 +111,6 @@ $(function(){
 			
 		},
 		messages: {
-			cfgDesc: {
-				required: '<spring:message code="required"/>',
-			},
 			ipType: {
 				required: '<spring:message code="required"/>',
 			},
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
index d6eaabefe..69d043ec3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
@@ -153,7 +153,7 @@
 								
 								<div class="pull-left">
 									 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
-									 <button type="button" class="btn btn-default" onClick="resetx()"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+									 <button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
 	                                 <button type="button" class="btn btn-default" id="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></button>
 								</div>
 								 <div class="pull-right">
@@ -300,7 +300,7 @@
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
-									<th><spring:message code="seq"/></th>
+									<%-- <th><spring:message code="seq"/></th> --%>
 									<th><spring:message code="config_describe"/></th>
 									<th>ip<spring:message code="type"/></th>
 									<th><spring:message code="client_ip"/></th>
@@ -343,7 +343,7 @@
 							<tbody>
 								<c:forEach items="${page.list }" var="ipCfg" varStatus="status" step="1">
 									<tr pId="${status.index}">
-									<td>${status.index+1 }</td>
+									<%-- <td>${status.index+1 }</td> --%>
 									<td>${ipCfg.cfgDesc }</td>
 									<td>V${ipCfg.ipType }</td>
 									<td>${ipCfg.srcIp }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
index aa68243c1..ee70af6ea 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
@@ -7,9 +7,6 @@
 $(function(){
 	$("#cfgFrom").validate({
 		rules: {
-			'cfgDesc':{
-				required:true
-			},
 			'cfgKeywords':{
 				required:true
 			},
@@ -33,9 +30,6 @@ $(function(){
 			}
 		},
 		messages: {
-			'cfgDesc':{
-				required:'<spring:message code="required"/>'
-			},
 			'cfgKeywords':{
 				required:'<spring:message code="required"/>'
 			},
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
index ff409f0a3..997b99ebe 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
@@ -110,7 +110,7 @@
 								</div> --%>
 								<div class="pull-left">
 									 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
-									 <button type="button" class="btn btn-default" onClick="resetx()"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+									 <button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
 	                                 <button type="button" class="btn btn-default" id="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></button>
 								</div>
 								 <div class="pull-right">
@@ -257,7 +257,7 @@
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
-									<th><spring:message code="seq"/></th>
+									<%-- <th><spring:message code="seq"/></th> --%>
 									<th><spring:message code="config_describe"/></th>
 									<th><spring:message code="key_word"/></th>
 									<th><spring:message code="block_type"/></th>
@@ -286,7 +286,7 @@
 							<tbody>
 								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 									<tr>
-									<td>${status.index+1 }</td>
+									<%-- <td>${status.index+1 }</td> --%>
 									<td>${cfg.cfgDesc }</td>
 									<td>${cfg.cfgKeywords }</td>
 									<td>