From 9b53712d3ed5cbf9b1c84aea158bf8d884e15cda Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Wed, 10 Oct 2018 17:53:28 +0800
Subject: [PATCH] =?UTF-8?q?snat/dnat=E5=A4=8D=E7=94=A8=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ipmulitiplex/dnatPolicyForm.jsp             |  4 ++--
 .../ipmulitiplex/dnatPolicyList.jsp             | 17 ++++++++++++++---
 .../ipmulitiplex/snatPolicyList.jsp             |  8 +++++---
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyForm.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyForm.jsp
index efce906b0..c416b17ac 100644
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyForm.jsp
@@ -167,7 +167,7 @@ $(function(){
 									    </div>
 									    <div class="col-md-6">
 									        <div class="form-group ">
-									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip"/></label>
 									            <div class="col-md-6">
 									                 <input class="form-control required ipCheck" type="text" name="destIpAddress" value="${_cfg.destIpAddress}">
 									            </div>
@@ -242,7 +242,7 @@ $(function(){
 										</div>
 									     <div class="col-md-6">
 									        <div class="form-group ">
-									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port"/></label>
 									            <div class="col-md-6">
 									                 <input class="form-control required portCheck" type="text" name="destPort" value="${_cfg.destPort}">
 									            </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp
index fbd5da063..0f2e799c4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp
@@ -88,7 +88,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="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
@@ -274,6 +274,9 @@
 									<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
+									<th><spring:message code="ip"/></th>
+									<th><spring:message code="port"/></th>
+									<th><spring:message code="protocol"/></th>
 									<%-- <th><spring:message code="do_log"/></th> --%>
 									<%-- <th><spring:message code="whether_area_block"/></th> --%>
 									<th><spring:message code="letter"/></th>
@@ -282,7 +285,7 @@
 									<th><spring:message code="label"/></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="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -306,6 +309,14 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>${indexCfg.destIpAddress }</td>
+									<td>${indexCfg.destPort }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('PROTOCOL')}" var="dict">
+											<c:if test="${indexCfg.protocol eq dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
+										</c:forEach>
+									</td>
+									
 									<%-- <td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
@@ -393,7 +404,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp
index a37de124a..74b05f940 100644
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp
@@ -88,7 +88,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="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
@@ -274,6 +274,7 @@
 									<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
+									<th><spring:message code="ip"/></th>
 									<%-- <th><spring:message code="do_log"/></th> --%>
 									<%-- <th><spring:message code="whether_area_block"/></th> --%>
 									<th><spring:message code="letter"/></th>
@@ -282,7 +283,7 @@
 									<th><spring:message code="label"/></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="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -306,6 +307,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>${indexCfg.srcIpAddress }</td>
 									<%-- <td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
@@ -393,7 +395,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>