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

修改区域地域ip和地域运营商不互斥的bug

Browse Source 
去掉cfgIndexInfo中areaIpCfg对象
cont_ip修改功能完成
This commit is contained in:
duandongmei
2018-05-30 17:10:39 +08:00
parent 911b9a6e09
commit d0d9c3eece
9 changed files with 221 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp
View File

@@ -5,40 +5,6 @@
<title><spring:message code="${cfgName}"></spring:message></title>
<script type="text/javascript">
$(function(){
areaControlInit();
$("input[name='isAreaEffective']").on('change',function(){
var val=$(this).val();
if(val==1){
$(".areaType").removeClass("hidden");
if($("input[name='areaType']:checked").val()==1){//areaISP
$("#areaIsp").removeClass("hidden");
}else if($("input[name='areaType']:checked").val()==0){//areaIp
$("#areaIp").removeClass("hidden");
}
}else{
$(".areaType").addClass("hidden");
$("#areaIp").addClass("hidden");
$("#areaIsp").addClass("hidden");
}
});
$("select[name$='ipType']").on("change",function(){
switchIpType($(this));
});
$("input[name='areaType']").on('change',function(){
var val=$(this).val();
if($(this).is(":visible")){
if(val==0){
$("#areaIp").removeClass("hidden");
$("#areaIsp").addClass("hidden");
}else{
$("#areaIsp").removeClass("hidden");
$("#areaIp").addClass("hidden");
}
}else{
$("#areaIsp").addClass("hidden");
$("#areaIp").addClass("hidden");
}
});
$("#cancel").on("click",function(){
window.history.back();
});
@@ -123,7 +89,7 @@ $(function(){
</div>
<!-- desc and action -->
<%@include file="/WEB-INF/include/form/ipInfo.jsp" %>
<%-- <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> --%>
<%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
<input type="hidden" name="isAreaEffective" value="0">
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
</div>

2
src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
View File

@@ -117,7 +117,7 @@
<button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/> <i class="fa fa-angle-double-down"></i></button>
</div>
<div class="pull-right">
<shiro:hasPermission name="avContIp:config">
<shiro:hasPermission name="avContentIp:config">
<sys:delRow url="${ctx}/ntc/av/contentIpForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/av/updateAvContIpValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
</shiro:hasPermission>