From cbeaaadb00c5447819b5ffc2b6b48ee685895776 Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Sat, 18 Aug 2018 19:58:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E7=95=8C=E9=9D=A2=E6=A0=87=E9=A2=98=E5=8F=8AIP=20Addr?=
 =?UTF-8?q?ess=E5=A2=9E=E5=8A=A0action=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/log/manipulation/dkBehaviorList.jsp | 10 +++++++-
 .../webapp/WEB-INF/views/log/ntc/ipList.jsp   | 23 +++++++++++++------
 2 files changed, 25 insertions(+), 8 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 cdfdfc530..34e0ac1fd 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -29,7 +29,15 @@ $(document).ready(function(){
 
 <div class="page-content">
 	<h3 class="page-title">
-		<spring:message code="dk_behavior"/>
+		<c:if test="${log.functionId == 407}">
+	     <spring:message code="basic_protocol"/>
+	   </c:if>
+	   <c:if test="${log.functionId == 408}">
+	      <spring:message code="encrypted_tunnel_behavior"/>
+	   </c:if>
+	   <c:if test="${log.functionId == 63}">
+	      <spring:message code="app_policy_config"/>
+	   </c:if>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	
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 828ba2b6d..abbdb6c98 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
@@ -48,15 +48,24 @@
 						<!-- 搜索内容与操作按钮栏 -->
 						<div class="col-md-12">
 							<div class="pull-left">
-								<form:select path="action" class="selectpicker select2 input-small">
-									<form:option value=""><spring:message code="action"/></form:option>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${(dict.itemValue eq 'action_monit') or (dict.itemValue eq 'action_reject')}">
-												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+									<select path="action" class="selectpicker select2 input-small">
+									<option value=""><spring:message code="action"/></option>
+									<c:forEach items="${serviceList}" var="service"
+											varStatus="satus">
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32)}"> --%>
+												<option value="${dict.itemCode}" 
+													<c:if test="${log.action eq dict.itemCode}">
+														selected
+													</c:if>
+													>
+													<spring:message code="${dict.itemValue}"/>
+												</option>
 											</c:if>
 										</c:forEach>
-								</form:select>
-							</div>
+									</c:forEach>
+								</select>
+								</div>
 							<div class="pull-left">
 								<div class="input-group">
                                 	<div class="input-group-btn">