1、修改ddos,音视频保存定时任务信息cronValid 和 cronInvalid 字段出错的问题
Conflicts: src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp
This commit is contained in:
@@ -242,6 +242,7 @@ $(function(){
|
||||
flag = validateEffectiveRuleLimit("${ctx}",serviceId);
|
||||
}
|
||||
if(flag){
|
||||
$("#cron .detail > div.disabled").remove();//删除disabled 的字段
|
||||
form.submit();
|
||||
}
|
||||
},
|
||||
@@ -555,6 +556,8 @@ function sampleFileValidate(fileType,fileName){
|
||||
<!-- dolog end-->
|
||||
<input type="hidden" name="isAreaEffective" value="0">
|
||||
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
|
||||
<br>
|
||||
<%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>
|
||||
</div>
|
||||
<div class="form-actions">
|
||||
<div class="row">
|
||||
|
||||
@@ -19,6 +19,14 @@
|
||||
<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>
|
||||
</div>
|
||||
</c:forEach>
|
||||
|
||||
<c:if test="${not empty _cfg.schedule }">
|
||||
<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"
|
||||
class="col-md-1 tabInfo" name="tabTitle${index }">
|
||||
<spring:message code='schedule' />
|
||||
<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>
|
||||
</div>
|
||||
</c:if>
|
||||
</div>
|
||||
<c:forEach items="${tabList}" var="region">
|
||||
<c:if test="${region[0] eq 5 }">
|
||||
@@ -51,4 +59,10 @@
|
||||
</c:if>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
<!-- 显示 定时任务信息 -->
|
||||
<c:if test="${not empty _cfg.schedule }">
|
||||
<div id="scheduleInfo${index}" class="content" name="subCfg${index}">
|
||||
<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>
|
||||
</div>
|
||||
</c:if>
|
||||
</html>
|
||||
@@ -75,6 +75,7 @@ $(function(){
|
||||
return;
|
||||
}
|
||||
loading('onloading...');
|
||||
$("#cron .detail > div.disabled").remove();//删除disabled 的字段
|
||||
form.submit();
|
||||
},
|
||||
errorContainer: "#messageBox",
|
||||
@@ -236,6 +237,8 @@ $(function(){
|
||||
<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
|
||||
<br>
|
||||
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
|
||||
<br>
|
||||
<%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>
|
||||
</div>
|
||||
<div class="form-actions">
|
||||
<div class="row">
|
||||
|
||||
@@ -19,6 +19,13 @@
|
||||
</div>
|
||||
</c:forEach>
|
||||
|
||||
<c:if test="${not empty _cfg.schedule }">
|
||||
<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"
|
||||
class="col-md-1 tabInfo" name="tabTitle${index }">
|
||||
<spring:message code='schedule' />
|
||||
<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>
|
||||
</div>
|
||||
</c:if>
|
||||
</div>
|
||||
<c:forEach items="${tabList}" var="region">
|
||||
<c:if test="${region[0] eq 1 }">
|
||||
@@ -130,4 +137,10 @@
|
||||
</c:if>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
<!-- 显示 定时任务信息 -->
|
||||
<c:if test="${not empty _cfg.schedule }">
|
||||
<div id="scheduleInfo${index}" class="content" name="subCfg${index}">
|
||||
<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>
|
||||
</div>
|
||||
</c:if>
|
||||
</html>
|
||||
Reference in New Issue
Block a user