diff --git a/src/i18n/langs/en/error.js b/src/i18n/langs/en/error.js index 9211cff3a..30fa912f3 100644 --- a/src/i18n/langs/en/error.js +++ b/src/i18n/langs/en/error.js @@ -40,5 +40,10 @@ export default { codeHasExist: 'Coding already exists', formartError: 'The format is incorrect, only characters/numbers/_', createDictionaryFailed: 'Failed to create dictionary', - updateDictionaryFailed: 'Failed to update dictionary' + updateDictionaryFailed: 'Failed to update dictionary', + createDetailFailed: 'Failed to create details', + updateDetailFailed: 'Failed to update details', + addFailed: 'Failure to add', + updateFailed: 'Failure to update' + }; diff --git a/src/i18n/langs/en/orderAuthor.js b/src/i18n/langs/en/orderAuthor.js index 33c2451b0..a1782f7fb 100644 --- a/src/i18n/langs/en/orderAuthor.js +++ b/src/i18n/langs/en/orderAuthor.js @@ -52,6 +52,7 @@ export default { transferQRCode: 'Transfer QRCode', today: 'Today', yesterday: 'Yesterday', + addOrder: 'AddOrder', aWeekAgo: 'A week ago', updateOrder: 'Update order', renewOrder: 'Renew order', @@ -78,7 +79,8 @@ export default { unitOfTime: 'Unit of time', trialTime: 'Trial time', distributionUser: 'Distribution user', - orderNumber: 'OrderNumber', + orderNumber: 'Order Number', + select: 'Select', sourcesOfInformation: 'Sources of information', distributePermission: 'Distribute permission', orderCreation: 'Order creation', diff --git a/src/i18n/langs/en/rules.js b/src/i18n/langs/en/rules.js index 9cbb3e33b..43dc28eb8 100644 --- a/src/i18n/langs/en/rules.js +++ b/src/i18n/langs/en/rules.js @@ -181,6 +181,10 @@ export default { goodsDescribtionInput: 'Please enter product description', userNameInput: 'Please enter user name', permissionTypeInput: 'Please select the permission type', + timeInput: 'Please enter the time', + chooseUser: 'Please select the user', + pleaseInputLessonName: 'Please enter the course name', + pleaseSelectTraining: 'Please select training', maxScaling: '(The maximum scale is 8 steps)', skinCodingInput: 'Please enter skin code', diff --git a/src/i18n/langs/en/system.js b/src/i18n/langs/en/system.js index ada9a3241..eeb86c0a7 100644 --- a/src/i18n/langs/en/system.js +++ b/src/i18n/langs/en/system.js @@ -11,8 +11,8 @@ export default { updateSuccess: 'Update successful', destory: 'Destory', simulationGroup: 'Simulation Group', - username: 'User Name', - phoneNumber: 'Cell-phone Number', + userName: 'User Name', + mobile: 'Cell-phone Number', skinCode: 'Skin Code', prdType: 'Product Type', simulationType: 'Simulation Type', @@ -21,5 +21,34 @@ export default { isError: 'Is Error', isSuspend: 'Is Suspend', isDrivingAsplanned: 'Whether to drive as planned', - delUserSimulationIsContinue: 'This operation will delete the user simulation data. Do you want to continue?' + delUserSimulationIsContinue: 'This operation will delete the user simulation data. Do you want to continue?', + createDetail: 'Create details', + editDetail: 'Editorial details', + mapName: 'Map Name', + trainingName: 'Training Name', + trainingUseTime: 'Training Time', + minute: 'Minute', + second: 'Second', + createSimulationTitle: 'Create Simulation Information', + addSuccess: 'Added Successfully', + pleaseInputNames: 'Please enter your nickname/name/cell phone number', + examUser: 'Examination Users', + examScore: 'Examination Score', + examResult: 'Examination Results', + examName: 'Paper Name', + delExamResultIsContinue: 'This operation will delete the test result. Do you want to continue?', + editExamDetail: 'Edit exam details', + subscribeMap: 'Subscribe', + roles: 'Roles', + email: 'Email', + nickname: 'Nickname', + delTypeIsContinue: 'This operation will delete the type. Do you want to continue?', + permission: 'Permission', + editUserPermission: 'Edit User Rights', + lessonName: 'Lesson Name', + selectTraining: 'Selection Training', + createUserTraining: 'Creating User Training', + editTrainingDetail: 'Editor Training Details', + trainingTime: 'Training duration' + }; diff --git a/src/i18n/langs/zh/error.js b/src/i18n/langs/zh/error.js index 73d0d7695..9d2918ead 100644 --- a/src/i18n/langs/zh/error.js +++ b/src/i18n/langs/zh/error.js @@ -40,6 +40,10 @@ export default { codeHasExist: '编码已存在', formartError: '格式不正确，只能是字符/数字/_', createDictionaryFailed: '创建字典失败', - updateDictionaryFailed: '更新字典失败' + updateDictionaryFailed: '更新字典失败', + createDetailFailed: '创建明细失败', + updateDetailFailed: '更新明细失败', + addFailed: '添加失败', + updateFailed: '更新失败' }; diff --git a/src/i18n/langs/zh/orderAuthor.js b/src/i18n/langs/zh/orderAuthor.js index b3089866e..e0012e7fd 100644 --- a/src/i18n/langs/zh/orderAuthor.js +++ b/src/i18n/langs/zh/orderAuthor.js @@ -83,5 +83,6 @@ export default { sourcesOfInformation: '信息来源', distributePermission: '权限分发', orderCreation: '订单创建', + select: '选择', chooseGoods: '选择商品' }; diff --git a/src/i18n/langs/zh/rules.js b/src/i18n/langs/zh/rules.js index e231d9ee0..302f5ee23 100644 --- a/src/i18n/langs/zh/rules.js +++ b/src/i18n/langs/zh/rules.js @@ -180,6 +180,10 @@ export default { goodsDescribtionInput: '请输入商品描述', userNameInput: '请输入用户名称', permissionTypeInput: '请选择权限类型', + timeInput: '请输入时长', + chooseUser: '请选择用户', + pleaseInputLessonName: '请输入课程名称', + pleaseSelectTraining: '请选择实训', maxScaling: '(缩放比例最大为8级)', skinCodingInput: '请输入皮肤编码', diff --git a/src/i18n/langs/zh/system.js b/src/i18n/langs/zh/system.js index b92e9f29b..ac2ef3ca0 100644 --- a/src/i18n/langs/zh/system.js +++ b/src/i18n/langs/zh/system.js @@ -11,8 +11,8 @@ export default { updateSuccess: '更新成功', destory: '销 毁', simulationGroup: '仿真Group', - username: '用户名', - phoneNumber: '手机号', + userName: '用户名', + mobile: '手机号', skinCode: '皮肤编号', prdType: '产品类型', simulationType: '仿真类型', @@ -21,5 +21,34 @@ export default { isError: '是否错误', isSuspend: '是否暂停', isDrivingAsplanned: '是否按计划行车', - delUserSimulationIsContinue: '此操作将删除此用户仿真数据, 是否继续?' + delUserSimulationIsContinue: '此操作将删除此用户仿真数据, 是否继续?', + createDetail: '创建明细', + editDetail: '编辑明细', + mapName: '地图名称', + trainingName: '实训名称', + trainingUseTime: '实训用时', + minute: '分', + second: '秒', + createSimulationTitle: '创建仿真信息', + addSuccess: '添加成功', + pleaseInputNames: '请输入昵称/名字/手机号', + examUser: '考试用户', + examScore: '考试成绩', + examResult: '考试结果', + examName: '试卷名称', + delExamResultIsContinue: '此操作将删除此考试结果, 是否继续?', + editExamDetail: '编辑考试详情', + subscribeMap: '订阅地图', + roles: '角色', + email: '邮箱', + nickname: '昵称', + delTypeIsContinue: '此操作将删除该类型, 是否继续?', + permission: '权限', + editUserPermission: '编辑用户权限', + lessonName: '课程名称', + selectTraining: '选择实训', + createUserTraining: '创建用户实训', + editTrainingDetail: '编辑实训详情', + trainingTime: '实训时长' + }; diff --git a/src/views/management/dictionaryDetail/edit.vue b/src/views/management/dictionaryDetail/edit.vue index 19d88b51d..3a80b410a 100644 --- a/src/views/management/dictionaryDetail/edit.vue +++ b/src/views/management/dictionaryDetail/edit.vue @@ -40,12 +40,12 @@ export default { const form = { labelWidth: '60px', items: [ - { prop: 'code', label: '编码', type: 'text', required: true, disabled: !isAdd }, - { prop: 'name', label: '名称', type: 'text', required: true }, + { prop: 'code', label: this.$t('system.code'), type: 'text', required: true, disabled: !isAdd }, + { prop: 'name', label: this.$t('system.name'), type: 'text', required: true }, { - prop: 'status', label: '状态', type: 'select', required: true, options: this.$ConstSelect.Status + prop: 'status', label: this.$t('system.status'), type: 'select', required: true, options: this.$ConstSelect.Status }, - { prop: 'remarks', label: '备注', type: 'textarea', required: false } + { prop: 'remarks', label: this.$t('system.remarks'), type: 'textarea', required: false } ] }; return form; @@ -53,21 +53,21 @@ export default { rules() { const crules = { name: [ - { required: true, message: '请输入名称', trigger: 'blur' }, - { min: 1, max: 25, message: '长度在 1 到 25 个字符', trigger: 'blur' } + { required: true, message: this.$t('rules.pleaseInputName'), trigger: 'blur' }, + { min: 1, max: 25, message: this.$t('rules.strLength1To25'), trigger: 'blur' } ], status: [ - { required: true, message: '请选择状态', trigger: 'change' } + { required: true, message: this.$t('rules.pleaseSelectStatus'), trigger: 'change' } ], remarks: [ - { max: 50, message: '不能超过 50 个字符', trigger: 'blur' } + { max: 50, message: this.$t('rules.strLengthNotExceed50'), trigger: 'blur' } ] }; if (this.type === 'ADD') { return Object.assign(crules, { code: [ - { required: true, message: '请输入编码', trigger: 'blur' }, - { min: 1, max: 25, message: '长度在 1 到 25 个字符', trigger: 'blur' }, + { required: true, message: this.$t('rules.pleaseInputCode'), trigger: 'blur' }, + { min: 1, max: 25, message: this.$t('rules.strLength1To25'), trigger: 'blur' }, { validator: this.validateCode, trigger: 'blur' } ] }); @@ -77,25 +77,25 @@ export default { }, title() { if (this.type === 'ADD') { - return '创建明细'; + return this.$t('system.createDetail'); } else { - return '编辑明细'; + return this.$t('system.editDetail'); } } }, methods: { validateCode(rule, value, callback) { if (!validateCharCode(value)) { - return callback(new Error('格式不正确，只能是字符/数字/_')); + return callback(new Error(this.$t('error.formartError'))); } else { checkDicDetailCodeExist(this.dicId, value).then(response => { if (response.data) { - return callback(new Error('编码已存在')); + return callback(new Error(this.$t('error.codeHasExist'))); } else { return callback(); } }).catch(() => { - return callback(new Error('服务异常')); + return callback(new Error(this.$t('error.serviceException'))); }); } }, @@ -121,21 +121,21 @@ export default { create() { const self = this; create(this.dicId, this.formModel).then(response => { - self.$message.success('创建字典目录成功'); + self.$message.success(this.$t('system.createSuccess')); self.handleClose(); self.$emit('reloadTable'); }).catch(error => { - self.$message.error('创建字典目录失败：' + error.message); + self.$message.error(`${this.$t('error.createDetailFailed')}:${error.message}`); }); }, update() { const self = this; update(this.dicId, this.formModel).then(response => { - self.$message.success('更新字典目录成功'); + self.$message.success(this.$t('system.updateSuccess')); self.handleClose(); self.$emit('reloadTable'); }).catch(error => { - self.$message.error('更新字典目录失败：' + error.message); + self.$message.error(`${this.$t('error.updateDetailFailed')}:${error.message}`); }); }, handleClose(done) { diff --git a/src/views/management/existingSimulation/index.vue b/src/views/management/existingSimulation/index.vue index c8275dc98..34c5fbd50 100644 --- a/src/views/management/existingSimulation/index.vue +++ b/src/views/management/existingSimulation/index.vue @@ -28,11 +28,11 @@ export default { }, userName: { type: 'text', - label: this.$t('system.username') + label: this.$t('system.userName') }, mobile: { type: 'text', - label: this.$t('system.phoneNumber') + label: this.$t('system.mobile') }, skinCode: { type: 'select', @@ -64,11 +64,11 @@ export default { indexShow: true, columns: [ { - title: this.$t('system.username'), + title: this.$t('system.userName'), prop: 'creator.name' }, { - title: this.$t('system.phoneNumber'), + title: this.$t('system.mobile'), prop: 'creator.mobile' }, { @@ -170,7 +170,7 @@ export default { return sessionId; }, handleDelete(index, row) { - this.$confirm(this.$t('global.delUserSimulationIsContinue'), this.$t('global.tips'), { + this.$confirm(this.$t('system.delUserSimulationIsContinue'), this.$t('global.tips'), { confirmButtonText: this.$t('global.confirm'), cancelButtonText: this.$t('global.cancel'), type: 'warning' diff --git a/src/views/management/userControl/edit.vue b/src/views/management/userControl/edit.vue index 73562f1e2..4550fece4 100644 --- a/src/views/management/userControl/edit.vue +++ b/src/views/management/userControl/edit.vue @@ -1,9 +1,9 @@ @@ -31,11 +31,11 @@ export default { const form = { labelWidth: '60px', items: [ - { prop: 'name', label: '名称', type: 'text', required: true, disabled: true }, + { prop: 'name', label: this.$t('system.name'), type: 'text', required: true, disabled: true }, // { prop: 'nickname', label: '昵称', type: 'text', required: true }, // { prop: 'mobile', label: '电话', type: 'text', required: true }, // { prop: 'email', label: '邮箱', type: 'text' }, - { prop: 'roles', label: '权限', type: 'select', required: true, options: this.$ConstSelect.roleList, multiple: true } + { prop: 'roles', label: this.$t('system.permission'), type: 'select', required: true, options: this.$ConstSelect.roleList, multiple: true } ] }; return form; @@ -43,11 +43,11 @@ export default { rules() { const crules = { name: [ - { required: true, message: '请输入名称', trigger: 'blur' }, - { min: 1, max: 25, message: '长度在 1 到 25 个字符', trigger: 'blur' } + { required: true, message: this.$t('rules.pleaseInputName'), trigger: 'blur' }, + { min: 1, max: 25, message: this.$t('rules.strLength1To25'), trigger: 'blur' } ], status: [ - { required: true, message: '请选择状态', trigger: 'change' } + { required: true, message: this.$t('rules.pleaseSelectStatus'), trigger: 'change' } ] }; return crules; @@ -76,11 +76,11 @@ export default { update() { const self = this; putRoles(this.formModel).then(response => { - self.$message.success('修改成功'); + self.$message.success(this.$t('system.updateSuccess')); self.handleClose(); self.$emit('reloadTable'); }).catch(error => { - self.$message.error('修改失败：' + error.message); + self.$message.error(`${this.$t('error.updateFailed')}: ${error.message}`); }); }, handleClose(done) { diff --git a/src/views/management/userControl/index.vue b/src/views/management/userControl/index.vue index 35aab7498..eafbbbe37 100644 --- a/src/views/management/userControl/index.vue +++ b/src/views/management/userControl/index.vue @@ -29,11 +29,11 @@ export default { queryObject: { name: { type: 'text', - label: '名称' + label: this.$t('system.name') }, roles: { type: 'select', - label: '角色', + label: this.$t('system.roles'), config: { data: this.$ConstSelect.roleList } @@ -47,23 +47,23 @@ export default { indexShow: true, columns: [ { - title: '名称', + title: this.$t('system.name'), prop: 'name' }, { - title: '昵称', + title: this.$t('system.nickname'), prop: 'nickname' }, { - title: '电话', + title: this.$t('system.mobile'), prop: 'mobile' }, { - title: '邮箱', + title: this.$t('system.email'), prop: 'email' }, { - title: '角色', + title: this.$t('system.roles'), prop: 'roles', type: 'tagMore', columnValue: (row) => { return this.$convertField(row.roles, this.$ConstSelect.roleList, ['value', 'label'], true); }, @@ -71,15 +71,15 @@ export default { }, { type: 'button', - title: '操作', + title: this.$t('global.operate'), width: '250', buttons: [ { - name: '编辑', + name: this.$t('global.edit'), handleClick: this.handleUserEdit }, { - name: '订阅地图', + name: this.$t('system.subscribeMap'), handleClick: this.handleMapCorrelation, type: 'danger' } @@ -100,9 +100,9 @@ export default { // 删除 handleUserDelete(index, row) { - this.$confirm('此操作将删除该类型, 是否继续?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + this.$confirm(this.$t('system.delTypeIsContinue'), this.$t('global.tips'), { + confirmButtonText: this.$t('global.confirm'), + cancelButtonText: this.$t('global.cancel'), type: 'warning' }).then(() => { // delPublishMap(row.id).then(response => { diff --git a/src/views/management/userExam/edit.vue b/src/views/management/userExam/edit.vue index 24c4769c3..ccd8f4e38 100644 --- a/src/views/management/userExam/edit.vue +++ b/src/views/management/userExam/edit.vue @@ -2,8 +2,8 @@ - 确 定 - 取 消 + {{ $t('global.confirm') }} + {{ $t('global.cancel') }} @@ -34,12 +34,12 @@ export default { computed: { form() { const form = { - labelWidth: '100px', + labelWidth: '160px', items: [ - { prop: 'userName', label: '用户名称', type: 'text', required: false, disabled: true }, - { prop: 'examName', label: '试卷名称', type: 'text', required: true, disabled: true }, - { prop: 'score', label: '考试分数', type: 'text', required: true }, - { prop: 'result', label: '考试结果', type: 'select', required: true, options: this.$ConstSelect.examResultList } + { prop: 'userName', label: this.$t('system.userName'), type: 'text', required: false, disabled: true }, + { prop: 'examName', label: this.$t('system.examName'), type: 'text', required: true, disabled: true }, + { prop: 'score', label: this.$t('system.examScore'), type: 'text', required: true }, + { prop: 'result', label: this.$t('system.examResult'), type: 'select', required: true, options: this.$ConstSelect.examResultList } ] }; return form; @@ -47,16 +47,16 @@ export default { rules() { const crules = { score: [ - { required: true, message: '请输入名称', trigger: 'blur' } + { required: true, message: this.$t('rules.pleaseInputName'), trigger: 'blur' } ], result: [ - { required: true, message: '请选择状态', trigger: 'change' } + { required: true, message: this.$t('rules.pleaseSelectStatus'), trigger: 'change' } ] }; return crules; }, title() { - return '编辑考试详情'; + return this.$t('system.editExamDetail'); } }, methods: { @@ -79,11 +79,11 @@ export default { update() { const self = this; updateExam(this.formModel).then(response => { - self.$message.success('修改成功！'); + self.$message.success(this.$t('system.updateSuccess')); self.handleClose(); self.$emit('reloadTable'); }).catch(error => { - self.$message.error('修改失败！' + error.message); + self.$message.error(`${this.$t('error.updateFailed')}: ${error.message}`); }); }, handleClose(done) { diff --git a/src/views/management/userExam/index.vue b/src/views/management/userExam/index.vue index 4e44c07c8..95efae1af 100644 --- a/src/views/management/userExam/index.vue +++ b/src/views/management/userExam/index.vue @@ -22,20 +22,20 @@ export default { pageIndex: 'pageNum' }, queryForm: { - labelWidth: '80px', + labelWidth: '150px', reset: true, queryObject: { examName: { type: 'text', - label: '试卷名称' + label: this.$t('system.examName') }, userName: { type: 'text', - label: '考试用户' + label: this.$t('system.examUser') }, result: { type: 'select', - label: '考试结果', + label: this.$t('system.examResult'), config: { data: this.$ConstSelect.examResultList } @@ -49,11 +49,11 @@ export default { indexShow: true, columns: [ { - title: '试卷名称', + title: this.$t('system.examName'), prop: 'examName' }, { - title: '考试结果', + title: this.$t('system.examResult'), prop: 'result', type: 'tag', columnValue: (row) => { return this.$convertField(row.result, this.$ConstSelect.examResultList, ['value', 'label']); }, @@ -67,28 +67,28 @@ export default { } }, { - title: '考试成绩', + title: this.$t('system.examScore'), prop: 'score' }, { - title: '考试用户', + title: this.$t('system.examUser'), prop: 'userName' }, { - title: '用户手机号', + title: this.$t('system.mobile'), prop: 'userMobile' }, { type: 'button', - title: '操作', + title: this.$t('global.operate'), width: '250', buttons: [ { - name: '编辑', + name: this.$t('global.edit'), handleClick: this.edit }, { - name: '删除', + name: this.$t('global.delete'), handleClick: this.handleDelete, type: 'danger' } @@ -115,17 +115,17 @@ export default { // 删除 handleDelete(index, row) { - this.$confirm('此操作将删除此考试结果, 是否继续?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + this.$confirm(this.$t('system.delExamResultIsContinue'), this.$t('global.tips'), { + confirmButtonText: this.$t('global.confirm'), + cancelButtonText: this.$t('global.cancel'), type: 'warning' }).then(() => { delPublishExam(row.id).then(response => { - this.$message.success('删除成功'); + this.$message.success(this.$t('system.deleteSuccess')); this.reloadTable(); }).catch(() => { this.reloadTable(); - this.$messageBox('删除失败'); + this.$messageBox(this.$t('error.deleteFailed')); }); }); }, diff --git a/src/views/management/userSimulation/add.vue b/src/views/management/userSimulation/add.vue index ae18d9c62..94a44d4df 100644 --- a/src/views/management/userSimulation/add.vue +++ b/src/views/management/userSimulation/add.vue @@ -2,8 +2,8 @@ - 确 定 - 取 消 + {{ $t('global.confirm') }} + {{ $t('global.cancel') }} @@ -41,12 +41,12 @@ export default { computed: { form() { const form = { - labelWidth: '100px', + labelWidth: '120px', items: [ - { prop: 'mapId', label: '地图名称', type: 'select', required: true, options: this.LessonList, change: true, onChange: this.mapChange }, - { prop: 'mapPrdCode', label: '产品名称', type: 'select', required: true, options: this.mapPrdList, placeholder: '请选择产品' }, - { prop: 'userName', label: '用户名称', type: 'complete', required: false, querySearchAsync: this.querySearchAsync, handleSelect: this.prdSelect, placeholder: '请输入昵称/名字/手机号' }, - { prop: 'duration', label: '实训时长', type: 'text', rightWidth: true, required: true, message: 's' } + { prop: 'mapId', label: this.$t('system.mapName'), type: 'select', required: true, options: this.LessonList, change: true, onChange: this.mapChange, placeholder: this.$t('rules.mapInput') }, + { prop: 'mapPrdCode', label: this.$t('system.productName'), type: 'select', required: true, options: this.mapPrdList, placeholder: this.$t('rules.productInput') }, + { prop: 'userName', label: this.$t('system.userName'), type: 'complete', required: false, querySearchAsync: this.querySearchAsync, handleSelect: this.prdSelect, placeholder: this.$t('system.pleaseInputNames') }, + { prop: 'duration', label: this.$t('system.trainingUseTime'), type: 'text', rightWidth: true, required: true, message: 's' } ] }; return form; @@ -54,22 +54,22 @@ export default { rules() { const crules = { mapId: [ - { required: true, message: '请选择地图', trigger: 'change' } + { required: true, message: this.$t('rules.mapInput'), trigger: 'change' } ], userName: [ - { required: true, message: '请选择用户', trigger: 'change' } + { required: true, message: this.$t('rules.chooseUser'), trigger: 'change' } ], mapPrdCode: [ - { required: true, message: '请选择产品', trigger: 'change' } + { required: true, message: this.$t('rules.productInput'), trigger: 'change' } ], duration: [ - { required: true, message: '请输入时长', trigger: 'blur' } + { required: true, message: this.$t('rules.timeInput'), trigger: 'blur' } ] }; return crules; }, title() { - return '创建仿真信息'; + return this.$t('system.createSimulationTitle'); } }, mounted() { @@ -113,7 +113,7 @@ export default { }); cb(results); } catch (error) { - console.error(error, '查询用户list'); + console.error(error); cb(results); } } else { @@ -148,13 +148,6 @@ export default { }, show(data) { this.dialogVisible = true; - // this.formModel = { - // mapId: '', - // mapPrdCode: '', - // userId: '', - // userName: '', - // duration: '', - // }; }, doSave() { const self = this; @@ -172,14 +165,14 @@ export default { }; if (params.userId) { postSimulationStats(params).then(response => { - self.$message.success('新增成功！'); + self.$message.success(this.$t('system.addSuccess')); self.handleClose(); self.$emit('reloadTable'); }).catch(error => { - self.$message.error('新增失败！' + error.message); + self.$message.error(this.$t('error.addFailed') + error.message); }); } else { - this.$message.error('请选择用户'); + this.$message.error(this.$t('rules.chooseUser')); } }, handleClose(done) { diff --git a/src/views/management/userSimulation/index.vue b/src/views/management/userSimulation/index.vue index e16045f55..1251f9b9f 100644 --- a/src/views/management/userSimulation/index.vue +++ b/src/views/management/userSimulation/index.vue @@ -29,16 +29,16 @@ export default { pageIndex: 'pageNum' }, queryForm: { - labelWidth: '80px', + labelWidth: '120px', reset: true, queryObject: { trainingName: { type: 'text', - label: '实训名称' + label: this.$t('system.trainingName') }, userName: { type: 'text', - label: '用户名' + label: this.$t('system.userName') } } @@ -49,41 +49,41 @@ export default { indexShow: true, columns: [ { - title: '用户名称', + title: this.$t('system.userName'), prop: 'userName' }, { - title: '用户手机号', + title: this.$t('system.mobile'), prop: 'userMobile' }, { - title: '地图名称', + title: this.$t('system.mapName'), prop: 'mapName' }, { - title: '实训用时', + title: this.$t('system.trainingUseTime'), prop: 'duration', type: 'tag', columnValue: (row) => { return this.computation(row.duration); }, tagType: (row) => { return 'success'; } }, { - title: '产品名称', + title: this.$t('system.productName'), prop: 'mapPrdName' }, { type: 'button', - title: '操作', + title: this.$t('global.operate'), width: '250', hide: (row) => { return !row.fake; }, buttons: [ { - name: '编辑', + name: this.$t('global.edit'), handleClick: this.edit, showControl: (row) => { return row.fake; } }, { - name: '删除', + name: this.$t('global.delete'), handleClick: this.handleDelete, type: 'danger', showControl: (row) => { return row.fake; } @@ -92,7 +92,7 @@ export default { } ], actions: [ - { text: '新增', handler: this.createTraining } + { text: this.$t('global.add'), handler: this.createTraining } ] }, currentModel: {} @@ -121,9 +121,9 @@ export default { const f = parseInt(fieldValue / 60); const s = fieldValue % 60; if (f > 0) { - return `${f}分${s}秒`; + return `${f} ${this.$t('system.minute')} ${s} ${this.$t('system.second')}`; } else { - return `${s}秒`; + return `${s} ${this.$t('system.second')}`; } } }, @@ -135,17 +135,17 @@ export default { // 删除 handleDelete(index, row) { - this.$confirm('此操作将删除此用户仿真数据, 是否继续?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + this.$confirm(this.$t('system.delUserSimulationIsContinue'), this.$t('global.tips'), { + confirmButtonText: this.$t('global.confirm'), + cancelButtonText: this.$t('global.cancel'), type: 'warning' }).then(() => { deleteSimulationStats(row.id).then(response => { - this.$message.success('删除成功'); + this.$message.success(this.$t('system.deleteSuccess')); this.reloadTable(); }).catch(() => { this.reloadTable(); - this.$messageBox('删除失败'); + this.$messageBox(this.$t('error.deleteFailed')); }); }); }, diff --git a/src/views/management/userTraining/add.vue b/src/views/management/userTraining/add.vue index d943c6e29..9bd04ad24 100644 --- a/src/views/management/userTraining/add.vue +++ b/src/views/management/userTraining/add.vue @@ -3,8 +3,8 @@ - 确 定 - 取 消 + {{ $t('global.confirm') }} + {{ $t('global.cancel') }} @@ -48,12 +48,12 @@ export default { form() { this.type === 'ADD'; const form = { - labelWidth: '100px', + labelWidth: '150px', items: [ - { prop: 'lessonId', label: '课程名称', type: 'select', required: true, options: this.LessonList }, - { prop: 'trainingName', label: '实训名称', type: 'text', required: true, rightWidth: true, disabled: true, buttontip: '选择实训', buttonClick: this.buttonClick, placeholder: '请选择实训' }, - { prop: 'userName', label: '用户名称', type: 'complete', required: false, querySearchAsync: this.querySearchAsync, handleSelect: this.prdSelect, placeholder: '请输入昵称/名字/手机号' }, - { prop: 'duration', label: '实训时长', type: 'text', required: true, rightWidth: true, message: 's' } + { prop: 'lessonId', label: this.$t('system.lessonName'), type: 'select', required: true, options: this.LessonList }, + { prop: 'trainingName', label: this.$t('system.trainingName'), type: 'text', required: true, rightWidth: true, disabled: true, buttontip: this.$t('system.selectTraining'), buttonClick: this.buttonClick, placeholder: this.$t('rules.pleaseSelectTraining') }, + { prop: 'userName', label: this.$t('system.userName'), type: 'complete', required: false, querySearchAsync: this.querySearchAsync, handleSelect: this.prdSelect, placeholder: this.$t('system.pleaseInputNames') }, + { prop: 'duration', label: this.$t('system.trainingTime'), type: 'text', required: true, rightWidth: true, message: 's' } ] }; return form; @@ -61,22 +61,22 @@ export default { rules() { const crules = { lessonId: [ - { required: true, message: '请输入教学名称', trigger: 'change' } + { required: true, message: this.$t('rules.pleaseInputLessonName'), trigger: 'change' } ], trainingName: [ - { required: true, message: '请选择实训', trigger: 'change' } + { required: true, message: this.$t('rules.pleaseSelectTraining'), trigger: 'change' } ], userName: [ - { required: true, message: '请输入用户名称', trigger: 'change' } + { required: true, message: this.$t('rules.userNameInput'), trigger: 'change' } ], duration: [ - { required: true, message: '请输入时长', trigger: 'blur' } + { required: true, message: this.$t('rules.timeInput'), trigger: 'blur' } ] }; return crules; }, title() { - return '创建用户实训'; + return this.$t('system.createUserTraining'); } }, mounted() { @@ -139,14 +139,6 @@ export default { }, show(data) { this.dialogVisible = true; - // this.formModel = { - // lessonId: '', - // trainingId: '', - // trainingName: '', - // userId: '', - // userName: '', - // duration: '', - // }; }, doSave() { const self = this; @@ -158,14 +150,14 @@ export default { const self = this; if (this.formModel.userId) { addUserTraining(this.formModel).then(response => { - self.$message.success('创建成功！'); + self.$message.success(this.$t('system.addSuccess')); self.handleClose(); self.$emit('reloadTable'); }).catch(error => { - self.$message.error('创建失败！' + error.message); + self.$message.error(this.$t('error.addFailed') + error.message); }); } else { - self.$message.error('请选择用户'); + self.$message.error(this.$t('rules.chooseUser')); } }, handleClose(done) { diff --git a/src/views/management/userTraining/addTraining.vue b/src/views/management/userTraining/addTraining.vue index fb7d44382..92a079ab3 100644 --- a/src/views/management/userTraining/addTraining.vue +++ b/src/views/management/userTraining/addTraining.vue @@ -17,8 +17,8 @@ - 确 定 - 取 消 + {{ $t('global.confirm') }} + {{ $t('global.cancel') }} @@ -34,7 +34,7 @@ export default { data() { return { dialogVisibles: false, - title: '选择实训', + title: this.$t('system.selectTraining'), treeData: [{ children: [], name: '' diff --git a/src/views/management/userTraining/edit.vue b/src/views/management/userTraining/edit.vue index ed229affe..8555f8b11 100644 --- a/src/views/management/userTraining/edit.vue +++ b/src/views/management/userTraining/edit.vue @@ -2,8 +2,8 @@ - 确 定 - 取 消 + {{ $t('global.confirm') }} + {{ $t('global.cancel') }} @@ -37,10 +37,10 @@ export default { const form = { labelWidth: '100px', items: [ - { prop: 'lessonName', label: '教学名称', type: 'text', required: false, disabled: true }, - { prop: 'trainingName', label: '实训名称', type: 'text', required: true, disabled: true }, - { prop: 'userName', label: '用户名称', type: 'text', required: true, disabled: true }, - { prop: 'duration', label: '实训时长', type: 'text', required: true, rightWidth: true, message: 's' } + { prop: 'lessonName', label: this.$t('system.lessonName'), type: 'text', required: false, disabled: true }, + { prop: 'trainingName', label: this.$t('system.trainingName'), type: 'text', required: true, disabled: true }, + { prop: 'userName', label: this.$t('system.userName'), type: 'text', required: true, disabled: true }, + { prop: 'duration', label: this.$t('system.trainingTime'), type: 'text', required: true, rightWidth: true, message: 's' } ] }; return form; @@ -48,13 +48,13 @@ export default { rules() { const crules = { duration: [ - { required: true, message: '请输入时长', trigger: 'blur' } + { required: true, message: this.$t('rules.timeInput'), trigger: 'blur' } ] }; return crules; }, title() { - return '编辑实训详情'; + return this.$t('system.editTrainingDetail'); } }, methods: { @@ -67,7 +67,6 @@ export default { userName: data.userName, trainingName: data.trainingName, duration: data.duration - // trainingCount: data.trainingCount }; } }, @@ -84,11 +83,11 @@ export default { duration: this.formModel.duration }; putUserTraining(param).then(response => { - self.$message.success('修改成功！'); + self.$message.success(this.$t('system.updateSuccess')); self.handleClose(); self.$emit('reloadTable'); }).catch(error => { - self.$message.error('修改失败！' + error.message); + self.$message.error(`${this.$t('error.updateFailed')}: ${error.message}`); }); }, handleClose(done) { diff --git a/src/views/management/userTraining/index.vue b/src/views/management/userTraining/index.vue index 39fac325b..f69b186d6 100644 --- a/src/views/management/userTraining/index.vue +++ b/src/views/management/userTraining/index.vue @@ -24,16 +24,16 @@ export default { pageIndex: 'pageNum' }, queryForm: { - labelWidth: '80px', + labelWidth: '120px', reset: true, queryObject: { trainingName: { type: 'text', - label: '实训名称' + label: this.$t('system.trainingName') }, userName: { type: 'text', - label: '用户名' + label: this.$t('system.userName') } } @@ -44,40 +44,40 @@ export default { indexShow: true, columns: [ { - title: '用户名称', + title: this.$t('system.userName'), prop: 'userName' }, { - title: '用户手机号', + title: this.$t('system.mobile'), prop: 'userMobile' }, { - title: '课程名称', + title: this.$t('system.lessonName'), prop: 'lessonName' }, { - title: '实训用时', + title: this.$t('system.trainingUseTime'), prop: 'duration', type: 'tag', columnValue: (row) => { return this.computation(row.duration); }, tagType: (row) => { return 'success'; } }, { - title: '实训名称', + title: this.$t('system.trainingName'), prop: 'trainingName' }, { type: 'button', - title: '操作', + title: this.$t('global.operate'), width: '250', buttons: [ { - name: '编辑', + name: this.$t('global.edit'), handleClick: this.edit, showControl: (row) => { return row.fake != '0'; } }, { - name: '删除', + name: this.$t('global.delete'), handleClick: this.handleDelete, type: 'danger', showControl: (row) => { return row.fake != '0'; } @@ -86,7 +86,7 @@ export default { } ], actions: [ - { text: '新增', handler: this.createTraining } + { text: this.$t('global.add'), handler: this.createTraining } ] }, currentModel: {} @@ -107,9 +107,9 @@ export default { const f = parseInt(fieldValue / 60); const s = fieldValue % 60; if (f > 0) { - return `${f}分${s}秒`; + return `${f} ${this.$t('system.minute')} ${s} ${this.$t('system.second')}`; } else { - return `${s}秒`; + return `${s} ${this.$t('system.second')}`; } } }, @@ -121,17 +121,17 @@ export default { // 删除 handleDelete(index, row) { - this.$confirm('此操作将删除此考试结果, 是否继续?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + this.$confirm(this.$t('system.delExamResultIsContinue'), this.$t('global.tips'), { + confirmButtonText: this.$t('global.confirm'), + cancelButtonText: this.$t('global.cancel'), type: 'warning' }).then(() => { deleteUserTraining(row.id).then(response => { - this.$message.success('删除成功'); + this.$message.success(this.$t('system.deleteSuccess')); this.reloadTable(); }).catch(() => { this.reloadTable(); - this.$messageBox('删除失败'); + this.$messageBox(this.$t('error.deleteFailed')); }); }); }, diff --git a/src/views/orderauthor/author/draft.vue b/src/views/orderauthor/author/draft.vue index 23cc20b9e..d5051ae55 100644 --- a/src/views/orderauthor/author/draft.vue +++ b/src/views/orderauthor/author/draft.vue @@ -11,8 +11,8 @@
- {{$t('global.create')}} - {{$t('global.return')}} + {{ $t('global.create') }} + {{ $t('global.return') }}
@@ -63,7 +63,7 @@ export default { }, rules() { - const _this = this; + const _this = this; const baseRules = { userId: [ { required: true, message: this.$t('rules.userNameInput'), trigger: 'blur' } diff --git a/src/views/orderauthor/author/index.vue b/src/views/orderauthor/author/index.vue index 30db034cf..c0bd0934b 100644 --- a/src/views/orderauthor/author/index.vue +++ b/src/views/orderauthor/author/index.vue @@ -1,244 +1,241 @@ diff --git a/src/views/orderauthor/commodity/index.vue b/src/views/orderauthor/commodity/index.vue index ba3db7326..d2249c676 100644 --- a/src/views/orderauthor/commodity/index.vue +++ b/src/views/orderauthor/commodity/index.vue @@ -1,221 +1,220 @@ diff --git a/src/views/orderauthor/order/addGoods.vue b/src/views/orderauthor/order/addGoods.vue index 67bd4b220..dab334ff8 100644 --- a/src/views/orderauthor/order/addGoods.vue +++ b/src/views/orderauthor/order/addGoods.vue @@ -1,189 +1,195 @@ diff --git a/src/views/orderauthor/order/canDistribute.vue b/src/views/orderauthor/order/canDistribute.vue index e8e25941a..8f9a721d4 100644 --- a/src/views/orderauthor/order/canDistribute.vue +++ b/src/views/orderauthor/order/canDistribute.vue @@ -1,54 +1,62 @@ diff --git a/src/views/orderauthor/order/draft.vue b/src/views/orderauthor/order/draft.vue index 84cbc5b80..e798fafc2 100644 --- a/src/views/orderauthor/order/draft.vue +++ b/src/views/orderauthor/order/draft.vue @@ -1,511 +1,508 @@