diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue index 573d955ff2f39c30cf27de7e4a396d8c14b7e482..6aa2c68a73da87a1bef2e327c0c0f32f69fabda5 100644 --- a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue @@ -59,7 +59,7 @@ - + diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue index cb524b2f4d5fbeadb59d554d5fe7b6b039c56af5..212cf5f0398faf2e38f757a11f1d1ed0328e708e 100644 --- a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue @@ -1,7 +1,7 @@ - + diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/timing/index.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/timing/index.vue index 8cd6fcea3e5ca37fe6ab0cff37b6ab53a93df630..989bf6c49fd401e6f16d275a66613da81d2d1d9a 100644 --- a/escheduler-ui/src/js/conf/home/pages/projects/pages/timing/index.vue +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/timing/index.vue @@ -1,5 +1,5 @@ - + diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue b/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue index 88757b23a4a09d9b30545d6f5045e679ef2bb636..e09dc04633378d0e970a0a2f615c706fac32c933 100644 --- a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue +++ b/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue @@ -1,7 +1,7 @@ - + diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue b/escheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue index ad1130f7821550cd0dad092392aa03dc6bb4c51f..1101fca72d98edc7fa733eb5f10dc4dbae518f3c 100644 --- a/escheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue +++ b/escheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue @@ -2,7 +2,7 @@ - + diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue b/escheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue index 29ed402b602ea6022cce6a6645388505f1f76541..0af3cf1f457c21a6ab2dba2a38e7450d982ca9ab 100644 --- a/escheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue +++ b/escheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue @@ -2,7 +2,7 @@ - + diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue b/escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue index d7d54c78dfb6c42c1e59ffcc9b292baa903211cc..fe527ccdedd2186e3000bf47fecbc768a42e4f45 100644 --- a/escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue +++ b/escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue @@ -2,7 +2,7 @@ - + diff --git a/escheduler-ui/src/js/conf/home/router/index.js b/escheduler-ui/src/js/conf/home/router/index.js index a6d34a8eae5e7e9a71d88edf806b71d265022f34..0ed509b35ff816475d81bf19bdd9f22a9134452b 100644 --- a/escheduler-ui/src/js/conf/home/router/index.js +++ b/escheduler-ui/src/js/conf/home/router/index.js @@ -215,7 +215,7 @@ const router = new Router({ name: 'file', component: resolve => require(['../pages/resource/pages/file/pages/list/index'], resolve), meta: { - title: `${i18n.$t('File Management')}` + title: `${i18n.$t('File Manage')}` } }, { @@ -247,7 +247,7 @@ const router = new Router({ name: 'udf', component: resolve => require(['../pages/resource/pages/udf/index'], resolve), meta: { - title: `${i18n.$t('UDF management')}` + title: `${i18n.$t('UDF manage')}` }, children: [ { @@ -307,7 +307,7 @@ const router = new Router({ name: 'tenement-manage', component: resolve => require(['../pages/security/pages/tenement/index'], resolve), meta: { - title: `${i18n.$t('Tenant Management')}` + title: `${i18n.$t('Tenant Manage')}` } }, { @@ -315,7 +315,7 @@ const router = new Router({ name: 'users-manage', component: resolve => require(['../pages/security/pages/users/index'], resolve), meta: { - title: `${i18n.$t('User Management')}` + title: `${i18n.$t('User Manage')}` } }, { @@ -323,7 +323,7 @@ const router = new Router({ name: 'warning-groups-manage', component: resolve => require(['../pages/security/pages/warningGroups/index'], resolve), meta: { - title: `${i18n.$t('Warning group management')}` + title: `${i18n.$t('Warning group manage')}` } }, { @@ -339,7 +339,7 @@ const router = new Router({ name: 'servers-manage', component: resolve => require(['../pages/security/pages/servers/index'], resolve), meta: { - title: `${i18n.$t('Servers management')}` + title: `${i18n.$t('Servers manage')}` }, redirect: { name: 'servers-master' diff --git a/escheduler-ui/src/js/conf/home/store/security/actions.js b/escheduler-ui/src/js/conf/home/store/security/actions.js index cd73ee9e8d572c32956695ca27daa2efaebf1891..b096ca1ee04308323d0873d0a8ec6f3433e9c9e7 100644 --- a/escheduler-ui/src/js/conf/home/store/security/actions.js +++ b/escheduler-ui/src/js/conf/home/store/security/actions.js @@ -140,7 +140,7 @@ export default { } let param = {} - // Management user + // Manage user if (o.type === 'user') { param.alertgroupId = payload.id } else { diff --git a/escheduler-ui/src/js/module/components/nav/nav.vue b/escheduler-ui/src/js/module/components/nav/nav.vue index f41b5d6287e4290aa856eb93f97baca230cbeab2..7a8c51152488de0628ad8ba9158cad121abd233a 100644 --- a/escheduler-ui/src/js/module/components/nav/nav.vue +++ b/escheduler-ui/src/js/module/components/nav/nav.vue @@ -28,7 +28,7 @@ - {{$t('Datasource')}} + {{$t('Datasource manage')}} @@ -121,7 +121,7 @@ - {{$t('Datasource')}} + {{$t('Datasource manage')}} diff --git a/escheduler-ui/src/js/module/components/secondaryMenu/menu.js b/escheduler-ui/src/js/module/components/secondaryMenu/menu.js index d927fd2f45851696e8eff5767b711219bce65045..58e6c4144cfc9551c37d28d55bdd5325216525a0 100644 --- a/escheduler-ui/src/js/module/components/secondaryMenu/menu.js +++ b/escheduler-ui/src/js/module/components/secondaryMenu/menu.js @@ -59,7 +59,7 @@ let menu = { security: [ { - name: `${i18n.$t('Tenant Management')}`, + name: `${i18n.$t('Tenant Manage')}`, id: 1, path: 'tenement-manage', isOpen: true, @@ -67,7 +67,7 @@ let menu = { children: [] }, { - name: `${i18n.$t('User Management')}`, + name: `${i18n.$t('User Manage')}`, id: 1, path: 'users-manage', isOpen: true, @@ -75,7 +75,7 @@ let menu = { children: [] }, { - name: `${i18n.$t('Warning group management')}`, + name: `${i18n.$t('Warning group manage')}`, id: 1, path: 'warning-groups-manage', isOpen: true, @@ -91,7 +91,7 @@ let menu = { children: [] }, { - name: `${i18n.$t('Servers management')}`, + name: `${i18n.$t('Servers manage')}`, id: 1, path: '', isOpen: true, @@ -112,7 +112,7 @@ let menu = { ], resource: [ { - name: `${i18n.$t('File Management')}`, + name: `${i18n.$t('File Manage')}`, id: 1, path: 'file', isOpen: true, @@ -121,7 +121,7 @@ let menu = { disabled: false }, { - name: `${i18n.$t('UDF management')}`, + name: `${i18n.$t('UDF manage')}`, id: 1, path: '', isOpen: true, @@ -129,12 +129,12 @@ let menu = { disabled: false, children: [ { - name: `${i18n.$t('Resource management')}`, + name: `${i18n.$t('Resource manage')}`, path: 'resource-udf-resource', id: 1 }, { - name: `${i18n.$t('Function management')}`, + name: `${i18n.$t('Function manage')}`, path: 'resource-udf-function', id: 2 } diff --git a/escheduler-ui/src/js/module/i18n/locale/en_US.js b/escheduler-ui/src/js/module/i18n/locale/en_US.js index 150c6b013e1e293b16bcfe098d5a28389ed6fcd3..3bb8acc9114f81676bf424ffd4bf276ea36025fb 100644 --- a/escheduler-ui/src/js/module/i18n/locale/en_US.js +++ b/escheduler-ui/src/js/module/i18n/locale/en_US.js @@ -67,10 +67,10 @@ export default { 'Project Home': 'Project Home', 'Project Manage': 'Project', 'Create Project': 'Create Project', - 'Cron Management': 'Cron Management', - 'Tenant Management': 'Tenant Management', + 'Cron Manage': 'Cron Manage', + 'Tenant Manage': 'Tenant Manage', 'Create Tenant': 'Create Tenant', - 'User Management': 'User Management', + 'User Manage': 'User Manage', 'Create User': 'Create User', 'User Information': 'User Information', 'Edit Password': 'Edit Password', @@ -220,7 +220,7 @@ export default { 'Download Details': 'Download Details', 'Return': 'Return', 'Save': 'Save', - 'File Management': 'File Management', + 'File Manage': 'File Manage', 'Upload Files': 'Upload Files', 'Create UDF Function': 'Create UDF Function', 'Upload UDF Resources': 'Upload UDF Resources', @@ -316,11 +316,11 @@ export default { 'Process': 'Process', 'Process definition': 'Process definition', 'Task record': 'Task record', - 'Warning group management': 'Warning group management', - 'Servers management': 'Servers management', - 'UDF management': 'UDF management', - 'Resource management': 'Resource management', - 'Function management': 'Function management', + 'Warning group manage': 'Warning group manage', + 'Servers manage': 'Servers manage', + 'UDF manage': 'UDF manage', + 'Resource manage': 'Resource manage', + 'Function manage': 'Function manage', 'Edit password': 'Edit password', 'Ordinary users': 'Ordinary users', 'Create process': 'Create process', @@ -409,4 +409,5 @@ export default { 'Queue manage': 'Queue manage', 'Create queue': 'Create queue', 'Edit queue': 'Edit queue', + 'Datasource manage': 'Datasource', } \ No newline at end of file diff --git a/escheduler-ui/src/js/module/i18n/locale/zh_CN.js b/escheduler-ui/src/js/module/i18n/locale/zh_CN.js index 6f153957b7d644a2d4619808741d8fa1cc8c4e57..b6670eb40ca2339f526293e18878f0ed1bbb939b 100644 --- a/escheduler-ui/src/js/module/i18n/locale/zh_CN.js +++ b/escheduler-ui/src/js/module/i18n/locale/zh_CN.js @@ -67,10 +67,10 @@ export default { 'Project Home': '项目首页', 'Project Manage': '项目管理', 'Create Project': '创建项目', - 'Cron Management': '定时管理', - 'Tenant Management': '租户管理', + 'Cron Manage': '定时管理', + 'Tenant Manage': '租户管理', 'Create Tenant': '创建租户', - 'User Management': '用户管理', + 'User Manage': '用户管理', 'Create User': '创建用户', 'User Information': '用户信息', 'Edit Password': '密码修改', @@ -220,7 +220,7 @@ export default { 'Download Details': '下载详情', 'Return': '返回', 'Save': '保存', - 'File Management': '文件管理', + 'File Manage': '文件管理', 'Upload Files': '上传文件', 'Create UDF Function': '创建UDF函数', 'Upload UDF Resources': '上传UDF资源', @@ -315,11 +315,11 @@ export default { 'Process': '工作流', 'Process definition': '工作流定义', 'Task record': '任务记录', - 'Warning group management': '告警组管理', - 'Servers management': '服务管理', - 'UDF management': 'UDF管理', - 'Resource management': '资源管理', - 'Function management': '函数管理', + 'Warning group manage': '告警组管理', + 'Servers manage': '服务管理', + 'UDF manage': 'UDF管理', + 'Resource manage': '资源管理', + 'Function manage': '函数管理', 'Edit password': '修改密码', 'Ordinary users': '普通用户', 'Create process': '创建工作流', @@ -366,7 +366,7 @@ export default { 'User Center': '用户中心', 'Please enter method': '请输入方法', 'none': '无', - 'name': '按名称', + 'name': '名称', 'Process priority': '流程优先级', 'Task priority': '任务优先级', 'Task timeout alarm': '任务超时告警', @@ -408,4 +408,5 @@ export default { 'Queue manage': '队列管理', 'Create queue': '创建队列', 'Edit queue': '编辑队列', + 'Datasource manage': '数据源中心', } \ No newline at end of file