From 87637e89aebe9aff2a9530b3a810b65cc6a7b17c Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 16 Sep 2019 11:17:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E5=87=BA=E5=B1=82=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/en/menu.js | 50 ++++++++----------- src/i18n/langs/zh/menu.js | 48 +++++++----------- .../menus/menuDialog/childDialog/userAdd.vue | 24 ++++----- .../menus/menuDialog/childDialog/userEdit.vue | 32 ++++++------ 4 files changed, 67 insertions(+), 87 deletions(-) diff --git a/src/i18n/langs/en/menu.js b/src/i18n/langs/en/menu.js index 98b3a9dfb..4bf62eb6b 100644 --- a/src/i18n/langs/en/menu.js +++ b/src/i18n/langs/en/menu.js @@ -175,40 +175,30 @@ export default { confirm: 'Confirm', close: 'Close', - // 工号 - // 用户名 - // 密码 - // 确认密码 - // 确定 - // 取 消 - // 请输入工号 - // 请输入用户名 - // 请输入密码 - // 请再次输入密码 - // 增加用户 - // 二次输入密码不一致 + jobNumber: 'JobNumber:', + userName: 'User Name:', + password: 'Password:', + confirmPassword: 'Confirm Password:', + inputJobNumber: 'Please enter job number', + inputUserName: 'Please enter user name', + inputPassword: 'Please enter password', + inputPasswordAgain: 'Please enter password again', + addUser: 'Add User', + passwordInconsistent: 'Inconsistent input password', - determine: 'Determine', + determine: 'Confirm', cancel: 'Cancel', deleteUser: 'Delete User', - selectTips: 'The selected username or job number is empty.' + selectTips: 'The selected username or job number is empty.', - // 工号 - // 用户名 - // 原始密码 - // 密码 - // 确认密码 - // 确定 - // 取 消 - // 请输入工号 - // 请输入用户名 - // 请输入原始密码 - // 请输入新密码 - // 请再次输入新密码 - // 用户编辑页面 - // 原始密码错误 - // 二次输入的密码错误 - // 老密码和新密相同 + originalPassword: 'Original Password:', + inputOriginal: 'Please enter original password', + inputNewPassword: 'Please enter new password', + inputNewAgain: 'Please enter new password again', + userEditPage: 'User Edit Page', + originalPasswordError: 'Original password error', + passwordError: 'Second entered password error', + passwordSame: 'Old password is the same as new password' }, platform: 'Platform', arrivalTime: 'Arrival time', diff --git a/src/i18n/langs/zh/menu.js b/src/i18n/langs/zh/menu.js index fd87c4c78..d78eec909 100644 --- a/src/i18n/langs/zh/menu.js +++ b/src/i18n/langs/zh/menu.js @@ -172,40 +172,30 @@ export default { confirm: '确认', close: '关闭', - // 工号 - // 用户名 - // 密码 - // 确认密码 - // 确定 - // 取 消 - // 请输入工号 - // 请输入用户名 - // 请输入密码 - // 请再次输入密码 - // 增加用户 - // 二次输入密码不一致 + jobNumber: '工号:', + userName: '用户名:', + password: '密码:', + confirmPassword: '确认密码:', + inputJobNumber: '请输入工号', + inputUserName: '请输入用户名', + inputPassword: '请输入密码', + inputPasswordAgain: '请再次输入密码', + addUser: '增加用户', + passwordInconsistent: '二次输入密码不一致', determine: '确定', cancel: '取 消', deleteUser: '删除用户', - selectTips: '选择的用户名或工号为空' + selectTips: '选择的用户名或工号为空', - // 工号 - // 用户名 - // 原始密码 - // 密码 - // 确认密码 - // 确定 - // 取 消 - // 请输入工号 - // 请输入用户名 - // 请输入原始密码 - // 请输入新密码 - // 请再次输入新密码 - // 用户编辑页面 - // 原始密码错误 - // 二次输入的密码错误 - // 老密码和新密相同 + originalPassword: '原始密码:', + inputOriginal: '请输入原始密码', + inputNewPassword: '请输入新密码', + inputNewAgain: '请再次输入新密码', + userEditPage: '用户编辑页面', + originalPasswordError: '原始密码错误', + passwordError: '二次输入的密码错误', + passwordSame: '老密码和新密相同' }, platform: '站台', arrivalTime: '到点', diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userAdd.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userAdd.vue index 5c6b913a2..aa2f8c525 100644 --- a/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userAdd.vue +++ b/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userAdd.vue @@ -3,16 +3,16 @@ :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
- + - + - + - + @@ -20,10 +20,10 @@
- 确定 + {{$t('menu.menuChildDialog.determine')}} - 取 消 + {{$t('menu.menuChildDialog.cancel')}} @@ -52,16 +52,16 @@ }, rules: { jobNumber: [ - { required: true, message: '请输入工号', trigger: 'blur' } + { required: true, message: this.$t('menu.menuChildDialog.inputJobNumber'), trigger: 'blur' } ], userName: [ - { required: true, message: '请输入用户名', trigger: 'blur' } + { required: true, message: this.$t('menu.menuChildDialog.inputUserName'), trigger: 'blur' } ], password: [ - { required: true, message: '请输入密码', trigger: 'change' } + { required: true, message: this.$t('menu.menuChildDialog.inputPassword'), trigger: 'change' } ], confirm: [ - { required: true, message: '请再次输入密码', trigger: 'change' } + { required: true, message: this.$t('menu.menuChildDialog.inputPasswordAgain'), trigger: 'change' } ], }, } @@ -80,7 +80,7 @@ return this.dialogShow ? OperationEvent.Command.close.confirm.domId : ''; }, title() { - return '增加用户' + return this.$t('menu.menuChildDialog.addUser') } }, mounted() { @@ -126,7 +126,7 @@ this.doClose(); this.$emit('operateUser', this.model); } else { - this.$messageBox('二次输入密码不一致'); + this.$messageBox(this.$t('menu.menuChildDialog.passwordInconsistent')); } } }) diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue index fe69bab58..f51273537 100644 --- a/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue +++ b/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue @@ -3,19 +3,19 @@ :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
- + - + - + - + - + @@ -23,10 +23,10 @@
- 确定 + {{$t('menu.menuChildDialog.determine')}} - 取 消 + {{$t('menu.menuChildDialog.cancel')}} @@ -57,19 +57,19 @@ }, rules: { jobNumber: [ - { required: true, message: '请输入工号', trigger: 'blur' } + { required: true, message: this.$t('menu.menuChildDialog.inputJobNumber'), trigger: 'blur' } ], userName: [ - { required: true, message: '请输入用户名', trigger: 'blur' } + { required: true, message: this.$t('menu.menuChildDialog.inputUserName'), trigger: 'blur' } ], oldPassword: [ - { required: true, message: '请输入原始密码', trigger: 'change' } + { required: true, message: this.$t('menu.menuChildDialog.inputOriginal'), trigger: 'change' } ], password: [ - { required: true, message: '请输入新密码', trigger: 'change' } + { required: true, message: this.$t('menu.menuChildDialog.inputNewPassword'), trigger: 'change' } ], confirm: [ - { required: true, message: '请再次输入新密码', trigger: 'change' } + { required: true, message: this.$t('menu.menuChildDialog.inputNewAgain'), trigger: 'change' } ], }, } @@ -88,7 +88,7 @@ return this.dialogShow ? OperationEvent.Command.close.confirm.domId : ''; }, title() { - return '用户编辑页面' + return this.$t('menu.menuChildDialog.userEditPage') } }, mounted() { @@ -136,11 +136,11 @@ this.loading = false; if (valid) if (this.selected.password !== this.model.oldPassword) { - this.$messageBox('原始密码错误'); + this.$messageBox(this.$t('menu.menuChildDialog.originalPasswordError')); } else if (this.model.password !== this.model.confirm) { - this.$messageBox('二次输入的密码错误'); + this.$messageBox(this.$t('menu.menuChildDialog.passwordError')); } else if (this.model.oldPassword === this.model.password) { - this.$messageBox('老密码和新密相同'); + this.$messageBox(this.$t('menu.menuChildDialog.passwordSame')); } else { this.doClose(); this.$emit('operateUser', this.model);