From 2dffe78baf978f73101b7586941be53433ef8939 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 12 Sep 2019 13:22:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=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/error.js | 4 ++ src/i18n/langs/en/global.js | 3 +- src/i18n/langs/en/index.js | 6 +- src/i18n/langs/en/menu.js | 3 + src/i18n/langs/en/orderAuthor.js | 8 ++- src/i18n/langs/en/permission.js | 5 +- src/i18n/langs/en/rules.js | 3 +- src/i18n/langs/en/tip.js | 6 +- src/i18n/langs/en/trainRoom.js | 29 ++++++++++ src/i18n/langs/zh/error.js | 4 ++ src/i18n/langs/zh/global.js | 5 +- src/i18n/langs/zh/index.js | 7 ++- src/i18n/langs/zh/menu.js | 3 + src/i18n/langs/zh/orderAuthor.js | 6 +- src/i18n/langs/zh/permission.js | 5 +- src/i18n/langs/zh/rules.js | 3 +- src/i18n/langs/zh/tip.js | 6 +- src/i18n/langs/zh/trainRoom.js | 29 ++++++++++ src/views/orderauthor/commodity/draft.vue | 18 +++--- src/views/orderauthor/commodity/index.vue | 4 +- src/views/orderauthor/order/addGoods.vue | 6 +- src/views/orderauthor/order/detail.vue | 4 +- src/views/orderauthor/order/list.vue | 4 +- src/views/orderauthor/permission/Qcode.vue | 4 +- src/views/orderauthor/rules/detail.vue | 4 +- src/views/orderauthor/rules/index.vue | 14 ++--- src/views/trainRoom/addPerson.vue | 6 +- src/views/trainRoom/index.vue | 66 +++++++++++++--------- src/views/trainRoom/operateMenu.vue | 2 +- src/views/trainRoom/trainChat.vue | 22 ++++---- 30 files changed, 202 insertions(+), 87 deletions(-) create mode 100644 src/i18n/langs/en/menu.js create mode 100644 src/i18n/langs/en/trainRoom.js create mode 100644 src/i18n/langs/zh/menu.js create mode 100644 src/i18n/langs/zh/trainRoom.js diff --git a/src/i18n/langs/en/error.js b/src/i18n/langs/en/error.js index 7a03b808c..902cfb36a 100644 --- a/src/i18n/langs/en/error.js +++ b/src/i18n/langs/en/error.js @@ -84,4 +84,8 @@ export default { startSimulationFailed: 'Start simulation failed, please go back and try again', endSimulationFailed: 'End simulation failed, please return', runGraphIsNotLoaded: 'Today\'s run graph is not loaded', + startedComprehensiveDrillFailure: 'Started a comprehensive drill failure.', + stationAttendantStationCannotBeEmpty: 'Station attendant station cannot be empty', + destroyedRoomFailed: 'Destroyed room failed!', + exceededTheTotalNumberOfAssignableRoles: 'The number of assigned roles has exceeded the total number of assignable roles!' }; diff --git a/src/i18n/langs/en/global.js b/src/i18n/langs/en/global.js index 4b86be33a..5d537b683 100644 --- a/src/i18n/langs/en/global.js +++ b/src/i18n/langs/en/global.js @@ -145,5 +145,6 @@ export default { amount: 'Amount', yes: 'Yes', no: 'No', - details: 'Details' + details: 'Details', + enterNameToFilter: 'Enter a name to filter' }; diff --git a/src/i18n/langs/en/index.js b/src/i18n/langs/en/index.js index 93cdf3b51..6334663ef 100644 --- a/src/i18n/langs/en/index.js +++ b/src/i18n/langs/en/index.js @@ -21,6 +21,8 @@ import dashboard from './dashboard'; import jlmap3d from './jlmap3d'; import display from './display'; import joinTraining from './joinTraining'; +import trainRoom from './trainRoom'; +import menu from './menu'; export default { ...enLocale, @@ -45,5 +47,7 @@ export default { dashboard, jlmap3d, display, - joinTraining + joinTraining, + trainRoom, + menu }; diff --git a/src/i18n/langs/en/menu.js b/src/i18n/langs/en/menu.js new file mode 100644 index 000000000..6d916df14 --- /dev/null +++ b/src/i18n/langs/en/menu.js @@ -0,0 +1,3 @@ +export default { + +}; diff --git a/src/i18n/langs/en/orderAuthor.js b/src/i18n/langs/en/orderAuthor.js index b893a5713..7b593f3d0 100644 --- a/src/i18n/langs/en/orderAuthor.js +++ b/src/i18n/langs/en/orderAuthor.js @@ -96,5 +96,11 @@ export default { packingDetails: 'Packing details', belongsToMap: 'Belongs to map', oneClickGeneration: 'One-click generation', - selectPermission: 'Select Permission' + selectPermission: 'Select Permission', + permission: 'Permission', + orderSelectionItem: 'Order selection item', + orderDetails: 'Order details', + statusType: 'Status type', + private: 'Private', + public: 'Public' }; diff --git a/src/i18n/langs/en/permission.js b/src/i18n/langs/en/permission.js index ce488cd3a..841100aa8 100644 --- a/src/i18n/langs/en/permission.js +++ b/src/i18n/langs/en/permission.js @@ -27,6 +27,7 @@ export default { editPermissionPackageRule: 'edit authority packaging rule', restPermissionMaxNumber: '(maximum number of remaining permissions: {0})', pleaseSelectTransferPermission: 'Select transfer permissions', - permissionName: 'Permission Name' - + permissionName: 'Permission Name', + private: 'Private', + public: 'Public' }; diff --git a/src/i18n/langs/en/rules.js b/src/i18n/langs/en/rules.js index 7d187d9a3..f114d40de 100644 --- a/src/i18n/langs/en/rules.js +++ b/src/i18n/langs/en/rules.js @@ -252,5 +252,6 @@ export default { modifyTheFailure: 'Modify the failure', selectTheCourseNameFirst: 'Please select the course name first', selectMultiplePermissions: 'Please select multiple permissions', - enterPermissionName: 'Please enter a permission name' + enterPermissionName: 'Please enter a permission name', + pleaseSelectPermission: 'Please select permission' }; diff --git a/src/i18n/langs/en/tip.js b/src/i18n/langs/en/tip.js index 104cc7f9b..c0332c76a 100644 --- a/src/i18n/langs/en/tip.js +++ b/src/i18n/langs/en/tip.js @@ -137,5 +137,9 @@ export default { setUpASubscriptionMapFailed: 'Setting up a subscription map failed!', getMapStateDataException: 'Get map state data exception, please refresh the page to reload. If you encounter such problems many times, please contact the development team in an emergency!', packagedSuccessfully: 'Packaged successfully', - oneKeyGeneratedSuccessfully: 'One key generated successfully!' + oneKeyGeneratedSuccessfully: 'One key generated successfully!', + obtainedPermissionSuccessfully: 'Successfully obtained permission', + modifyTheUserPermissionStatus: 'Will this action modify the user permission status?', + destroyRoomHint: 'You will destroy the room, are you sure you want to do this?', + contentIsEmptyAndCannotBeSent: 'The content is empty and cannot be sent!' }; diff --git a/src/i18n/langs/en/trainRoom.js b/src/i18n/langs/en/trainRoom.js new file mode 100644 index 000000000..899d120c3 --- /dev/null +++ b/src/i18n/langs/en/trainRoom.js @@ -0,0 +1,29 @@ +export default { + comprehensiveTrainingManager: 'Comprehensive training manager:', + comprehensiveDrillRoom: 'Comprehensive drill room', + numberOfAssignableRoles: 'Number of assignable roles:', + dispatcher: 'Dispatcher', + increaseDispatchers: 'Increase dispatchers', + stationAttendant: 'Station attendant', + increaseStationAttendant: 'Increase station attendant', + teacher: 'Teacher', + increaseTeacher: 'Increase teacher', + universalAccount: 'Universal Account', + increaseUniversalAccount: 'Increase universal account', + driver: 'Driver', + increaseDriver: 'Increase driver', + bigScreen: 'Big screen', + increaseBigScreen: 'Increase big screen', + destroyRoom: 'Destroy room', + generatingQRCode: 'Generating QRCode', + startSimulation: 'Start simulation', + enterSimulation: 'Enter simulation', + endSimulation: 'End Simulation', + distributeTheRoomQRCode: 'Distribute the room QR code', + increaseIbp: 'increase IBP', + kickOutTheRoom: 'Kick out the room', + sending: 'sending...', + holdAndTalk: 'Hold and talk', + recording: 'recording...', + sendText: 'Send text' +}; diff --git a/src/i18n/langs/zh/error.js b/src/i18n/langs/zh/error.js index 5906394d2..9cc2977b0 100644 --- a/src/i18n/langs/zh/error.js +++ b/src/i18n/langs/zh/error.js @@ -84,4 +84,8 @@ export default { startSimulationFailed: '开始仿真失败，请返回重试', endSimulationFailed: '结束仿真失败，请返回', runGraphIsNotLoaded: '今日运行图未加载', + startedComprehensiveDrillFailure: '开始综合演练失败。', + stationAttendantStationCannotBeEmpty: '值班员所属车站不能为空', + destroyedRoomFailed: '销毁房间失败！', + exceededTheTotalNumberOfAssignableRoles: '分配角色数量已超过可分配角色总数！' }; diff --git a/src/i18n/langs/zh/global.js b/src/i18n/langs/zh/global.js index c592ef5ca..2c8e3ea98 100644 --- a/src/i18n/langs/zh/global.js +++ b/src/i18n/langs/zh/global.js @@ -18,7 +18,7 @@ export default { chooseDate: '请选择日期', chooseTime: '请选择时间', chooseDateTime: '请选择日期时间', - choosh: '请选择', + choose: '请选择', select: '选 择', selectAdd: '选中添加', export: '导 出', @@ -151,5 +151,6 @@ export default { amount: '总数量', yes: '是', no: '否', - details: '详情' + details: '详情', + enterNameToFilter: '输入名称进行过滤' }; diff --git a/src/i18n/langs/zh/index.js b/src/i18n/langs/zh/index.js index 8f52b6de0..35c6b1a52 100644 --- a/src/i18n/langs/zh/index.js +++ b/src/i18n/langs/zh/index.js @@ -21,6 +21,8 @@ import dashboard from './dashboard'; import jlmap3d from './jlmap3d'; import display from './display'; import joinTraining from './joinTraining'; +import trainRoom from './trainRoom'; +import menu from './menu'; export default { ...cnLocale, @@ -44,5 +46,8 @@ export default { exam, dashboard, jlmap3d, - display + display, + joinTraining, + trainRoom, + menu }; diff --git a/src/i18n/langs/zh/menu.js b/src/i18n/langs/zh/menu.js new file mode 100644 index 000000000..6d916df14 --- /dev/null +++ b/src/i18n/langs/zh/menu.js @@ -0,0 +1,3 @@ +export default { + +}; diff --git a/src/i18n/langs/zh/orderAuthor.js b/src/i18n/langs/zh/orderAuthor.js index 421c09035..e031b9cd1 100644 --- a/src/i18n/langs/zh/orderAuthor.js +++ b/src/i18n/langs/zh/orderAuthor.js @@ -96,5 +96,9 @@ export default { packingDetails: '打包详情', belongsToMap: '所属地图', oneClickGeneration: '一键生成', - selectPermission: '选择权限' + selectPermission: '选择权限', + permission: '权限', + orderSelectionItem: '订单选择商品', + orderDetails: '订单详情', + statusType: '状态类型', }; diff --git a/src/i18n/langs/zh/permission.js b/src/i18n/langs/zh/permission.js index cbae6d3f9..1706eac16 100644 --- a/src/i18n/langs/zh/permission.js +++ b/src/i18n/langs/zh/permission.js @@ -27,6 +27,7 @@ export default { editPermissionPackageRule: '编辑权限打包规则', restPermissionMaxNumber: '（剩余最大权限个数：{0}）', pleaseSelectTransferPermission: '选择转赠权限', - permissionName: '权限名称' - + permissionName: '权限名称', + private: '专用', + public: '公用' }; diff --git a/src/i18n/langs/zh/rules.js b/src/i18n/langs/zh/rules.js index 0f438e31b..f770c817b 100644 --- a/src/i18n/langs/zh/rules.js +++ b/src/i18n/langs/zh/rules.js @@ -262,5 +262,6 @@ export default { modifyTheFailure: '修改失败', selectTheCourseNameFirst: '请先选择课程名称', selectMultiplePermissions: '请选择多个权限', - enterPermissionName: '请输入权限名称' + enterPermissionName: '请输入权限名称', + pleaseSelectPermission: '请选择权限' }; diff --git a/src/i18n/langs/zh/tip.js b/src/i18n/langs/zh/tip.js index 9a2431ec1..c0361c159 100644 --- a/src/i18n/langs/zh/tip.js +++ b/src/i18n/langs/zh/tip.js @@ -141,5 +141,9 @@ export default { setUpASubscriptionMapFailed: '设置订阅地图失败！', getMapStateDataException: '获取地图状态数据异常，请刷新页面重新加载。若多次遇到此类问题，请急时联系开发团队处理！', packagedSuccessfully: '打包成功', - oneKeyGeneratedSuccessfully: '一键生成成功！' + oneKeyGeneratedSuccessfully: '一键生成成功！', + obtainedPermissionSuccessfully: '领取权限成功', + modifyTheUserPermissionStatus: '此操作将修改用户权限状态?', + destroyRoomHint: '您将销毁房间，是否确定执行此操作', + contentIsEmptyAndCannotBeSent: '内容为空，不可发送！' }; diff --git a/src/i18n/langs/zh/trainRoom.js b/src/i18n/langs/zh/trainRoom.js new file mode 100644 index 000000000..882c3f421 --- /dev/null +++ b/src/i18n/langs/zh/trainRoom.js @@ -0,0 +1,29 @@ +export default { + comprehensiveTrainingManager: '综合实训管理者：', + comprehensiveDrillRoom: '综合演练室', + numberOfAssignableRoles: '可分配角色数量：', + dispatcher: '调度员', + increaseDispatchers: '增加调度人员', + stationAttendant: '车站值班员', + increaseStationAttendant: '增加车站值班员', + teacher: '教员', + increaseTeacher: '增加教员', + universalAccount: '通号', + increaseUniversalAccount: '增加通号', + driver: '司机', + increaseDriver: '增加司机', + bigScreen: '大屏', + increaseBigScreen: '增加大屏', + destroyRoom: '销毁房间', + generatingQRCode: '生成二维码', + startSimulation: '开始仿真', + enterSimulation: '进入仿真', + endSimulation: '结束仿真', + distributeTheRoomQRCode: '分发房间二维码', + increaseIbp: '增加IBP', + kickOutTheRoom: '提出房间', + sending: '发送中...', + holdAndTalk: '按住说话', + recording: '录音中...', + sendText: '发送文字' +}; diff --git a/src/views/orderauthor/commodity/draft.vue b/src/views/orderauthor/commodity/draft.vue index e7d8a17c0..de73b58b8 100644 --- a/src/views/orderauthor/commodity/draft.vue +++ b/src/views/orderauthor/commodity/draft.vue @@ -77,13 +77,13 @@ export default { const form = { labelWidth: '135px', items: [ - { prop: 'name', label: '商品名称', type: 'text', required: false }, - { prop: 'permissionName', label: '权限', type: 'text', required: false, disabled: true, rightWidth: true, buttontip: '选择权限', buttonClick: this.buttonClick }, - { prop: 'forever', label: '是否试用', type: 'radio', required: false, options: this.$ConstSelect.Whether, disabled: this.foreverIsDisabled }, - { prop: 'tryUseTimeUnit', label: '时间单位', type: 'select', required: false, disabled: this.foreverIsDisabled, show: this.isShowForever, options: this.TimeStyleList }, - { prop: 'tryUseTime', label: '试用时长', type: 'number', required: false, disabled: this.foreverIsDisabled, show: this.isShowForever, message: `${this.TimeStyleDict[this.formModel.tryUseTimeUnit]}` }, - { prop: 'price', label: '价格', type: 'number', required: false, min: 0.01, message: '元' }, - { prop: 'remarks', label: '描述', type: 'textarea', required: false } + { prop: 'name', label: this.$t('orderAuthor.commodityName'), type: 'text', required: false }, + { prop: 'permissionName', label: this.$t('orderAuthor.permission'), type: 'text', required: false, disabled: true, rightWidth: true, buttontip: this.$t('orderAuthor.selectPermission'), buttonClick: this.buttonClick }, + { prop: 'forever', label: this.$t('orderAuthor.whetherTrial'), type: 'radio', required: false, options: this.$ConstSelect.Whether, disabled: this.foreverIsDisabled }, + { prop: 'tryUseTimeUnit', label: this.$t('orderAuthor.unitOfTime'), type: 'select', required: false, disabled: this.foreverIsDisabled, show: this.isShowForever, options: this.TimeStyleList }, + { prop: 'tryUseTime', label: this.$t('orderAuthor.trialTime'), type: 'number', required: false, disabled: this.foreverIsDisabled, show: this.isShowForever, message: `${this.TimeStyleDict[this.formModel.tryUseTimeUnit]}` }, + { prop: 'price', label: this.$t('orderAuthor.price'), type: 'number', required: false, min: 0.01, message: this.$t('global.yuan') }, + { prop: 'remarks', label: this.$t('orderAuthor.describtion'), type: 'textarea', required: false } ] }; @@ -96,7 +96,7 @@ export default { { required: true, message: this.$t('rules.goodsNameInput'), trigger: 'blur' } ], permissionName: [ - { required: true, message: '请选择权限', trigger: 'change' } + { required: true, message: this.$t('rules.pleaseSelectPermission'), trigger: 'change' } ], forever: [ { required: true, message: this.$t('rules.pleaseSelect'), trigger: 'change' } @@ -177,7 +177,7 @@ export default { id: res.data.id }; } catch (err) { - this.$messageBox('获取商品详情失败'); + this.$messageBox(this.$t('error.getItemDetailFailed')); } } diff --git a/src/views/orderauthor/commodity/index.vue b/src/views/orderauthor/commodity/index.vue index 98a806ccf..7a01f50ef 100644 --- a/src/views/orderauthor/commodity/index.vue +++ b/src/views/orderauthor/commodity/index.vue @@ -60,11 +60,11 @@ export default { prop: 'name' }, { - title: '权限名称', + title: this.$t('orderAuthor.permissionName'), prop: 'permissionName' }, { - title: `${this.$t('orderAuthor.price')}（元）`, + title: `${this.$t('orderAuthor.price')}（￥）`, prop: 'price' }, { diff --git a/src/views/orderauthor/order/addGoods.vue b/src/views/orderauthor/order/addGoods.vue index 8c0f442d5..397381d15 100644 --- a/src/views/orderauthor/order/addGoods.vue +++ b/src/views/orderauthor/order/addGoods.vue @@ -1,6 +1,6 @@