From e87d8bd3260ad443dc367559fc486fe96bc011f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sat, 7 May 2022 22:15:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A0=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E6=8C=89=E9=92=AE=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/lang/en.js | 47 +++++++----
src/i18n/lang/zh-cn.js | 21 ++++-
src/i18n/lang/zh-tw.js | 14 +++-
src/views/monitor/job/index.vue | 95 +++++++++++++++++-----
src/views/system/commonLang/index.vue | 18 ++--
src/views/system/config/index.vue | 16 ++--
src/views/system/dept/index.vue | 20 +++--
src/views/system/dict/index.vue | 22 ++---
src/views/system/menu/index.vue | 18 ++--
src/views/system/notice/index.vue | 20 +++--
src/views/system/post/index.vue | 20 ++---
src/views/system/role/index.vue | 38 ++++++---
src/views/system/roleusers/index.vue | 66 ++++++++++++---
src/views/system/user/index.vue | 71 +++++++++++-----
src/views/system/user/profile/userInfo.vue | 4 +-
15 files changed, 339 insertions(+), 151 deletions(-)
diff --git a/src/i18n/lang/en.js b/src/i18n/lang/en.js
index 7f03972..1cfa85e 100644
--- a/src/i18n/lang/en.js
+++ b/src/i18n/lang/en.js
@@ -14,23 +14,25 @@ export default {
systemDept: 'Dept',
systemDic: 'Dict',
systemPost: 'Post',
- systemParam: 'Param',
+ systemParam: 'Config',
systemLog: 'Log',
operLog: 'Oper log',
loginLog: 'Login log',
systemNotice: 'Notice',
systemLang: 'Language set',
timedTask: 'TimedTask',
- serviceMonitor: 'serviceMonitor',
- codeGeneration: 'codeGeneration',
- systemInterface: 'systemInterface',
+ serviceMonitor: 'ServiceMonitor',
+ codeGeneration: 'CodeGeneration',
+ systemInterface: 'SystemInterface',
sendEmail: 'Email',
systemArticle: 'Article',
articleList: 'Article list',
formBuild: 'Form building',
officialWebsite: 'Official website',
fileStorage: 'File Storage',
- personalCenter: 'Personal'
+ personalCenter: 'Personal',
+ menuPermi: 'Menu permi',
+ assignUsers: 'Assign users',
},
tagsView: {
refresh: 'refresh',
@@ -82,17 +84,28 @@ export default {
edit: 'Edit',
search: 'Search',
reset: 'Reset',
- preview: 'preview',
- import: 'import',
- export: 'export',
- synchronize: 'synchronize',
- generateCode: 'generateCode',
- start: 'start',
- stop: 'stop',
- runOnce: 'runOnce',
- log: 'log',
- expand: 'expand',
- collapse: 'collapse',
- details: 'details'
+ preview: 'Preview',
+ import: 'Import',
+ export: 'Export',
+ synchronize: 'Synchronize',
+ generateCode: 'GenerateCode',
+ start: 'Start',
+ stop: 'Stop',
+ run: 'Run',
+ runOnce: 'RunOnce',
+ log: 'Log',
+ expand: 'Expand',
+ collapse: 'Collapse',
+ details: 'Details',
+ submit: 'Submit',
+ cancel: 'Cancel',
+ more: 'More',
+ save: 'Save',
+ close: 'Close',
+ authorize: 'Authorize',
+ multi: 'Multi',
+ upload: 'Upload',
+ view: 'To view',
+ copy: 'Copy',
}
};
\ No newline at end of file
diff --git a/src/i18n/lang/zh-cn.js b/src/i18n/lang/zh-cn.js
index 5ca3763..51d1f8f 100644
--- a/src/i18n/lang/zh-cn.js
+++ b/src/i18n/lang/zh-cn.js
@@ -29,8 +29,10 @@ export default {
articleList: '文章列表',
formBuild: '表单构建',
officialWebsite: '官网地址',
- fileStorage: '文件存儲',
- personalCenter: '个人中心'
+ fileStorage: '文件存儲',
+ personalCenter: '个人中心',
+ menuPermi: '菜单权限',
+ assignUsers: '分配用户',
},
tagsView: {
refresh: '刷新页面',
@@ -88,11 +90,22 @@ export default {
synchronize: '同步',
generateCode: '生成代码',
start: '启动',
- stop: '停止',
+ stop: '停止',
+ run: '运行',
runOnce: '运行一次',
log: '日志',
expand: '展开',
collapse: '折叠',
- details: '详细'
+ details: '详细',
+ submit: '确定',
+ cancel: '取消',
+ more: '更多',
+ save: '保存',
+ close: '关闭',
+ authorize: '授权',
+ multi: '批量',
+ upload: '上传',
+ view: '查看',
+ copy: '複製',
}
};
\ No newline at end of file
diff --git a/src/i18n/lang/zh-tw.js b/src/i18n/lang/zh-tw.js
index 1397990..8577183 100644
--- a/src/i18n/lang/zh-tw.js
+++ b/src/i18n/lang/zh-tw.js
@@ -30,7 +30,9 @@ export default {
formBuild: '表單構建',
officialWebsite: '官網地址',
fileStorage: '文件存儲',
- personalCenter: '個人中心'
+ personalCenter: '個人中心',
+ menuPermi: '菜單權限',
+ assignUsers: '分配用戶',
},
tagsView: {
refresh: '重繪',
@@ -89,10 +91,18 @@ export default {
generateCode: '生成代碼',
start: '啟動',
stop: '停止',
+ run: '運行',
runOnce: '運行一次',
log: '日誌',
expand: '展開',
collapse: '折疊',
- details: '詳細'
+ details: '詳細',
+ submit: '確定',
+ cancel: '取消',
+ more: '更多',
+ save: '保存',
+ upload: '上傳',
+ view: '查看',
+ copy: '复制',
}
};
\ No newline at end of file
diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index e02f884..04748a5 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -4,24 +4,37 @@
-
+
- 搜索
- 重置
+ {{ $t('btn.search') }}
+ {{ $t('btn.reset') }}
- 新增
+
+ {{ $t('btn.add') }}
+
- 导出
+
+ {{ $t('btn.export') }}
+
- 日志
+
+ {{ $t('btn.log') }}
+
@@ -44,20 +57,64 @@
- 日志
- 运行
-
- 停止
+
+ {{ $t('btn.log') }}
+
+
+ {{ $t('btn.run') }}
+
+
+ {{ $t('btn.stop') }}
- 启动
- 编辑
+ {{ $t('btn.start') }}
+
+
+ {{ $t('btn.edit') }}
+
- 删除
+ {{ $t('btn.delete') }}
+
@@ -140,7 +197,7 @@
-
+
生成表达式
@@ -182,8 +239,8 @@
@@ -337,7 +394,7 @@ function handleShowCron() {
/** 确定后回传值 */
const changeCron = (val) => {
if (typeof val !== 'string') return false
- openCron.value = false
+ openCron.value = false
form.value.cron = val
}
// 启动按钮
diff --git a/src/views/system/commonLang/index.vue b/src/views/system/commonLang/index.vue
index 310b36b..77e84a3 100644
--- a/src/views/system/commonLang/index.vue
+++ b/src/views/system/commonLang/index.vue
@@ -40,23 +40,23 @@
- 搜索
- 重置
+ {{ $t('btn.search') }}
+ {{ $t('btn.reset') }}
- 新增
+ {{ $t('btn.add') }}
- 修改
+ {{ $t('btn.edit') }}
- 删除
+ {{ $t('btn.delete') }}
- 导出
+ {{ $t('btn.export') }}
@@ -167,8 +167,8 @@
@@ -212,7 +212,7 @@ const state = reactive({
rules: {
id: [{ required: true, message: 'id不能为空', trigger: 'blur', type: 'number' }],
// langCode: [{ required: true, message: '语言code不能为空', trigger: 'change' }],
- langKey: [{ required: true, message: '语言key不能为空', trigger: 'change' }],
+ langKey: [{ required: true, pattern: /^[A-Za-z].+$/, message: '语言key不能为空', trigger: 'change' }],
langName: [{ required: true, message: '内容不能为空', trigger: 'blur' }],
langNameEn: [{ required: true, message: '内容不能为空', trigger: 'blur' }],
langNameTw: [{ required: true, message: '内容不能为空', trigger: 'blur' }],
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 9c0a5be..5ff2b8a 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -16,20 +16,22 @@
- 搜索
- 重置
+ {{ $t('btn.search') }}
+ {{ $t('btn.reset') }}
- 新增
+ {{ $t('btn.add') }}
- 修改
+ {{ $t('btn.edit') }}
- 删除
+ {{ $t('btn.delete') }}
+
@@ -95,8 +99,8 @@
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 5cb0463..eabfb10 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -13,23 +13,23 @@
- 搜索
- 重置
+ {{ $t('btn.search') }}
+ {{ $t('btn.reset') }}
- 新增
+ {{ $t('btn.add') }}
- 修改
+ {{ $t('btn.edit') }}
- 删除
+ {{ $t('btn.delete') }}
- 导出
+ {{ $t('btn.export') }}
@@ -52,8 +52,8 @@
- 修改
- 删除
+ {{ $t('btn.edit') }}
+ {{ $t('btn.delete') }}
@@ -83,8 +83,8 @@
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 3a8532b..4bcba14 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -13,14 +13,14 @@
- 搜索
- 重置
+ {{ $t('btn.search') }}
+ {{ $t('btn.reset') }}
- 新增
+ {{ $t('btn.add') }}
@@ -33,7 +33,13 @@
-
+
@@ -42,20 +48,28 @@
-
修改
-
删除
+
+ {{ $t('btn.edit') }}
+
+
+ {{ $t('btn.delete') }}
+
-
handleCommand(command, scope.row)" v-hasPermi="['system:role:edit', 'system:role:authorize', 'system:roleusers:list']">
+ handleCommand(command, scope.row)"
+ v-hasPermi="['system:role:edit', 'system:role:authorize', 'system:roleusers:list']"
+ >
- 更多
+ {{ $t('btn.more') }}
- 菜单权限
- 分配用户
+ {{ $t('menu.menuPermi') }}
+ {{ $t('menu.assignUsers') }}
@@ -93,8 +107,8 @@
diff --git a/src/views/system/roleusers/index.vue b/src/views/system/roleusers/index.vue
index 6276c09..10421ba 100644
--- a/src/views/system/roleusers/index.vue
+++ b/src/views/system/roleusers/index.vue
@@ -8,27 +8,45 @@
-
+
- 搜索
+ {{ $t('btn.search') }}
- 添加用户
+
+ {{ $t('btn.add') }}
+
- 批量取消授权
+
+ {{ $t('btn.multi') }}{{ $t('btn.cancel') }}{{ $t('btn.authorize') }}
+
- 关闭
+ {{ $t('btn.close') }}
-
+
@@ -41,19 +59,36 @@
-
- 取消授权
+
+ {{ $t('btn.cancel') }}{{ $t('btn.authorize') }}
-
+
-
+
@@ -78,13 +113,18 @@
-
+
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 7c06234..e828ccd 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -33,29 +33,44 @@
-
+
- 搜索
- 重置
+ {{ $t('btn.search') }}
+ {{ $t('btn.reset') }}
- 新增
+
+ {{ $t('btn.add') }}
+
- 修改
+
+ {{ $t('btn.edit') }}
+
- 删除
+
+ {{ $t('btn.delete') }}
+
- 导出
+
+ {{ $t('btn.export') }}
+
@@ -76,13 +91,27 @@
-
-
-
+
+
+
+
+
-
+
@@ -144,14 +173,16 @@
-
+
+
-
+
+
@@ -164,8 +195,8 @@
@@ -201,8 +232,8 @@
@@ -357,7 +388,7 @@ function handleQuery() {
function resetQuery() {
dateRange.value = []
proxy.resetForm('queryRef')
- queryParams.value.deptId = undefined
+ queryParams.value.deptId = undefined
handleQuery()
}
/** 删除按钮操作 */
@@ -450,7 +481,9 @@ const handleFileSuccess = (response, file, fileList) => {
upload.open = false
upload.isUploading = false
proxy.$refs['uploadRef'].clearFiles()
- proxy.$alert("" + response.msg + '
', '导入结果', { dangerouslyUseHTMLString: true })
+ proxy.$alert("" + response.msg + '
', '导入结果', {
+ dangerouslyUseHTMLString: true,
+ })
getList()
}
/** 提交上传文件 */
diff --git a/src/views/system/user/profile/userInfo.vue b/src/views/system/user/profile/userInfo.vue
index 06f7b5c..5a7cefc 100644
--- a/src/views/system/user/profile/userInfo.vue
+++ b/src/views/system/user/profile/userInfo.vue
@@ -16,8 +16,8 @@
- 保存
- 关闭
+ {{ $t('btn.save') }}
+ {{ $t('btn.close') }}