From 25402786f8e11a7cf6f7f0bfec7c4ca36f4a6f02 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Mon, 16 Sep 2019 16:08:55 +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/global.js | 2 + src/i18n/langs/en/menu.js | 23 +++++++-- src/i18n/langs/zh/menu.js | 47 +++++++------------ .../fuzhou_01/menus/menuDialog/trainAdd.vue | 25 ++++++---- .../menus/menuDialog/trainDelete.vue | 16 +++---- .../menus/menuDialog/trainTranstalet.vue | 22 ++++----- 6 files changed, 72 insertions(+), 63 deletions(-) diff --git a/src/i18n/langs/en/global.js b/src/i18n/langs/en/global.js index 83a612571..f72e68c09 100644 --- a/src/i18n/langs/en/global.js +++ b/src/i18n/langs/en/global.js @@ -110,6 +110,8 @@ export default { orderCode: 'Order Code: ', creationTime: 'Create Time: ', amountPayable: 'Amounts Payable: ', + screenName: 'Screen Name', + timeUnitPrice: 'Screen Unit Price', buyProject: 'The products you will purchase are virtual content services. After purchase, you will not be able to return, transfer or exchange. Please confirm.', relatedServices: 'You can view and use the related services in the “Permissions Details” area after purchase.', diff --git a/src/i18n/langs/en/menu.js b/src/i18n/langs/en/menu.js index d46ad1656..93770d805 100644 --- a/src/i18n/langs/en/menu.js +++ b/src/i18n/langs/en/menu.js @@ -202,7 +202,7 @@ export default { }, menuDialog: { versionName: 'ControlMonitor 1.3.5.0', - confirm: 'confirm', + confirm: 'Confirm', copyright: 'Copyright (C) 2010-2011 Beijing Jiu Lian Technology Co., Ltd.', moduleName: 'Module Name', version: 'Version', @@ -210,7 +210,7 @@ export default { mainProgramVersion: 'Main Program Version:', about: 'About ControlMonitor', - userList: 'userList', + userList: 'User List', jobNumber: 'JobNumber', userName: 'UserName', refresh: 'Refresh', @@ -231,7 +231,24 @@ export default { password: 'Password', back: 'Back', clear: 'Clear', - IncorrectPassword: 'Incorrect Password!' + IncorrectPassword: 'Incorrect Password!', + + addLocation: 'Add Location', + terminalOne: 'Terminal:', + pleaseSelect: 'please select', + frontTrainNumber: 'Front TrainNumber:', + addTrainNumber: 'Add TrainNumber:', + inputTrainNumber: 'Please input train number', + selectTerminal: 'Please select terminal', + addPlanTrain: 'Add Plan Train', + + terminalTwo: 'Terminal:', + trainNumber: 'TrainNumber:', + deletePlanTrain: 'Delete Plan Train', + + purpose: 'Purpose', + inputFrontNumber: 'Please input front train number', + panPlanCar: 'Pan Plan Car' }, platform: 'Platform', arrivalTime: 'Arrival time', diff --git a/src/i18n/langs/zh/menu.js b/src/i18n/langs/zh/menu.js index 4bbcc06e1..4153f1826 100644 --- a/src/i18n/langs/zh/menu.js +++ b/src/i18n/langs/zh/menu.js @@ -225,10 +225,10 @@ export default { passwordBox: '密码框', userNameLabel: '用户名：', - password: '密 码：', + password: '密 码：', back: '回退', clear: '清空', - IncorrectPassword: '密码输入错误！' + IncorrectPassword: '密码输入错误！', // 控制模式转换 // 选择 @@ -256,37 +256,22 @@ export default { // 确认将如下操作区域的控制模式由站控转为中控: // 操作区域 - // 添加位置 - // 终   端: - // 请选择 - // 前车车次号: - // 添加车次号: - // 确定 - // 取 消 - // 请输入车次号 - // 请选择终端 - // 添加计划车 + addLocation: '添加位置', + terminalOne: '终 端:', + pleaseSelect: '请选择', + frontTrainNumber: '前车车次号:', + addTrainNumber: '添加车次号:', + inputTrainNumber: '请输入车次号', + selectTerminal: '请选择终端', + addPlanTrain: '添加计划车', - // 终  端: - // 请选择 - // 车 次 号: - // 确定 - // 取 消 - // 请输入车次号 - // 请选择终端 - // 删除计划车 + terminalTwo: '终 端:', + trainNumber: '车 次 号:', + deletePlanTrain: '删除计划车', - // 车 次 号: - // 目的 - // 终  端: - // 请选择 - // 车 次 号: - // 确定 - // 取 消 - // 请输入车次号 - // 请输入前车车次号 - // 请选择终端 - // 平移计划车 + purpose: '目的', + inputFrontNumber: '请输入前车车次号', + panPlanCar: '平移计划车' }, platform: '站台', arrivalTime: '到点', diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/trainAdd.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/trainAdd.vue index bf8dc4c48..94e09b20b 100644 --- a/src/jmap/theme/fuzhou_01/menus/menuDialog/trainAdd.vue +++ b/src/jmap/theme/fuzhou_01/menus/menuDialog/trainAdd.vue @@ -3,31 +3,32 @@ :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
- 添加位置 + {{$t('menu.menuDialog.addLocation')}}
- 终   端: - + {{$t('menu.menuDialog.terminalOne')}} + - + + {{$t('menu.menuDialog.frontTrainNumber')}}
- + - 确定 + {{$t('menu.menuDialog.confirm')}} - 取 消 + {{$t('menu.menuDialog.cancel')}} @@ -52,13 +53,13 @@ rules: { groupNumber: [ - { required: true, message: '请输入车次号', trigger: 'blur' } + { required: true, message: this.$t('menu.menuDialog.inputTrainNumber'), trigger: 'blur' } ], // trainNumberLimber: [ // { required: true, message: '请输入前车车次号', trigger: 'blur' } // ], stationStandCode: [ - { required: true, message: '请选择终端', trigger: 'change' } + { required: true, message: this.$t('menu.menuDialog.selectTerminal'), trigger: 'change' } ], }, operation: null, @@ -80,7 +81,7 @@ return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : ''; }, title() { - return '添加计划车' + return this.$t('menu.menuDialog.addPlanTrain') } }, mounted() { @@ -159,4 +160,8 @@ padding: 0 5px; background-color: #F0F0F0; } + #frontTrainNumber{ + line-height: 100%; + display: inline-block; + } \ No newline at end of file diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/trainDelete.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/trainDelete.vue index 2cc0045d3..29dabbd91 100644 --- a/src/jmap/theme/fuzhou_01/menus/menuDialog/trainDelete.vue +++ b/src/jmap/theme/fuzhou_01/menus/menuDialog/trainDelete.vue @@ -3,22 +3,22 @@ :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag> - 终  端: - + {{$t('menu.menuDialog.terminalTwo')}} + - + - 确定 + {{$t('menu.menuDialog.confirm')}} - 取 消 + {{$t('menu.menuDialog.cancel')}} @@ -42,10 +42,10 @@ rules: { groupNumber: [ - { required: true, message: '请输入车次号', trigger: 'blur' } + { required: true, message: this.$t('menu.menuDialog.inputTrainNumber'), trigger: 'blur' } ], stationStandCode: [ - { required: true, message: '请选择终端', trigger: 'change' } + { required: true, message: this.$t('menu.menuDialog.selectTerminal'), trigger: 'change' } ], }, operation: null, @@ -67,7 +67,7 @@ return this.dialogShow ? OperationEvent.Command.planTrain.delPlanTrain.domId : ''; }, title() { - return '删除计划车' + return this.$t('menu.menuDialog.deletePlanTrain') } }, mounted() { diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue index d437716e9..b57f51969 100644 --- a/src/jmap/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue +++ b/src/jmap/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue @@ -2,21 +2,21 @@ - +
- 目的 + {{$t('menu.menuDialog.purpose')}}
- 终  端: - + {{$t('menu.menuDialog.terminalTwo')}} + - +
@@ -24,10 +24,10 @@ - 确定 + {{$t('menu.menuDialog.confirm')}} - 取 消 + {{$t('menu.menuDialog.cancel')}} @@ -52,13 +52,13 @@ rules: { groupNumber: [ - { required: true, message: '请输入车次号', trigger: 'blur' } + { required: true, message: this.$t('menu.menuDialog.inputTrainNumber'), trigger: 'blur' } ], trainNumberLimber: [ - { required: true, message: '请输入前车车次号', trigger: 'blur' } + { required: true, message: this.$t('menu.menuDialog.inputFrontNumber'), trigger: 'blur' } ], stationStandCode: [ - { required: true, message: '请选择终端', trigger: 'change' } + { required: true, message: this.$t('menu.menuDialog.selectTerminal'), trigger: 'change' } ], }, operation: null, @@ -80,7 +80,7 @@ return this.dialogShow ? OperationEvent.Command.planTrain.translatPlanTrain.domId : ''; }, title() { - return '平移计划车' + return this.$t('menu.menuDialog.panPlanCar') } }, mounted() {