From ed3d56e59ad67ba4a2685406c2cc51c84108259c Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Fri, 31 Aug 2018 17:17:06 +0800
Subject: [PATCH] =?UTF-8?q?APP=E5=8D=8F=E8=AE=AE=E3=80=81=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E5=8D=8F=E8=AE=AE=E3=80=81=E5=8A=A0=E5=AF=86=E9=9A=A7?=
 =?UTF-8?q?=E9=81=93=20=E6=9F=A5=E8=AF=A2=E5=8E=BB=E9=99=A4=E4=B8=A2?=
 =?UTF-8?q?=E5=8C=85=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp    | 9 ++++++---
 src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp | 4 ++--
 .../WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp      | 4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
index 7d91e613d..4b2dc61ff 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
@@ -33,6 +33,7 @@
 			$(".Wdate").attr("value",'');
 			$("#level").attr("value",'');
 			$("#searchForm")[0].reset();
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		});
 		//异步获取策略ip相关信息
 		$("span[id^=open]").click(function(){
@@ -310,11 +311,12 @@
 							<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="social_app"/></th>
 								    <th><spring:message code="behaviour_type"/></th>
-								    <th><spring:message code="ratelimit"/></th>
-									<th><spring:message code="block_type"/></th>
+<%-- 								    <th><spring:message code="ratelimit"/></th>
+ --%>								<th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -339,10 +341,11 @@
 									<span id="open${status.index}" class="" compileId="${cfg.compileId}" cfgId="${cfg.cfgId}"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 									<input type="checkbox" class="i-checks child-checks" id="${cfg.cfgId}" value="${cfg.isAudit}">
 									</td>
+									<td>${cfg.compileId }</td>
 								    <td>${cfg.cfgDesc }</td>
 								    <td>${cfg.appName }</td>
 								    <td>${cfg.behavName }</td>
-								    <td>${cfg.ratelimit }</td>
+								<%--     <td>${cfg.ratelimit }</td> --%>
 									<td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.action }">
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
index 14413be11..d32876c3e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
@@ -321,7 +321,7 @@
 								    <th class="cfgDesc"><spring:message code="config_describe"/></th>
 								    <th><spring:message code="basic_protocol"/></th>
 								    <%-- <th><spring:message code="behaviour_type"/></th> --%>
-								    <th><spring:message code="ratelimit"/></th>
+								   <%--  <th><spring:message code="ratelimit"/></th> --%>
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
@@ -351,7 +351,7 @@
 								    <td>${cfg.cfgDesc }</td>
 								    <td>${cfg.appName }</td>
 								  <%--   <td>${cfg.behavName }</td> --%>
-								    <td>${cfg.ratelimit }</td>
+								   <%--  <td>${cfg.ratelimit }</td> --%>
 									<td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.action }">
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
index f25295cd8..a72db7637 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
@@ -321,7 +321,7 @@
 								    <th class="cfgDesc"><spring:message code="config_describe"/></th>
 								    <th><spring:message code="encrypted_tunnel_behavior"/></th>
 								    <th><spring:message code="behaviour_type"/></th>
-								    <th><spring:message code="ratelimit"/></th>
+								   <%--  <th><spring:message code="ratelimit"/></th> --%>
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
@@ -351,7 +351,7 @@
 								    <td>${cfg.cfgDesc }</td>
 								    <td>${cfg.appName }</td>
 								    <td>${cfg.behavName }</td>
-								    <td>${cfg.ratelimit }</td>
+								   <%--  <td>${cfg.ratelimit }</td> --%>
 									<td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.action }">