From 2ff41d8c6d38b8228c247fc91e99adf58b3fa7b2 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Thu, 13 Sep 2018 11:41:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89cfg=E7=9A=84=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/log/manipulation/dkBehaviorList.jsp |  7 +++---
 .../webapp/WEB-INF/views/log/ntc/appList.jsp  | 14 +++++++-----
 .../webapp/WEB-INF/views/log/ntc/bgpList.jsp  |  3 +--
 .../webapp/WEB-INF/views/log/ntc/dnsList.jsp  | 10 +++++----
 .../webapp/WEB-INF/views/log/ntc/ftpList.jsp  | 14 +++++++-----
 .../webapp/WEB-INF/views/log/ntc/httpList.jsp | 10 +++++----
 .../webapp/WEB-INF/views/log/ntc/ipList.jsp   |  3 +--
 .../WEB-INF/views/log/ntc/l2tpLogList.jsp     | 22 ++++++++++---------
 .../webapp/WEB-INF/views/log/ntc/mailList.jsp | 10 +++++----
 .../WEB-INF/views/log/ntc/mmAvIpList.jsp      | 14 +++++++-----
 .../WEB-INF/views/log/ntc/mmAvUrlList.jsp     | 14 +++++++-----
 .../WEB-INF/views/log/ntc/mmPicIpList.jsp     | 18 ++++++++-------
 .../views/log/ntc/mmPornAudioSampleList.jsp   | 18 ++++++++-------
 .../views/log/ntc/mmPornVideoSampleList.jsp   | 18 ++++++++-------
 .../views/log/ntc/mmSampleAudioList.jsp       | 16 ++++++++------
 .../WEB-INF/views/log/ntc/mmSamplePicList.jsp | 18 ++++++++-------
 .../views/log/ntc/mmSampleVideoList.jsp       | 18 ++++++++-------
 .../views/log/ntc/mmSampleVoipList.jsp        |  1 -
 .../views/log/ntc/mmVoipAccountList.jsp       | 14 +++++++-----
 .../WEB-INF/views/log/ntc/mmVoipIpList.jsp    | 14 +++++++-----
 .../WEB-INF/views/log/ntc/openVpnList.jsp     | 14 +++++++-----
 .../webapp/WEB-INF/views/log/ntc/p2pList.jsp  |  7 ++----
 .../WEB-INF/views/log/ntc/pptpLogList.jsp     | 18 ++++++++-------
 .../webapp/WEB-INF/views/log/ntc/sshList.jsp  | 14 +++++++-----
 .../WEB-INF/views/log/ntc/sslLogList.jsp      | 20 +++++++++--------
 25 files changed, 181 insertions(+), 148 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 b6a66a19f..c3ba3a9b9 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -52,7 +52,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							
@@ -62,11 +61,11 @@ $(document).ready(function(){
 							<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="${serviceList}" var="service"
+									<%-- <form:option value=""><spring:message code="action"/></form: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)}">  
+											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32) && (service.action ne 96)  }">  
 												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 											</c:if>
 										</c:forEach>
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 502710f0d..0dd8febbf 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							
@@ -54,14 +53,17 @@ $(document).ready(function(){
 							<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=""><spring:message code="action"/></form: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) && (service.action ne 96)  }">  
 												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 											</c:if>
 										</c:forEach>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
index 905043774..c1c223754 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
@@ -42,7 +42,6 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-						<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->
@@ -53,7 +52,7 @@
 									<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)}">  
+											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32) && (service.action ne 96)  }">  
 												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 											</c:if>
 										</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
index 15e6c537d..02fb34466 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
@@ -42,18 +42,20 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-						<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->
 						<div class="col-md-12">
 							<div class="pull-left">
-								<form:select path="action" class="selectpicker select2 input-small">
+									<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')}">
+									<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) && (service.action ne 96)  }">  
 												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 											</c:if>
+										</c:forEach>
 									</c:forEach>
 								</form:select>
 							</div>
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 3ba2e2577..070c43d4d 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							
@@ -54,14 +53,17 @@ $(document).ready(function(){
 							<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=""><spring:message code="action"/></form: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) && (service.action ne 96)  }">  
 												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 											</c:if>
 										</c:forEach>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
index 5245b6fba..8d4bd650f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
@@ -42,18 +42,20 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-						<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->
 						<div class="col-md-12">
 							<div class="pull-left">
-								<form:select path="action" class="selectpicker select2 input-small">
+									<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')}">
+									<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) && (service.action ne 96)  }">  
 												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 											</c:if>
+										</c:forEach>
 									</c:forEach>
 								</form:select>
 							</div>
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 3093fe5bb..d38f9dccc 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
@@ -42,7 +42,6 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-						<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->
@@ -53,7 +52,7 @@
 									<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)}">  
+											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32)  && (service.action ne 96)}">  
 												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 											</c:if>
 										</c:forEach>
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 ea024cb17..1f595de06 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
@@ -47,19 +47,21 @@
 								<!-- 筛选按钮展开状态-->
 								<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction}"/>
 								<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-								<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 								<!-- 搜索内容与操作按钮栏 -->
 								<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="action">
-												<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
-													<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
-												</c:if>		
-											</c:forEach>
-						             	</form:select>
-									</div>
+									<form:select path="action" class="selectpicker select2 input-small">
+									<form:option value=""><spring:message code="action"/></form: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) && (service.action ne 96)  }">  
+												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+								</form:select>
+							</div>
 	                        		<div class="pull-left">
 										<div class="input-group">
 											<div class="input-group-btn">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
index ae2e4e2bf..9e7f989ff 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
@@ -42,18 +42,20 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-						<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->
 						<div class="col-md-12">
 							<div class="pull-left">
-								<form:select path="action" class="selectpicker select2 input-small">
+									<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')}">
+									<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) && (service.action ne 96)  }">  
 												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 											</c:if>
+										</c:forEach>
 									</c:forEach>
 								</form:select>
 							</div>
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 73dc401c1..72c789722 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
@@ -43,7 +43,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							
@@ -53,14 +52,17 @@ $(document).ready(function(){
 							<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=""><spring:message code="action"/></form: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) && (service.action ne 96)  }">  
 												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 											</c:if>
 										</c:forEach>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
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 7796f250c..dbdf2939f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							
@@ -54,14 +53,17 @@ $(document).ready(function(){
 							<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=""><spring:message code="action"/></form: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) && (service.action ne 96)  }">  
 												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 											</c:if>
 										</c:forEach>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
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 7ca1e9686..0d2be860c 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							
@@ -54,14 +53,17 @@ $(document).ready(function(){
 							<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="action">
-											<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
-												<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
-											</c:if>		
+									<form:option value=""><spring:message code="action"/></form: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) && (service.action ne 96)  }">  
+												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+											</c:if>
 										</c:forEach>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
index 644015d59..e736a3f05 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							
@@ -54,14 +53,17 @@ $(document).ready(function(){
 							<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="action">
-											<c:if test="${action.itemValue eq 'action_reject' or action.itemValue eq 'action_monit' }">
-												<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
-											</c:if>		
+									<form:option value=""><spring:message code="action"/></form: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) && (service.action ne 96)  }">  
+												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+											</c:if>
 										</c:forEach>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
index f48710757..b81414bd6 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							
@@ -54,14 +53,17 @@ $(document).ready(function(){
 							<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="action">
-											<c:if test="${action.itemValue eq 'action_reject' or action.itemValue eq 'action_monit' }">
-												<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
-											</c:if>		
+									<form:option value=""><spring:message code="action"/></form: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) && (service.action ne 96)  }">  
+												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+											</c:if>
 										</c:forEach>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
index a2b4bb81b..b6f4e96f1 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
@@ -57,7 +57,6 @@
 									value="${page.pageSize}" />
 								<input id="functionId" name="functionId" type="hidden"
 									value="${log.functionId}" />
-								<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 								<!-- 筛选按钮展开状态-->
 								<input id="isFilterAction" name="isFilterAction" type="hidden"
 									value="${log.isFilterAction }" />
@@ -68,12 +67,15 @@
 								<!-- 搜索内容与操作按钮栏 -->
 								<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="action">
-												<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
-													<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
-												</c:if>		
+									<form:select path="action" class="selectpicker select2 input-small">
+									<form:option value=""><spring:message code="action"/></form: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) && (service.action ne 96)  }">  
+												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+													</c:if>
+												</c:forEach>
 											</c:forEach>
 										</form:select>
 									</div>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
index 6a6f89c2f..16200e51c 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							
@@ -54,14 +53,17 @@ $(document).ready(function(){
 							<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="action">
-											<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
-												<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
-											</c:if>		
+									<form:option value=""><spring:message code="action"/></form: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) && (service.action ne 96)  }">  
+												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+											</c:if>
 										</c:forEach>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
index 4e616a933..e9c7b4dc9 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							
@@ -54,14 +53,17 @@ $(document).ready(function(){
 							<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="action">
-											<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
-												<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
-											</c:if>		
+									<form:option value=""><spring:message code="action"/></form: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) && (service.action ne 96)  }">  
+												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+											</c:if>
 										</c:forEach>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
index 7b1ac7609..4d3a66743 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							
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 afb0aca65..d8361913b 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							
@@ -54,14 +53,17 @@ $(document).ready(function(){
 							<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=""><spring:message code="action"/></form: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) && (service.action ne 96)  }">  
 												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 											</c:if>
 										</c:forEach>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
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 4aafe5346..c2f0f0a72 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							
@@ -54,14 +53,17 @@ $(document).ready(function(){
 							<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=""><spring:message code="action"/></form: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) && (service.action ne 96)  }">  
 												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 											</c:if>
 										</c:forEach>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
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 0e9e52d27..da502dddd 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							
@@ -54,14 +53,17 @@ $(document).ready(function(){
 							<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=""><spring:message code="action"/></form: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) && (service.action ne 96)  }">  
 												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 											</c:if>
 										</c:forEach>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
index dc3f3c2bc..51c8fcd56 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
@@ -43,7 +43,6 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-						<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->
@@ -54,7 +53,7 @@
 								<c:set var="actionIndex" value="0"></c:set>
 								<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)}"> 
+											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32) && (service.action ne 96)}"> 
 												<c:set var="actionIndex" value="${actionIndex+1}"></c:set>
 											</c:if>
 										</c:forEach>
@@ -62,11 +61,9 @@
 								   <c:if test="${ (actionIndex > 1) || (actionIndex == 0) }">
 								    <option value=""><spring:message code="action"/></option>
 								   </c:if>
-								   
-								   
 									<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)}"> 
+											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32)  && (service.action ne 96)}"> 
 												<option value="${dict.itemCode}"    
 													<c:if test="${log.action eq dict.itemCode}">
 														 selected="selected"
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 9aacb786b..2904fb212 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
@@ -47,18 +47,20 @@
 								<!-- 筛选按钮展开状态-->
 								<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction}"/>
 								<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-								<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 								<!-- 搜索内容与操作按钮栏 -->
 								<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="action">
-												<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
-													<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
-												</c:if>		
+									<form:select path="action" class="selectpicker select2 input-small">
+									<form:option value=""><spring:message code="action"/></form: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) && (service.action ne 96)  }">  
+												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+											</c:if>
+												</c:forEach>
 											</c:forEach>
-						             	</form:select>
+										</form:select>
 									</div>
 	                        		<div class="pull-left">
 										<div class="input-group">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
index 69d4b04f0..32760babb 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							
@@ -54,14 +53,17 @@ $(document).ready(function(){
 							<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=""><spring:message code="action"/></form: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) && (service.action ne 96)  }">  
 												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 											</c:if>
 										</c:forEach>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
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 6c5f197f6..f2fcc3edc 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
@@ -48,19 +48,21 @@
 								<!-- 筛选按钮展开状态-->
 								<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction}"/>
 								<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-								<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 								<!-- 搜索内容与操作按钮栏 -->
 								<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="action">
-												<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
-													<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
-												</c:if>		
-											</c:forEach>
+									  <form:select path="action" class="selectpicker select2 input-small">
+										<form:option value=""><spring:message code="action"/></form: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) && (service.action ne 96)  }">  
+													<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+												</c:if>
+											  </c:forEach>
+										   </c:forEach>
 										</form:select>
-						            </div>
+									</div>
 									<div class="pull-left">
 										<div class="input-group">
 											<div class="input-group-btn">