From 126fc80ea464e8b2f850499e9ad916444abb9acf Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Mon, 16 Sep 2019 08:56:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/en/menu.js | 151 ++++++++++-------- src/i18n/langs/en/tip.js | 3 +- src/i18n/langs/zh/menu.js | 27 +++- src/i18n/langs/zh/tip.js | 3 +- .../childDialog/childDialog/noticeInfo.vue | 10 +- .../dialog/childDialog/confirmControl.vue | 24 +-- .../childDialog/confirmControlSpeed.vue | 14 +- .../childDialog/confirmSignalUnlock.vue | 10 +- .../menus/dialog/childDialog/confirmTrain.vue | 18 +-- .../menus/dialog/routeCmdControl.vue | 4 +- 10 files changed, 150 insertions(+), 114 deletions(-) diff --git a/src/i18n/langs/en/menu.js b/src/i18n/langs/en/menu.js index 87d8fea95..ebf9795e0 100644 --- a/src/i18n/langs/en/menu.js +++ b/src/i18n/langs/en/menu.js @@ -61,71 +61,90 @@ export default { }, menuTrain: { - + addTrainIdentificationNumber: 'Add train identification number', + modifyTrainIdentificationNumber: 'Modify train identification number', + deleteTrainIdentificationNumber: 'Delete train identification number', + moveTrainIdentificationNumber: 'Move train identification number', + exchangeTrainIdentificationNumber: 'Exchange train identification number', + modifyTrainGroupNumber: 'Modify train group number' }, - platform: 'Platform', - arrivalTime: 'Arrival time', - stopTime: 'Stop time', - departureTime: 'Departure time', - runLevel: 'Run level', - serviceNumber: 'Service number', - tripNumber: 'Trip number', - stationName: 'Station name:', - stationKilometerMark: 'Station kilometer mark:', - arrivalTime2: 'Arrival time:', - file: 'File(F)', - view: 'View(V)', - edit: 'Edit(E)', - tool: 'Tool(T)', - help: 'help(H)', - viewPlanList: 'View plan list', - createAWeekPlan: 'Create a week plan', - loadTheDayPlan: 'Load the day plan', - achieving: 'Achieving......', - addToTheFront: 'Add to the front', - addToTheEnd: 'Add to the end', - crossing: 'Crossing', - date: 'Date', - name: 'Name', - address: 'Address', - displaysDefaultStopTimesAndRunLevels: 'Displays default stop times and run levels', - addTask: 'Add task', - runGraphName: 'Run graph name', - skinType: 'Skin type', - selectTemplateRunGraph: 'Select template run graph', - load: 'load', - plannedDateRange: 'Planned date range', - deleteAllPreviousTasks: 'Delete all previous tasks (including this task)', - deleteAllSubsequentTasks: 'Delete all subsequent tasks (including this task)', - deleteTask: 'Delete task', - deleteTheDayPlan: 'Delete the day plan', - mapName: 'Map name', - loadDate: 'Load date', - operationChartSchedule: 'Operation chart schedule', - trainLine: 'Train line', - startStation: 'Start station', - startPlatform: 'Start platform', - terminal: 'Terminal', - endPlatform: 'End platform', - addTask2: 'Add task', - deleteTask2: 'Delete task', - replace: 'replace', - inTheLibrary: 'In the library', - outOfTheLibrary: 'Out of the library', - changeTripNumber: 'Change trip number', - lineStartTime: 'Line start time', - lineEndTime: 'Line end time', - lineDetails: 'Line details', - station: 'Station', - affectSubsequentTasks: 'Affect subsequent tasks', - manual: 'manual', - defaultStopTime: 'Default stop time', - clearGuest: 'Clear guest', - continuationPlan: 'Continuation plan', - firstTrain: 'First train', - serialNumber: 'Serial number', - defaultRunLevel: 'Default run level', - lastTrain: 'Last train', - description: 'Description', - modifyTask: 'Modify task' + platform: 'Platform', + arrivalTime: 'Arrival time', + stopTime: 'Stop time', + departureTime: 'Departure time', + runLevel: 'Run level', + serviceNumber: 'Service number', + tripNumber: 'Trip number', + stationName: 'Station name:', + stationKilometerMark: 'Station kilometer mark:', + arrivalTime2: 'Arrival time:', + file: 'File(F)', + view: 'View(V)', + edit: 'Edit(E)', + tool: 'Tool(T)', + help: 'help(H)', + viewPlanList: 'View plan list', + createAWeekPlan: 'Create a week plan', + loadTheDayPlan: 'Load the day plan', + achieving: 'Achieving......', + addToTheFront: 'Add to the front', + addToTheEnd: 'Add to the end', + crossing: 'Crossing', + date: 'Date', + name: 'Name', + address: 'Address', + displaysDefaultStopTimesAndRunLevels: 'Displays default stop times and run levels', + addTask: 'Add task', + runGraphName: 'Run graph name', + skinType: 'Skin type', + selectTemplateRunGraph: 'Select template run graph', + load: 'load', + plannedDateRange: 'Planned date range', + deleteAllPreviousTasks: 'Delete all previous tasks (including this task)', + deleteAllSubsequentTasks: 'Delete all subsequent tasks (including this task)', + deleteTask: 'Delete task', + deleteTheDayPlan: 'Delete the day plan', + mapName: 'Map name', + loadDate: 'Load date', + operationChartSchedule: 'Operation chart schedule', + trainLine: 'Train line', + startStation: 'Start station', + startPlatform: 'Start platform', + terminal: 'Terminal', + endPlatform: 'End platform', + addTask2: 'Add task', + deleteTask2: 'Delete task', + replace: 'replace', + inTheLibrary: 'In the library', + outOfTheLibrary: 'Out of the library', + changeTripNumber: 'Change trip number', + lineStartTime: 'Line start time', + lineEndTime: 'Line end time', + lineDetails: 'Line details', + station: 'Station', + affectSubsequentTasks: 'Affect subsequent tasks', + manual: 'manual', + defaultStopTime: 'Default stop time', + clearGuest: 'Clear guest', + continuationPlan: 'Continuation plan', + firstTrain: 'First train', + serialNumber: 'Serial number', + defaultRunLevel: 'Default run level', + lastTrain: 'Last train', + description: 'Description', + modifyTask: 'Modify task', + accessSetting: 'Access setting', + signalOff: 'SignalOff', + signalReopening: 'Signal reopening', + cancelTheWay: 'Cancel the way', + approachManualControl: 'Approach manual control', + accessToATSAutomaticControl: 'Access to ATS automatic control', + setTheRunLevel: 'Set the run level', + setTheFoldbackStrategy: 'Set the foldback strategy', + turnoutSettingSpeedLimit: 'Turnout setting speed limit', + turnoutCancelsSpeedLimit: 'Turnout cancels speed limit', + signalDeblocking: 'Signal deblocking', + in: 'In the', + signalConfirmed: 'signal, the signal is unlocked, is it confirmed?', + commandInformation: 'Command information' }; diff --git a/src/i18n/langs/en/tip.js b/src/i18n/langs/en/tip.js index 192073de3..a7e03fabd 100644 --- a/src/i18n/langs/en/tip.js +++ b/src/i18n/langs/en/tip.js @@ -151,5 +151,6 @@ export default { generateUserDailyRunGraphFailed: 'Generate user daily run graph failed', createRunChartPlanSuccessfully: 'Create a run chart plan successfully', createRunChartPlanFailed: 'Create run chart plan failed', - deleteTheRunningGraphLoadedTheNextDay: 'This operation will delete the running graph loaded the next day, will it continue?' + deleteTheRunningGraphLoadedTheNextDay: 'This operation will delete the running graph loaded the next day, will it continue?', + commandFailed: 'Command failed' }; diff --git a/src/i18n/langs/zh/menu.js b/src/i18n/langs/zh/menu.js index 659975a5a..abbad857f 100644 --- a/src/i18n/langs/zh/menu.js +++ b/src/i18n/langs/zh/menu.js @@ -113,12 +113,13 @@ export default { // 取消故障 }, menuTrain: { - // 添加列车识别号 - // 删除列车识别号 - // 修改列车识别号 + addTrainIdentificationNumber: '添加列车识别号', + modifyTrainIdentificationNumber: '修改列车识别号', + deleteTrainIdentificationNumber: '删除列车识别号', + moveTrainIdentificationNumber: '移动列车识别号', + exchangeTrainIdentificationNumber: '交换列车识别号', + modifyTrainGroupNumber: '修改车组号' // 修改车组号 - // 移动列车识别号 - // 交换列车识别号 // 设置通信故障 // 取消通信故障 // 确认运行至前方站 @@ -187,5 +188,19 @@ export default { defaultRunLevel: '缺省运行等级', lastTrain: '模板车', description: '描述', - modifyTask: '修改任务' + modifyTask: '修改任务', + accessSetting: '进路设置', + signalOff: '信号关灯', + signalReopening: '信号重开', + cancelTheWay: '取消进路', + approachManualControl: '进路交人工控', + accessToATSAutomaticControl: '进路交ATS自动控', + setTheRunLevel: '设置运行等级', + setTheFoldbackStrategy: '设置折返策略', + turnoutSettingSpeedLimit: '道岔设置限速', + turnoutCancelsSpeedLimit: '道岔取消限速', + signalDeblocking: '信号解封', + in: '在', + signalConfirmed: '信号机，信号解锁，确认下达吗？', + commandInformation: '命令信息' }; diff --git a/src/i18n/langs/zh/tip.js b/src/i18n/langs/zh/tip.js index b296bf5a2..a92b07dce 100644 --- a/src/i18n/langs/zh/tip.js +++ b/src/i18n/langs/zh/tip.js @@ -155,5 +155,6 @@ export default { generateUserDailyRunGraphFailed: '生成用户每日运行图成失败', createRunChartPlanSuccessfully: '创建运行图计划成功', createRunChartPlanFailed: '创建运行图计划失败', - deleteTheRunningGraphLoadedTheNextDay: '此操作将删除次日加载的运行图, 是否继续?' + deleteTheRunningGraphLoadedTheNextDay: '此操作将删除次日加载的运行图, 是否继续?', + commandFailed: '命令下达失败' }; diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/childDialog/noticeInfo.vue b/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/childDialog/noticeInfo.vue index 8c0fa7ed6..d4d9d5c30 100644 --- a/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/childDialog/noticeInfo.vue +++ b/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/childDialog/noticeInfo.vue @@ -8,7 +8,7 @@ - 确定 + {{$t('global.confirm')}} @@ -23,7 +23,7 @@ data() { return { dialogShow: false, - messages: ['命令下达失败'], + messages: [this.$t('tip.commandFailed')], operate: null } }, @@ -32,7 +32,7 @@ return this.dialogShow && !this.$store.state.menuOperation.break; }, title() { - return '提示'; + return this.$t('tip.hint'); }, domIdSure() { return this.dialogShow ? OperationEvent.Command.close.notice.domId : ''; @@ -47,7 +47,7 @@ doShow(operate, messages) { this.operate = operate || {}; this.dialogShow = true; - this.messages = ['命令下达失败']; + this.messages = [this.$t('tip.commandFailed')]; if (messages) { this.messages = messages; } @@ -74,4 +74,4 @@ padding-bottom: 40px !important; border: 1px solid lightgray; } - \ No newline at end of file + diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue b/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue index 720e0baa5..678384b32 100644 --- a/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue +++ b/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue @@ -8,10 +8,10 @@ - 确定 + {{$t('global.confirm')}} - 取 消 + {{$t('global.cancel')}} @@ -42,23 +42,23 @@ }, title() { if (this.operation === OperationEvent.Signal.arrangementRoute.menu.operation) { - return '进路设置'; + return this.$t('menu.accessSetting'); } else if (this.operation === OperationEvent.Signal.signalClose.menu.operation) { - return '信号关灯'; + return this.$t('menu.signalOff'); } else if (this.operation === OperationEvent.Signal.reopenSignal.menu.operation) { - return '信号重开'; + return this.$t('menu.signalReopening'); } else if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) { - return '取消进路'; + return this.$t('menu.cancelTheWay'); } else if (this.operation === OperationEvent.Signal.humanControl.menu.operation) { - return '进路交人工控'; + return this.$t('menu.approachManualControl'); } else if (this.operation === OperationEvent.Signal.atsAutoControl.menu.operation) { - return '进路交ATS自动控' + return this.$t('menu.accessToATSAutomaticControl'); } else if (this.operation === OperationEvent.StationStand.setRunLevel.menu.operation) { - return '设置运行等级'; + return this.$t('menu.setTheRunLevel'); } else if (this.operation === OperationEvent.StationStand.setStopTime.menu.operation) { - return '停站时间'; + return this.$t('menu.stopTime'); } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) { - return '设置折返策略'; + return this.$t('menu.setTheFoldbackStrategy'); } }, domIdCancel() { @@ -357,4 +357,4 @@ padding-bottom: 40px !important; border: 1px solid lightgray; } - \ No newline at end of file + diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmControlSpeed.vue index e7611354b..5a9e2ada6 100644 --- a/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmControlSpeed.vue +++ b/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmControlSpeed.vue @@ -6,10 +6,10 @@ - 确定 + {{$t('global.confirm')}} - 取 消 + {{$t('global.cancel')}} @@ -36,13 +36,13 @@ title() { if (this.dialogShow) { if (this.operation === OperationEvent.Section.setSpeed.order.operation) { - return "区段设置限速"; + return this.$t('menu.menuSection.sectionSetSpeedLimit'); } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) { - return "区段取消限速"; + return this.$t('menu.menuSection.sectionCancelSpeedLimit'); } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) { - return "道岔设置限速"; + return this.$t('menu.switchSettingSpeedLimit'); } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) { - return "道岔取消限速"; + return this.$t('menu.menuSection.sectionCancelSpeedLimit'); } } }, @@ -150,4 +150,4 @@ padding-bottom: 40px !important; border: 1px solid lightgray; } - \ No newline at end of file + diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue b/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue index a79c917f9..4a3f6ddb3 100644 --- a/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue +++ b/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue @@ -2,14 +2,14 @@
- 在{{stationName}}【{{signalName}}】信号机，信号解锁，确认下达吗？ + {{$t('menu.in')}}{{stationName}}【{{signalName}}】{{$t('menu.signalConfirmed')}}
- 确定 + {{$t('global.confirm')}} - 取 消 + {{$t('global.cancel')}} @@ -33,7 +33,7 @@ return this.dialogShow && !this.$store.state.menuOperation.break; }, title() { - return '信号解封' + return this.$t('menu.signalDeblocking') }, domIdCancel() { return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; @@ -115,4 +115,4 @@ padding-bottom: 40px !important; border: 1px solid lightgray; } - \ No newline at end of file + diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmTrain.vue b/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmTrain.vue index 8c8d9299e..e7a187b26 100644 --- a/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmTrain.vue +++ b/src/jmap/theme/fuzhou_01/menus/dialog/childDialog/confirmTrain.vue @@ -8,10 +8,10 @@ - 确定 + {{$t('global.confirm')}} - 取 消 + {{$t('global.cancel')}} @@ -42,17 +42,17 @@ }, title() { if (this.operation === OperationEvent.Train.addTrainId.menu.operation) { - return '添加列车识别号'; + return this.$t('menu.menuTrain.addTrainIdentificationNumber'); } else if (this.operation === OperationEvent.Train.editTrainId.menu.operation) { - return '修改列车识别号'; + return this.$t('menu.menuTrain.modifyTrainIdentificationNumber'); } else if (this.operation === OperationEvent.Train.delTrainId.menu.operation) { - return '删除列车识别号'; + return this.$t('menu.menuTrain.deleteTrainIdentificationNumber'); } else if (this.operation === OperationEvent.Train.moveTrainId.menu.operation) { - return '移动列车识别号'; + return this.$t('menu.menuTrain.moveTrainIdentificationNumber'); } else if (this.operation === OperationEvent.Train.switchTrainId.menu.operation) { - return '交换列车识别号'; + return this.$t('menu.menuTrain.exchangeTrainIdentificationNumber'); } else if (this.operation === OperationEvent.Train.editTrainNo.menu.operation) { - return '修改车组号' + return this.$t('menu.menuTrain.modifyTrainGroupNumber'); } }, domIdCancel() { @@ -165,4 +165,4 @@ padding-bottom: 40px !important; border: 1px solid lightgray; } - \ No newline at end of file + diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/routeCmdControl.vue b/src/jmap/theme/fuzhou_01/menus/dialog/routeCmdControl.vue index 24aa4389b..ff2b3f121 100644 --- a/src/jmap/theme/fuzhou_01/menus/dialog/routeCmdControl.vue +++ b/src/jmap/theme/fuzhou_01/menus/dialog/routeCmdControl.vue @@ -3,7 +3,7 @@
- 命令信息 + {{$t('menu.commandInformation')}} @@ -427,4 +427,4 @@ } } } - \ No newline at end of file +