From 255160214e22ccc06c81b150c60c1132052ccc11 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Tue, 24 Jul 2018 14:36:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=87=BA=E5=85=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E6=94=B9=E4=B8=BA=E5=AD=97=E5=85=B8=E4=B8=AD?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=EF=BC=8C=E5=8E=BB=E6=8E=89=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=8D=A2=E4=B8=BA=E5=A4=84=E7=90=86=E6=9C=BA?=
 =?UTF-8?q?IP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/log/manipulation/dkBehaviorList.jsp   | 12 ++++++------
 .../webapp/WEB-INF/views/log/ntc/appList.jsp    | 12 ++++++------
 .../webapp/WEB-INF/views/log/ntc/ddosList.jsp   | 12 ++++++------
 .../webapp/WEB-INF/views/log/ntc/ftpList.jsp    | 12 ++++++------
 .../WEB-INF/views/log/ntc/l2tpLogList.jsp       | 17 +++++++++++------
 .../webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp | 12 ++++++------
 .../WEB-INF/views/log/ntc/mmAvUrlList.jsp       | 12 ++++++------
 .../WEB-INF/views/log/ntc/mmPicIpList.jsp       | 12 ++++++------
 .../WEB-INF/views/log/ntc/mmPicUrlList.jsp      | 12 ++++++------
 .../WEB-INF/views/log/ntc/mmVoipAccountList.jsp | 12 ++++++------
 .../WEB-INF/views/log/ntc/mmVoipIpList.jsp      | 12 ++++++------
 .../webapp/WEB-INF/views/log/ntc/mmVoipList.jsp | 12 ++++++------
 .../WEB-INF/views/log/ntc/pptpLogList.jsp       | 17 +++++++++++------
 .../webapp/WEB-INF/views/log/ntc/sslLogList.jsp | 17 +++++++++++------
 14 files changed, 99 insertions(+), 84 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
index 2c85b6826..ec1117794 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -126,12 +126,6 @@ $(document).ready(function(){
 	                                    	</form:select>
 									</div>
 									</div>
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="entrance_id"/>：</label>
-											<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
-									</div>
-									</div>
 									<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="entrance"/>：</label>
@@ -142,6 +136,12 @@ $(document).ready(function(){
 											</c:forEach>
 										</form:select>
 									</div>
+									</div>
+									<div class="col-md-2">
+											<div class="form-group">
+	                                            <label><spring:message code="clj_ip"/>：</label>
+	                                            <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
+	                                        </div>
 									</div>
 									<div class="col-md-2">
 										<div class="form-group">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
index 028f4a577..2b42a5239 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
@@ -126,12 +126,6 @@ $(document).ready(function(){
 	                                    	</form:select>
 									</div>
 									</div>
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="entrance_id"/>：</label>
-											<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
-									</div>
-									</div>
 									<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="entrance"/>：</label>
@@ -143,6 +137,12 @@ $(document).ready(function(){
 										</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>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
index a99ca6fc6..a34e1523c 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
@@ -126,12 +126,6 @@ $(document).ready(function(){
 	                                    	</form:select>
 									</div>
 									</div>
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="entrance_id"/>：</label>
-											<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
-									</div>
-									</div>
 									<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="entrance"/>：</label>
@@ -143,6 +137,12 @@ $(document).ready(function(){
 										</form:select>
 									</div>
 									</div>
+									<div class="col-md-2">
+											<div class="form-group">
+	                                            <label><spring:message code="clj_ip"/>：</label>
+	                                            <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
+	                                        </div>
+										</div>
 									<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="clientip"/>：</label>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
index 7ac6bdf0d..087207c1d 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
@@ -126,12 +126,6 @@ $(document).ready(function(){
 	                                    	</form:select>
 									</div>
 									</div>
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="entrance_id"/>：</label>
-											<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
-									</div>
-									</div>
 									<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="entrance"/>：</label>
@@ -143,6 +137,12 @@ $(document).ready(function(){
 										</form:select>
 									</div>
 									</div>
+									<div class="col-md-2">
+											<div class="form-group">
+	                                            <label><spring:message code="clj_ip"/>：</label>
+	                                            <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
+	                                        </div>
+										</div>
 									<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="clientip"/>：</label>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
index 94918a050..dc98ccd4a 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
@@ -122,16 +122,21 @@
 			                                </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 name="capIp" type="text" class="form-control" value="${log.capIp}"/>
-	                                        </div>
-										</div>
-										<div class="col-md-2">
-											<div class="form-group">
-	                                            <label><spring:message code="entrance_id"/>：</label>
-	                                            <input name="entranceId" type="text" class="form-control" value="${log.entranceId}"/>
 	                                        </div>
 										</div>
 										<div class="col-md-2">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
index 8767a7871..36e5207d5 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
@@ -126,12 +126,6 @@ $(document).ready(function(){
 	                                    	</form:select>
 									</div>
 									</div>
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="entrance_id"/>：</label>
-											<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
-									</div>
-									</div>
 									<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="entrance"/>：</label>
@@ -143,6 +137,12 @@ $(document).ready(function(){
 										</form:select>
 									</div>
 									</div>
+									<div class="col-md-2">
+											<div class="form-group">
+	                                            <label><spring:message code="clj_ip"/>：</label>
+	                                            <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
+	                                        </div>
+										</div>
 									<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="clientip"/>：</label>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
index d128c41ec..8a948cb13 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
@@ -126,12 +126,6 @@ $(document).ready(function(){
 	                                    	</form:select>
 									</div>
 									</div>
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="entrance_id"/>：</label>
-											<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
-									</div>
-									</div>
 									<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="entrance"/>：</label>
@@ -143,6 +137,12 @@ $(document).ready(function(){
 										</form:select>
 									</div>
 									</div>
+									<div class="col-md-2">
+											<div class="form-group">
+	                                            <label><spring:message code="clj_ip"/>：</label>
+	                                            <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
+	                                        </div>
+										</div>
 									<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="clientip"/>：</label>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
index 34c184961..cb435de50 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
@@ -126,12 +126,6 @@ $(document).ready(function(){
 	                                    	</form:select>
 									</div>
 									</div>
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="entrance_id"/>：</label>
-											<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
-									</div>
-									</div>
 									<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="entrance"/>：</label>
@@ -143,6 +137,12 @@ $(document).ready(function(){
 										</form:select>
 									</div>
 									</div>
+									<div class="col-md-2">
+											<div class="form-group">
+	                                            <label><spring:message code="clj_ip"/>：</label>
+	                                            <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
+	                                        </div>
+										</div>
 									<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="clientip"/>：</label>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
index 1a0dd7c50..aaa8f894c 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
@@ -126,12 +126,6 @@ $(document).ready(function(){
 	                                    	</form:select>
 									</div>
 									</div>
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="entrance_id"/>：</label>
-											<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
-									</div>
-									</div>
 									<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="entrance"/>：</label>
@@ -143,6 +137,12 @@ $(document).ready(function(){
 										</form:select>
 									</div>
 									</div>
+									<div class="col-md-2">
+											<div class="form-group">
+	                                            <label><spring:message code="clj_ip"/>：</label>
+	                                            <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
+	                                        </div>
+										</div>
 									<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="clientip"/>：</label>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
index d647f578a..1130625cf 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
@@ -126,12 +126,6 @@ $(document).ready(function(){
 	                                    	</form:select>
 									</div>
 									</div>
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="entrance_id"/>：</label>
-											<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
-									</div>
-									</div>
 									<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="entrance"/>：</label>
@@ -143,6 +137,12 @@ $(document).ready(function(){
 										</form:select>
 									</div>
 									</div>
+									<div class="col-md-2">
+											<div class="form-group">
+	                                            <label><spring:message code="clj_ip"/>：</label>
+	                                            <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
+	                                        </div>
+										</div>
 									<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="clientip"/>：</label>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
index c0be5e9ac..f9c0543ed 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -126,12 +126,6 @@ $(document).ready(function(){
 	                                    	</form:select>
 									</div>
 									</div>
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="entrance_id"/>：</label>
-											<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
-									</div>
-									</div>
 									<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="entrance"/>：</label>
@@ -143,6 +137,12 @@ $(document).ready(function(){
 										</form:select>
 									</div>
 									</div>
+									<div class="col-md-2">
+											<div class="form-group">
+	                                            <label><spring:message code="clj_ip"/>：</label>
+	                                            <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
+	                                        </div>
+										</div>
 									<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="clientip"/>：</label>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipList.jsp
index fe5e6f700..126a32937 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipList.jsp
@@ -126,12 +126,6 @@ $(document).ready(function(){
 	                                    	</form:select>
 									</div>
 									</div>
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="entrance_id"/>：</label>
-											<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
-									</div>
-									</div>
 									<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="entrance"/>：</label>
@@ -143,6 +137,12 @@ $(document).ready(function(){
 										</form:select>
 									</div>
 									</div>
+									<div class="col-md-2">
+											<div class="form-group">
+	                                            <label><spring:message code="clj_ip"/>：</label>
+	                                            <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
+	                                        </div>
+										</div>
 									<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="clientip"/>：</label>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
index cdacd2505..c164d6131 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
@@ -122,16 +122,21 @@
 			                                </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 name="capIp" type="text" class="form-control" value="${log.capIp}"/>
-	                                        </div>
-										</div>
-										<div class="col-md-2">
-											<div class="form-group">
-	                                            <label><spring:message code="entrance_id"/>：</label>
-	                                            <input name="entranceId" type="text" class="form-control" value="${log.entranceId}"/>
 	                                        </div>
 										</div>
 										<div class="col-md-2">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
index 628ea07c0..066a20201 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
@@ -131,16 +131,21 @@
 			                                </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 name="capIp" type="text" class="form-control" value="${log.capIp}"/>
-	                                        </div>
-										</div>
-										<div class="col-md-2">
-											<div class="form-group">
-	                                            <label><spring:message code="entrance_id"/>：</label>
-	                                            <input name="entranceId" type="text" class="form-control" value="${log.entranceId}"/>
 	                                        </div>
 										</div>
 										<div class="col-md-2">