From e6576da655f63183210a85679f4c95f2fbf793ab Mon Sep 17 00:00:00 2001
From: chiguangxu <chigx@intranet.com>
Date: Thu, 22 Mar 2018 22:18:57 +0800
Subject: [PATCH] =?UTF-8?q?0000019:=E6=90=9C=E7=B4=A2=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=8C=96=EF=BC=8C=E6=89=80=E6=9C=89=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=95=8C=E9=9D=A2=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E9=87=8D=E6=96=B0=E8=B0=83=E6=95=B4=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/tags/sys/treeselect.tag    |   3 +-
 .../WEB-INF/views/basics/serviceDictList.jsp  | 101 ++++---
 .../WEB-INF/views/basics/sysDictList.jsp      | 100 ++++---
 .../WEB-INF/views/basics/taskInfoList.jsp     |  88 +++---
 .../WEB-INF/views/cfg/complexCfgList.jsp      | 253 +++++++++--------
 .../webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp | 185 ++++++------
 .../webapp/WEB-INF/views/cfg/ipCfgList.jsp    | 220 +++++++-------
 .../webapp/WEB-INF/views/cfg/requestList.jsp  |  88 +++---
 .../WEB-INF/views/cfg/stringCfgList.jsp       | 268 ++++++++++--------
 .../views/specific/specificServiceCfgList.jsp |  58 ++--
 .../specific/specificServiceHostCfgList.jsp   | 140 +++++----
 .../webapp/WEB-INF/views/sys/dictList.jsp     |  79 +++---
 .../webapp/WEB-INF/views/sys/menuList.jsp     |  26 +-
 .../webapp/WEB-INF/views/sys/userList.jsp     |  79 +++---
 .../WEB-INF/views/systemService/list.jsp      |   4 +-
 .../webapp/static/global/css/components.css   |   6 +
 16 files changed, 900 insertions(+), 798 deletions(-)

diff --git a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
index ee9955d66..7b58533d6 100644
--- a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
@@ -27,7 +27,8 @@
 <div class="input-append">
 	<input id="${id}Id" name="${name}" class="${cssClass} singleClass" type="hidden" value="${value}" />
 	<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'} type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}" placeholder="${value}"
-		class="${cssClass}" style="${cssStyle} background-color:transparent"/><a id="${id}Button" href="javascript:" class="btn ${disabled} ${hideBtn ? 'hide' : ''}" style="${smallBtn?'padding:4px 2px;':''}">&nbsp;<i class="icon-search"></i>&nbsp;</a>&nbsp;&nbsp;
+		class="${cssClass}" style="${cssStyle} background-color:transparent"/>
+		<%-- <a id="${id}Button" href="javascript:" class="btn ${disabled} ${hideBtn ? 'hide' : ''}" style="${smallBtn?'padding:4px 2px;':''}">&nbsp;<i class="icon-search"></i>&nbsp;</a>&nbsp;&nbsp; --%>
 </div>
 <script type="text/javascript">
 	$("#${id}Button, #${id}Name").click(function(){
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
index caee8722c..beef230f6 100644
--- a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
@@ -155,16 +155,15 @@
                                             </div>
                                             
                                             <input id="intype" class="form-control input-medium" placeholder="请输入配置编码" type="text">
-                                            
-                                            <div class="input-group-btn">
-                                              	 <button class="btn btn-default btn-search" type="button" onclick="page()"><i class="fa fa-search"></i></button>
-                                            </div>
+                                     
                                             
                                         </div>
 	                               </div>
 	                               
-	                               <div class="pull-left">
-	                                     <button type="button" class="btn btn-default" id="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></button>
+	                                <div class="pull-left">
+	                               		 <button type="button" class="btn blue" onClick="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="filter-btn"> <spring:message code="filter"></spring:message>  <i class="fa fa-angle-double-down"></i></button>
 									</div>
 
 									<div class="pull-right">
@@ -185,54 +184,64 @@
 							
 							
 							<!-- 筛选搜索内容栏默认隐藏-->
+							
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
 								
-									<div class="col-md-6">
-											<div class="pull-left">
-												<label>创建时间：</label>
-											</div>
-											<div class="pull-left">
-												<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value="${serviceDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-											</div>
-											<div class="pull-left">
-												<label>到</label>
-											</div>
-											<div class="pull-left">
-												<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value="${serviceDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-											</div>
+									<div class="col-md-3">
+										
+										<div class="form-group">
+                                            <label><spring:message code="create_time"/>：</label>
+                                            <input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" data-options="buttons:buttons"
+												value="<fmt:formatDate value="${serviceDictInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+                                          
+                                        </div>
+			
 									</div>
-									 <div class="col-md-6">
-										<div class="pull-left">
-											<label>修改时间：</label>
-										</div>
-										<div class="pull-left">
-											<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${serviceDictInfo.editBeginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										</div>
-										<div class="pull-left">
-											<label>到</label>
-										</div>
-										<div class="pull-left">
-											<input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${serviceDictInfo.editEndDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										</div>
-									</div> 
+									
+									<div class="col-md-3">
+										
+										<div class="form-group">
+                                            <label>&nbsp;</label>
+                                            <input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+												value="<fmt:formatDate value="${serviceDictInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+                                          
+                                        </div>
+			
+									</div>
+									
+									
+									<div class="col-md-3">
+										
+										<div class="form-group">
+                                            <label><spring:message code="edit_time"/>：</label>
+                                            <input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${serviceDictInfo.editBeginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+                                        </div>
+			
+									</div>
+									
+									<div class="col-md-3">
+										
+										<div class="form-group">
+                                            <label>&nbsp;</label>
+                                            <input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${serviceDictInfo.editEndDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+                                          
+                                        </div>
+			
+									</div>
+									
+									
+						
 								</div>
 								
-								<h5 class="page-header"></h5>
-								<div class="row">
-									
-									<div class="pull-left">
-										<button type="button" class="btn blue" onclick="page()"> <i class="fa fa-search"></i> 搜索  </button>
-										<button type="button" class="btn btn-default" onclick="reset()" id="resetBtn"> <i class="fa fa-refresh"></i> 重置  </button>
-									</div>
-							
-								</div>
+								
 							</div>
 							
+							
+							
+							
 							<!-- /筛选搜索内容栏    结束-->
 						
 						</form:form>
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
index ac09e3345..ca5cc8f6d 100644
--- a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
@@ -158,16 +158,14 @@
                                             </div>
                                             
                                             <input id="intype" class="form-control input-medium" placeholder="请输入配置编码" type="text">
-                                            
-                                            <div class="input-group-btn">
-                                              	 <button class="btn btn-default btn-search" type="button" onclick="page()"><i class="fa fa-search"></i></button>
-                                            </div>
-                                            
+                                     
                                         </div>
 	                               </div>
 	                               
-	                               <div class="pull-left">
-	                                     <button type="button" class="btn btn-default" id="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></button>
+	                                <div class="pull-left">
+	                               		 <button type="button" class="btn blue" onClick="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="filter-btn"> <spring:message code="filter"></spring:message>  <i class="fa fa-angle-double-down"></i></button>
 									</div>
 
 									<div class="pull-right">
@@ -188,54 +186,62 @@
 							
 							
 							<!-- 筛选搜索内容栏默认隐藏-->
+							
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
 								
-									<div class="col-md-6">
-											<div class="pull-left">
-												<label>创建时间：</label>
-											</div>
-											<div class="pull-left">
-												<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value="${sysDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-											</div>
-											<div class="pull-left">
-												<label>到</label>
-											</div>
-											<div class="pull-left">
-												<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value="${sysDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-											</div>
+									<div class="col-md-3">
+										
+										<div class="form-group">
+                                            <label><spring:message code="create_time"/>：</label>
+                                            <input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" data-options="buttons:buttons"
+												value="<fmt:formatDate value="${sysDictInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+                                          
+                                        </div>
+			
 									</div>
-									 <div class="col-md-6">
-										<div class="pull-left">
-											<label>修改时间：</label>
-										</div>
-										<div class="pull-left">
-											<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${sysDictInfo.editBeginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										</div>
-										<div class="pull-left">
-											<label>到</label>
-										</div>
-										<div class="pull-left">
-											<input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${sysDictInfo.editEndDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										</div>
-									</div> 
+									
+									<div class="col-md-3">
+										
+										<div class="form-group">
+                                            <label>&nbsp;</label>
+                                            <input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+												value="<fmt:formatDate value="${sysDictInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+                                          
+                                        </div>
+			
+									</div>
+									
+									
+									<div class="col-md-3">
+										
+										<div class="form-group">
+                                            <label><spring:message code="edit_time"/>：</label>
+                                            <input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${sysDictInfo.editBeginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+                                        </div>
+			
+									</div>
+									
+									<div class="col-md-3">
+										
+										<div class="form-group">
+                                            <label>&nbsp;</label>
+                                            <input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${sysDictInfo.editEndDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+                                          
+                                        </div>
+			
+									</div>
+									
+									
+						
 								</div>
 								
-								<h5 class="page-header"></h5>
-								<div class="row">
-									
-									<div class="pull-left">
-										<button type="button" class="btn blue" onclick="page()"> <i class="fa fa-search"></i> 搜索  </button>
-										<button type="button" class="btn btn-default" onclick="reset()" id="resetBtn"> <i class="fa fa-refresh"></i> 重置  </button>
-									</div>
-							
-								</div>
+								
 							</div>
 							
+							
 							<!-- /筛选搜索内容栏    结束-->
 						
 						</form:form>
diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
index 9931e7eb3..1e7d9d16a 100644
--- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
@@ -54,15 +54,13 @@
                                             <div class="input-group-btn">
 												<input id="taskName" name="taskName" class="form-control input-medium" type="text" value="${taskInfo.taskName }">
                                             </div>
-                                            
-                                            <div class="input-group-btn">
-                                              	 <button class="btn btn-default btn-search" type="button" onclick="page()"><i class="fa fa-search"></i></button>
-                                            </div>
-                                            
+                                        
                                         </div>
 	                               </div>
 	                                
 	                               <div class="pull-left">
+	                               		 <button type="button" class="btn blue" onClick="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="filter-btn"> <spring:message code="filter"></spring:message>  <i class="fa fa-angle-double-down"></i></button>
 									</div>
 
@@ -99,51 +97,55 @@
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
 								
-									<div class="col-md-6">
-											<div class="pull-left">
-												<label><spring:message code="task_time"/>：</label>
-											</div>
-											<div class="pull-left">
-												<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate" data-options="buttons:buttons"
+									<div class="col-md-3">
+										
+										<div class="form-group">
+                                            <label><spring:message code="task_time"/>：</label>
+                                            <input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" data-options="buttons:buttons"
 												value="<fmt:formatDate value="${taskInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
-											</div>
-											<div class="pull-left">
-												<label><spring:message code="to"/></label>
-											</div>
-											<div class="pull-left">
-												<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+                                          
+                                        </div>
+			
+									</div>
+									
+									<div class="col-md-3">
+										
+										<div class="form-group">
+                                            <label>&nbsp;</label>
+                                            <input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
 												value="<fmt:formatDate value="${taskInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
-											</div>
-											
+                                          
+                                        </div>
+			
 									</div>
-							
-									<div class="col-md-6">
-										<div class="pull-left">
-											<label><spring:message code="edit_time"/>：</label>
-										</div>
-										<div class="pull-left">
-											<input id="dobeginDate" name="dobeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+									
+									
+									<div class="col-md-3">
+										
+										<div class="form-group">
+                                            <label><spring:message code="edit_time"/>：</label>
+                                            <input id="dobeginDate" name="dobeginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
 											value="<fmt:formatDate value="${taskInfo.dobeginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
-										</div>
-										<div class="pull-left">
-											<label><spring:message code="to"/></label>
-										</div>
-										<div class="pull-left">
-											<input id="doendDate" name="doendDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${taskInfo.doendDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
-										</div>
+                                        </div>
+			
 									</div>
+									
+									<div class="col-md-3">
+										
+										<div class="form-group">
+                                            <label>&nbsp;</label>
+                                            <input id="doendDate" name="doendDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${taskInfo.doendDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+                                          
+                                        </div>
+			
+									</div>
+									
+									
+						
 								</div>
 								
-								<h5 class="page-header"></h5>
-								<div class="row">
-									
-									<div class="pull-left">
-										<button type="button" class="btn blue" onclick="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>
-									</div>
-							
-								</div>
+								
 							</div>
 							
 							<!-- /筛选搜索内容栏    结束-->
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
index 409022bba..7173e0660 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
@@ -38,7 +38,9 @@
 		<%-- <button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/complex/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button> --%>
 		<c:if test="${audit==0}">
 		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/cfg/complex/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="add"></spring:message></button>
+			onClick="javascript:window.location='${ctx}/cfg/complex/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'">
+			<i class="fa fa-plus"></i>
+			<spring:message code="add"></spring:message></button>
 		</c:if>
 	</div>
 
@@ -66,53 +68,34 @@
 								<div class="pull-left">
 									<c:set var="state"><spring:message code='state'/></c:set>
 									<form:select path="isAudit" class="selectpicker select2 input-small">
-										<form:option value=""><spring:message code="state"/></form:option>
+										<form:option value=""><spring:message code="all_states"/></form:option>
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
 										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
+								
 								<div class="pull-left">
-									<c:set var="request_number"><spring:message code='request_number'/></c:set>
-									<form:select path="requestId" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
-										<form:option value=""><spring:message code="${request_number}"></spring:message></form:option>
-										<c:forEach items="${requestInfos}" var="requestInfo" >
-											<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
-								<div class="pull-left">
-									<c:set var="flI18n"><spring:message code='type'/></c:set>
-									<form:select path="classify" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
-										<form:option value=""><spring:message code="${flI18n}"></spring:message></form:option>
-										<c:forEach items="${fls}" var="fl" >
-											<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
-								<div class="pull-left">
-									<c:set var="attributeI18n"><spring:message code='attribute'/></c:set>
-									<form:select path="attribute" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
-										<form:option value=""><spring:message code="${attributeI18n}"></spring:message></form:option>
-										<c:forEach items="${xzs}" var="xz" >
-											<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
-								<div class="pull-left">
-									<c:set var="labelI18n"><spring:message code='label'/></c:set>
-									<form:select path="lable" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
-										<form:option value=""><spring:message code="${labelI18n}"></spring:message></form:option>
-										<c:forEach items="${lables}" var="lable" >
-											<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
+								
+									<div class="input-group">
+                                         <div class="input-group-btn">
+                                         
+                                        	<form:select path="" class="selectpicker select2 input-small" >
+                                        		<form:option value="key_word"><spring:message code="key_word"></spring:message></form:option>
+												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
+											</form:select>
+									
+                                         </div>
+                                         
+                                         <input id="intype" class="form-control input-medium" type="text" value="">
+                                  
+                                    </div> 
 								</div>
 								<%-- <button type="button" class="btn btn-default btn-sm" onclick="return page()">
 								<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
 								</button> --%>
-								<div class="pull-left">
+							<%-- 	<div class="pull-left">
 								<c:set var="sortI18n"><spring:message code="sort"/></c:set>
 									<select name="orderBy" class="selectpicker select2 input-small">
 										<option value="" <c:if test="${empty page.orderBy}">selected</c:if> ><spring:message code="${sortI18n}"/></option>
@@ -123,93 +106,140 @@
 										<option value="${page.alias}.audit_time asc" <c:if test="${fn:contains(page.orderBy , 'audit_time asc') }">selected</c:if> ><spring:message code="auditTime_asc"/></option>
 										<option value="${page.alias}.audit_time desc" <c:if test="${fn:contains(page.orderBy , 'audit_time desc') }">selected</c:if> ><spring:message code="auditTime_desc"/></option>
 									</select>
-								</div>
+								</div> --%>
 								<div class="pull-left">
-	                                     <button type="button" class="btn btn-default" id="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></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="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></button>
 								</div>
 								 <div class="pull-right">
-                                    <button class="btn btn-default btn-search" type="button" onclick="return page()"><i class="fa fa-search"></i></button>
                                  	<a class="btn  btn-icon-only btn-default setfields tooltips" 
                                       		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
                                              <i class="icon-wrench"></i>
                                      </a>
                                  </div>
 							</div>
-							<!-- 搜索内容与操作按钮栏 -->
+							<!-- /搜索内容与操作按钮栏 -->
 							
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
-									<div class="col-md-6">
-											<div class="pull-left col-md-2">
-												<label><spring:message code="config_time"/>：</label>
-											</div>
-											<div class="pull-left">
-												<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value='${cfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-											</div>
-											<div class="pull-left">
-												<label>到</label>
-											</div>
-											<div class="pull-left">
-												<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value="${cfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-											</div>
+								
+									<div class="col-md-3">
 											
-									</div>
-							
-									<div class="col-md-6">
-										<div class="pull-left col-md-2">
-											<label><spring:message code="edit_time"/>：</label>
-										</div>
-										<div class="pull-left">
-											<input name="search_edit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${cfg.search_edit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										</div>
-										<div class="pull-left">
-											<label>到</label>
-										</div>
-										<div class="pull-left">
-											<input name="search_edit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${cfg.search_edit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										</div>
-									</div>
+										<div class="form-group">
+	                                            <label class="control-label"><spring:message code='request_number'/></label>
+	                                            <c:set var="select"><spring:message code='select'/></c:set>
+	                                            <form:select path="requestId" class="selectpicker form-control" title="${select}" data-live-search="true" data-live-search-placeholder="search">
+													<c:forEach items="${requestInfos}" var="requestInfo" >
+														<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+		                                        
+                                        <div class="col-md-3">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='type'/></label>
+	                                            <c:set var="select"><spring:message code='select'/></c:set>
+	                                            <form:select path="classify" class="selectpicker form-control" title="${select}" data-live-search="true" data-live-search-placeholder="search">
+												<c:forEach items="${fls}" var="fl" >
+													<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
+												</c:forEach>
+											</form:select>
+											</div>
+                                          
+                                        </div>
+					
+										<div class="col-md-3">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='attribute'/></label>
+	                                            <c:set var="select"><spring:message code='select'/></c:set>
+	                                            <form:select path="attribute" class="selectpicker form-control" title="${select}" data-live-search="true" data-live-search-placeholder="search">
+													<c:forEach items="${xzs}" var="xz" >
+														<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+		                                        
+                                        <div class="col-md-3">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='label'/></label>
+	                                          	<c:set var="select"><spring:message code='select'/></c:set>
+	                                            <form:select path="lable" class="selectpicker  form-control" title="${select }" data-live-search="true" data-live-search-placeholder="search">
+													<c:forEach items="${lables}" var="lable" >
+														<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
 									
-									<div class="col-md-6">
-										<div class="pull-left col-md-2">
-											<label><spring:message code="audit_time"/>：</label>
-										</div>
-										<div class="pull-left">
-											<input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${cfg.search_audit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										</div>
-										<div class="pull-left">
-											<label>到</label>
-										</div>
-										<div class="pull-left">
-											<input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${cfg.search_audit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										</div>
-									</div>
-									<div class="col-md-6">
-										<div class="pull-left col-md-2">
-											<label><spring:message code="key_word"/>：</label>
-										</div>
-										<div class="pull-left">
-											<form:input path="keywords" class="form-control input-small"/>
-										</div>
-									</div>
 								</div>
-								<h5 class="page-header"></h5>
+								
 								<div class="row">
-									
-									<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" id="resetBtn" class="btn btn-default"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="config_time"/>：</label>
+											<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value='${cfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="edit_time"/>：</label>
+											<input name="search_edit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_edit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_edit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_edit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="audit_time"/>：</label>
+											<input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_audit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_audit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
 									</div>
-							
 								</div>
-							</div>
+								
+							
+							</div> 
 							
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
@@ -341,19 +371,6 @@
 				</div>
 			</div>
 </div>
-<style>
-	.input-medium {
-    width: 200px !important;
-}
-	.Wdate {
-    border: #c2cad8 1px solid;
-    height: 26px;
-}
 
-.dropdown-menu {
-    min-width: 50px;
-}
-
-</style>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
index f478acd47..9f263cbbb 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
@@ -82,9 +82,10 @@
 
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/cfg/dnsIp/list'"><spring:message code="refresh"></spring:message></button>
 		<shiro:hasPermission name="system:service:view">
-			<button type="button" class="btn btn-primary" onClick="javascript:window.location='${ctx}/cfg/dnsIp/form'"><spring:message code="add"></spring:message></button>
+			<button type="button" class="btn btn-primary" onClick="javascript:window.location='${ctx}/cfg/dnsIp/form'">
+			<i class="fa fa-plus"></i>
+			<spring:message code="add"></spring:message></button>
 		</shiro:hasPermission>
 	</div>
 
@@ -116,48 +117,14 @@
 									</form:select> --%>
 									<input name="cfgDesc" class="form-control input-medium" placeholder="<spring:message code="config_describe"/>" value="${dnsIpCfg.cfgDesc }"/>
 								</div>
+							
 								<div class="pull-left">
-									<form:select path="request.id" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
-										<form:option value=""><spring:message code="request_number"/></form:option>
-										<c:forEach items="${requestInfos}" var="requestInfo" >
-											<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
-								<div class="pull-left">
-									<form:select path="classify" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
-										<form:option value=""><spring:message code="type"></spring:message></form:option>
-										<c:forEach items="${fls}" var="fl">
-											<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
-								<div class="pull-left">
-									<form:select path="attribute" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
-										<form:option value=""><spring:message code="attribute"></spring:message></form:option>
-										<c:forEach items="${xzs}" var="xz" >
-											<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
-								<div class="pull-left">
-									<c:set var="labelI18n"><spring:message code='label'/></c:set>
-									<form:select path="lable" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
-										<form:option value=""><spring:message code="label"></spring:message></form:option>
-										<c:forEach items="${lables}" var="lable" >
-											<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
-								<div class="pull-left">
+									<button type="button" class="btn blue" onClick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
+									<button type="button" class="btn btn-default 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-left">
-									<button type="button" class="btn btn-default" onclick="return page();"> <i class="fa fa-search"></i></button>
-								</div>
-								<div class="pull-left">
-									<button type="button" class="btn btn-default resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/></button>
-								</div>
+								
+						
 								<div class="pull-right">
 									<%-- <button type="button" class="btn btn-default" onclick="edit()">
                                         <i class="fa fa-edit"></i> <spring:message code="edit"/>
@@ -187,60 +154,85 @@
 							
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<div class="col-md-12 filter-action-select-panle hide" >
-								<div class="row">
 								
-									<div class="col-md-6">
-											<div class="pull-left">
-												<label><spring:message code="config_time"/>：</label>
-											</div>
-											<div class="pull-left">
-												<input name="searchCreateTimeStart" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate"
-												value="<fmt:formatDate value='${dnsIpCfg.searchCreateTimeStart}' pattern='yyyy-MM-dd HH:mm:ss'/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-											</div>
-											<div class="pull-left">
-												<label>-</label>
-											</div>
-											<div class="pull-left">
-												<input name="searchCreateTimeEnd" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate"
-												value="<fmt:formatDate value="${dnsIpCfg.searchCreateTimeEnd}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-											</div>
-											
-									</div>
-							
-									<%-- <div class="col-md-6">
-										<div class="pull-left">
-											<label><spring:message code="edit_time"/>：</label>
-										</div>
-										<div class="pull-left">
-											<input name="searchEditTimeStart" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate"
-											value="<fmt:formatDate value="${dnsIpCfg.searchEditTimeStart}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										</div>
-										<div class="pull-left">
-											<label>-</label>
-										</div>
-										<div class="pull-left">
-											<input name="searchEditTimeEnd" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate"
-											value="<fmt:formatDate value="${dnsIpCfg.searchEditTimeEnd}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										</div>
-									</div>
+								<div class="row">
 									
-									<div class="col-md-6">
-										<div class="pull-left">
-											<label><spring:message code="audit_time"/>：</label>
+										<div class="col-md-2">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='request_number'/>：</label>
+	                                            <c:set var="select"><spring:message code='select'/></c:set>
+	                                            <form:select path="request.id" class="selectpicker form-control" title="${select}" data-live-search="true" data-live-search-placeholder="search">
+													<c:forEach items="${requestInfos}" var="requestInfo" >
+														<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+	                                        
+                                        <div class="col-md-2">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='type'/>：</label>
+	                                            <c:set var="select"><spring:message code='select'/></c:set>
+	                                            <form:select path="classify" class="selectpicker form-control" title="${select}" data-live-search="true" data-live-search-placeholder="search">
+												<c:forEach items="${fls}" var="fl" >
+													<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
+												</c:forEach>
+											</form:select>
+											</div>
+                                          
+                                        </div>
+				
+										<div class="col-md-2">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='attribute'/>：</label>
+	                                            <c:set var="select"><spring:message code='select'/></c:set>
+	                                            <form:select path="attribute" class="selectpicker form-control" title="${select}" data-live-search="true" data-live-search-placeholder="search">
+													<c:forEach items="${xzs}" var="xz" >
+														<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+	                                        
+                                        <div class="col-md-2">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='label'/>：</label>
+	                                          	<c:set var="select"><spring:message code='select'/></c:set>
+	                                            <form:select path="lable" class="selectpicker  form-control" title="${select }" data-live-search="true" data-live-search-placeholder="search">
+													<c:forEach items="${lables}" var="lable" >
+														<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+                                        
+                                        <div class="col-md-2">
+											<div class="form-group">
+												<label><spring:message code="config_time"/>：</label>
+												<input name="searchCreateTimeStart" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+												value="<fmt:formatDate value='${dnsIpCfg.searchCreateTimeStart}' pattern='yyyy-MM-dd HH:mm:ss'/>" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											</div>
 										</div>
-										<div class="pull-left">
-											<input name="searchAuditTimeStart" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate"
-											value="<fmt:formatDate value="${dnsIpCfg.searchAuditTimeStart}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										<div class="col-md-2">
+											<div class="form-group">
+												<label>&nbsp;</label>
+												<input name="searchCreateTimeEnd" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+												value="<fmt:formatDate value="${dnsIpCfg.searchCreateTimeEnd}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											
+											</div>
 										</div>
-										<div class="pull-left">
-											<label>-</label>
-										</div>
-										<div class="pull-left">
-											<input name="searchAuditTimeEnd" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate"
-											value="<fmt:formatDate value="${dnsIpCfg.searchAuditTimeEnd}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										</div>
-									</div> --%>
+									
 								</div>
+								
+							
 							</div>
 							
 							<!-- /筛选搜索内容栏    结束-->
@@ -347,19 +339,6 @@
 				</div>
 			</div>
 </div>
-<style>
-	.input-medium {
-    width: 200px !important;
-}
-	.Wdate {
-    border: #c2cad8 1px solid;
-    height: 26px;
-}
 
-.dropdown-menu {
-    min-width: 50px;
-}
-
-</style>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
index 27e4c836f..d6eaabefe 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
@@ -40,7 +40,9 @@
 		<%-- <button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/ip/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}'"><spring:message code="refresh"></spring:message></button> --%>
 		<c:if test="${audit==0}">
 			<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/cfg/ip/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}'"><spring:message code="add"></spring:message></button>
+			onClick="javascript:window.location='${ctx}/cfg/ip/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}'">
+			<i class="fa fa-plus"></i>
+			<spring:message code="add"></spring:message></button>
 		</c:if>
 	</div>
 	<h3 class="page-title">
@@ -66,7 +68,7 @@
 							<div class="col-md-12">
 								<div class="pull-left">
 									<form:select path="isAudit" class="selectpicker select2 input-small">
-										<form:option value=""><spring:message code="state"/></form:option>
+										<form:option value=""><spring:message code="all_states"/></form:option>
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
@@ -74,6 +76,24 @@
 									</form:select>
 								</div>
 								<div class="pull-left">	
+								
+										<div class="input-group">
+                                            <div class="input-group-btn">
+                                            
+                                           		<form:select path="" class="selectpicker select2 input-small" >
+													<form:option value="srcIp"><spring:message code="client_ip"></spring:message></form:option>
+													<form:option value="dstIp"><spring:message code="server_ip"></spring:message></form:option>
+													<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
+												</form:select>
+												
+                                            </div>
+                                            
+                                            <input id="intype" class="form-control input-medium" type="text" value="">
+                                     
+                                        </div> 
+                                        
+	                               
+	                               
 										<%-- <div class="input-group">
                                             <div class="input-group-btn">
                                                 <form:select path="seltype" class="selectpicker select2 input-small" >
@@ -118,7 +138,8 @@
 								<%-- <button type="button" class="btn btn-default btn-sm" onclick="return page()">
 								<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
 								</button> --%>
-								<div class="pull-left">
+								
+								<%-- <div class="pull-left">
 									<select name="orderBy" class="selectpicker select2 input-small">
 										<option value="" <c:if test="${empty page.orderBy}">selected</c:if> ><spring:message code="sort"/></option>
 										<option value="${page.alias}.create_time asc" <c:if test="${fn:contains(page.orderBy,'create_time asc') }">selected</c:if> ><spring:message code="createTime_asc"/></option>
@@ -128,12 +149,14 @@
 										<option value="${page.alias}.audit_time asc" <c:if test="${fn:contains(page.orderBy , 'audit_time asc') }">selected</c:if> ><spring:message code="auditTime_asc"/></option>
 										<option value="${page.alias}.audit_time desc" <c:if test="${fn:contains(page.orderBy , 'audit_time desc') }">selected</c:if> ><spring:message code="auditTime_desc"/></option>
 									</select>
-								</div>
+								</div> --%>
+								
 								<div class="pull-left">
-	                                     <button type="button" class="btn btn-default" id="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></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="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></button>
 								</div>
 								 <div class="pull-right">
-                                    <button class="btn btn-default btn-search" type="button" onclick="return page()"><i class="fa fa-search"></i></button>
                                  	<a class="btn  btn-icon-only btn-default setfields tooltips" 
                                       		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
                                              <i class="icon-wrench"></i>
@@ -151,103 +174,123 @@
 										<c:when test="${action==8}">
 										</c:when>
 										<c:otherwise>
-											<div class="pull-left">
-												<form:select path="requestId" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
-													<form:option value=""><spring:message code="request_number"></spring:message></form:option>
-													<c:forEach items="${requestInfos}" var="requestInfo" >
-														<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
-													</c:forEach>
-												</form:select>
-											</div>
-											<div class="pull-left">
-												<form:select path="classify" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
-													<form:option value=""><spring:message code="type"></spring:message></form:option>
+										
+											<div class="col-md-3">
+										
+												<div class="form-group">
+		                                            <label class="control-label"><spring:message code='request_number'/></label>
+		                                            <c:set var="select"><spring:message code='select'/></c:set>
+		                                            <form:select path="requestId" class="selectpicker form-control" title="${select}" data-live-search="true" data-live-search-placeholder="search">
+														<c:forEach items="${requestInfos}" var="requestInfo" >
+															<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
+														</c:forEach>
+													</form:select>
+												</div>
+	                                          
+	                                        </div>
+	                                        
+	                                        <div class="col-md-3">
+										
+												<div class="form-group">
+		                                            <label class="control-label"><spring:message code='type'/></label>
+		                                            <c:set var="select"><spring:message code='select'/></c:set>
+		                                            <form:select path="classify" class="selectpicker form-control" title="${select}" data-live-search="true" data-live-search-placeholder="search">
 													<c:forEach items="${fls}" var="fl" >
 														<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
 													</c:forEach>
 												</form:select>
-											</div>
-											<div class="pull-left">
-												<form:select path="attribute" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
-													<form:option value=""><spring:message code="attribute"></spring:message></form:option>
-													<c:forEach items="${xzs}" var="xz" >
-														<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
-													</c:forEach>
-												</form:select>
-											</div>
-											<div class="pull-left">
-												<form:select path="lable" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
-													<form:option value=""><spring:message code="label"></spring:message></form:option>
-													<c:forEach items="${lables}" var="lable" >
-														<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
-													</c:forEach>
-												</form:select>
-											</div>
+												</div>
+	                                          
+	                                        </div>
+				
+											<div class="col-md-3">
+										
+												<div class="form-group">
+		                                            <label class="control-label"><spring:message code='attribute'/></label>
+		                                            <c:set var="select"><spring:message code='select'/></c:set>
+		                                            <form:select path="attribute" class="selectpicker form-control" title="${select}" data-live-search="true" data-live-search-placeholder="search">
+														<c:forEach items="${xzs}" var="xz" >
+															<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
+														</c:forEach>
+													</form:select>
+												</div>
+	                                          
+	                                        </div>
+	                                        
+	                                        <div class="col-md-3">
+										
+												<div class="form-group">
+		                                            <label class="control-label"><spring:message code='label'/></label>
+		                                          	<c:set var="select"><spring:message code='select'/></c:set>
+		                                            <form:select path="lable" class="selectpicker  form-control" title="${select }" data-live-search="true" data-live-search-placeholder="search">
+														<c:forEach items="${lables}" var="lable" >
+															<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
+														</c:forEach>
+													</form:select>
+												</div>
+	                                          
+	                                        </div>
 										</c:otherwise>
 									</c:choose>
 								</div>
+								
+								
 								<div class="row">
-									<div class="col-md-6">
-										<div class="pull-left">
+									<div class="col-md-2">
+										<div class="form-group">
 											<label><spring:message code="config_time"/>：</label>
-										</div>
-										<div class="pull-left">
-											<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value='${ipCfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										</div>
-										<div class="pull-left">
-											<label>到</label>
-										</div>
-										<div class="pull-left">
-											<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${ipCfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										</div>
-									</div>
-							
-									<div class="col-md-6">
-										<div class="pull-left">
-											<label><spring:message code="edit_time"/>：</label>
-										</div>
-										<div class="pull-left">
-											<input name="search_edit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${ipCfg.search_edit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										</div>
-										<div class="pull-left">
-											<label>到</label>
-										</div>
-										<div class="pull-left">
-											<input name="search_edit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${ipCfg.search_edit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value='${ipCfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
 									</div>
 									
-									<div class="col-md-6">
-										<div class="pull-left">
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${ipCfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="edit_time"/>：</label>
+											<input name="search_edit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${ipCfg.search_edit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_edit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${ipCfg.search_edit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
 											<label><spring:message code="audit_time"/>：</label>
-										</div>
-										<div class="pull-left">
-											<input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											<input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
 											value="<fmt:formatDate value="${ipCfg.search_audit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
 										</div>
-										<div class="pull-left">
-											<label>到</label>
-										</div>
-										<div class="pull-left">
-											<input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
 											value="<fmt:formatDate value="${ipCfg.search_audit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
 										</div>
 									</div>
 								</div>
 								
-								<h5 class="page-header"></h5>
-								<div class="row">
-									
-									<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" id="resetBtn" class="btn btn-default"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
-									</div>
 							
-								</div>
 							</div>
 							
 							<!-- /筛选搜索内容栏    结束-->
@@ -433,19 +476,6 @@
 				</div>
 			</div>
 </div>
-<style>
-	.input-medium {
-    width: 200px !important;
-}
-	.Wdate {
-    border: #c2cad8 1px solid;
-    height: 26px;
-}
 
-.dropdown-menu {
-    min-width: 50px;
-}
-
-</style>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
index 79d040c02..9dd59db75 100644
--- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
@@ -62,20 +62,18 @@
                                             
                                             <input id="intype" class="form-control input-medium" type="text" value="">
                                             
-                                            <div class="input-group-btn">
-                                              	 <button class="btn btn-default btn-search" type="button" onclick="page()"><i class="fa fa-search"></i></button>
-                                            </div>
-                                            
                                         </div>
 	                               </div>
 	                                
 	                               <div class="pull-left">
+	                               		 <button type="button" class="btn blue" onClick="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="filter-btn"> <spring:message code="filter"></spring:message>  <i class="fa fa-angle-double-down"></i></button>
 									</div>
 
 									<div class="pull-right">
 									<shiro:hasPermission name="cfg:requestInfo:edit">
-                                        <button type="button" class="btn btn-default" onclick="edit()">
+                                        <button type="button" class="btn btn-default" onClick="edit()">
                                             <i class="fa fa-edit"></i> <spring:message code="edit"></spring:message></button>
                                             <sys:delRow url="${ctx}/cfg/request/delete" id="contentTable" label="delete"></sys:delRow>
                                       <!--   <button type="button" class="btn btn-default">
@@ -109,51 +107,55 @@
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
 								
-									<div class="col-md-6">
-											<div class="pull-left">
-												<label><spring:message code="request_time"/>：</label>
-											</div>
-											<div class="pull-left">
-												<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate" data-options="buttons:buttons"
+									<div class="col-md-3">
+										
+										<div class="form-group">
+                                            <label><spring:message code="request_time"/>：</label>
+                                            <input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" data-options="buttons:buttons"
 												value="<fmt:formatDate value="${requestInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
-											</div>
-											<div class="pull-left">
-												<label><spring:message code="to"/></label>
-											</div>
-											<div class="pull-left">
-												<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+                                          
+                                        </div>
+			
+									</div>
+									
+									<div class="col-md-3">
+										
+										<div class="form-group">
+                                            <label>&nbsp;</label>
+                                            <input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
 												value="<fmt:formatDate value="${requestInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
-											</div>
-											
+                                          
+                                        </div>
+			
 									</div>
-							
-									<div class="col-md-6">
-										<div class="pull-left">
-											<label><spring:message code="edit_time"/>：</label>
-										</div>
-										<div class="pull-left">
-											<input id="dobeginDate" name="dobeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+									
+									
+									<div class="col-md-3">
+										
+										<div class="form-group">
+                                            <label><spring:message code="edit_time"/>：</label>
+                                            <input id="dobeginDate" name="dobeginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
 											value="<fmt:formatDate value="${requestInfo.dobeginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
-										</div>
-										<div class="pull-left">
-											<label><spring:message code="to"/></label>
-										</div>
-										<div class="pull-left">
-											<input id="doendDate" name="doendDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${requestInfo.doendDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
-										</div>
+                                        </div>
+			
 									</div>
+									
+									<div class="col-md-3">
+										
+										<div class="form-group">
+                                            <label>&nbsp;</label>
+                                            <input id="doendDate" name="doendDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${requestInfo.doendDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+                                          
+                                        </div>
+			
+									</div>
+									
+									
+						
 								</div>
 								
-								<h5 class="page-header"></h5>
-								<div class="row">
-									
-									<div class="pull-left">
-										<button type="button" class="btn blue" onclick="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>
-									</div>
-							
-								</div>
+								
 							</div>
 							
 							<!-- /筛选搜索内容栏    结束-->
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
index 799f9b5d4..ff409f0a3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
@@ -38,7 +38,9 @@
 		<%-- <button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/string/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button> --%>
 		<c:if test="${audit==0}">
 			<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/cfg/string/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}'"><spring:message code="add"></spring:message></button>
+			onClick="javascript:window.location='${ctx}/cfg/string/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}'">
+			<i class="fa fa-plus"></i>
+			<spring:message code="add"></spring:message></button>
 		</c:if>
 	</div>
 
@@ -65,55 +67,37 @@
 							<div class="col-md-12">
 								<div class="pull-left">
 									<form:select path="isAudit" class="selectpicker select2 input-small">
-										<form:option value=""><spring:message code="state"/></form:option>
+										<form:option value=""><spring:message code="all_states"/></form:option>
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
 										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
-								<c:choose>
-									<c:when test="${action==5}">
-									</c:when>
-									<c:otherwise>
-										<div class="pull-left">
-											<form:select path="requestId" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
-												<form:option value=""><spring:message code="request_number"></spring:message></form:option>
-												<c:forEach items="${requestInfos}" var="requestInfo" >
-													<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
-												</c:forEach>
+								
+								<div class="pull-left">
+								
+									<div class="input-group">
+                                         <div class="input-group-btn">
+                                         
+                                        	<form:select path="" class="selectpicker select2 input-small" >
+                                        		<form:option value="key_word"><spring:message code="key_word"></spring:message></form:option>
+												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 											</form:select>
-										</div>
-										<div class="pull-left">
-											<form:select path="classify" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
-												<form:option value="${fl.serviceDictId}"><spring:message code="type"></spring:message></form:option>
-												<c:forEach items="${fls}" var="fl" >
-													<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
-												</c:forEach>
-											</form:select>
-										</div>
-										<div class="pull-left">
-											<form:select path="attribute" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
-												<form:option value=""><spring:message code="attribute"></spring:message></form:option>
-												<c:forEach items="${xzs}" var="xz" >
-													<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
-												</c:forEach>
-											</form:select>
-										</div>
-										<div class="pull-left">
-											<form:select path="lable" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
-												<form:option value=""><spring:message code="label"></spring:message></form:option>
-												<c:forEach items="${lables}" var="lable" >
-													<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
-												</c:forEach>
-											</form:select>
-										</div>
-									</c:otherwise>
-								</c:choose>
+									
+                                         </div>
+                                         
+                                         <input id="intype" class="form-control input-medium" type="text" value="">
+                                  
+                                    </div> 
+								</div>
+								
+								
+								
 								<%-- <button type="button" class="btn btn-default btn-sm" onclick="return page()">
 								<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
 								</button> --%>
-								<div class="pull-left">
+								<%-- <div class="pull-left">
 									<select name="orderBy" class="selectpicker select2 input-small">
 										<option value="" <c:if test="${empty page.orderBy}">selected</c:if> ><spring:message code="sort"/></option>
 										<option value="${page.alias}.create_time asc" <c:if test="${fn:contains(page.orderBy,'create_time asc') }">selected</c:if> ><spring:message code="createTime_asc"/></option>
@@ -123,93 +107,148 @@
 										<option value="${page.alias}.audit_time asc" <c:if test="${fn:contains(page.orderBy , 'audit_time asc') }">selected</c:if> ><spring:message code="auditTime_asc"/></option>
 										<option value="${page.alias}.audit_time desc" <c:if test="${fn:contains(page.orderBy , 'audit_time desc') }">selected</c:if> ><spring:message code="auditTime_desc"/></option>
 									</select>
-								</div>
+								</div> --%>
 								<div class="pull-left">
-	                                     <button type="button" class="btn btn-default" id="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></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="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></button>
 								</div>
 								 <div class="pull-right">
-                                    <button class="btn btn-default btn-search" type="button" onclick="return page()"><i class="fa fa-search"></i></button>
                                  	<a class="btn  btn-icon-only btn-default setfields tooltips" 
                                       		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
                                              <i class="icon-wrench"></i>
                                      </a>
                                  </div>
 							</div>
-							<!-- 搜索内容与操作按钮栏 -->
+							<!-- /搜索内容与操作按钮栏 -->
 							
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
-									<div class="col-md-6">
-											<div class="pull-left col-md-2">
-												<label><spring:message code="config_time"/>：</label>
-											</div>
-											<div class="pull-left">
-												<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value='${cfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-											</div>
-											<div class="pull-left">
-												<label>到</label>
-											</div>
-											<div class="pull-left">
-												<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value="${cfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-											</div>
+								
+									<c:choose>
+										<c:when test="${action==5}">
+										</c:when>
+										<c:otherwise>
+											<div class="col-md-3">
 											
-									</div>
-							
-									<div class="col-md-6">
-										<div class="pull-left col-md-2">
-											<label><spring:message code="edit_time"/>：</label>
-										</div>
-										<div class="pull-left">
-											<input name="search_edit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${cfg.search_edit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										</div>
-										<div class="pull-left">
-											<label>到</label>
-										</div>
-										<div class="pull-left">
-											<input name="search_edit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${cfg.search_edit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										</div>
-									</div>
+													<div class="form-group">
+			                                            <label class="control-label"><spring:message code='request_number'/></label>
+			                                            <c:set var="select"><spring:message code='select'/></c:set>
+			                                            <form:select path="requestId" class="selectpicker form-control" title="${select}" data-live-search="true" data-live-search-placeholder="search">
+															<c:forEach items="${requestInfos}" var="requestInfo" >
+																<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
+															</c:forEach>
+														</form:select>
+													</div>
+		                                          
+		                                        </div>
+		                                        
+		                                        <div class="col-md-3">
+											
+													<div class="form-group">
+			                                            <label class="control-label"><spring:message code='type'/></label>
+			                                            <c:set var="select"><spring:message code='select'/></c:set>
+			                                            <form:select path="classify" class="selectpicker form-control" title="${select}" data-live-search="true" data-live-search-placeholder="search">
+														<c:forEach items="${fls}" var="fl" >
+															<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
+														</c:forEach>
+													</form:select>
+													</div>
+		                                          
+		                                        </div>
+					
+												<div class="col-md-3">
+											
+													<div class="form-group">
+			                                            <label class="control-label"><spring:message code='attribute'/></label>
+			                                            <c:set var="select"><spring:message code='select'/></c:set>
+			                                            <form:select path="attribute" class="selectpicker form-control" title="${select}" data-live-search="true" data-live-search-placeholder="search">
+															<c:forEach items="${xzs}" var="xz" >
+																<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
+															</c:forEach>
+														</form:select>
+													</div>
+		                                          
+		                                        </div>
+		                                        
+		                                        <div class="col-md-3">
+											
+													<div class="form-group">
+			                                            <label class="control-label"><spring:message code='label'/></label>
+			                                          	<c:set var="select"><spring:message code='select'/></c:set>
+			                                            <form:select path="lable" class="selectpicker  form-control" title="${select }" data-live-search="true" data-live-search-placeholder="search">
+															<c:forEach items="${lables}" var="lable" >
+																<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
+															</c:forEach>
+														</form:select>
+													</div>
+		                                          
+		                                        </div>
+											
+											
+										</c:otherwise>
+									</c:choose>
 									
-									<div class="col-md-6">
-										<div class="pull-left col-md-2">
-											<label><spring:message code="audit_time"/>：</label>
-										</div>
-										<div class="pull-left">
-											<input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${cfg.search_audit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										</div>
-										<div class="pull-left">
-											<label>到</label>
-										</div>
-										<div class="pull-left">
-											<input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${cfg.search_audit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										</div>
-									</div>
-									<div class="col-md-6">
-										<div class="pull-left col-md-2">
-											<label><spring:message code="key_word"/>：</label>
-										</div>
-										<div class="pull-left">
-											<form:input path="cfgKeywords" class="form-control input-small"/>
-										</div>
-									</div>
 								</div>
-								<h5 class="page-header"></h5>
+								
 								<div class="row">
-									
-									<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" id="resetBtn" class="btn btn-default"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="config_time"/>：</label>
+											<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value='${cfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="edit_time"/>：</label>
+											<input name="search_edit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_edit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_edit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_edit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="audit_time"/>：</label>
+											<input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_audit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_audit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
 									</div>
-							
 								</div>
-							</div>
+								
+							
+							</div> 
 							
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
@@ -351,19 +390,6 @@
 				</div>
 			</div>
 </div>
-<style>
-	.input-medium {
-    width: 200px !important;
-}
-	.Wdate {
-    border: #c2cad8 1px solid;
-    height: 26px;
-}
 
-.dropdown-menu {
-    min-width: 50px;
-}
-
-</style>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
index 2c5db4ad0..8d33bc3f2 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
@@ -154,17 +154,18 @@
 												</select>
                                             </div>
                                             <input id="intype" class="form-control input-medium" placeholder="<spring:message code='input_protocol_id'/>" type="text" onchange="casec()">
-                                            <div class="input-group-btn">
-                                              	 <button class="btn btn-default btn-search" type="button" onclick="page()"><i class="fa fa-search"></i></button>
-                                            </div>
+                                    
                                             
                                         </div>
 	                               </div>
 	                               <div class="pull-left" style="margin-top:10px;display:none" id="showError">
 									<label class="error"><spring:message code='input_integer'/></label>
 									</div>
-	                               <div class="pull-left">
-	                                     <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code='filter'/> <i class="fa fa-angle-double-down"></i></button>
+	                       
+									 <div class="pull-left">
+	                               		 <button type="button" class="btn blue" onClick="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="filter-btn"> <spring:message code="filter"></spring:message>  <i class="fa fa-angle-double-down"></i></button>
 									</div>
 									
 
@@ -189,37 +190,34 @@
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
 								
-									<div class="col-md-6">
-											<div class="pull-left">
-												<label><spring:message code='operate_time'/>：</label>
-											</div>
-											<div class="pull-left">
-												<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value="${specificServiceCfg.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-											</div>
-											<div class="pull-left">
-												<label><spring:message code='to'/></label>
-											</div>
-											<div class="pull-left">
-												<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value="${specificServiceCfg.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-											</div>
+								
+									<div class="col-md-2">
+										
+										<div class="form-group">
+                                            <label><spring:message code="operate_time"/>：</label>
+                                            <input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${specificServiceCfg.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+                                        </div>
+			
 									</div>
+									
+									<div class="col-md-2">
+										
+										<div class="form-group">
+                                            <label>&nbsp;</label>
+                                            <input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${specificServiceCfg.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+                                          
+                                        </div>
+			
+									</div>
+								
 								</div>
 								
-								<h5 class="page-header"></h5>
-								<div class="row">
-									
-									<div class="pull-left">
-										<button type="button"  class="btn blue" onclick="page()"> <i class="fa fa-search"></i> <spring:message code='search'/>  </button>
-										<button type="button" id="resetBtn" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> <spring:message code='reset'/>  </button>
-									</div>
-							
-								</div>
+								
 							</div>
 							
 							<!-- /筛选搜索内容栏    结束-->
-						
 						</form:form>
 
 					</div>
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp
index aa7c1885d..3f11c536d 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp
@@ -128,7 +128,7 @@
 											   </c:forEach>
 										</form:select>
 								   </div> --%>
-								   <div class="pull-left">
+								 <%--   <div class="pull-left">
 									<c:set var="spec_service_id">请选择协议名称</c:set>
 									<form:select path="specServiceId" class="selectpicker select2 input-small" title="${spec_service_id}" data-live-search="true" data-live-search-placeholder="search" onchange="page()">
 										<c:forEach items="${listSpecService}" var="specService" >
@@ -169,8 +169,47 @@
 								   <div class="pull-left">
                                     <button class="btn btn-default btn-search" type="button" onclick="return page()"><i class="fa fa-search"></i></button>
                                  </div>
+                                  --%>
+                                  
+                              <div class="pull-left" >
+									<form:select path="protocol" class="selectpicker select2 input-small" >
+										<form:option value="">所有协议</form:option>
+										   <c:forEach items="${fns:getDictList('SPEC_PROTOCOL')}" var="dict">
+										      <form:option value="${dict.itemCode}">${dict.itemValue}</form:option>
+										   </c:forEach>
+									</form:select>
+							   </div>
+							   
+							     <div class="pull-left">
+									<form:select path="direction" class="selectpicker select2 input-small" >
+										<form:option value="">所有方向</form:option>
+										   <c:forEach items="${fns:getDictList('SPEC_DIRECTION')}" var="dict">
+										      <form:option value="${dict.itemCode}">${dict.itemValue}</form:option>
+										   </c:forEach>
+									</form:select>
+							   </div>
+							   
+							   <div class="pull-left">	
+							
+									<div class="input-group">
+                                           <div class="input-group-btn">
+                                           
+                                          		<form:select path="" class="selectpicker select2 input-small" >
+												<form:option value="srcIp">协议ID</form:option>
+												<form:option value="srcIp"><spring:message code="client_ip"></spring:message></form:option>
+												<form:option value="dstIp"><spring:message code="server_ip"></spring:message></form:option>
+											</form:select>
+											
+                                           </div>
+                                           
+                                           <input id="intype" class="form-control input-medium" type="text" value="">
+                                    
+                                       </div> 
+                                </div>  
 								<div class="pull-left">
-	                                     <button type="button" class="btn btn-default" id="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></button>
+									  <button type="button" class="btn blue" onClick="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="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></button>
 								</div>
 								 
 									
@@ -207,69 +246,62 @@
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
-								
-									<div class="col-md-6">
-											<div class="pull-left">
-												<label>配置时间：</label>
-											</div>
-											<div class="pull-left">
-												<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate" data-options="buttons:buttons"
-												value="<fmt:formatDate value="${specificServiceHostCfg.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-											</div>
-											<div class="pull-left">
-												<label><spring:message code="to"/></label>
-											</div>
-											<div class="pull-left">
-												<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value="${specificServiceHostCfg.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-											</div>
-											
-									</div>
-							
-									<div class="col-md-6">
-										<div class="pull-left">
-											<label>修改时间：</label>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="config_time"/>：</label>
+											<input name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value='${specificServiceHostCfg.beginDate}' pattern='yyyy-MM-dd HH:mm:ss'/>" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
-										<div class="pull-left">
-											<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${specificServiceHostCfg.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="edit_time"/>：</label>
+											<input name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
 											value="<fmt:formatDate value="${specificServiceHostCfg.editBeginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
 										</div>
-										<div class="pull-left">
-											<label><spring:message code="to"/></label>
-										</div>
-										<div class="pull-left">
-											<input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
 											value="<fmt:formatDate value="${specificServiceHostCfg.editEndDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
 										</div>
 									</div>
 									
-										<div class="col-md-6">
-										<div class="pull-left">
-											<label>审核时间：</label>
-										</div>
-										<div class="pull-left">
-											<input id="auditBeginDate" name="auditBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="audit_time"/>：</label>
+											<input name="auditBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
 											value="<fmt:formatDate value="${specificServiceHostCfg.auditBeginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="auditEndDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${specificServiceHostCfg.auditEndDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
 										</div>
-										<div class="pull-left">
-											<label><spring:message code="to"/></label>
-										</div>
-										<div class="pull-left">
-											<input id="auditEndDate" name="auditEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${specificServiceHostCfg.auditEndDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										</div>
-									</div> 
-								</div>
-								
-								<h5 class="page-header"></h5>
-								<div class="row">
-									
-									<div class="pull-left">
-										<button type="button" class="btn blue" onclick="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>
 									</div>
-							
 								</div>
+							
+							
+							
 							</div>
 							
 							<!-- /筛选搜索内容栏    结束-->
diff --git a/src/main/webapp/WEB-INF/views/sys/dictList.jsp b/src/main/webapp/WEB-INF/views/sys/dictList.jsp
index f1bd68ac9..f54bf0e25 100644
--- a/src/main/webapp/WEB-INF/views/sys/dictList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/dictList.jsp
@@ -225,43 +225,50 @@
 		<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
 		<!-- 搜索内容与操作按钮栏 -->
 		<div class="col-md-12 filter-action-select-panle" style="background-color:transparent">
-		<div class="row">
-		<div class="col-md-3">
-			<div class="pull-left">
-				<label>模块名称：</label>
-			</div>
-			<div class="pull-left">
-				<input id="moduleName" name="moduleName" type="text" maxlength="50" class="form-control" value="${sysDataDictionaryName.moduleName}"/>
-			</div>
-		</div>
-		<div class="col-md-3">
-			<div class="pull-left">
-				<label>字典标识：</label>
-			</div>
-			<div class="pull-left">
-				<input id="mark" name="mark" type="text" maxlength="50" class="form-control" value="${sysDataDictionaryName.mark}"/>
-			</div>
-		</div>
-		<div class="col-md-6">
-			<div class="pull-left">
-				<label>创建时间：</label>
-			</div>
-			<div class="pull-left">
-				<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-					value="<fmt:formatDate value="${sysDataDictionaryName.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
-			</div>
-			<div class="pull-left">
-				<label><spring:message code="to"/></label>
-			</div>
-			<div class="pull-left">
-				<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-					value="<fmt:formatDate value="${sysDataDictionaryName.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
-			</div>
-				<div class="pull-left">
-					<button type="submit" class="btn blue""><i class="fa fa-search"></i><spring:message code="search" /></button>
+			<div class="row">
+				<div class="col-md-2">
+							
+					 <div class="form-group">
+					 	<label>模块名称：</label>
+					 	<input id="moduleName" name="moduleName" type="text" maxlength="50" class="form-control" value="${sysDataDictionaryName.moduleName}"/>
+					 </div>		
+				</div>	
+				
+				<div class="col-md-2">
+							
+					 <div class="form-group">
+					 	<label>字典标识：</label>
+					 	<input id="mark" name="mark" type="text" maxlength="50" class="form-control" value="${sysDataDictionaryName.mark}"/>
+					 </div>		
+				</div>	
+				
+				<div class="col-md-2">
+							
+					 <div class="form-group">
+					 	<label>创建时间：</label>
+					 	<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+							value="<fmt:formatDate value="${sysDataDictionaryName.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+					 </div>		
+				</div>	
+				
+				<div class="col-md-2">
+							
+					 <div class="form-group">
+					 	<label>&nbsp;</label>
+					 	<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+							value="<fmt:formatDate value="${sysDataDictionaryName.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+					 </div>		
+				</div>	
+				
+				<div class="col-md-1">
+					<div class="form-group">
+						<label>&nbsp;</label>
+						<button type="submit" class="btn blue form-control"><i class="fa fa-search"></i><spring:message code="search" /></button>
+					
+					</div>
 				</div>
-		</div>
-		</div>
+	
+			</div>
 		</div>
 	</form:form>
 	</div>
diff --git a/src/main/webapp/WEB-INF/views/sys/menuList.jsp b/src/main/webapp/WEB-INF/views/sys/menuList.jsp
index fc5759676..82e13222d 100644
--- a/src/main/webapp/WEB-INF/views/sys/menuList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/menuList.jsp
@@ -21,9 +21,7 @@
 <body>
 	<div class="page-content">
 		<div class="theme-panel hidden-xs hidden-sm">
-		
-			<button type="button" class="btn btn-default">&nbsp;刷新&nbsp;</button>
-	
+
 			<shiro:hasPermission name="sys:menu:edit"><button type="button" class="btn btn-primary"
 				onClick="javascript:window.location='${ctx}/sys/menu/form'">&nbsp;新增菜单&nbsp;</button></shiro:hasPermission>
 				
@@ -31,33 +29,21 @@
 	
 		<h3 class="page-title">
 			菜单管理 
+			<small><spring:message code="date_list"/></small>
 		</h3>
+		
+		<h5 class="page-header"></h5>
 	
 		<div class="row">
 			<div class="col-md-12">
-				<div class="portlet box blue">
-					<div class="portlet-title">
-						<div class="caption">
-							<i class="fa fa-cogs"></i>菜单列表
-						</div>
-						<div class="tools">
-							<a href="javascript:;" class="collapse" data-original-title=""
-								title=""> </a> <a href="#portlet-config" data-toggle="modal"
-								class="config" data-original-title="" title=""> </a> <a
-								href="javascript:;" class="reload" data-original-title=""
-								title=""> </a> <a href="javascript:;" class="remove"
-								data-original-title="" title=""> </a>
-						</div>
-					</div>
+				<div class="portlet">
+
 					<div class="portlet-body">
 	
-	
 						<div class="row" >
 	
-	
 						   <div class="col-md-12">
 							
-							
 								<sys:message content="${message}"/>
 								<form id="listForm" method="post">
 									<table id="treeTable" class="table table-striped table-bordered table-condensed">
diff --git a/src/main/webapp/WEB-INF/views/sys/userList.jsp b/src/main/webapp/WEB-INF/views/sys/userList.jsp
index d5770c07e..c273baed9 100644
--- a/src/main/webapp/WEB-INF/views/sys/userList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/userList.jsp
@@ -65,7 +65,6 @@
 
 		<shiro:hasPermission name="sys:user:edit">
 			<div class="theme-panel hidden-xs hidden-sm">
-			<button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/sys/user/list'"><spring:message code="refresh"></spring:message></button>
 				<button type="button" class="btn btn-primary"
 					onClick="javascript:window.location='${ctx}/sys/user/form'">
 					<i class="fa fa-plus"></i>
@@ -96,61 +95,65 @@
 					<div class="col-md-12 filter-action-select-panle"
 						style="background-color: transparent">
 						<div class="row">
-							<div class="col-md-3">
-								<div class="pull-left">
+							<div class="col-md-2">
+							
+								<div class="form-group">
 									<label>归属公司：</label>
-								</div>
-								<div class="pull-left">
 									<sys:treeselect id="company" name="company.id"
 										value="${user.company.id}" labelName="company.name"
 										labelValue="${user.company.name}" title="公司"
 										url="/sys/office/treeData?type=1" cssClass="form-control"
 										allowClear="true"/>
 								</div>
-								</div>
-								<div class="col-md-3">
-								<div class="pull-left">
-									<label>登录名：</label>
-								</div>
-								<div class="pull-left">
-									<form:input path="loginId" htmlEscape="false" maxlength="50"
-										class="form-control" />
-								</div>
+										
 							 </div>
-							
-							<div class="col-md-3">
-								<div class="pull-left">
-									<label>姓名：</label>
-								</div>
-								<div class="pull-left">
-									<form:input path="name" htmlEscape="false" maxlength="50"
-										class="form-control" />
-								</div>
-								</div>
-								<div class="col-md-3">
-								<div class="pull-left">
+							 
+							 	
+							<div class="col-md-2">
+								<div class="form-group">
 									<label>归属部门：</label>
-								</div>
-								<div class="pull-left">
 									<sys:treeselect id="office" name="office.id" value="${user.office.id}" labelName="office.name"
 										labelValue="${user.office.name}" title="部门"
 										url="/sys/office/treeData?type=3" cssClass="form-control" allowClear="true"
 										notAllowSelectParent="true"/>
 								</div>
+								
+							</div>
+							 
+							 <div class="col-md-2">
+							
+								<div class="form-group">
+									<label>登录名：</label>
+									<form:input path="loginId" htmlEscape="false" maxlength="50"
+										class="form-control" />
+								</div>
+										
+							 </div>
+							 
+							 
+							
+							<div class="col-md-2">
+								<div class="form-group">
+									<label>姓名：</label>
+									<form:input path="name" htmlEscape="false" maxlength="50"
+										class="form-control" />
 								</div>
 							</div>
-						<div class="row">
-							<div class="pull-left">
-								<button type="submit" class="btn blue" onclick="return page();">
-									<i class="fa fa-search"></i>
-									<spring:message code="search" />
-								</button>
-								<button type="reset" class="btn btn-default">
-									<i class="fa fa-refresh"></i>
-									<spring:message code="reset" />
-								</button>
+							
+							<div class="col-md-1">
+								<div class="form-group">
+									<label>&nbsp;</label>
+									<button type="submit" class="btn blue form-control" onclick="return page();">
+										<i class="fa fa-search"></i>
+										<spring:message code="search" />
+									</button>
+								
+								</div>
 							</div>
+							
+							
 						</div>
+						
 
 					</div>
 
diff --git a/src/main/webapp/WEB-INF/views/systemService/list.jsp b/src/main/webapp/WEB-INF/views/systemService/list.jsp
index a6e48912b..ac89c6866 100644
--- a/src/main/webapp/WEB-INF/views/systemService/list.jsp
+++ b/src/main/webapp/WEB-INF/views/systemService/list.jsp
@@ -81,9 +81,7 @@ function deleteService(id) {
 									<input name="serviceId" class="form-control input-medium" placeholder="<spring:message code="service_id"/>" value="${systemServiceInfo.serviceId }"/>
 								</div>
 								<div class="pull-left">
-									<button type="submit" onclick="return page();" class="btn btn-default">
-										<i class="fa fa-search"></i>
-									</button>
+									 <button type="button" class="btn blue" onClick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
 								</div>
 							</div>
 						</form:form>
diff --git a/src/main/webapp/static/global/css/components.css b/src/main/webapp/static/global/css/components.css
index fa69f2746..1b7f78bfb 100644
--- a/src/main/webapp/static/global/css/components.css
+++ b/src/main/webapp/static/global/css/components.css
@@ -21556,6 +21556,12 @@ Color library demo
  	line-height: 34px; 
  }
  
+ .filter-action-select-panle .form-group {
+	padding-right: 5px;
+	margin-bottom: 5px;
+	padding-left: 5px;
+}
+
  
  .customColumnList {
  	padding-left:10px;