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
f992a5cf
authored
Jan 22, 2018
by
xuxueli
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
时间组件,最近一周、最近一月,包含当日零点;确保多次筛选时数据一致;
parent
6ca29c0d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
xxl-job-admin/src/main/webapp/static/js/index.js
xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
xxl-job-admin/src/main/webapp/static/js/index.js
View file @
f992a5cf
...
...
@@ -9,8 +9,8 @@ $(function () {
rangesConf
[
I18n
.
daterangepicker_ranges_yesterday
]
=
[
moment
().
subtract
(
1
,
'days'
).
startOf
(
'day'
),
moment
().
subtract
(
1
,
'days'
).
endOf
(
'day'
)];
rangesConf
[
I18n
.
daterangepicker_ranges_this_month
]
=
[
moment
().
startOf
(
'month'
),
moment
().
endOf
(
'month'
)];
rangesConf
[
I18n
.
daterangepicker_ranges_last_month
]
=
[
moment
().
subtract
(
1
,
'months'
).
startOf
(
'month'
),
moment
().
subtract
(
1
,
'months'
).
endOf
(
'month'
)];
rangesConf
[
I18n
.
daterangepicker_ranges_recent_week
]
=
[
moment
().
subtract
(
1
,
'weeks'
)
,
moment
(
)];
rangesConf
[
I18n
.
daterangepicker_ranges_recent_month
]
=
[
moment
().
subtract
(
1
,
'months'
)
,
moment
(
)];
rangesConf
[
I18n
.
daterangepicker_ranges_recent_week
]
=
[
moment
().
subtract
(
1
,
'weeks'
)
.
startOf
(
'day'
),
moment
().
endOf
(
'day'
)];
rangesConf
[
I18n
.
daterangepicker_ranges_recent_month
]
=
[
moment
().
subtract
(
1
,
'months'
)
.
startOf
(
'day'
),
moment
().
endOf
(
'day'
)];
$
(
'#filterTime'
).
daterangepicker
({
autoApply
:
false
,
...
...
xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
View file @
f992a5cf
...
...
@@ -41,8 +41,8 @@ $(function() {
rangesConf
[
I18n
.
daterangepicker_ranges_yesterday
]
=
[
moment
().
subtract
(
1
,
'days'
).
startOf
(
'day'
),
moment
().
subtract
(
1
,
'days'
).
endOf
(
'day'
)];
rangesConf
[
I18n
.
daterangepicker_ranges_this_month
]
=
[
moment
().
startOf
(
'month'
),
moment
().
endOf
(
'month'
)];
rangesConf
[
I18n
.
daterangepicker_ranges_last_month
]
=
[
moment
().
subtract
(
1
,
'months'
).
startOf
(
'month'
),
moment
().
subtract
(
1
,
'months'
).
endOf
(
'month'
)];
rangesConf
[
I18n
.
daterangepicker_ranges_recent_week
]
=
[
moment
().
subtract
(
1
,
'weeks'
)
,
moment
(
)];
rangesConf
[
I18n
.
daterangepicker_ranges_recent_month
]
=
[
moment
().
subtract
(
1
,
'months'
)
,
moment
(
)];
rangesConf
[
I18n
.
daterangepicker_ranges_recent_week
]
=
[
moment
().
subtract
(
1
,
'weeks'
)
.
startOf
(
'day'
),
moment
().
endOf
(
'day'
)];
rangesConf
[
I18n
.
daterangepicker_ranges_recent_month
]
=
[
moment
().
subtract
(
1
,
'months'
)
.
startOf
(
'day'
),
moment
().
endOf
(
'day'
)];
$
(
'#filterTime'
).
daterangepicker
({
autoApply
:
false
,
...
...
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