Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
熊鹏飞
/
xxljob220
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
01f5ed22
authored
Dec 05, 2017
by
xuxueli
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
调度报表优化,支持时间区间筛选;
parent
0e1ef7f3
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl
xxl-job-admin/src/main/webapp/static/js/index.js
xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl
View file @
01f5ed22
...
...
@@ -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>
...
...
xxl-job-admin/src/main/webapp/static/js/index.js
View file @
01f5ed22
...
...
@@ -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'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment