diff --git a/src/i18n/langs/en.js b/src/i18n/langs/en.js index 6ced23b..cfa1a81 100644 --- a/src/i18n/langs/en.js +++ b/src/i18n/langs/en.js @@ -51,7 +51,9 @@ module.exports = { creationdate: 'Creation Date', adduser: 'Add User', question1: 'Are you sure you want to reset your password?', - question2: 'Are you sure you want to delete this user?' + question2: 'Are you sure you want to delete this user?', + toast1: 'The username cannot be empty', + toast2: 'Password cannot be empty' }, role: { rolemanagement: 'Role Management', @@ -59,14 +61,18 @@ module.exports = { role: 'Role', describe: 'Describe', creationdate: 'Creation Date', - addrole: 'Add Role' + addrole: 'Add Role', + toast1: 'Role name cannot be empty' }, system: { systemmanagement: 'System Management', code: 'Code', value: 'Value', addparameter: 'Add Parameter', - question1: 'Are you sure to delete it?' + question1: 'Are you sure to delete it?', + toast1: 'Encoding cannot be empty', + toast2: 'Name cannot be empty', + toast3: 'Value cannot be empty' }, developer: { developeroptions: 'Developer Options' diff --git a/src/i18n/langs/zh.js b/src/i18n/langs/zh.js index 8f8b655..b7156e4 100644 --- a/src/i18n/langs/zh.js +++ b/src/i18n/langs/zh.js @@ -51,7 +51,9 @@ module.exports = { creationdate: '创建日期', adduser: '添加用户', question1: '确定重置密码吗?', - question2: '确定删除该用户吗?' + question2: '确定删除该用户吗?', + toast1: '用户名不能为空', + toast2: '密码不能为空' }, role: { rolemanagement: '角色管理', @@ -59,14 +61,18 @@ module.exports = { role: '角色', describe: '描述', creationdate: '创建日期', - addrole: '新增角色' + addrole: '新增角色', + toast1: '角色名称不能为空' }, system: { systemmanagement: '系统管理', code: '编码', value: '值', addparameter: '添加参数', - question1: '确定删除吗?' + question1: '确定删除吗?', + toast1: '编码不能为空', + toast2: '名字不能为空', + toast3: '数值不能为空' }, developer: { developeroptions: '开发者选项' diff --git a/src/pages/modules/systemmanage/role.vue b/src/pages/modules/systemmanage/role.vue index 1ec3263..e51e382 100644 --- a/src/pages/modules/systemmanage/role.vue +++ b/src/pages/modules/systemmanage/role.vue @@ -232,7 +232,8 @@ export default { async _sysRoleAdd () { this.$refs.child.disabled = true if (!this.rolename) { - this.toast('角色名称不能为空') + // this.toast('角色名称不能为空') + this.toast(this.$t('role.toast1')) this.$refs.child.disabled = false return } @@ -252,7 +253,8 @@ export default { async _sysRoleEdit () { this.$refs.child.disabled = true if (!this.rolename) { - this.toast('角色名称不能为空') + // this.toast('角色名称不能为空') + this.toast(this.$t('role.toast1')) this.$refs.child.disabled = false return } diff --git a/src/pages/modules/systemmanage/system.vue b/src/pages/modules/systemmanage/system.vue index dd3f24d..453fbcd 100644 --- a/src/pages/modules/systemmanage/system.vue +++ b/src/pages/modules/systemmanage/system.vue @@ -221,17 +221,20 @@ export default { async _paramAdd () { this.$refs.child.disabled = true if (!this.code) { - this.toast('编码不能为空') + // this.toast('编码不能为空') + this.toast(this.$t('system.toast1')) this.$refs.child.disabled = false return } if (!this.name) { - this.toast('名字不能为空') + // this.toast('名字不能为空') + this.toast(this.$t('system.toast2')) this.$refs.child.disabled = false return } if (!this.value) { - this.toast('数值不能为空') + // this.toast('数值不能为空') + this.toast(this.$t('system.toast3')) this.$refs.child.disabled = false return } @@ -251,17 +254,20 @@ export default { async _paramEdit () { this.$refs.child.disabled = true if (!this.code) { - this.toast('编码不能为空') + // this.toast('编码不能为空') + this.toast(this.$t('system.toast1')) this.$refs.child.disabled = false return } if (!this.name) { - this.toast('名字不能为空') + // this.toast('名字不能为空') + this.toast(this.$t('system.toast2')) this.$refs.child.disabled = false return } if (!this.value) { - this.toast('数值不能为空') + // this.toast('数值不能为空') + this.toast(this.$t('system.toast3')) this.$refs.child.disabled = false return } diff --git a/src/pages/modules/systemmanage/user.vue b/src/pages/modules/systemmanage/user.vue index cf2ee4b..5b2f995 100644 --- a/src/pages/modules/systemmanage/user.vue +++ b/src/pages/modules/systemmanage/user.vue @@ -288,12 +288,14 @@ export default { async _usersAdd () { this.$refs.child.disabled = true if (!this.username) { - this.toast('用户名不能为空') + // this.toast('用户名不能为空') + this.toast(this.$t('user.toast1')) this.$refs.child.disabled = false return } if (!this.password) { - this.toast('密码不能为空') + // this.toast('密码不能为空') + this.toast(this.$t('user.toast2')) this.$refs.child.disabled = false return } @@ -319,7 +321,8 @@ export default { async _usersEdit () { this.$refs.child.disabled = true if (!this.username) { - this.toast('用户名不能为空') + // this.toast('用户名不能为空') + this.toast(this.$t('user.toast1')) this.$refs.child.disabled = false return } diff --git a/src/pages/modules/vehicleinformation/vehiclecontrol.vue b/src/pages/modules/vehicleinformation/vehiclecontrol.vue index 4083e06..a839aaa 100644 --- a/src/pages/modules/vehicleinformation/vehiclecontrol.vue +++ b/src/pages/modules/vehicleinformation/vehiclecontrol.vue @@ -123,7 +123,7 @@ export default { return { interTime: this.$store.getters.setTime, timer: null, - show: true, + show: false, result: [], obj: {}, status: {},