From f992a5cf8c4227f69ba60d349e25af9525290e8d Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Mon, 22 Jan 2018 22:40:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=BB=84=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=80=E8=BF=91=E4=B8=80=E5=91=A8=E3=80=81=E6=9C=80=E8=BF=91?=
 =?UTF-8?q?=E4=B8=80=E6=9C=88=EF=BC=8C=E5=8C=85=E5=90=AB=E5=BD=93=E6=97=A5?=
 =?UTF-8?q?=E9=9B=B6=E7=82=B9=EF=BC=9B=E7=A1=AE=E4=BF=9D=E5=A4=9A=E6=AC=A1?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=97=B6=E6=95=B0=E6=8D=AE=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xxl-job-admin/src/main/webapp/static/js/index.js          | 4 ++--
 xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xxl-job-admin/src/main/webapp/static/js/index.js b/xxl-job-admin/src/main/webapp/static/js/index.js
index 9010d539..12c1d150 100644
--- a/xxl-job-admin/src/main/webapp/static/js/index.js
+++ b/xxl-job-admin/src/main/webapp/static/js/index.js
@@ -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,
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 d12e3e49..d195241b 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
@@ -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,