(1)修复重置按钮功能

(2)隐藏seq一列
(3)描述字段可为空,取消了非空验证
This commit is contained in:
wangxin
2018-03-26 15:03:24 +08:00
parent 9d50205d5f
commit 8b1f516458
9 changed files with 12 additions and 30 deletions

View File

@@ -4,7 +4,7 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <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"> <div class="col-md-6">
<input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}"> <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
</div> </div>

View File

@@ -4,7 +4,7 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <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"> <div class="col-md-6">
<input class="form-control" type="text" id="cfgDesc" name="cfgDesc" value="${_cfg.cfgDesc}"> <input class="form-control" type="text" id="cfgDesc" name="cfgDesc" value="${_cfg.cfgDesc}">
</div> </div>

View File

@@ -4,7 +4,7 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <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"> <div class="col-md-6">
<input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}"> <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
</div> </div>

View File

@@ -14,9 +14,6 @@ $(function(){
}); });
$("#cfgFrom").validate({ $("#cfgFrom").validate({
rules: { rules: {
'cfgDesc':{
required:true
},
'keywords':{ 'keywords':{
required:true required:true
}, },
@@ -34,9 +31,6 @@ $(function(){
} }
}, },
messages: { messages: {
'cfgDesc':{
required:'<spring:message code="required"/>'
},
'keywords':{ 'keywords':{
required:'<spring:message code="required"/>' required:'<spring:message code="required"/>'
}, },

View File

@@ -109,7 +109,7 @@
</div> --%> </div> --%>
<div class="pull-left"> <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 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> <button type="button" class="btn btn-default" id="filter-btn"> 筛选 <i class="fa fa-angle-double-down"></i></button>
</div> </div>
<div class="pull-right"> <div class="pull-right">
@@ -248,7 +248,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap"> <table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead> <thead>
<tr> <tr>
<th><spring:message code="seq"/></th> <%-- <th><spring:message code="seq"/></th> --%>
<th><spring:message code="config_describe"/></th> <th><spring:message code="config_describe"/></th>
<th><spring:message code="key_word"/></th> <th><spring:message code="key_word"/></th>
<th><spring:message code="block_type"/></th> <th><spring:message code="block_type"/></th>
@@ -271,7 +271,7 @@
<tbody> <tbody>
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1"> <c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
<tr> <tr>
<td>${status.index+1 }</td> <%-- <td>${status.index+1 }</td> --%>
<td>${cfg.cfgDesc }</td> <td>${cfg.cfgDesc }</td>
<%-- <td>${cfg.district }</td> --%> <%-- <td>${cfg.district }</td> --%>
<td>${cfg.keywords }</td> <td>${cfg.keywords }</td>

View File

@@ -62,9 +62,6 @@ $(function(){
}); });
$("#ipCfgFrom").validate({ $("#ipCfgFrom").validate({
rules: { rules: {
cfgDesc: {
required: true,
},
ipType: { ipType: {
required: true, required: true,
}, },
@@ -114,9 +111,6 @@ $(function(){
}, },
messages: { messages: {
cfgDesc: {
required: '<spring:message code="required"/>',
},
ipType: { ipType: {
required: '<spring:message code="required"/>', required: '<spring:message code="required"/>',
}, },

View File

@@ -153,7 +153,7 @@
<div class="pull-left"> <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 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> <button type="button" class="btn btn-default" id="filter-btn"> 筛选 <i class="fa fa-angle-double-down"></i></button>
</div> </div>
<div class="pull-right"> <div class="pull-right">
@@ -300,7 +300,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap"> <table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead> <thead>
<tr> <tr>
<th><spring:message code="seq"/></th> <%-- <th><spring:message code="seq"/></th> --%>
<th><spring:message code="config_describe"/></th> <th><spring:message code="config_describe"/></th>
<th>ip<spring:message code="type"/></th> <th>ip<spring:message code="type"/></th>
<th><spring:message code="client_ip"/></th> <th><spring:message code="client_ip"/></th>
@@ -343,7 +343,7 @@
<tbody> <tbody>
<c:forEach items="${page.list }" var="ipCfg" varStatus="status" step="1"> <c:forEach items="${page.list }" var="ipCfg" varStatus="status" step="1">
<tr pId="${status.index}"> <tr pId="${status.index}">
<td>${status.index+1 }</td> <%-- <td>${status.index+1 }</td> --%>
<td>${ipCfg.cfgDesc }</td> <td>${ipCfg.cfgDesc }</td>
<td>V${ipCfg.ipType }</td> <td>V${ipCfg.ipType }</td>
<td>${ipCfg.srcIp }</td> <td>${ipCfg.srcIp }</td>

View File

@@ -7,9 +7,6 @@
$(function(){ $(function(){
$("#cfgFrom").validate({ $("#cfgFrom").validate({
rules: { rules: {
'cfgDesc':{
required:true
},
'cfgKeywords':{ 'cfgKeywords':{
required:true required:true
}, },
@@ -33,9 +30,6 @@ $(function(){
} }
}, },
messages: { messages: {
'cfgDesc':{
required:'<spring:message code="required"/>'
},
'cfgKeywords':{ 'cfgKeywords':{
required:'<spring:message code="required"/>' required:'<spring:message code="required"/>'
}, },

View File

@@ -110,7 +110,7 @@
</div> --%> </div> --%>
<div class="pull-left"> <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 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> <button type="button" class="btn btn-default" id="filter-btn"> 筛选 <i class="fa fa-angle-double-down"></i></button>
</div> </div>
<div class="pull-right"> <div class="pull-right">
@@ -257,7 +257,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap"> <table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead> <thead>
<tr> <tr>
<th><spring:message code="seq"/></th> <%-- <th><spring:message code="seq"/></th> --%>
<th><spring:message code="config_describe"/></th> <th><spring:message code="config_describe"/></th>
<th><spring:message code="key_word"/></th> <th><spring:message code="key_word"/></th>
<th><spring:message code="block_type"/></th> <th><spring:message code="block_type"/></th>
@@ -286,7 +286,7 @@
<tbody> <tbody>
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1"> <c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
<tr> <tr>
<td>${status.index+1 }</td> <%-- <td>${status.index+1 }</td> --%>
<td>${cfg.cfgDesc }</td> <td>${cfg.cfgDesc }</td>
<td>${cfg.cfgKeywords }</td> <td>${cfg.cfgKeywords }</td>
<td> <td>