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

完善IP复用地址池、策略配置.

Browse Source
This commit is contained in:
zhangwq
2018-12-01 16:06:08 +08:00
parent 68e822bb26
commit 8cfb175fd2
18 changed files with 804 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform2.jsp
View File

@@ -103,7 +103,6 @@ var resetIndex = function(){
<form:form id="cfgFrom" modelAttribute="_cfg" action="${ctx}/maintenance/ipMultiplexPoolCfg/snatSaveOrUpdate" method="post" class="form-horizontal">
<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
<input type="hidden" name="functionId" value="${_cfg.functionId}">
<input type="hidden" name="addrPoolId" value="${_cfg.addrPoolId}">
<input type="hidden" id="compileId" name="compileId" value="${_cfg.compileId}">
<c:if test="${fn:length(serviceList)==1}">
<c:forEach items="${serviceList}" var="service">

28
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp
View File

@@ -6,8 +6,10 @@
<script>
$(document).ready(function() {
//搜索框提示语初始化
if("${cfg.addrPoolId}"){
$("#intype").val("${cfg.addrPoolId}");
if("${cfg.cfgId}"){
$("#intype").val("${cfg.cfgId}");
}else if("${cfg.addrPoolName}"){
$("#intype").val("${cfg.addrPoolName}");
}else{
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
}
@@ -38,8 +40,6 @@
}
}
var requestUrl = "http://192.168.11.137:8090/command/?cmd=IpNumGet&addr_pool_id=";
//var requestUrl = "https://api.douban.com/v2/book/search?q=javascript&count=1";
$("td[addrPoolId]").each(function(){
var td = $(this);
var audit = $(this).attr("audit")
@@ -48,7 +48,6 @@
var failed=$.validator.messages.failed;
// 判断是否为审核通过状态
if(audit == 1){
// $.getJSON(requestUrl,function(data,status){});
$.ajax({
timeout:15000,// 超时时间
data:{"addrPoolId":addrPoolId,"cmd":"IpNumGet"},
@@ -178,7 +177,8 @@
<div class="input-group">
<div class="input-group-btn">
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="addrPoolId"><spring:message code="address_pool_id"></spring:message></form:option>
<form:option value="cfgId"><spring:message code="address_pool_id"></spring:message></form:option>
<form:option value="addrPoolName"><spring:message code="address_pool"></spring:message></form:option>
<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
</form:select>
@@ -357,7 +357,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageTypes }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
@@ -371,7 +371,7 @@
<th><spring:message code="block_type"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="whether_area_block"/></th>
<%-- <th><spring:message code="whether_area_block"/></th> --%>
<th><spring:message code="letter"/></th>
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
@@ -388,8 +388,8 @@
<tbody>
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
<tr>
<td><input type="checkbox" class="i-checks" serviceId="${cfg.serviceId}" id="${cfg.cfgId}" value="${cfg.isAudit}" addressPoolId="${cfg.addrPoolId }" ></td>
<td>${cfg.addrPoolId }</td>
<td><input type="checkbox" class="i-checks" serviceId="${cfg.serviceId}" id="${cfg.cfgId}" value="${cfg.isAudit}" addressPoolId="${cfg.cfgId }" ></td>
<td>${cfg.cfgId }</td>
<td>
<a href="javascript:;" data-original-title="${cfg.addrPoolName}"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
@@ -397,7 +397,7 @@
</a>
</td>
<td>${cfg.ipTotal }</td>
<td audit="${cfg.isAudit}" addrPoolId="${cfg.addrPoolId }"><div class="loading-total"></div></td>
<td audit="${cfg.isAudit}" addrPoolId="${cfg.cfgId }"><div class="loading-total"></div></td>
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
@@ -419,14 +419,14 @@
<c:when test="${cfg.isAudit eq '3'}"><span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
</c:choose>
</td>
<td>
<%-- <td>
<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
<c:if test="${cfg.isAreaEffective==1}">
<a href="javascript:viewAreaInfo('${ctx}','${cfg.areaEffectiveIds }','${cfg.compileId }')" >
<spring:message code="selective"/>
</a>
</c:if>
</td>
</td> --%>
<td>${cfg.requestName }</td>
<td>
<c:set var="classify"></c:set>
@@ -488,7 +488,7 @@
<td>
<!-- <a href="#">新增IP</a>
<a href="#">删除IP</a> -->
<a href="javascript:;" onclick="getInfo(this)" addrPoolId="${cfg.addrPoolId }"><spring:message code="show_detail"/></a>
<a href="javascript:;" onclick="getInfo(this)" addrPoolId="${cfg.cfgId }"><spring:message code="show_detail"/></a>
</td>
<td>${cfg.creatorName }</td>
<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>