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

ip复用策略提交①界面新增字段复用类型ir_type;②审核user_region字段调整

Browse Source
This commit is contained in:
wangxin
2018-06-28 17:19:06 +08:00
parent 09ed1bb293
commit 53303cd747
8 changed files with 61 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,10 +152,10 @@ $(function(){
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="group_name"/></label>
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label>
<div class="col-md-6">
<select id="dnsStrategyId" name="dnsStrategyId" class="selectpicker show-tick form-control">
<option value="0"><spring:message code="select"/></option>
<select id="dnsStrategyId" name="dnsStrategyId" class="selectpicker show-tick form-control required">
<option value=""><spring:message code="select"/></option>
<c:forEach items="${policyGroups }" var="policyGroup">
<option value="${policyGroup.groupId}" <c:if test="${_cfg.dnsStrategyId==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
</c:forEach>
@@ -164,6 +164,20 @@ $(function(){
<div for="dnsStrategyId"></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="ir_type"/></label>
<div class="col-md-6">
<select name="irType" class="selectpicker show-tick form-control required">
<option value=""><spring:message code="select"/></option>
<c:forEach items="${fns:getDictList('IR_TYPE')}" var="irTypeC">
<option value="${irTypeC.itemCode}" <c:if test="${_cfg.irType==irTypeC.itemCode}">selected</c:if>><spring:message code="${irTypeC.itemValue}"/></option>
</c:forEach>
</select>
</div>
<div for="irType"></div>
</div>
</div>
</div>
</c:if>
<c:if test="${specialProtocol ne null and specialProtocol eq 'ipratelimit'}">

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

@@ -223,6 +223,7 @@
<th><spring:message code="whether_area_block"/></th>
<c:if test="${specialFunctionId ne null and specialFunctionId eq 'ipmulitiplex'}">
<th><spring:message code="group_name"/></th>
<th><spring:message code="ir_type"/></th>
</c:if>
<c:if test="${specialFunctionId ne null and specialFunctionId eq 'ipratelimit'}">
<th><spring:message code="ratelimit"/></th>
@@ -281,6 +282,11 @@
</td>
<c:if test="${specialFunctionId ne null and specialFunctionId eq 'ipmulitiplex'}">
<td>${cfg.groupName }</td>
<td>
<c:forEach items="${fns:getDictList('IR_TYPE')}" var="irTypeC">
<c:if test="${cfg.irType==irTypeC.itemCode}"><spring:message code="${irTypeC.itemValue}"/></c:if>
</c:forEach>
</td>
</c:if>
<c:if test="${specialFunctionId ne null and specialFunctionId eq 'ipratelimit'}">
<td>