Merge branch 'sprint216_25241' into 'master'

* Fix bug#25241

See merge request easycorp/zentaopms!4534
This commit is contained in:
孙广明
2022-07-14 02:35:09 +00:00
2 changed files with 3 additions and 1 deletions
+2 -1
View File
@@ -137,6 +137,7 @@ $(function()
location.href = createLink('execution', 'cfd', 'executionID=' + executionID + '&type=' + type + '&withWeekend=' + withWeekend + '&begin=' + begin + '&end=' + end);
});
$("#end, #begin").datetimepicker('setEndDate', today)
$("#end, #begin").datetimepicker('setEndDate', today);
$("#end, #begin").datetimepicker('setStartDate', executionBegin);
$('.datetimepicker-days table tfoot').append('<tr><th colspan="7">' + dateRangeTip + '</th></tr>');
});
+1
View File
@@ -21,6 +21,7 @@
<?php js::set('XUnit', $lang->execution->burnXUnit); ?>
<?php js::set('dateRangeTip', $lang->execution->charts->cfd->dateRangeTip); ?>
<?php js::set('today', date(DT_DATE1)); ?>
<?php js::set('executionBegin', $execution->begin); ?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<?php