From 1f0610b9f6bab9f65f1c51ed4fac19397d4e8f7a Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Mon, 10 Dec 2018 12:51:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0snat/dnat=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=E7=94=B1=E9=85=8D=E7=BD=AE=E8=B7=B3=E8=BD=AC=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp        | 2 --
 .../views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp    | 3 +++
 .../views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp    | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp
index 7436bb55b..fc1671cbe 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp
@@ -389,7 +389,6 @@
 									<th class="sort-column r.addr_pool_name"><spring:message code="address_pool"/></th>
 									<th class="sort-column r.ip_total"><spring:message code="ip_total"/></th>
 									<th><spring:message code="available_ip_total"/></th>
-									<th><spring:message code="log_total"/></th>
 									
 									<%-- <th><spring:message code="block_type"/></th> --%>
 									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
@@ -421,7 +420,6 @@
 									</td>
 									<td>${cfg.ipTotal }</td>
 									<td audit="${cfg.isAudit}" addrPoolId="${cfg.cfgId }"><div class="loading-total"></div></td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									
 									<%-- <td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp
index 24d3317d7..72e7f5154 100644
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp
@@ -299,6 +299,8 @@
 									<th><spring:message code="translated_dest_ip"/></th>
 									<th><spring:message code="translated_dest_port"/></th>
 									<th><spring:message code="protocol"/></th>
+									<th><spring:message code="log_total"/></th>
+									
 									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<%-- <th><spring:message code="do_log"/></th> --%>
@@ -342,6 +344,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									
 									<%-- <td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp
index 68f910199..dd977e393 100644
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp
@@ -317,6 +317,7 @@
 									<th><spring:message code="user_type"/></th>
 									<th><spring:message code="user"/></th>
 									<th><spring:message code="ip"/></th>
+									<th><spring:message code="log_total"/></th>
 									
 									<%-- <th class="sort-column a.action"><spring:message code="block_type"/></th> --%>
 									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
@@ -369,6 +370,7 @@
 				              			</c:forEach>
 									</td>
 									<td>${indexCfg.srcIpAddress }</td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
 									
 									<%-- <td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">