增加定时器

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
This commit is contained in:
zhangwei
2019-01-26 19:01:41 +06:00
parent 87e07376fa
commit 9b304e3c13
38 changed files with 303 additions and 34 deletions

View File

@@ -36,7 +36,13 @@
<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 1 }">
@@ -239,4 +245,10 @@
</c:forEach>
</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>

View File

@@ -430,6 +430,8 @@ var switchRateLimitType=function(){
</c:forEach>
<%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
<%@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">