From 9c369ccde492025c550cc40ee2fbd47763248344 Mon Sep 17 00:00:00 2001
From: lenboo <denny1011@163.com>
Date: Fri, 21 Jun 2019 16:42:00 +0800
Subject: [PATCH] move queue count and command count to statistics.

---
 .../home/pages/projects/pages/index/index.vue | 24 -------------------
 .../src/js/conf/home/router/index.js          |  8 +++++++
 .../components/secondaryMenu/_source/menu.js  | 18 +++++++++++++-
 .../src/js/module/i18n/locale/en_US.js        |  8 ++++++-
 .../src/js/module/i18n/locale/zh_CN.js        |  6 +++++
 5 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue
index 28f61f9e6..f695f3a67 100644
--- a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue
@@ -33,30 +33,6 @@
             </div>
           </div>
         </div>
-        <div class="row" style="padding-top: 20px;">
-          <div class="col-md-6">
-          </div>
-          <div class="col-md-6">
-            <div class="chart-title">
-              <span>{{$t('Queue statistics')}}</span>
-            </div>
-            <div class="row">
-              <m-queue-count :search-params="searchParams">
-              </m-queue-count>
-            </div>
-          </div>
-        </div>
-        <div class="row">
-          <div class="col-md-12">
-            <div class="chart-title" style="margin-bottom: 20px;margin-top: 30px">
-              <span>{{$t('Command status statistics')}}</span>
-            </div>
-            <div>
-              <m-command-state-count :search-params="searchParams">
-              </m-command-state-count>
-            </div>
-          </div>
-        </div>
         <div class="row">
           <div class="col-md-12">
             <div class="chart-title" style="margin-bottom: -20px;margin-top: 30px">
diff --git a/escheduler-ui/src/js/conf/home/router/index.js b/escheduler-ui/src/js/conf/home/router/index.js
index 97a7e81a1..c1aa86d6e 100644
--- a/escheduler-ui/src/js/conf/home/router/index.js
+++ b/escheduler-ui/src/js/conf/home/router/index.js
@@ -439,6 +439,14 @@ const router = new Router({
           meta: {
             title: `Mysql`
           }
+        },
+        {
+          path: '/monitor/servers/statistics',
+          name: 'statistics',
+          component: resolve => require(['../pages/monitor/pages/servers/statistics'], resolve),
+          meta: {
+            title: `statistics`
+          }
         }
       ]
     }
diff --git a/escheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js b/escheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
index 20182ce0b..1c0aefbec 100644
--- a/escheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
+++ b/escheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
@@ -193,7 +193,7 @@ let menu = {
   monitor: [
     {
       name: `${i18n.$t('Servers manage')}`,
-      id: 0,
+      id: 1,
       path: '',
       isOpen: true,
       disabled: true,
@@ -242,6 +242,22 @@ let menu = {
           disabled: true
         }
       ]
+    },
+    {
+      name: `${i18n.$t('Statistics manage')}`,
+      id: 0,
+      path: '',
+      isOpen: true,
+      disabled: true,
+      icon: 'fa-server',
+      children: [
+        {
+          name: "Statistics",
+          path: 'statistics',
+          id: 0,
+          disabled: true
+        }
+      ]
     }
   ]
 }
diff --git a/escheduler-ui/src/js/module/i18n/locale/en_US.js b/escheduler-ui/src/js/module/i18n/locale/en_US.js
index fbc621e18..cf81d9c95 100644
--- a/escheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/escheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -458,5 +458,11 @@ export default {
   'Post Statement': 'Post Statement',
   'Statement cannot be empty': 'Statement cannot be empty',
   'Process Define Count': 'Process Define Count',
-  'Process Instance Running Count': 'Process Instance Running Count'
+  'Process Instance Running Count': 'Process Instance Running Count',
+  'process number of waiting for running': 'process number of waiting for running',
+  'failure command number': 'failure command number',
+  'tasks number of waiting running': 'tasks number of waiting running',
+  'task number of ready to kill': '待杀死任务数',
+  'Statistics manage': 'Statistics manage',
+  'statistics': 'statistics',
 }
diff --git a/escheduler-ui/src/js/module/i18n/locale/zh_CN.js b/escheduler-ui/src/js/module/i18n/locale/zh_CN.js
index d77c55715..78ef8323a 100644
--- a/escheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/escheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -460,4 +460,10 @@ export default {
   'Process Define Count': '流程定义个数',
   'Process Instance Running Count': '运行流程实例个数',
   'Please select a queue': '请选择队列',
+  'process number of waiting for running': '待执行的流程数',
+  'failure command number': '执行失败的命令数',
+  'tasks number of waiting running': '待运行任务数',
+  'task number of ready to kill': '待杀死任务数',
+  'Statistics manage': '统计管理',
+  'statistics': '统计',
 }
-- 
GitLab