Browse Source

move queue count and command count to statistics.

pull/2/head
lenboo 6 years ago
parent
commit
9c369ccde4
  1. 24
      escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue
  2. 8
      escheduler-ui/src/js/conf/home/router/index.js
  3. 18
      escheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
  4. 8
      escheduler-ui/src/js/module/i18n/locale/en_US.js
  5. 6
      escheduler-ui/src/js/module/i18n/locale/zh_CN.js

24
escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue

@ -33,30 +33,6 @@
</div> </div>
</div> </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="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="chart-title" style="margin-bottom: -20px;margin-top: 30px"> <div class="chart-title" style="margin-bottom: -20px;margin-top: 30px">

8
escheduler-ui/src/js/conf/home/router/index.js

@ -439,6 +439,14 @@ const router = new Router({
meta: { meta: {
title: `Mysql` title: `Mysql`
} }
},
{
path: '/monitor/servers/statistics',
name: 'statistics',
component: resolve => require(['../pages/monitor/pages/servers/statistics'], resolve),
meta: {
title: `statistics`
}
} }
] ]
} }

18
escheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js

@ -193,7 +193,7 @@ let menu = {
monitor: [ monitor: [
{ {
name: `${i18n.$t('Servers manage')}`, name: `${i18n.$t('Servers manage')}`,
id: 0, id: 1,
path: '', path: '',
isOpen: true, isOpen: true,
disabled: true, disabled: true,
@ -242,6 +242,22 @@ let menu = {
disabled: true 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
}
]
} }
] ]
} }

8
escheduler-ui/src/js/module/i18n/locale/en_US.js

@ -458,5 +458,11 @@ export default {
'Post Statement': 'Post Statement', 'Post Statement': 'Post Statement',
'Statement cannot be empty': 'Statement cannot be empty', 'Statement cannot be empty': 'Statement cannot be empty',
'Process Define Count': 'Process Define Count', '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',
} }

6
escheduler-ui/src/js/module/i18n/locale/zh_CN.js

@ -460,4 +460,10 @@ export default {
'Process Define Count': '流程定义个数', 'Process Define Count': '流程定义个数',
'Process Instance Running Count': '运行流程实例个数', 'Process Instance Running Count': '运行流程实例个数',
'Please select a queue': '请选择队列', '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': '统计',
} }

Loading…
Cancel
Save