diff --git a/escheduler-ui/src/js/conf/home/pages/home/index.vue b/escheduler-ui/src/js/conf/home/pages/home/index.vue index 4f3e2e977b..7b7fdf2667 100644 --- a/escheduler-ui/src/js/conf/home/pages/home/index.vue +++ b/escheduler-ui/src/js/conf/home/pages/home/index.vue @@ -1,16 +1,16 @@ diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue index 619f4932c9..6bd9e0dbab 100644 --- a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue +++ b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue @@ -6,12 +6,12 @@
IP: {{item.host}} - 端口: {{item.port}} - zk注册目录: {{item.zkDirectory}} + {{$t('Port')}}: {{item.port}} + {{$t('Zk registration directory')}}: {{item.zkDirectory}}
- 创建时间: {{item.createTime | formatDate}} - 最后心跳时间: {{item.lastHeartbeatTime | formatDate}} + {{$t('Create Time')}}: {{item.createTime | formatDate}} + {{$t('Last heartbeat time')}}: {{item.lastHeartbeatTime | formatDate}}
diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/mysql.vue b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/mysql.vue index 933264d730..e3e9bdb665 100644 --- a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/mysql.vue +++ b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/mysql.vue @@ -22,7 +22,7 @@
- 最大连接数 + 最大连接数 - {{item.date | formatDate}}
{{item.maxConnections}} @@ -48,13 +48,13 @@
- 最大连接数 + 最大使用连接数
{{item.maxUsedConnections}}
- 最大连接数 + 最大使用连接数
diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss index a80046a81e..255d8921eb 100644 --- a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss +++ b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss @@ -59,7 +59,7 @@ height: 160px; line-height: 160px; >b { - font-size: 80px; + font-size: 72px; } >.state { >i { diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue index f6a77c1b19..96a4f80258 100644 --- a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue +++ b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue @@ -6,12 +6,12 @@
IP: {{item.host}} - 端口: {{item.port}} - zk注册目录: {{item.zkDirectory}} + {{$t('Port')}}: {{item.port}} + {{$t('Zk registration directory')}}: {{item.zkDirectory}}
- 创建时间: {{item.createTime | formatDate}} - 最后心跳时间: {{item.lastHeartbeatTime | formatDate}} + {{$t('Create Time')}}: {{item.createTime | formatDate}} + {{$t('Last heartbeat time')}}: {{item.lastHeartbeatTime | formatDate}}
diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/commandStateCount.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/commandStateCount.vue new file mode 100644 index 0000000000..7f038e0356 --- /dev/null +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/commandStateCount.vue @@ -0,0 +1,77 @@ + + \ No newline at end of file diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue new file mode 100644 index 0000000000..1ecea42b8f --- /dev/null +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue @@ -0,0 +1,70 @@ + + diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/processStateCount.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/processStateCount.vue new file mode 100644 index 0000000000..19022d75cb --- /dev/null +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/processStateCount.vue @@ -0,0 +1,122 @@ + + + + diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/projectChart.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/projectChart.vue deleted file mode 100644 index 6d7ca15574..0000000000 --- a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/projectChart.vue +++ /dev/null @@ -1,362 +0,0 @@ - - - - diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/queueCount.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/queueCount.vue new file mode 100644 index 0000000000..c23ccef404 --- /dev/null +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/queueCount.vue @@ -0,0 +1,102 @@ + + + + diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue new file mode 100644 index 0000000000..2f1108ce20 --- /dev/null +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue @@ -0,0 +1,129 @@ + + + + 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 c8e75e315f..31a96d0d35 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 @@ -1,12 +1,84 @@ + + \ No newline at end of file diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/token/index.vue b/escheduler-ui/src/js/conf/home/pages/security/pages/token/index.vue index f7132dbcd6..c8fdc6603f 100644 --- a/escheduler-ui/src/js/conf/home/pages/security/pages/token/index.vue +++ b/escheduler-ui/src/js/conf/home/pages/security/pages/token/index.vue @@ -5,35 +5,6 @@ import mToken from '@/conf/home/pages/user/pages/token' export default { name: 'token-index', - data () { - return {} - }, - props: {}, - methods: {}, - watch: {}, - beforeCreate () { - }, - created () { - }, - beforeMount () { - }, - mounted () { - }, - beforeUpdate () { - }, - updated () { - }, - beforeDestroy () { - }, - destroyed () { - }, - computed: {}, components: { mToken } } - - diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/createWorker.vue b/escheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/createWorker.vue index ff3d20be24..ecbf97a691 100644 --- a/escheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/createWorker.vue +++ b/escheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/createWorker.vue @@ -2,7 +2,7 @@ diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue b/escheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue index a6fd4ef4e3..f4983ae46c 100644 --- a/escheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue +++ b/escheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue @@ -7,7 +7,7 @@ {{$t('#')}} - 分组名称 + {{$t('Group')}} IPList @@ -62,8 +62,6 @@