1、修改ddos,音视频保存定时任务信息cronValid 和 cronInvalid 字段出错的问题

Conflicts:
	src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp
This commit is contained in:
fangshunjian
2019-01-27 19:45:48 +06:00
committed by zhangwei
parent 2abffe2e34
commit fa20de4df1
4 changed files with 33 additions and 0 deletions

View File

@@ -242,6 +242,7 @@ $(function(){
flag = validateEffectiveRuleLimit("${ctx}",serviceId); flag = validateEffectiveRuleLimit("${ctx}",serviceId);
} }
if(flag){ if(flag){
$("#cron .detail > div.disabled").remove();//删除disabled 的字段
form.submit(); form.submit();
} }
}, },
@@ -555,6 +556,8 @@ function sampleFileValidate(fileType,fileName){
<!-- dolog end--> <!-- dolog end-->
<input type="hidden" name="isAreaEffective" value="0"> <input type="hidden" name="isAreaEffective" value="0">
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %> <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
<br>
<%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>
</div> </div>
<div class="form-actions"> <div class="form-actions">
<div class="row"> <div class="row">

View File

@@ -19,6 +19,14 @@
<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i> <i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>
</div> </div>
</c:forEach> </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> </div>
<c:forEach items="${tabList}" var="region"> <c:forEach items="${tabList}" var="region">
<c:if test="${region[0] eq 5 }"> <c:if test="${region[0] eq 5 }">
@@ -51,4 +59,10 @@
</c:if> </c:if>
</c:if> </c:if>
</c:forEach> </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> </html>

View File

@@ -75,6 +75,7 @@ $(function(){
return; return;
} }
loading('onloading...'); loading('onloading...');
$("#cron .detail > div.disabled").remove();//删除disabled 的字段
form.submit(); form.submit();
}, },
errorContainer: "#messageBox", errorContainer: "#messageBox",
@@ -236,6 +237,8 @@ $(function(){
<%@include file="/WEB-INF/include/form/areaInfo.jsp"%> <%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
<br> <br>
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %> <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
<br>
<%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>
</div> </div>
<div class="form-actions"> <div class="form-actions">
<div class="row"> <div class="row">

View File

@@ -19,6 +19,13 @@
</div> </div>
</c:forEach> </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> </div>
<c:forEach items="${tabList}" var="region"> <c:forEach items="${tabList}" var="region">
<c:if test="${region[0] eq 1 }"> <c:if test="${region[0] eq 1 }">
@@ -130,4 +137,10 @@
</c:if> </c:if>
</c:if> </c:if>
</c:forEach> </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> </html>