From 5a5bf7c0f8e92cf618fdf17f9ae3ae9e4a27f50c Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Wed, 22 Aug 2018 14:34:08 +0800
Subject: [PATCH] =?UTF-8?q?bgp=E5=A2=9E=E5=8A=A0cfgId=E6=9F=A5=E8=AF=A2=20?=
 =?UTF-8?q?p2p=E6=97=A5=E5=BF=97=E7=95=8C=E9=9D=A2=20action=E5=8F=AA?=
 =?UTF-8?q?=E6=9C=89=E4=B8=80=E4=B8=AA=E7=9A=84=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/cfg/other/bgpList.jsp       |  5 ++++
 .../webapp/WEB-INF/views/log/ntc/p2pList.jsp  | 26 +++++++++++++------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
index d4cd42318..a7063e016 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
@@ -9,6 +9,8 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
+		}else if("${cfg.compileId}"){
+			$("#intype").val("${cfg.compileId}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -132,6 +134,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
+												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<%-- <form:option value="voipIp.srcIpAddress"><spring:message code="client_ip"/></form:option>
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
@@ -306,6 +309,7 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
+									<th style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="cfgDesc"><spring:message code="config_describe"/></th>
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="do_log"/></th>
@@ -332,6 +336,7 @@
 									<span id="open${status.index}" class="" compileId="${indexCfg.compileId}" cfgId="${indexCfg.cfgId}"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 									<input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}">
 									</td>
+									<td>${indexCfg.compileId }</td>
 								    <td>${indexCfg.cfgDesc }</td>
 									<td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
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 1d691911d..e0f976368 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
@@ -6,6 +6,7 @@
 	P2P<spring:message code="log"></spring:message>
 </title>
 <script>
+
 	$(document).ready(function() {
 		//reset
 		$("#resetBtn").on("click",function(){
@@ -21,7 +22,7 @@
 			$("#searchForm")[0].reset();
 		});
 		//筛选功能
-		filterActionInit();
+		filterActionInit();	 
 	});
 </script>
 </head>
@@ -48,15 +49,24 @@
 						<!-- 搜索内容与操作按钮栏 -->
 						<div class="col-md-12">
 							<div class="pull-left">
-								<select path="action" class="selectpicker select2 input-small">
-									<option value=""><spring:message code="action"/></option>
-									<c:forEach items="${serviceList}" var="service"
-											varStatus="satus">
+								<select  id="action"  path="action" class="selectpicker select2 input-small">
+								<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)}"> --%>
-												<option value="${dict.itemCode}" 
+											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32)}"> 
+												<c:set var="actionIndex" value="${actionIndex+1}"></c:set>
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+								   <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)}"> 
+												<option value="${dict.itemCode}"    
 													<c:if test="${log.action eq dict.itemCode}">
-														selected
+														 selected="selected"
 													</c:if>
 													>
 													<spring:message code="${dict.itemValue}"/>