From 180959270c29f5771773be508920530072184d42 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Tue, 29 May 2018 16:28:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BB=A5=E5=8F=8Aform?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95IP=E7=B1=BB=E5=9E=8B=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=BB=8E=E5=AD=97=E5=85=B8=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp | 5 +++--
 src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
index 7d6753711..e508408a4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
@@ -115,8 +115,9 @@ $(function(){
 							            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_type"/></label>
 							            <div class="col-md-6">
 							            	 <select name="ipType" class="selectpicker show-tick form-control required">
-							                   <option value="4" <c:if test="${_cfg.ipType==4}">selected</c:if> >V4</option>
-							                   <option value="6" <c:if test="${_cfg.ipType==6}">selected</c:if>>V6</option>
+							                   <c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
+												<option value="${ipType.itemCode}" <c:if test="${_cfg.ipType==ipType.itemCode}">selected</c:if> >${ipType.itemValue}</option>
+					                			</c:forEach>
 							                 </select>
 							            </div>
 							            <div for="ipType"></div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
index 6efc86779..c68f62626 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
@@ -232,7 +232,9 @@
 									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" value="${cfg.isAudit}"></td>
 									<%-- <td>${status.index+1 }</td> --%>
 									<td>${cfg.cfgDesc }</td>
-									<td>V${cfg.ipType }</td>
+									<td><c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
+										<c:if test="${ipType.itemCode==cfg.ipType}">${ipType.itemValue}</c:if>
+					                </c:forEach></td>
 									<td>${cfg.srcIpAddress }</td>
 									<td>${cfg.srcPort }</td>
 									<td>${cfg.destIpAddress }</td>