From dbc2c98f4cdb686f50bf9ac1d9de83968721c1af Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Wed, 18 Jul 2018 19:09:03 +0800
Subject: [PATCH] =?UTF-8?q?1-=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86->IP?=
 =?UTF-8?q?=E5=A4=8D=E7=94=A8=E5=9C=B0=E5=9D=80=E6=B1=A0->=E2=80=9C?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE=EF=BC=8C=E6=96=B9=E5=90=91=E2=80=9D=20?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=202-=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86->IP?=
 =?UTF-8?q?=E5=A4=8D=E7=94=A8=E7=AD=96=E7=95=A5->=E2=80=9C=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=8C=BA=E5=9F=9F=E7=AE=A1=E6=8E=A7=E2=80=9D=20?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/cfg/common/ipForm.jsp       |  7 ++++-
 .../WEB-INF/views/cfg/common/ipList.jsp       |  4 +++
 .../cfg/maintenance/ipMultiplexPool/form.jsp  | 29 +++++++++++++++----
 .../cfg/maintenance/ipMultiplexPool/list.jsp  |  8 ++---
 4 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
index b3bd04589..148871021 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
@@ -238,7 +238,12 @@ $(function(){
 									</div>
 								</div>
 							</c:if>
-                           <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
+							<c:if test="${specialProtocol ne 'ipmulitiplex'}">
+                           	<%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
+                           	</c:if>
+							<c:if test="${specialProtocol eq 'ipmulitiplex'}">
+                           		<input type="hidden" name="isAreaEffective" value="0" >
+                           	</c:if>
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
                           </div>
                           <div class="form-actions">
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
index 5f2f5ae99..7fba8bea3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
@@ -292,7 +292,9 @@
 									<th exportColumn="block_type"><spring:message code="block_type"/></th>
 									<th exportColumn="direction"><spring:message code="direction"/></th>
 									<th exportColumn="protocol"><spring:message code="protocol"/></th>
+									<c:if test="${specialFunctionId ne 'ipmulitiplex'}">
 									<th exportColumn="whether_area_block"><spring:message code="whether_area_block"/></th>
+									</c:if>
 									<c:if test="${specialFunctionId ne null and specialFunctionId eq 'ipmulitiplex'}">
 									<th exportColumn="group_name"><spring:message code="group_name"/></th>
 									<th exportColumn="ir_type"><spring:message code="ir_type"/></th>
@@ -361,6 +363,7 @@
 										</c:forEach>
 										</c:if>
 									</td>
+									<c:if test="${specialFunctionId ne 'ipmulitiplex'}">
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">
@@ -369,6 +372,7 @@
 												</a>
 										</c:if>
 									</td>
+									</c:if>
 									<c:if test="${specialFunctionId ne null and specialFunctionId eq 'ipmulitiplex'}">
 									<td>${cfg.groupName }</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
index 7c56bd622..e527202bd 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
@@ -54,6 +54,8 @@ $(function(){
                        	<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
                        	<input type="hidden" id="compileId" name="compileId" value="${_cfg.compileId}">
                        	<input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0">
+                       	<input type="hidden" name="direction" value="0">
+                       	<input type="hidden" name="protocol" value="0">
                        	<!-- 配置域类型 -->
                    		<c:forEach items="${regionList}" var="region">
                    			<c:if test="${_cfg.functionId eq region.functionId}">
@@ -150,7 +152,22 @@ $(function(){
 										    <div for="port"></div>
 								        </div>
 								    </div>
-								   <div class="col-md-6">
+								    <div class="col-md-6">
+										<div class="form-group ">
+											<label class="control-label col-md-3"><font color="red">*</font>
+												<spring:message code="location" /></label>
+												<div class="col-md-6">
+													<select name="location"
+														class="selectpicker show-tick form-control required">
+														<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="locationC">
+															<option value="${locationC.itemCode}" <c:if test="${_cfg.location==locationC.itemCode || (_cfg.location==null && locationC.itemCode==0)}">selected</c:if>><spring:message code="${locationC.itemValue}"/></option>
+														</c:forEach>
+													</select>
+												</div>
+											<div for="location"></div>
+										</div>
+									</div>
+								   <%-- <div class="col-md-6">
 										<div class="form-group ">
 											<label class="control-label col-md-3"><font color="red">*</font>
 												<spring:message code="direction" /></label>
@@ -164,10 +181,10 @@ $(function(){
 												</div>
 											<div for="direction"></div>
 										</div>
-									</div>
+									</div> --%>
 								</div>
-								<div class="row">
-								    <div class="col-md-6">
+								 <%-- <div class="row">
+								     <div class="col-md-6">
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
 								            <div class="col-md-6">
@@ -180,7 +197,7 @@ $(function(){
 								            </div>
 										    <div for="protocol"></div>
 								        </div>
-								    </div>
+								    </div> 
 								   <div class="col-md-6">
 										<div class="form-group ">
 											<label class="control-label col-md-3"><font color="red">*</font>
@@ -196,7 +213,7 @@ $(function(){
 											<div for="location"></div>
 										</div>
 									</div>
-								</div>
+								</div>--%>
 								</div>
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
                           </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
index d8d135674..e8270c021 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
@@ -265,8 +265,8 @@
 									<th><spring:message code="group_name"/></th>
 									<th><spring:message code="ip"/></th>
 									<th><spring:message code="port"/></th>
-									<th><spring:message code="protocol"/></th>
-									<th><spring:message code="direction"/></th>
+									<%-- <th><spring:message code="protocol"/></th>
+									<th><spring:message code="direction"/></th> --%>
 									<th><spring:message code="location"/></th>
 									<th><spring:message code="ip_type"/></th>
 									<th><spring:message code="block_type"/></th>
@@ -303,7 +303,7 @@
 									</td>
 									<td>${cfg.srcIpAddress }</td>
 									<td>${cfg.port }</td>
-									<td>
+									<%-- <td>
 										<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
 											<c:if test="${cfg.protocol==protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
 										</c:forEach>
@@ -312,7 +312,7 @@
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
 											<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
 										</c:forEach>
-									</td>
+									</td> --%>
 									<td>
 										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="locationC">
 											<c:if test="${cfg.location eq locationC.itemCode}"><spring:message code="${locationC.itemValue }"/></c:if>