ak
/
xx-job
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调度报表优化，支持时间区间筛选；

This commit is contained in:
xuxueli 2017-12-05 00:42:07 +08:00
parent 0e1ef7f3ed
commit 01f5ed2206
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl
View File

@ -84,7 +84,7 @@
<div class="progress">
<div class="progress-bar" style="width: 100%"></div>
</div>
<span class="progress-description">调度中心注册发现的执行器机器数量</span>
<span class="progress-description">调度中心在线的执行器机器数量</span>
</div>
</div>
</div>

6
xxl-job-admin/src/main/webapp/static/js/index.js
View File

@ -20,10 +20,10 @@ $(function () {
//'最近1小时': [moment().subtract(1, 'hours'), moment()],
'今日': [moment().startOf('day'), moment().endOf('day')],
'昨日': [moment().subtract(1, 'days').startOf('day'), moment().subtract(1, 'days').endOf('day')],
'最近7日': [moment().subtract(7, 'days'), moment()],
'最近30日': [moment().subtract(1, 'months'), moment()],
'本月': [moment().startOf('month'), moment().endOf('month')],
'上个月': [moment().subtract(1, 'months').startOf('month'), moment().subtract(1, 'months').endOf('month')]
'上个月': [moment().subtract(1, 'months').startOf('month'), moment().subtract(1, 'months').endOf('month')],
'最近1周': [moment().subtract(1, 'weeks'), moment()],
'最近1月': [moment().subtract(1, 'months'), moment()]
},
locale : {
format: 'YYYY-MM-DD HH:mm:ss',