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 4f3e2e977b4f87cf9d1137a0be4cb3a4dd11ae0b..7b7fdf2667f7e45e601068ad1b804b51899e9f00 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 619f4932c93ed4aef9313ba338f3084c199606ce..6bd9e0dbabe16ffc0ea00864d238d4ea523769fe 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 933264d730c195aa6d2e80b4fac81a075ed9870c..e3e9bdb66502acf2959e99b3eb82750de8bcd614 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 a80046a81ec933417148594a7af6d6de4a6e25f5..255d8921eb94ad7639cb61d738396be5f8e8ad2a 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 f6a77c1b1971b81cfb936e11167a4c8cf2ad445b..96a4f80258a2b38ba8c71cb0edff633d91cc8027 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 0000000000000000000000000000000000000000..7f038e035675fba1bf388c9d9558b66744be3ae3 --- /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 0000000000000000000000000000000000000000..1ecea42b8f601501767b425bea537db7a0527d4f --- /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 0000000000000000000000000000000000000000..19022d75cba9af6ef4b033f81848cf6317ce2d00 --- /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 6d7ca155745a37c570c05724d20e936dc03af168..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..c23ccef404f5087ffeb72582cf12919605a5b1c0 --- /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 0000000000000000000000000000000000000000..2f1108ce2076bc28a422c37273351a17f39a4799 --- /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 c8e75e315fd1c86726179d92e19395818ad60516..31a96d0d350341a72f9d1e9556b235d5bf2c1632 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 f7132dbcd6cf28a50805b31de779c99bea259d37..c8fdc6603fccd2e0f15592a6933154c9060443a3 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 ff3d20be24e81d606d03233dabff8334fbb6d1e0..ecbf97a691821b7a9ce1bbd65f32826c5bb8df17 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 a6fd4ef4e37347cc9d07fecf64e0396873159507..f4983ae46ce324cb361a8c33937bdb4a132b3d5f 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 @@