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
2540860e
authored
Jan 08, 2016
by
xueli.xue
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
调度日志,弹出框优化
parent
d467d7f2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
40 additions
and
1 deletions
xxl-job-admin/src/main/java/com/xxl/job/controller/JobLogController.java
xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl
xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
xxl-job-admin/src/main/java/com/xxl/job/controller/JobLogController.java
View file @
2540860e
package
com
.
xxl
.
job
.
controller
;
import
java.text.ParseException
;
import
java.util.Calendar
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.List
;
...
...
@@ -47,6 +48,15 @@ public class JobLogController {
@RequestMapping
public
String
index
(
Model
model
,
String
jobName
,
String
filterTime
)
{
// 默认filterTime
Calendar
todayz
=
Calendar
.
getInstance
();
todayz
.
set
(
Calendar
.
HOUR_OF_DAY
,
0
);
todayz
.
set
(
Calendar
.
MINUTE
,
0
);
todayz
.
set
(
Calendar
.
SECOND
,
0
);
model
.
addAttribute
(
"triggerTimeStart"
,
todayz
.
getTime
());
model
.
addAttribute
(
"triggerTimeEnd"
,
Calendar
.
getInstance
().
getTime
());
model
.
addAttribute
(
"jobName"
,
jobName
);
model
.
addAttribute
(
"filterTime"
,
filterTime
);
return
"joblog/index"
;
...
...
xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl
View file @
2540860e
...
...
@@ -191,6 +191,19 @@
</div>
</div>
</div>
<!-- ComAlertTec.模态框Modal-科技感 -->
<div class="modal fade" id="ComAlertTec" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content-tec">
<div class="modal-body"><div class="alert" style="color:#fff;"></div></div>
<div class="modal-footer">
<div class="text-center" >
<button type="button" class="btn btn-info ok" data-dismiss="modal" >确认</button>
</div>
</div>
</div>
</div>
</div>
<script>
// 通用提示
var ComAlert = {
...
...
@@ -237,5 +250,20 @@
});
}
};
// 提示-科技主题
var ComAlertTec = {
show:function(msg, callback){
// 弹框初始
$('#ComAlertTec .alert').html(msg);
$('#ComAlertTec').modal('show');
$('#ComAlertTec .ok').click(function(){
$('#ComAlertTec').modal('hide');
if(typeof callback == 'function') {
callback();
}
});
}
};
</script>
</#macro>
\ No newline at end of file
xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
View file @
2540860e
...
...
@@ -77,7 +77,7 @@ $(function() {
// 日志弹框提示
$
(
'#joblog_list'
).
on
(
'click'
,
'.logTips'
,
function
(){
var
title
=
$
(
this
).
attr
(
'title'
);
ComAlert
.
show
(
2
,
title
);
ComAlert
Tec
.
show
(
title
);
});
// 过滤时间
...
...
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