diff --git a/xxl-job-admin/src/main/java/com/xxl/job/controller/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/controller/JobLogController.java index 7a4214db..3122a421 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/controller/JobLogController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/controller/JobLogController.java @@ -1,6 +1,7 @@ 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"; diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl index 93d741cd..c69d574b 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl @@ -191,6 +191,19 @@ + + \ No newline at end of file diff --git a/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js b/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js index 6cde6c1b..d1e4c28d 100644 --- a/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js +++ b/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js @@ -77,7 +77,7 @@ $(function() { // 日志弹框提示 $('#joblog_list').on('click', '.logTips', function(){ var title = $(this).attr('title'); - ComAlert.show(2, title); + ComAlertTec.show(title); }); // 过滤时间