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

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

Browse Source
This commit is contained in:
duandongmei
2018-10-22 18:44:20 +08:00
parent 5afa7e420b 7765a5aa9a
commit ea149d40ba
14 changed files with 216 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,8 @@ $(function(){
<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
<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" id="isAreaEffective" name="isAreaEffective" value="1">
<input type="hidden" id="areaType" name="areaType" value="1">
<!-- 配置域类型 -->
<c:forEach items="${regionList}" var="region">
<c:if test="${_cfg.functionId eq region.functionId}">
@@ -86,7 +87,7 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="group"/></label>
<div class="col-md-6">
<select name="policyGroup" class="selectpicker show-tick form-control required">
<option value="" <c:if test="${empty _cfg.policyGroup }">selected</c:if>><spring:message code="select"/></option>
<option value="0" <c:if test="${empty _cfg.policyGroup }">selected</c:if>><spring:message code="select"/></option>
<c:forEach items="${policyGroups}" var="policyGroup">
<option value="${policyGroup.groupId}" <c:if test="${_cfg.policyGroup==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
</c:forEach>
@@ -156,9 +157,10 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="server_ip" /></label>
<div class="col-md-6">
<input class="form-control required ipCheck" type="text"
<input class="form-control required ipCheck ipUnique" type="text"
name="destIpAddress"
value="${_cfg.destIpAddress}">
value="${_cfg.destIpAddress}"
ctx="${ctx}">
</div>
<div for="destIpAddress"></div>
</div>

45
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform.jsp
View File

@@ -52,7 +52,8 @@ $(function(){
<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
<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" id="isAreaEffective" name="isAreaEffective" value="1">
<input type="hidden" id="areaType" name="areaType" value="1">
<!-- 配置域类型 -->
<c:forEach items="${regionList}" var="region">
<c:if test="${_cfg.functionId eq region.functionId}">
@@ -83,10 +84,10 @@ $(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="group"/></label>
<label class="control-label col-md-3"><spring:message code="group"/></label>
<div class="col-md-6">
<select name="policyGroup" class="selectpicker show-tick form-control required">
<option value="" <c:if test="${empty _cfg.policyGroup }">selected</c:if>><spring:message code="select"/></option>
<select name="policyGroup" class="selectpicker show-tick form-control">
<option value="0" <c:if test="${empty _cfg.policyGroup }">selected</c:if>><spring:message code="select"/></option>
<c:forEach items="${policyGroups }" var="policyGroup">
<option value="${policyGroup.groupId}" <c:if test="${_cfg.policyGroup==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
</c:forEach>
@@ -142,13 +143,45 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="server_ip" /></label>
<div class="col-md-6">
<input class="form-control required ipCheck" type="text"
<input class="form-control required ipCheck ipUnique" type="text"
name="destIpAddress"
value="${_cfg.destIpAddress}">
value="${_cfg.destIpAddress}"
ctx="${ctx}">
</div>
<div for="destIpAddress"></div>
</div>
</div>
<!-- ISP -->
<div class="col-md-6 ">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="isp"/></label>
<div class="col-md-6">
<select name="areaIsp[0].isp" class="selectpicker form-control required" data-live-search="true" data-live-search-placeholder="search" >
<option value="" ><spring:message code="select"/></option>
<c:choose>
<c:when test="${!empty _areaIsps }">
<c:forEach items="${isps}" var="isp">
<c:forEach items="${_areaIsps}" var="areaIsp">
<option value="${isp.itemCode}"
<c:if test="${isp.itemCode==areaIsp.isp}">selected</c:if>
>${isp.itemValue}</option>
</c:forEach>
</c:forEach>
</c:when>
<c:otherwise>
<c:forEach items="${isps}" var="isp">
<option value="${isp.itemCode}"
<c:if test="${isp.itemCode==areaIsp.isp}">selected</c:if>
>${isp.itemValue}</option>
</c:forEach>
</c:otherwise>
</c:choose>
</select>
</div>
<div for="areaIsp[0].isp"></div>
</div>
</div>
<span class="span1"></span>
</div>
<div class="row hidden">
<div class="col-md-6 ">