diff --git a/src/i18n/langs/en/global.js b/src/i18n/langs/en/global.js index 5d537b683..bc7046640 100644 --- a/src/i18n/langs/en/global.js +++ b/src/i18n/langs/en/global.js @@ -141,7 +141,7 @@ export default { append: 'Append', release: 'Release', temporarilyNoData: 'Temporarily no data', - second: 'Second', + second: 'Seconds', amount: 'Amount', yes: 'Yes', no: 'No', diff --git a/src/i18n/langs/en/menu.js b/src/i18n/langs/en/menu.js index 6d916df14..d6304ad50 100644 --- a/src/i18n/langs/en/menu.js +++ b/src/i18n/langs/en/menu.js @@ -1,3 +1,29 @@ export default { - + menuBar: { + system: 'System', + view: 'View', + refresh: 'Refresh', + display: 'Display', + setTrainIdDisplay: 'Set TrainId Display', + setNameDisplay: 'Set Name Display', + setDeviceDisplay: 'Set Device Display', + stationMapSwitch: 'StationMapSwitch', + controlModeSwitch: 'ControlModeSwitch', + toStationControl: 'Switch Station Control', + forcedStationControl: 'Forced Station Control', + toCentralControl: 'Switch Central Control', + requestOperationArea: 'RequestOperationArea', + historyQuery: 'HistoryQuery', + userManage: 'UserManage', + help: 'Help', + about: 'ControlMonitor(A)', + planCarOperation: 'PlanCarOperation', + addPlanCar: 'Add Plan Car', + panPlanCar: 'Pan Plan Car', + deletePlanCar: 'Delete Plan Car', + trainNumberMaintenance: 'TrainNumberMaintenance', + schedulingLog: 'SchedulingLog', + systemAnalysis: 'SystemAnalysis', + implemented: 'implementing......' + } }; diff --git a/src/i18n/langs/en/teach.js b/src/i18n/langs/en/teach.js index 5c491a14e..d145ed68a 100644 --- a/src/i18n/langs/en/teach.js +++ b/src/i18n/langs/en/teach.js @@ -15,5 +15,6 @@ export default { buy: 'buy', permissionDistribute: 'Permission distribution (class)', authorityTransferred: 'Authority transferred', - courseList: 'Course list' + courseList: 'Course list', + seconds: 'seconds' }; diff --git a/src/i18n/langs/zh/menu.js b/src/i18n/langs/zh/menu.js index 6d916df14..c6ee8164b 100644 --- a/src/i18n/langs/zh/menu.js +++ b/src/i18n/langs/zh/menu.js @@ -1,3 +1,29 @@ export default { - + menuBar: { + system: '系统', + view: '查看', + refresh: '刷新', + display: '显示', + setTrainIdDisplay: '设置列车识别号显示', + setNameDisplay: '设置名称显示', + setDeviceDisplay: '设置设备显示', + stationMapSwitch: '站场图切换', + controlModeSwitch: '控制模式转换', + toStationControl: '转为站控', + forcedStationControl: '强制站控', + toCentralControl: '转为中控', + requestOperationArea: '请求操作区域', + historyQuery: '历史查询', + userManage: '用户管理', + help: '帮助', + about: '关于ControlMonitor(A)', + planCarOperation: '计划车操作', + addPlanCar: '添加计划车', + panPlanCar: '平移计划车', + deletePlanCar: '删除计划车', + trainNumberMaintenance: '车次号维护', + schedulingLog: '调度日志', + systemAnalysis: '系统分析', + implemented: '实现中......' + } }; diff --git a/src/i18n/langs/zh/teach.js b/src/i18n/langs/zh/teach.js index 4a148e78d..cb98b896c 100644 --- a/src/i18n/langs/zh/teach.js +++ b/src/i18n/langs/zh/teach.js @@ -15,5 +15,6 @@ export default { buy: '购买', permissionDistribute: '权限分发(上课)', authorityTransferred: '权限转赠', - courseList: '课程列表' + courseList: '课程列表', + seconds: '秒' }; diff --git a/src/jmap/theme/fuzhou_01/menus/menuBar.vue b/src/jmap/theme/fuzhou_01/menus/menuBar.vue index 8201a6251..2db14d703 100644 --- a/src/jmap/theme/fuzhou_01/menus/menuBar.vue +++ b/src/jmap/theme/fuzhou_01/menus/menuBar.vue @@ -134,70 +134,70 @@ export default { menuNormal: { local: [ { - title: '系统', + title: this.$t('menu.menuBar.system'), operate: OperationEvent.Command.mBar.system, click: this.undeveloped, children: [ ] }, { - title: '查看', + title: this.$t('menu.menuBar.view'), operate: OperationEvent.Command.mBar.check, click: this.undeveloped, children: [ ] }, { - title: '刷新', + title: this.$t('menu.menuBar.refresh'), operate: OperationEvent.Command.mBar.fresh, click: this.refresh, children: [ ] }, { - title: '显示', + title: this.$t('menu.menuBar.display'), operate: OperationEvent.Command.mBar.view, children: [ { - title: '设置列车识别号显示', + title: this.$t('menu.menuBar.setTrainIdDisplay'), click: this.setTrainIdDisplay, operate: OperationEvent.Command.view.setTrainIdDisplay }, { - title: '设置名称显示', + title: this.$t('menu.menuBar.setNameDisplay'), click: this.setNameDisplay, operate: OperationEvent.Command.view.setNameDisplay }, { - title: '设置设备显示', + title: this.$t('menu.menuBar.setDeviceDisplay'), click: this.setDeviceDisplay, operate: OperationEvent.Command.view.setDeviceDisplay } ] }, { - title: '站场图切换', + title: this.$t('menu.menuBar.stationMapSwitch'), operate: '', click: this.undeveloped, children: [ ] }, { - title: '控制模式转换', + title: this.$t('menu.menuBar.controlModeSwitch'), operate: OperationEvent.Command.mBar.remoteControl, children: [ { - title: '转为站控', + title: this.$t('menu.menuBar.toStationControl'), click: this.turnToStationControl, operate: OperationEvent.StationControl.requestStationControl.mbar }, { - title: '强制站控', + title: this.$t('menu.menuBar.forcedStationControl'), click: this.mandatoryStationControl, operate: OperationEvent.StationControl.forcedStationControl.password }, { - title: '转为中控', + title: this.$t('menu.menuBar.toCentralControl'), click: this.conterStationControl, operate: OperationEvent.StationControl.requestCentralControl.mbar, froce: true @@ -205,36 +205,36 @@ export default { ] }, { - title: '请求操作区域', + title: this.$t('menu.menuBar.requestOperationArea'), operate: OperationEvent.Command.mBar.requestZone, click: this.undeveloped, children: [ ] }, { - title: '历史查询', + title: this.$t('menu.menuBar.historyQuery'), operate: OperationEvent.Command.mBar.historyQuery, click: this.undeveloped, children: [ ] }, { - title: '用户管理', + title: this.$t('menu.menuBar.userManage'), operate: OperationEvent.Command.mBar.userManage, children: [ { - title: '用户管理', + title: this.$t('menu.menuBar.userManage'), click: this.userManage, operate: OperationEvent.Command.manage.userManage } ] }, { - title: '帮助', + title: this.$t('menu.menuBar.help'), operate: OperationEvent.Command.mBar.help, children: [ { - title: '关于ControlMonitor(A)', + title: this.$t('menu.menuBar.about'), click: this.about, operate: OperationEvent.Command.help.about } @@ -243,150 +243,150 @@ export default { ], central: [ { - title: '系统', + title: this.$t('menu.menuBar.system'), operate: OperationEvent.Command.mBar.system, click: this.undeveloped, children: [ ] }, { - title: '查看', + title: this.$t('menu.menuBar.view'), operate: OperationEvent.Command.mBar.check, click: this.undeveloped, children: [ ] }, { - title: '刷新', + title: this.$t('menu.menuBar.refresh'), operate: OperationEvent.Command.mBar.fresh, click: this.refresh, children: [ ] }, { - title: '显示', + title: this.$t('menu.menuBar.display'), operate: OperationEvent.Command.mBar.view, children: [ { - title: '设置列车识别号显示', + title: this.$t('menu.menuBar.setTrainIdDisplay'), click: this.setTrainIdDisplay, operate: OperationEvent.Command.view.setTrainIdDisplay }, { - title: '设置名称显示', + title: this.$t('menu.menuBar.setNameDisplay'), click: this.setNameDisplay, operate: OperationEvent.Command.view.setNameDisplay }, { - title: '设置设备显示', + title: this.$t('menu.menuBar.setDeviceDisplay'), click: this.setDeviceDisplay, operate: OperationEvent.Command.view.setDeviceDisplay } ] }, { - title: '站场图切换', + title: this.$t('menu.menuBar.stationMapSwitch'), operate: '', click: this.undeveloped, children: [ ] }, { - title: '计划车操作', + title: this.$t('menu.menuBar.planCarOperation'), operate: OperationEvent.Command.mBar.planTrain, children: [ { - title: '添加计划车', + title: this.$t('menu.menuBar.addPlanCar'), click: this.addPlanTrain, operate: OperationEvent.Command.planTrain.addPlanTrain }, { - title: '平移计划车', + title: this.$t('menu.menuBar.panPlanCar'), click: this.translatPlanTrain, operate: OperationEvent.Command.planTrain.translatPlanTrain }, { - title: '删除计划车', + title: this.$t('menu.menuBar.deletePlanCar'), click: this.delPlanTrain, operate: OperationEvent.Command.planTrain.delPlanTrain } ] }, { - title: '车次号维护', + title: this.$t('menu.menuBar.trainNumberMaintenance'), operate: '', click: this.undeveloped, children: [ ] }, { - title: '控制模式转换', + title: this.$t('menu.menuBar.controlModeSwitch'), operate: OperationEvent.Command.mBar.remoteControl, children: [ { - title: '转为站控', + title: this.$t('menu.menuBar.toStationControl'), click: this.turnToStationControl, operate: OperationEvent.StationControl.requestStationControl.mbar, froce: true }, { - title: '强制站控', + title: this.$t('menu.menuBar.forcedStationControl'), click: this.mandatoryStationControl, operate: OperationEvent.StationControl.forcedStationControl.password, froce: true }, { - title: '转为中控', + title: this.$t('menu.menuBar.toCentralControl'), click: this.conterStationControl, operate: OperationEvent.StationControl.requestCentralControl.mbar } ] }, { - title: '请求操作区域', + title: this.$t('menu.menuBar.requestOperationArea'), operate: OperationEvent.Command.mBar.requestZone, click: this.undeveloped, children: [ ] }, { - title: '调度日志', + title: this.$t('menu.menuBar.schedulingLog'), operate: '', click: this.undeveloped, children: [ ] }, { - title: '系统分析', + title: this.$t('menu.menuBar.systemAnalysis'), operate: '', click: this.undeveloped, children: [ ] }, { - title: '用户管理', + title: this.$t('menu.menuBar.userManage'), operate: OperationEvent.Command.mBar.userManage, children: [ { - title: '用户管理', + title: this.$t('menu.menuBar.userManage'), click: this.userManage, operate: OperationEvent.Command.manage.userManage } ] }, { - title: '历史查询', + title: this.$t('menu.menuBar.historyQuery'), operate: OperationEvent.Command.mBar.historyQuery, click: this.undeveloped, children: [ ] }, { - title: '帮助', + title: this.$t('menu.menuBar.help'), operate: OperationEvent.Command.mBar.help, children: [ { - title: '关于ControlMonitor(A)', + title: this.$t('menu.menuBar.about'), click: this.about, operate: OperationEvent.Command.help.about } @@ -689,8 +689,9 @@ export default { }, undeveloped() { this.doClose(); - this.$alert('实现中......', '提示', { - confirmButtonText: '确定', + + this.$alert(this.$t('menu.menuBar.implemented'), this.$t('global.tips'), { + confirmButtonText: this.$t('global.confirm'), callback: action => { } }); diff --git a/src/views/teach/practical/index.vue b/src/views/teach/practical/index.vue index 5845fb890..96123d98a 100644 --- a/src/views/teach/practical/index.vue +++ b/src/views/teach/practical/index.vue @@ -7,11 +7,11 @@

{{ $t('teach.trainingTime') }} - {{ courseModel.minDuration | setTime }} 秒 + {{ courseModel.minDuration | setTime }} {{ $t('teach.seconds') }}

{{ $t('teach.trainingMaximum') }} - {{ courseModel.maxDuration | setTime }} 秒 + {{ courseModel.maxDuration | setTime }} {{ $t('teach.seconds') }}

{{ $t('teach.trainingInstructions') }}