From 01f5ed22060665a37652ebc921bed9e01e219520 Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Tue, 5 Dec 2017 00:42:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E6=8A=A5=E8=A1=A8=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E6=94=AF=E6=8C=81=E6=97=B6=E9=97=B4=E5=8C=BA?=
 =?UTF-8?q?=E9=97=B4=E7=AD=9B=E9=80=89=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl | 2 +-
 xxl-job-admin/src/main/webapp/static/js/index.js         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl
index bca912ec..164fa753 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl
@@ -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>
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 0eda6b69..d20136d6 100644
--- a/xxl-job-admin/src/main/webapp/static/js/index.js
+++ b/xxl-job-admin/src/main/webapp/static/js/index.js
@@ -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',