From b7f0f67bbd0cd2ea00abf2198170b72f27731b75 Mon Sep 17 00:00:00 2001
From: dongxiaoyan <dongxiaoyan@192.168.11.154>
Date: Sun, 6 Jan 2019 13:06:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=B1=95=E7=A4=BA=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/log/ntc/ipList.jsp   | 56 ++++++++---------
 .../WEB-INF/views/log/ntc/openVpnList.jsp     | 61 +++++++++----------
 2 files changed, 58 insertions(+), 59 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
index 798d55cb1..9917e63b2 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
@@ -152,31 +152,6 @@
 						
 						<!-- 筛选搜索内容栏默认隐藏-->
 						<div class="col-md-12 filter-action-select-panle hide" >
-							<div class="row">
-								<div class="col-md-2">
-									<div class="form-group">
-                                		<label class="control-label"><spring:message code='transport_layer_protocol'/>：</label>
-                                       	<form:select path="transProto" class="selectpicker form-control">
-											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
-												<form:option value="${protocol.itemCode}"><spring:message code="${protocol.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="direction"/>：</label>
-                                       	<form:select path="direction" class="selectpicker form-control">
-											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
-												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
-											</c:forEach>
-										</form:select>
-									</div>
-                                </div>
-								
 								<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="entrance"/>：</label>
@@ -196,12 +171,18 @@
 									</div>
 								</div>
 								
+							<div class="row">
 								<div class="col-md-2">
 									<div class="form-group">
-										<label><spring:message code="clientip"></spring:message>：</label>
-										<input name="sIp" type="text" class="form-control" value="${log.sIp }"/>
+                                		<label class="control-label"><spring:message code='transport_layer_protocol'/>：</label>
+                                       	<form:select path="transProto" class="selectpicker form-control">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
+												<form:option value="${protocol.itemCode}"><spring:message code="${protocol.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
 									</div>
-								</div>
+                                </div>
 								
 								<div class="col-md-2">
 									<div class="form-group">
@@ -209,6 +190,25 @@
 										<input name="dIp" type="text" class="form-control" value="${log.dIp }"/>
 									</div>
 								</div>
+								
+								<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="clientip"></spring:message>：</label>
+										<input name="sIp" type="text" class="form-control" value="${log.sIp }"/>
+									</div>
+								</div>
+                                   
+								<div class="col-md-2">
+									<div class="form-group">
+                                		<label class="control-label"><spring:message code="direction"/>：</label>
+                                       	<form:select path="direction" class="selectpicker form-control">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
+												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
+									</div>
+                                </div>
 							</div>
 							<div class="row">
 								<div class="col-md-2">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
index f9b7e4edb..cfd2f1559 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -128,6 +128,23 @@ $(document).ready(function(){
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="entrance"/>：</label>
+											<form:select path="entranceId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+												<form:option value=""><spring:message code="select"/></form:option>
+												<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance" >
+													<form:option value="${entrance.itemCode}"><spring:message code="${entrance.itemValue}"></spring:message></form:option>
+												</c:forEach>
+											</form:select>
+										</div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="clj_ip"/>：</label>
+											<input id=capIp name="capIp" class="form-control" type="text" value="${log.capIp}"/>
+										</div>
+									</div>
 									<div class="col-md-2">
 										<div class="form-group">
 										<label><spring:message code="transport_layer_protocol"/>：</label>
@@ -140,7 +157,18 @@ $(document).ready(function(){
 											</form:select>
 										</div>
 									</div>
-									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="serverip"/>：</label>
+											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
+										</div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="clientip"/>：</label>
+											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
+										</div>
+									</div>									
 									<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="direction"/>：</label>
@@ -150,36 +178,7 @@ $(document).ready(function(){
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
-									</div>
-									</div>
-									<div class="col-md-2">
-									<div class="form-group">
-										<label><spring:message code="entrance"/>：</label>
-										<form:select path="entranceId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
-											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance" >
-												<form:option value="${entrance.itemCode}"><spring:message code="${entrance.itemValue}"></spring:message></form:option>
-											</c:forEach>
-										</form:select>
-									</div>
-									</div>
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="clj_ip"/>：</label>
-											<input id=capIp name="capIp" class="form-control" type="text" value="${log.capIp}"/>
-									</div>
-									</div>
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="clientip"/>：</label>
-											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
-									</div>
-									</div>
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="serverip"/>：</label>
-											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
-									</div>
+										</div>
 									</div>
 								</div>
 								<div class="row">