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

Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

Browse Source
This commit is contained in:
tanghao
2019-01-10 17:51:21 +08:00
parent 8fadfd8254 f9a39c7801
commit f04fb1090c
7 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
View File

@@ -8,6 +8,11 @@ $(function(){
$(".ratelimitAction").find("input[name='userRegion1']").on("change",function(){
switchRateLimitType();
});
if($(".action:checked").val()==16){
$(".dnsIpSpoofing").removeClass("hidden");
}else{
$(".dnsIpSpoofing").addClass("hidden");
}
$(".action").on("change", function() {
$("#serviceId").val($(this).attr("serviceId"));
$("#protocolId").val($(this).attr("protocolId"));
@@ -24,6 +29,11 @@ $(function(){
if($(this).val()==1){
$(".ipPortAdd").click();
}
if($(".action:checked").val()==16){
$(".dnsIpSpoofing").removeClass("hidden");
}else{
$(".dnsIpSpoofing").addClass("hidden");
}
switchAction($(this).val());
});
$("#serviceId").val($(".action:checked").attr("serviceId"));
@@ -316,10 +326,10 @@ var delContent = function(contentClassName, addBtnClassName) {
<div for="action"></div>
</div>
</div>
<div class="col-md-6 hidden">
<div class="col-md-6 dnsIpSpoofing hidden">
<div class="form-group">
<label class="control-label col-md-3">
<input type="checkbox" name="userRegion4" class="child-checks" <%-- <c:if test="${_cfg.userRegion4 eq '1' }"> --%>checked<%-- </c:if> --%> value="1">
<input type="checkbox" name="userRegion4" class="child-checks" <c:if test='${_cfg.userRegion4 eq "8" }'> checked</c:if> value="8">
</label>
<div class="col-md-6">
<label class="control-label">

13
src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
View File

@@ -384,7 +384,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th class="sort-column r.compile_id" style="display: none" column="cfg_id" ><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc cfgDesc" column="config_describe" ><spring:message code="config_describe"/></th>
<%-- <th><spring:message code="block_by_app_server_ip"/></th> --%>
<th column="user_region4" ><spring:message code="block_by_app_server_ip"/></th>
<th class="sort-column r.action" column="block_type" ><spring:message code="block_type"/></th>
<th column="ratelimit" ><spring:message code="ratelimit"/></th>
<th column="social_app" ><spring:message code="social_app"/></th>
@@ -415,14 +415,11 @@
</td>
<td>${cfg.compileId }</td>
<td>${cfg.cfgDesc }</td>
<%-- <td>
<c:if test="${cfg.userRegion4 eq '1'}">
<spring:message code="yes"/>
<td>
<c:if test="${cfg.userRegion4 eq '8'}">
<spring:message code="block_by_app_server_ip"/>
</c:if>
<c:if test="${empty cfg.userRegion4}">
<spring:message code="no"/>
</c:if>
</td> --%>
</td>
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq cfg.action }">