From adafb2cec5cff29e2e85275c43814a5b4a0da464 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 31 May 2024 08:52:10 +0800 Subject: [PATCH] =?UTF-8?q?rev:=20admin=20=E4=BF=AE=E5=A4=8D=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/config/application.yml | 2 + nladmin-ui/src/components/Crud/crud.js | 8 ++-- nladmin-ui/src/i18n/langs/en.js | 20 +++++++- nladmin-ui/src/i18n/langs/in.js | 20 +++++++- nladmin-ui/src/i18n/langs/zh-CN.js | 20 +++++++- nladmin-ui/src/mixins/crud.js | 21 ++++---- nladmin-ui/src/views/login.vue | 13 ++--- .../views/system/user/center/updatePass.vue | 2 +- nladmin-ui/src/views/system/user/index.vue | 48 +++++++++---------- nladmin-ui/src/views/system/user/locale/en.js | 12 +++-- nladmin-ui/src/views/system/user/locale/in.js | 12 +++-- nladmin-ui/src/views/system/user/locale/zh.js | 12 +++-- 12 files changed, 130 insertions(+), 60 deletions(-) diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/nladmin-system/nlsso-server/src/main/resources/config/application.yml index e7700dc..2ff4391 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -4,6 +4,8 @@ server: relaxed-path-chars: [ '|','{','}','[',']' ] #字符问题: https://blog.csdn.net/weixin_41996632/article/details/90715118 spring: + messages: + basename: language/login/login,language/error/error,language/buss/buss,language/task/task datasource: druid: initial-size: 5 #初始化时建立物理连接的个数 diff --git a/nladmin-ui/src/components/Crud/crud.js b/nladmin-ui/src/components/Crud/crud.js index eb70ffc..3025671 100644 --- a/nladmin-ui/src/components/Crud/crud.js +++ b/nladmin-ui/src/components/Crud/crud.js @@ -89,10 +89,10 @@ function CRUD(options) { } }, msg: { - submit: '提交成功', - add: '新增成功', - edit: '编辑成功', - del: '删除成功' + submit: i18n.t('common.submit'), + add: i18n.t('common.add'), + edit: i18n.t('common.edit'), + del: i18n.t('common.del') }, page: { // 页码 diff --git a/nladmin-ui/src/i18n/langs/en.js b/nladmin-ui/src/i18n/langs/en.js index 9056ce2..783672e 100644 --- a/nladmin-ui/src/i18n/langs/en.js +++ b/nladmin-ui/src/i18n/langs/en.js @@ -1,5 +1,12 @@ export default { 'lang': 'English', + // 平台 + 'platform': { + 'title': 'NOBLELIFT Platform', + 'tip1': 'The user name cannot be empty', + 'tip2': 'The password cannot be empty', + 'tip3': 'The verification code cannot be empty' + }, 'common': { 'home': 'Dashboard', 'Layout_setting': 'Layout Setting', @@ -72,6 +79,13 @@ export default { 'moreMenu': 'MoreMenu', 'browses': 'browse', 'fz': 'Full screen zoom', + 'submit': 'Submit Success', + 'add': 'Add Success', + 'edit': 'Edit Success', + 'del': 'Delete Success', + 'close': 'Confirm Close', + 'save': 'Save Success', + 'datas': 'Data', 'Tips': 'Tips', 'Tip1': 'Confirm to delete the selected {count} pieces of data?', 'Tip3': 'User name not used as login', @@ -83,14 +97,16 @@ export default { 'Tip9': 'Please enter your password again', 'Tip10': 'Please enter your old password', 'Tip11': 'Please enter your new password', - 'Tip12': '6 to 20 characters in length', + 'Tip12': '{min} to {max} characters in length', 'Tip13': 'Are you sure to log out and exit the system?', 'Tip14': 'WebSocket connection error', 'Tip15': 'Please enter an icon name', 'Tip16': 'NOT NULL', 'Tip17': 'Please enter what you are searching for', 'loading': 'loading...', - 'Tip18': 'select date time' + 'Tip18': 'select date time', + 'Tip19': 'Are you sure to delete the selected data?', + 'Tip20': 'The login has expired,please log in again!' }, 'WorkOrder': { 'form': { diff --git a/nladmin-ui/src/i18n/langs/in.js b/nladmin-ui/src/i18n/langs/in.js index 867231b..122b11c 100644 --- a/nladmin-ui/src/i18n/langs/in.js +++ b/nladmin-ui/src/i18n/langs/in.js @@ -1,5 +1,12 @@ export default { 'lang': 'in', + // 平台 + 'platform': { + 'title': 'NOBLELIFT Platform', + 'tip1': 'Nama pengguna tidak dapat kosong', + 'tip2': 'Kata sandi tidak dapat kosong', + 'tip3': 'Kode verifikasi tidak dapat kosong' + }, 'common': { 'home': 'rumah', // 首页 'Layout_setting': 'Pengaturan Bentangan', @@ -72,6 +79,13 @@ export default { 'moreMenu': 'LebihBanyakMenu', 'browses': 'melayar', 'fz': 'Zum layar penuh', + 'submit': 'Mengirim Sukses', + 'add': 'Tambah Sukses', + 'edit': 'Sunting Sukses', + 'del': 'Hapus Sukses', + 'close': 'Konfirmasi Tutup', + 'save': 'Simpan Sukses', + 'datas': 'Data', 'Tips': 'Prompt', 'Tip1': 'Konfirmasikan untuk menghapus {count} data yang dipilih?', 'Tip3': 'Nama pengguna tidak digunakan sebagai daftar masuk', @@ -83,14 +97,16 @@ export default { 'Tip9': 'Silakan masukkan sandi lagi', 'Tip10': 'Silakan masukkan kata sandi lama Anda', 'Tip11': 'Silakan masukkan sandi baru', - 'Tip12': 'Antara 6 dan 20 karakter dalam panjang', + 'Tip12': 'Antara {min} dan {max} karakter dalam panjang', 'Tip13': 'Apakah Anda yakin untuk log keluar dan keluar dari sistem?', 'Tip14': 'Koneksi WebSocket error', 'Tip15': 'Silakan masukkan nama ikon', 'Tip16': 'TIDAK NULL', 'Tip17': 'Silakan masukkan apa yang Anda cari', 'loading': 'Memuatkan Data...', - 'Tip18': 'pilih tanggal waktu' + 'Tip18': 'pilih tanggal waktu', + 'Tip19': 'Apakah Anda yakin untuk menghapus data yang dipilih?', + 'Tip20': 'Log masuk telah habis,silakan log masuk lagi!' }, 'WorkOrder': { 'form': { diff --git a/nladmin-ui/src/i18n/langs/zh-CN.js b/nladmin-ui/src/i18n/langs/zh-CN.js index f7b6237..3556d31 100644 --- a/nladmin-ui/src/i18n/langs/zh-CN.js +++ b/nladmin-ui/src/i18n/langs/zh-CN.js @@ -1,5 +1,12 @@ export default { 'lang': 'zh', + // 平台 + 'platform': { + 'title': '诺力开发平台', + 'tip1': '用户名不能为空', + 'tip2': '密码不能为空', + 'tip3': '验证码不能为空' + }, 'common': { 'home': '首页', // 首页 'Layout_setting': '布局设置', @@ -72,6 +79,13 @@ export default { 'moreMenu': '更多菜单', 'browses': '浏览', 'fz': '全屏缩放', + 'submit': '提交成功', + 'add': '新增成功', + 'edit': '编辑成功', + 'del': '删除成功', + 'close': '确认关闭', + 'save': '保存成功', + 'datas': '数据', 'Tips': '提示', 'Tip1': '确认删除选中的{count}条数据?', 'Tip3': '用户姓名不作为登录使用', @@ -83,14 +97,16 @@ export default { 'Tip9': '请再次输入密码', 'Tip10': '请输入旧密码', 'Tip11': '请输入新密码', - 'Tip12': '长度在 6 到 20 个字符', + 'Tip12': '长度在 {min} 到 {max} 个字符', 'Tip13': '确定注销并退出系统吗?', 'Tip14': 'WebSocket连接发生错误', 'Tip15': '请输入图标名称', 'Tip16': '不能为空', 'Tip17': '请输入你要搜索的内容', 'loading': '数据加载中...', - 'Tip18': '选择日期时间' + 'Tip18': '选择日期时间', + 'Tip19': '你确定删除选中的数据吗?', + 'Tip20': '当前登录状态已过期,请重新登录!' }, 'WorkOrder': { 'form': { diff --git a/nladmin-ui/src/mixins/crud.js b/nladmin-ui/src/mixins/crud.js index 0ccbde2..81690e8 100644 --- a/nladmin-ui/src/mixins/crud.js +++ b/nladmin-ui/src/mixins/crud.js @@ -7,6 +7,7 @@ import { downloadFile } from '@/utils/index' import checkPermission from '@/utils/permission' +import i18n from '@/i18n' export default { data() { @@ -115,28 +116,28 @@ export default { */ submitSuccessNotify() { this.$notify({ - title: '提交成功', + title: i18n.t('common.submit'), type: 'success', duration: 2500 }) }, addSuccessNotify() { this.$notify({ - title: '新增成功', + title: i18n.t('common.add'), type: 'success', duration: 2500 }) }, editSuccessNotify() { this.$notify({ - title: '编辑成功', + title: i18n.t('common.edit'), type: 'success', duration: 2500 }) }, delSuccessNotify() { this.$notify({ - title: '删除成功', + title: i18n.t('common.del'), type: 'success', duration: 2500 }) @@ -179,9 +180,9 @@ export default { * 多选删除提示 */ beforeDelAllMethod() { - this.$confirm('你确定删除选中的数据吗?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + this.$confirm(i18n.t('common.Tip19'), i18n.t('common.Tips'), { + confirmButtonText: i18n.t('common.Confirm'), + cancelButtonText: i18n.t('common.Cancel'), type: 'warning' }).then(() => { this.delAllMethod() @@ -202,7 +203,7 @@ export default { this.dleChangePage(ids.length) this.init() this.$notify({ - title: '删除成功', + title: i18n.t('common.del'), type: 'success', duration: 2500 }) @@ -318,7 +319,7 @@ export default { * 获取弹窗的标题 */ getFormTitle() { - return this.isAdd ? `新增${this.title}` : `编辑${this.title}` + return this.isAdd ? i18n.t('common.Create') + `${this.title}` : i18n.t('common.Editors') + `${this.title}` }, /** * 通用导出 @@ -327,7 +328,7 @@ export default { this.beforeInit() this.downloadLoading = true download(this.url + '/download', this.params).then(result => { - this.downloadFile(result, this.title + '数据', 'xlsx') + this.downloadFile(result, this.title + i18n.t('common.datas'), 'xlsx') this.downloadLoading = false }).catch(() => { this.downloadLoading = false diff --git a/nladmin-ui/src/views/login.vue b/nladmin-ui/src/views/login.vue index f7dcbfc..d723e61 100644 --- a/nladmin-ui/src/views/login.vue +++ b/nladmin-ui/src/views/login.vue @@ -62,12 +62,13 @@ import Config from '@/settings' import { getCodeImg } from '@/api/login' import Cookies from 'js-cookie' import Background from '@/assets/images/background.jpg' +import i18n from '@/i18n' export default { name: 'Login', data() { return { language: '简体中文', - title: '诺力开发平台', + title: i18n.t('platform.title'), title_param: 'platform', Background: Background, codeUrl: '', @@ -80,9 +81,9 @@ export default { uuid: '' }, loginRules: { - username: [{ required: true, trigger: 'blur', message: '用户名不能为空' }], - password: [{ required: true, trigger: 'blur', message: '密码不能为空' }], - code: [{ required: true, trigger: 'change', message: '验证码不能为空' }] + username: [{ required: true, trigger: 'blur', message: i18n.t('platform.tip1') }], + password: [{ required: true, trigger: 'blur', message: i18n.t('platform.tip2') }], + code: [{ required: true, trigger: 'change', message: i18n.t('platform.tip3') }] }, loading: false, redirect: undefined @@ -185,8 +186,8 @@ export default { console.log(point) if (point) { this.$notify({ - title: '提示', - message: '当前登录状态已过期,请重新登录!', + title: i18n.t('common.Tips'), + message: i18n.t('common.Tip20'), type: 'warning', duration: 5000 }) diff --git a/nladmin-ui/src/views/system/user/center/updatePass.vue b/nladmin-ui/src/views/system/user/center/updatePass.vue index 2c8779c..a1b0b85 100644 --- a/nladmin-ui/src/views/system/user/center/updatePass.vue +++ b/nladmin-ui/src/views/system/user/center/updatePass.vue @@ -45,7 +45,7 @@ export default { ], newPass: [ { required: true, message: i18n.t('common.Tip11'), trigger: 'blur' }, - { min: 6, max: 20, message: i18n.t('common.Tip12'), trigger: 'blur' } + { min: 6, max: 20, message: i18n.t('common.Tip12', { min: 6, max: 20 }), trigger: 'blur' } ], confirmPass: [ { required: true, validator: confirmPass, trigger: 'blur' } diff --git a/nladmin-ui/src/views/system/user/index.vue b/nladmin-ui/src/views/system/user/index.vue index cb40fb3..4d9f0db 100644 --- a/nladmin-ui/src/views/system/user/index.vue +++ b/nladmin-ui/src/views/system/user/index.vue @@ -252,10 +252,10 @@ width="700px" > - + - + - - + +