From 3c68637b8ea9eeb8a03034840c286be8c152394f Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Fri, 2 Mar 2018 12:02:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=87=E7=AD=BE=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5label=E4=B8=BAlable=20ip=E5=88=97=E8=A1=A8=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/include/form/basicInfo.jsp |  2 +-
 .../webapp/WEB-INF/views/cfg/ipCfgForm.jsp    | 24 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
index 03b4fef25..547b825e3 100644
--- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
@@ -60,7 +60,7 @@
                		<c:forEach items="${lables}" var="lable">
                		<option value="${lable.item_code}"
                			<c:if test="${lable.isValid==0}">disabled="disabled"</c:if>
-               		 <c:if test="${lable.item_code==_cfg.label}">selected</c:if>
+               		 <c:if test="${lable.item_code==_cfg.lable}">selected</c:if>
                		>${lable.item_value}</option>
                		</c:forEach>
              	</select>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
index 068611e2e..115fdc765 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
@@ -27,6 +27,16 @@ $(function(){
 			}else if($("input[name='dstIpMask']").val()=="FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"){
 				$("input[name='dstIpMask']").val("255.255.255.255");
 			}
+			if(!$("input[name='srcIp']").val()){
+				$("input[name='srcIp']").val("0.0.0.0");
+			}else if($("input[name='srcIp']").val()=="::"){
+				$("input[name='srcIp']").val("0.0.0.0");
+			}
+			if(!$("input[name='dstIp']").val()){
+				$("input[name='dstIp']").val("0.0.0.0");
+			}else if($("input[name='dstIp']").val()=="::"){
+				$("input[name='dstIp']").val("0.0.0.0");
+			}
 		}
 		if(6==type){
 			if(!$("input[name='srcIpMask']").val()){
@@ -39,6 +49,16 @@ $(function(){
 			}else if($("input[name='dstIpMask']").val()=="255.255.255.255"){
 				$("input[name='dstIpMask']").val("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
 			}
+			if(!$("input[name='srcIp']").val()){
+				$("input[name='srcIp']").val("::");
+			}else if($("input[name='srcIp']").val()=="0.0.0.0"){
+				$("input[name='srcIp']").val("::");
+			}
+			if(!$("input[name='dstIp']").val()){
+				$("input[name='dstIp']").val("::");
+			}else if($("input[name='dstIp']").val()=="0.0.0.0"){
+				$("input[name='dstIp']").val("::");
+			}
 		}
 	});
 });
@@ -79,8 +99,10 @@ $(function(){
                             	<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
                             </c:if>
                             <input type="hidden" name="tableName" value="${_cfg.tableName}">  
-                            <input type="hidden" name="serviceId" value="${_cfg.serviceId}">  
+                            <input type="hidden" name="serviceId" value="${serviceId}">  
                             <input type="hidden" name="cfgName" value="${cfgName}">  
+                            <input type="hidden" name="action" value="${action}">
+                            <input type="hidden" name="protocolId" value="${_cfg.protocolId}">
                             <!--  <div class="row">
 							    <div class="col-md-6">
 							        <div class="form-group">