gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1-配置管理->IP复用地址池->“协议，方向” 隐藏

Browse Source 
2-配置管理->IP复用策略->“是否区域管控” 隐藏
This commit is contained in:
wangxin
2018-07-18 19:09:03 +08:00
parent db58842418
commit dbc2c98f4c
4 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
View File

@@ -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">

4
src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
View File

@@ -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>

29
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
View File

@@ -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>

8
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
View File

@@ -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>