diff --git a/hippo4j-ui/src/locale/lang/en.js b/hippo4j-ui/src/locale/lang/en.js
index a3b6ca8c..5ea48ce2 100644
--- a/hippo4j-ui/src/locale/lang/en.js
+++ b/hippo4j-ui/src/locale/lang/en.js
@@ -30,14 +30,12 @@ export default {
num: 'Num',
createTime: 'Create Time',
updateTime: 'Update Time',
- tenant: 'Tenant',
requiredError: 'this is required',
hint: 'Warning'
},
// 运行报表
report: {
- item: 'Item',
poolInstance: 'Pool Instance',
user: 'User',
role: 'Role',
@@ -46,11 +44,20 @@ export default {
// 租户管理
tenantManage: {
+ tenant: 'Tenant',
tenantName: 'Tenant Name',
owner: 'Owner',
tenantIntro: 'Tenant Intro'
},
+ // 项目管理
+ projectManage: {
+ item: 'Item',
+ itemName: 'Item Name',
+ owner: 'Owner',
+ itemIntro: 'Item Intro'
+ },
+
// 线程池
threadPool: {
tenant: 'Tenant',
diff --git a/hippo4j-ui/src/locale/lang/zh.js b/hippo4j-ui/src/locale/lang/zh.js
index 5824d378..f92e8a63 100644
--- a/hippo4j-ui/src/locale/lang/zh.js
+++ b/hippo4j-ui/src/locale/lang/zh.js
@@ -30,14 +30,12 @@ export default {
num: '序号',
createTime: '创建时间',
updateTime: '修改时间',
- tenant: '租户',
requiredError: '这是必填项',
hint: '提示'
},
// 运行报表
report: {
- item: '项目',
poolInstance: '线程池实例',
user: '登录用户',
role: '用户角色',
@@ -46,11 +44,20 @@ export default {
// 租户管理
tenantManage: {
+ tenant: '租户',
tenantName: '租户名称',
owner: '负责人',
tenantIntro: '租户简介'
},
+ // 项目管理
+ projectManage: {
+ item: '项目',
+ itemName: '项目名称',
+ owner: '负责人',
+ itemIntro: '项目简介'
+ },
+
// 线程池
threadPool: {
tenant: '租户',
diff --git a/hippo4j-ui/src/views/dashboard/admin/components/PanelGroup.vue b/hippo4j-ui/src/views/dashboard/admin/components/PanelGroup.vue
index b0915ca6..c2629a0c 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 @@
- {{ $t('common.tenant') }}
+ {{ $t('tenantManage.tenant') }}
@@ -20,7 +20,7 @@
- {{ $t('report.item') }}
+ {{ $t('projectManage.item') }}
diff --git a/hippo4j-ui/src/views/hippo4j/item/index.vue b/hippo4j-ui/src/views/hippo4j/item/index.vue
index 183f35f8..be8e0398 100755
--- a/hippo4j-ui/src/views/hippo4j/item/index.vue
+++ b/hippo4j-ui/src/views/hippo4j/item/index.vue
@@ -4,7 +4,7 @@
@@ -15,7 +15,7 @@
icon="el-icon-search"
@click="fetchData"
>
- 搜索
+ {{ $t('common.query') }}
- 添加
+ {{ $t('common.insert') }}
-
+
{{ scope.$index + 1 }}
-
+
{{ scope.row.tenantId }}
-
+
{{ scope.row.itemId }}
-
+
{{ scope.row.itemName }}
-
+
{{ scope.row.owner }}
-
+
{{ scope.row.gmtModified }}
-
+
- 编辑
+ {{ $t('common.edit') }}
- 删除
+ {{ $t('common.delete') }}
@@ -93,10 +93,10 @@
label-position="left"
label-width="100px"
>
-
+
-
+
-
-
+
+
-
-
+
+
-
+
@@ -148,7 +148,7 @@
@@ -204,11 +204,11 @@ export default {
create: 'Create',
},
rules: {
- tenantId: [{ required: true, message: 'this is required', trigger: 'blur' }],
- itemId: [{ required: true, message: 'this is required', trigger: 'blur' }],
- itemName: [{ required: true, message: 'this is required', trigger: 'blur' }],
- owner: [{ required: true, message: 'this is required', trigger: 'blur' }],
- itemDesc: [{ required: true, message: 'this is required', trigger: 'blur' }],
+ tenantId: [{ required: true, message: this.$t('common.requiredError'), trigger: 'blur' }],
+ itemId: [{ required: true, message: this.$t('common.requiredError'), trigger: 'blur' }],
+ itemName: [{ required: true, message: this.$t('common.requiredError'), trigger: 'blur' }],
+ owner: [{ required: true, message: this.$t('common.requiredError'), trigger: 'blur' }],
+ itemDesc: [{ required: true, message: this.$t('common.requiredError'), trigger: 'blur' }],
},
temp: {
id: undefined,
@@ -272,8 +272,8 @@ export default {
this.fetchData();
this.dialogFormVisible = false;
this.$notify({
- title: 'Success',
- message: 'Created Successfully',
+ title: this.$t('message.success'),
+ message: this.$t('message.createdSuccess'),
type: 'success',
duration: 2000,
});
@@ -297,8 +297,8 @@ export default {
this.fetchData();
this.dialogFormVisible = false;
this.$notify({
- title: 'Success',
- message: 'Update Successfully',
+ title: this.$t('message.success'),
+ message: this.$t('message.createdSuccess'),
type: 'success',
duration: 2000,
});
@@ -307,9 +307,9 @@ export default {
});
},
openDelConfirm(name) {
- return this.$confirm(`此操作将删除 ${name}, 是否继续?`, '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ return this.$confirm(this.$t('message.deleteMessage', { name }), this.$t('common.hint'), {
+ confirmButtonText: this.$t('common.ok'),
+ cancelButtonText: this.$t('common.cancel'),
type: 'warning',
});
},
@@ -319,8 +319,8 @@ export default {
jobProjectApi.deleted(delObj).then((response) => {
this.fetchData();
this.$notify({
- title: 'Success',
- message: 'Delete Successfully',
+ title: this.$t('message.success'),
+ message: this.$t('message.createdSuccess'),
type: 'success',
duration: 2000,
});
diff --git a/hippo4j-ui/src/views/hippo4j/tenant/index.vue b/hippo4j-ui/src/views/hippo4j/tenant/index.vue
index cada4eab..9ce4b2ac 100755
--- a/hippo4j-ui/src/views/hippo4j/tenant/index.vue
+++ b/hippo4j-ui/src/views/hippo4j/tenant/index.vue
@@ -4,7 +4,7 @@
@@ -38,7 +38,7 @@
{{ scope.$index + 1 }}
-
+
{{ scope.row.tenantId }}
@@ -83,11 +83,11 @@
label-position="left"
label-width="120px"
>
-
+