增加定时器功能

Conflicts:
	src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp

src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp

@@ -737,6 +737,8 @@ var showHideIPSECProtocol=function(obj){
 													<%@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 class="form-actions">
 														<div class="row">
 															<div class="col-md-6">

src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp

@@ -19,6 +19,15 @@
 	</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 }">
@@ -245,4 +254,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>