diff --git a/hippo4j-ui/src/locale/lang/en.js b/hippo4j-ui/src/locale/lang/en.js index f581c3bb..6729da8c 100644 --- a/hippo4j-ui/src/locale/lang/en.js +++ b/hippo4j-ui/src/locale/lang/en.js @@ -16,16 +16,28 @@ export default { edit: 'Edit', delete: 'Delete', cancel: 'Cancel', - confirm: 'Confirm' + confirm: 'Confirm', + threadPool: 'Thread Pool', + }, + + + // 运行报表 + report: { + tenant: 'Tenant', + item: 'Item', + poolInstance: 'Pool Instance', + user: 'User', + role: 'Role', + tenants: 'Tenants', + createTime: 'Create Time', + updateTime: 'Update Time' }, + // 线程池 threadPool: { tenant: 'Tenant', project: 'Project', - threadPool: 'Thread Pool', - - } } diff --git a/hippo4j-ui/src/locale/lang/zh.js b/hippo4j-ui/src/locale/lang/zh.js index f12d91c6..da82d53d 100644 --- a/hippo4j-ui/src/locale/lang/zh.js +++ b/hippo4j-ui/src/locale/lang/zh.js @@ -16,13 +16,25 @@ export default { edit: '编辑', delete: '删除', cancel: '取消', - confirm: '确认' + confirm: '确认', + threadPool: '线程池', }, + // 运行报表 + report: { + tenant: '租户', + item: '项目', + poolInstance: '线程池实例', + user: '登录用户', + role: '用户角色', + tenants: '所属租户', + createTime: '创建时间', + updateTime: '修改时间' + }, + // 线程池 threadPool: { tenant: '租户', project: '项目', - threadPool: '线程池', } } diff --git a/hippo4j-ui/src/views/dashboard/admin/components/PanelGroup.vue b/hippo4j-ui/src/views/dashboard/admin/components/PanelGroup.vue index 07a82751..0d616534 100644 --- a/hippo4j-ui/src/views/dashboard/admin/components/PanelGroup.vue +++ b/hippo4j-ui/src/views/dashboard/admin/components/PanelGroup.vue @@ -7,7 +7,7 @@
- Tenant + {{ $t('report.tenant') }}
@@ -20,7 +20,7 @@
- Item + {{ $t('report.item') }}
@@ -33,7 +33,7 @@
- Thread Pool + {{ $t('common.threadPool') }}
@@ -46,7 +46,7 @@
- Pool Instance + {{ $t('report.poolInstance') }}
diff --git a/hippo4j-ui/src/views/dashboard/admin/index.vue b/hippo4j-ui/src/views/dashboard/admin/index.vue index ca04d36d..e9f79e76 100644 --- a/hippo4j-ui/src/views/dashboard/admin/index.vue +++ b/hippo4j-ui/src/views/dashboard/admin/index.vue @@ -18,19 +18,19 @@
- + {{ temp.userName }} - + {{ temp.role }} - + - + {{ temp.gmtCreate }} - + {{ temp.gmtModified }} diff --git a/hippo4j-ui/src/views/hippo4j/threadpool/index.vue b/hippo4j-ui/src/views/hippo4j/threadpool/index.vue index f6505f24..68707ba4 100755 --- a/hippo4j-ui/src/views/hippo4j/threadpool/index.vue +++ b/hippo4j-ui/src/views/hippo4j/threadpool/index.vue @@ -33,7 +33,7 @@