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

定时器增加长期生效选项，长期生效只有生效时间【开始时间】，无失效时间【结束时间】。

Browse Source
This commit is contained in:
zhangwei
2019-01-29 14:25:09 +06:00
parent 0ebee67507
commit 2dadd96484
6 changed files with 96 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/webapp/WEB-INF/include/form/scheduleNew.jsp
View File

@@ -5,7 +5,10 @@
margin-bottom: 10px;
}
.detail{
border-left: 2px solid #999;
/* border-left: 1px solid #999; */
}
.mode{
border-right: 1px solid #999;
}
</style>
@@ -95,7 +98,12 @@
<div class="col-md-1 mode"><!-- 一次，每天，每周，每月选择 -->
<div class="form-group">
<label class="radio-inline">
<input id="single" type="radio" class="required every" name="schedule.userRegion1" value="single" checked="checked" <c:if test="${_cfg.schedule.userRegion1 == 'single' }">checked="checked"</c:if>><spring:message code="single"/>
<input id="always" type="radio" class="required every" name="schedule.userRegion1" value="always" checked="checked" <c:if test="${_cfg.schedule.userRegion1 == 'always' }">checked="checked"</c:if>><spring:message code="always"/>
</label>
</div>
<div class="form-group">
<label class="radio-inline">
<input id="single" type="radio" class="required every" name="schedule.userRegion1" value="single" <c:if test="${_cfg.schedule.userRegion1 == 'single' }">checked="checked"</c:if>><spring:message code="single"/>
</label>
</div>
<div class="form-group">
@@ -116,7 +124,24 @@
</div>
<div class="col-md-9 detail">
<!-- 一次执行 -->
<div class="single">
<div class="always">
<div class="form-group ">
<label class="control-label col-md-2"><spring:message code="startTime"/></label>
<div class="col-md-4">
<input name="schedule.cronValid" id="alwaysValid" type="text" class="form-control Wdate required" readonly="readonly" value="${_cfg.schedule.cronValid }" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'%y-%M-%d %H:{%m+2}:%s'});"/>
</div>
<div for="schedule.cronValid"></div>
</div>
<%-- <div class="form-group ">
<label class="control-label col-md-2"><spring:message code="endTime"/></label>
<div class="col-md-4">
<input name="schedule.cronInvalid" id="singleInvalid" type="text" class="form-control Wdate required" readonly="readonly" value="${_cfg.schedule.cronInvalid }" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'singleValid\')}'});"/>
</div>
<div for="schedule.cronInvalid"></div>
</div> --%>
</div>
<!-- 一次执行 -->
<div class="single hidden">
<div class="form-group ">
<label class="control-label col-md-2"><spring:message code="startTime"/></label>
<div class="col-md-4">

32
src/main/webapp/WEB-INF/include/form/scheduleNewSubList.jsp
View File

@@ -18,7 +18,7 @@
function init(){
//初始化 mode 模式，一次，每天，每周，每月
$("div.cronContain ").each(function(i,n){
$("div.cronContain_${index } ").each(function(i,n){
var $this = $(this);
var mode = $this.find("input.every:checked").val();
@@ -31,10 +31,10 @@
$this.find(".detail > div").not("."+mode).find("select").val("");
$this.find("input").attr("disabled","disabled").attr("name",function(){
return $(this).attr("name") + i;
return $(this).attr("name") + ${index };
});
$this.find("select").attr("disabled","disabled").attr("name",function(){
return $(this).attr("name") + i;
return $(this).attr("name") + ${index };
});
$this.find("input[type='radio']:not(:checked)").closest(".form-group").remove();
@@ -50,11 +50,16 @@
</script>
<div id="cron" class=' cronContain row <c:if test="${empty _cfg.schedule }">hidden</c:if>' >
<div id="cron" class=' cronContain_${index } row <c:if test="${empty _cfg.schedule }">hidden</c:if>' >
<div class="col-md-1 mode"><!-- 一次，每天，每周，每月选择 -->
<div class="form-group">
<label class="radio-inline">
<input id="single" type="radio" class="required every" name="schedule.userRegion1" value="single" checked="checked" <c:if test="${_cfg.schedule.userRegion1 == 'single' }">checked="checked"</c:if>><spring:message code="single"/>
<input id="always" type="radio" class="required every" name="schedule.userRegion1" value="always" checked="checked" <c:if test="${_cfg.schedule.userRegion1 == 'always' }">checked="checked"</c:if>><spring:message code="always"/>
</label>
</div>
<div class="form-group">
<label class="radio-inline">
<input id="single" type="radio" class="required every" name="schedule.userRegion1" value="single" <c:if test="${_cfg.schedule.userRegion1 == 'single' }">checked="checked"</c:if>><spring:message code="single"/>
</label>
</div>
<div class="form-group">
@@ -74,8 +79,23 @@
</div>
</div>
<div class="col-md-9 detail">
<!-- 一次执行，长期生效 -->
<div class="always">
<div class="form-group row">
<label class="control-label col-md-1"><spring:message code="startTime"/></label>
<div class="col-md-4">
<input name="schedule.cronValid" type="text" class="form-control Wdate required" readonly="readonly" value="${_cfg.schedule.cronValid }" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div>
</div>
<%-- <div class="form-group row">
<label class="control-label col-md-1"><spring:message code="endTime"/></label>
<div class="col-md-4">
<input name="schedule.cronInvalid" type="text" class="form-control Wdate required" readonly="readonly" value="${_cfg.schedule.cronInvalid }" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div>
</div> --%>
</div>
<!-- 一次执行 -->
<div class="single">
<div class="single hidden">
<div class="form-group row">
<label class="control-label col-md-1"><spring:message code="startTime"/></label>
<div class="col-md-4">