From d9b8f1e8fd8e4ad1fb4813b5f633089d4ce275f7 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 12 Sep 2019 17:28:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E8=B0=83=E6=95=B4=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/menu.js | 66 ++++++++++++++++- src/i18n/langs/en/rules.js | 6 +- src/i18n/langs/en/tip.js | 7 +- src/i18n/langs/zh/error.js | 4 +- src/i18n/langs/zh/global.js | 4 +- src/i18n/langs/zh/menu.js | 66 ++++++++++++++++- src/i18n/langs/zh/rules.js | 6 +- src/i18n/langs/zh/tip.js | 7 +- .../theme/fuzhou_01/menusPlan/addTask.vue | 44 ++++++------ .../menusPlan/chooseTemplatePlan.vue | 16 ++--- .../fuzhou_01/menusPlan/createTodayPlan.vue | 24 +++---- .../fuzhou_01/menusPlan/createWeekPlan.vue | 24 +++---- .../theme/fuzhou_01/menusPlan/deleteTask.vue | 10 +-- .../fuzhou_01/menusPlan/deleteTodayPlan.vue | 6 +- .../fuzhou_01/menusPlan/managePlanList.vue | 24 +++---- .../fuzhou_01/menusPlan/modifyingPlan.vue | 46 ++++++------ .../fuzhou_01/menusPlan/modifyingTask.vue | 70 +++++++++---------- .../theme/fuzhou_01/planSchedule/menuBar.vue | 31 ++++---- .../theme/fuzhou_01/planSchedule/schedule.vue | 12 ++-- .../fuzhou_01/planSchedule/statusBar.vue | 10 +-- 22 files changed, 322 insertions(+), 168 deletions(-) diff --git a/src/i18n/langs/en/error.js b/src/i18n/langs/en/error.js index 902cfb36a..f820c8816 100644 --- a/src/i18n/langs/en/error.js +++ b/src/i18n/langs/en/error.js @@ -87,5 +87,7 @@ export default { 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!' + exceededTheTotalNumberOfAssignableRoles: 'The number of assigned roles has exceeded the total number of assignable roles!', + getRunGraphDataFailed: 'Failed to get run graph data', + getStationListFail: 'Failed to get station list' }; diff --git a/src/i18n/langs/en/global.js b/src/i18n/langs/en/global.js index 5d537b683..e709fbf3e 100644 --- a/src/i18n/langs/en/global.js +++ b/src/i18n/langs/en/global.js @@ -146,5 +146,6 @@ export default { yes: 'Yes', no: 'No', details: 'Details', - enterNameToFilter: 'Enter a name to filter' + enterNameToFilter: 'Enter a name to filter', + colon: ':' }; diff --git a/src/i18n/langs/en/menu.js b/src/i18n/langs/en/menu.js index 6d916df14..9109fbba4 100644 --- a/src/i18n/langs/en/menu.js +++ b/src/i18n/langs/en/menu.js @@ -1,3 +1,67 @@ export default { - + 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' }; diff --git a/src/i18n/langs/en/rules.js b/src/i18n/langs/en/rules.js index f114d40de..328068be0 100644 --- a/src/i18n/langs/en/rules.js +++ b/src/i18n/langs/en/rules.js @@ -253,5 +253,9 @@ export default { selectTheCourseNameFirst: 'Please select the course name first', selectMultiplePermissions: 'Please select multiple permissions', enterPermissionName: 'Please enter a permission name', - pleaseSelectPermission: 'Please select permission' + pleaseSelectPermission: 'Please select permission', + pleaseSelectTemplateRunGraph: 'Please select a template to run the diagram', + selectTheRunningDiagramToBeLoaded: 'Please select the running diagram to be loaded', + selectOneOrMoreDates: 'Select one or more dates', + selectAPlannedDateRange: 'Please select a planned date range' }; diff --git a/src/i18n/langs/en/tip.js b/src/i18n/langs/en/tip.js index c0332c76a..fd14ac98e 100644 --- a/src/i18n/langs/en/tip.js +++ b/src/i18n/langs/en/tip.js @@ -141,5 +141,10 @@ export default { 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!' + contentIsEmptyAndCannotBeSent: 'The content is empty and cannot be sent!', + generateUserDailyRunGraphSuccessfully: 'Generate user daily run graph successfully', + 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?' }; diff --git a/src/i18n/langs/zh/error.js b/src/i18n/langs/zh/error.js index 9cc2977b0..3bfd295fe 100644 --- a/src/i18n/langs/zh/error.js +++ b/src/i18n/langs/zh/error.js @@ -87,5 +87,7 @@ export default { startedComprehensiveDrillFailure: '开始综合演练失败。', stationAttendantStationCannotBeEmpty: '值班员所属车站不能为空', destroyedRoomFailed: '销毁房间失败！', - exceededTheTotalNumberOfAssignableRoles: '分配角色数量已超过可分配角色总数！' + exceededTheTotalNumberOfAssignableRoles: '分配角色数量已超过可分配角色总数！', + getRunGraphDataFailed: '获取运行图数据失败', + getStationListFail: '获取车站列表失败' }; diff --git a/src/i18n/langs/zh/global.js b/src/i18n/langs/zh/global.js index 2c8e3ea98..77f6d2df8 100644 --- a/src/i18n/langs/zh/global.js +++ b/src/i18n/langs/zh/global.js @@ -65,7 +65,6 @@ export default { update: '更 新', return: '返 回', toBeDeveloped: '功能待开发', - choose: '选 择', yuan: '元', filteringKeywords: '输入关键字进行过滤', lastStep: '上一步', @@ -152,5 +151,6 @@ export default { yes: '是', no: '否', details: '详情', - enterNameToFilter: '输入名称进行过滤' + enterNameToFilter: '输入名称进行过滤', + colon: '：' }; diff --git a/src/i18n/langs/zh/menu.js b/src/i18n/langs/zh/menu.js index 6d916df14..cd7238012 100644 --- a/src/i18n/langs/zh/menu.js +++ b/src/i18n/langs/zh/menu.js @@ -1,3 +1,67 @@ export default { - + platform: '站台', + arrivalTime: '到点', + stopTime: '停站时间', + departureTime: '发点', + runLevel: '运行等级', + serviceNumber: '表号', + tripNumber: '车次号', + stationName: '车站名称：', + stationKilometerMark: '车站公里标：', + arrivalTime2: '到站时间：', + file: '文件（F）', + view: '显示（V）', + edit: '编辑（E）', + tool: '工具（T）', + help: '帮助（H）', + viewPlanList: '查看计划列表', + createAWeekPlan: '创建一周计划', + loadTheDayPlan: '加载当天计划', + achieving: '实现中......', + addToTheFront: '加在前面', + addToTheEnd: '加在最后', + crossing: '交路', + date: '日期', + name: '姓名', + address: '地址', + displaysDefaultStopTimesAndRunLevels: '显示默认停站时间和运行等级', + addTask: '添加任务', + runGraphName: '运行图名称', + skinType: '皮肤类型', + selectTemplateRunGraph: '选择模板运行图', + load: '加载', + plannedDateRange: '计划日期范围', + deleteAllPreviousTasks: '删除以前所有任务（包含本任务）', + deleteAllSubsequentTasks: '删除以后所有任务（包含本任务）', + deleteTask: '删除任务', + deleteTheDayPlan: '删除当天计划', + mapName: '地图名称', + loadDate: '加载日期', + operationChartSchedule: '运行图计划表', + trainLine: '列车线路', + startStation: '起点站', + startPlatform: '起点站台', + terminal: '终点站', + endPlatform: '终点站台', + addTask2: '加任务', + deleteTask2: '删任务', + replace: '替  换', + inTheLibrary: '进库', + outOfTheLibrary: '出库', + changeTripNumber: '改车次号', + lineStartTime: '线路开始时间', + lineEndTime: '线路结束时间', + lineDetails: '线路详细信息', + station: '车站', + affectSubsequentTasks: '影响后续任务', + manual: '手工', + defaultStopTime: '缺省停站时间', + clearGuest: '清客', + continuationPlan: '延续计划', + firstTrain: '首班车', + serialNumber: '序列号', + defaultRunLevel: '缺省运行等级', + lastTrain: '模板车', + description: '描述', + modifyTask: '修改任务' }; diff --git a/src/i18n/langs/zh/rules.js b/src/i18n/langs/zh/rules.js index f770c817b..ff4280796 100644 --- a/src/i18n/langs/zh/rules.js +++ b/src/i18n/langs/zh/rules.js @@ -263,5 +263,9 @@ export default { selectTheCourseNameFirst: '请先选择课程名称', selectMultiplePermissions: '请选择多个权限', enterPermissionName: '请输入权限名称', - pleaseSelectPermission: '请选择权限' + pleaseSelectPermission: '请选择权限', + pleaseSelectTemplateRunGraph: '请选择模板运行图', + selectTheRunningDiagramToBeLoaded: '请选择需要加载的运行图', + selectOneOrMoreDates: '选择一个或多个日期', + selectAPlannedDateRange: '请选择计划日期范围' }; diff --git a/src/i18n/langs/zh/tip.js b/src/i18n/langs/zh/tip.js index c0361c159..d03bf0b8d 100644 --- a/src/i18n/langs/zh/tip.js +++ b/src/i18n/langs/zh/tip.js @@ -145,5 +145,10 @@ export default { obtainedPermissionSuccessfully: '领取权限成功', modifyTheUserPermissionStatus: '此操作将修改用户权限状态?', destroyRoomHint: '您将销毁房间，是否确定执行此操作', - contentIsEmptyAndCannotBeSent: '内容为空，不可发送！' + contentIsEmptyAndCannotBeSent: '内容为空，不可发送！', + generateUserDailyRunGraphSuccessfully: '生成用户每日运行图成功', + generateUserDailyRunGraphFailed: '生成用户每日运行图成失败', + createRunChartPlanSuccessfully: '创建运行图计划成功', + createRunChartPlanFailed: '创建运行图计划失败', + deleteTheRunningGraphLoadedTheNextDay: '此操作将删除次日加载的运行图, 是否继续?' }; diff --git a/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue b/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue index 0e720a0c5..da41834cd 100644 --- a/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue +++ b/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue @@ -13,13 +13,13 @@
- 加在最前 + {{$t('menu.addToTheFront')}} - 车次号： + {{$t('menu.tripNumber') + $t('global.colon')}} - + - 开始时间： + {{$t('global.startTime') + $t('global.colon')}} - + - 加在最后 + {{$t('global.addToTheEnd')}} - 车次号： + {{$t('menu.tripNumber') + $t('global.colon')}} - + - 开始时间： + {{$t('global.startTime') + $t('global.colon')}} - + - 交路： + {{$t('menu.crossing') + $t('global.colon')}} - - - + + + - 详情： + {{$t('global.details') + $t('global.colon')}} - - - + + + - 显示默认停站时间和运行等级 + {{$t('menu.displaysDefaultStopTimesAndRunLevels')}}
- 确 定 - 取 消 + {{$t('global.confirm')}} + {{$t('global.cancel')}} @@ -133,7 +133,7 @@ export default { }, computed: { title() { - return '添加任务'; + return this.$t('menu.addTask'); } }, mounted() { diff --git a/src/jmap/theme/fuzhou_01/menusPlan/chooseTemplatePlan.vue b/src/jmap/theme/fuzhou_01/menusPlan/chooseTemplatePlan.vue index 2dbf053be..6fabe9ae7 100644 --- a/src/jmap/theme/fuzhou_01/menusPlan/chooseTemplatePlan.vue +++ b/src/jmap/theme/fuzhou_01/menusPlan/chooseTemplatePlan.vue @@ -11,8 +11,8 @@ > - 选 择 - 取 消 + {{$t('global.select')}} + {{$t('global.cancel')}} @@ -34,11 +34,11 @@ export default { }, queryForm: { reset: true, - labelWidth: '100px', + labelWidth: '120px', queryObject: { name: { type: 'text', - label: '运行图名称' + label: this.$t('menu.runGraphName') } } }, @@ -48,11 +48,11 @@ export default { radioShow: true, columns: [ { - title: '运行图名称', + title: this.$t('menu.runGraphName'), prop: 'name' }, { - title: '皮肤类型', + title: this.$t('menu.skinType'), prop: 'skinCode', type: 'tag', columnValue: (row) => { @@ -68,7 +68,7 @@ export default { }, computed: { title() { - return '选择模板运行图'; + return this.$t('menu.selectTemplateRunGraph'); } }, methods: { @@ -99,7 +99,7 @@ export default { this.$emit('chooseConfirm', choose); this.doClose(); } else { - this.$messageBox(`请选择模板运行图`); + this.$messageBox(this.$t('menu.pleaseSelectTemplateRunGraph')); } } }, diff --git a/src/jmap/theme/fuzhou_01/menusPlan/createTodayPlan.vue b/src/jmap/theme/fuzhou_01/menusPlan/createTodayPlan.vue index 5b813183a..7386807c3 100644 --- a/src/jmap/theme/fuzhou_01/menusPlan/createTodayPlan.vue +++ b/src/jmap/theme/fuzhou_01/menusPlan/createTodayPlan.vue @@ -11,8 +11,8 @@ > - 加 载 - 取 消 + {{$t('menu.load')}} + {{$t('global.cancel')}} @@ -36,11 +36,11 @@ export default { }, queryForm: { reset: true, - labelWidth: '100px', + labelWidth: '120px', queryObject: { name: { type: 'text', - label: '运行图名称' + label: this.$t('menu.runGraphName') } } }, @@ -50,11 +50,11 @@ export default { radioShow: true, columns: [ { - title: '运行图名称', + title: this.$t('menu.runGraphName'), prop: 'name' }, { - title: '皮肤类型', + title: this.$t('menu.skinType'), prop: 'skinCode', type: 'tag', columnValue: (row) => { @@ -70,7 +70,7 @@ export default { }, computed: { title() { - return '加载当天计划'; + return this.$t('menu.loadTheDayPlan'); } }, methods: { @@ -105,14 +105,14 @@ export default { this.reloadTable(); this.loadRunData(); this.doClose(); - this.$message.success(`生成用户每日运行图成功`); + this.$message.success(this.$t('tip.generateUserDailyRunGraphSuccessfully')); }).catch(() => { this.loading = false; this.reloadTable(); - this.$messageBox(`生成用户每日运行图失败`); + this.$messageBox(this.$t('tip.generateUserDailyRunGraphFailed')); }); } else { - this.$messageBox(`请选择需要加载的运行图`); + this.$messageBox(this.$t('rules.selectTheRunningDiagramToBeLoaded')); } } }, @@ -128,11 +128,11 @@ export default { this.$store.dispatch('runPlan/setPlanData', resp.data); }).catch(() => { this.$store.dispatch('runPlan/setPlanData', []); - this.$messageBox(`获取运行图数据失败`); + this.$messageBox(this.$t('error.getRunGraphDataFailed')); }); }); }).catch(() => { - this.$messageBox(`获取车站列表失败`); + this.$messageBox(this.$t('error.getStationListFail')); }); } }, diff --git a/src/jmap/theme/fuzhou_01/menusPlan/createWeekPlan.vue b/src/jmap/theme/fuzhou_01/menusPlan/createWeekPlan.vue index 7a7071d58..e2317098c 100644 --- a/src/jmap/theme/fuzhou_01/menusPlan/createWeekPlan.vue +++ b/src/jmap/theme/fuzhou_01/menusPlan/createWeekPlan.vue @@ -11,24 +11,24 @@ :close-on-click-modal="false" > - - + + - 选择 + {{this.$t('global.select')}} - + @@ -36,8 +36,8 @@ - 确 定 - 取 消 + {{$t('global.confirm')}} + {{$t('global.cancel')}} @@ -65,15 +65,15 @@ export default { }, computed: { title() { - return '创建一周计划'; + return this.$t('menu.createAWeekPlan'); }, rules() { const rules = { planId: [ - { required: true, message: '请选择模板运行图', trigger: 'blur' } + { required: true, message: this.$t('rules.inputTemplateRunPlan'), trigger: 'blur' } ], dateList: [ - { required: true, message: '请选择计划日期范围', trigger: 'change' } + { required: true, message: this.$t('rules.selectAPlannedDateRange'), trigger: 'change' } ] }; @@ -110,11 +110,11 @@ export default { this.$refs['form'].validate((valid) => { if (valid) { createRunPlanLoad(this.buildModel()).then(response => { - this.$message.success('创建运行图计划成功'); + this.$message.success(this.$t('tip.createRunChartPlanSuccessfully')); this.doClose(); }).catch(() => { this.doClose(); - this.$messageBox('创建运行图计划失败'); + this.$messageBox(this.$t('tip.createRunChartPlanFailed')); }); } }); diff --git a/src/jmap/theme/fuzhou_01/menusPlan/deleteTask.vue b/src/jmap/theme/fuzhou_01/menusPlan/deleteTask.vue index 4d6f216da..fc61cb683 100644 --- a/src/jmap/theme/fuzhou_01/menusPlan/deleteTask.vue +++ b/src/jmap/theme/fuzhou_01/menusPlan/deleteTask.vue @@ -11,14 +11,14 @@ :close-on-click-modal="false" > - 删除以前所有任务（包含本任务） + {{$t('menu.deleteAllPreviousTasks')}} - 删除以后所有任务（包含本任务） + {{$t('menu.deleteAllSubsequentTasks')}} - 确 定 - 取 消 + {{$t('global.confirm')}} + {{$t('global.cancel')}} @@ -40,7 +40,7 @@ export default { }, computed: { title() { - return '删除任务'; + return this.$t('menu.deleteTask'); } }, mounted() { diff --git a/src/jmap/theme/fuzhou_01/menusPlan/deleteTodayPlan.vue b/src/jmap/theme/fuzhou_01/menusPlan/deleteTodayPlan.vue index 295030d42..b2de44fca 100644 --- a/src/jmap/theme/fuzhou_01/menusPlan/deleteTodayPlan.vue +++ b/src/jmap/theme/fuzhou_01/menusPlan/deleteTodayPlan.vue @@ -11,8 +11,8 @@ :close-on-click-modal="false" > - 确 定 - 取 消 + {{$t('global.confirm')}} + {{$t('global.cancel')}} @@ -31,7 +31,7 @@ export default { }, computed: { title() { - return '删除当天计划'; + return this.$t('menu.deleteTheDayPlan'); } }, mounted() { diff --git a/src/jmap/theme/fuzhou_01/menusPlan/managePlanList.vue b/src/jmap/theme/fuzhou_01/menusPlan/managePlanList.vue index 0c93359ff..a82edc41e 100644 --- a/src/jmap/theme/fuzhou_01/menusPlan/managePlanList.vue +++ b/src/jmap/theme/fuzhou_01/menusPlan/managePlanList.vue @@ -38,30 +38,30 @@ export default { indexShow: true, columns: [ { - title: this.$t('publish.mapName'), + title: this.$t('menu.mapName'), prop: 'mapId', type: 'tag', columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); }, tagType: (row) => { return ''; } }, { - title: this.$t('publish.runPlanName'), + title: this.$t('menu.runGraphName'), prop: 'templatePlanId', type: 'tag', columnValue: (row) => { return this.$convertField(row.templatePlanId, this.templatePlanList, ['id', 'name']); }, tagType: (row) => { return 'success'; } }, { - title: '加载日期', + title: this.$t('menu.loadDate'), prop: 'loadTime' }, { type: 'button', - title: '操作', + title: this.$t('global.operate'), width: '100', buttons: [ { - name: '删除', + name: this.$t('global.delete'), handleClick: this.handleDelete, type: 'danger' } @@ -69,7 +69,7 @@ export default { } ], actions: [ - { text: '创建', btnCode: 'employee_insert', handler: this.handleCreateRunPlan } + { text: this.$t('global.create'), btnCode: 'employee_insert', handler: this.handleCreateRunPlan } ] }, @@ -78,7 +78,7 @@ export default { }, computed: { title() { - return '运行图计划表'; + return this.$t('menu.operationChartSchedule'); } }, mounted() { @@ -107,17 +107,17 @@ export default { return getRunPlanLoadList(params); }, handleDelete(index, row) { - this.$confirm('此操作将删除次日加载的运行图, 是否继续?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + this.$confirm(this.$t('tip.deleteTheRunningGraphLoadedTheNextDay'), this.$t('tip.hint'), { + confirmButtonText: this.$t('global.confirm'), + cancelButtonText: this.$t('global.cancel'), type: 'warning' }).then(() => { deleteRunPlanLoad(row.id).then(response => { - this.$message.success('删除成功'); + this.$message.success(this.$t('global.successfullyDelete')); this.reloadTable(); }).catch(() => { this.reloadTable(); - this.$messageBox('删除失败'); + this.$messageBox(this.$t('global.failDelete')); }); }).catch(() => { }); }, diff --git a/src/jmap/theme/fuzhou_01/menusPlan/modifyingPlan.vue b/src/jmap/theme/fuzhou_01/menusPlan/modifyingPlan.vue index 90bba4e44..683a52308 100644 --- a/src/jmap/theme/fuzhou_01/menusPlan/modifyingPlan.vue +++ b/src/jmap/theme/fuzhou_01/menusPlan/modifyingPlan.vue @@ -11,32 +11,32 @@ :close-on-click-modal="false" > - 列车线路 + {{$t('menu.trainLine')}} - - - - + + + + - 加任务 + {{this.$t('menu.addTask2')}} - 替  换 + {{this.$t('menu.replace')}} - 删任务 + {{this.$t('menu.deleteTask2')}}
- 进库 - 出库 + {{this.$t('menu.inTheLibrary')}} + {{this.$t('menu.outOfTheLibrary')}}
@@ -50,37 +50,37 @@ - 改车次号 + {{$t('menu.changeTripNumber')}} - 线路开始时间 + {{$t('menu.lineStartTime')}} - 线路结束时间 + {{$t('menu.lineEndTime')}} - 线路详细信息 + {{$t('menu.lineDetails')}} - - - - - + + + + + - 影响后续任务 + {{$t('menu.affectSubsequentTasks')}} - 确 定 - 取 消 + {{$t('global.confirm')}} + {{$t('global.cancel')}} @@ -106,7 +106,7 @@ export default { }, computed: { title() { - return '修改'; + return this.$t('global.modify'); } }, mounted() { diff --git a/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue b/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue index 691db5458..e8c6f2db8 100644 --- a/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue +++ b/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue @@ -15,10 +15,10 @@ - 车次号： + {{$t('menu.tripNumber') + $t('global.colon')}} - + - 手工 + {{this.$t('global.manual')}} - 缺省停站时间： + {{$t('menu.defaultStopTime') + $t('global.colon')}} - + - 表号： + {{$t('menu.serviceNumber') + $t('global.colon')}} @@ -68,13 +68,13 @@ - 清客 + {{$t('menu.clearGuest')}} - 延续计划 + {{$t('menu.continuationPlan')}} - 首班车 + {{$t('menu.firstTrain')}} @@ -85,10 +85,10 @@ - 序列号： + {{$t('menu.serialNumber') + $t('global.colon')}} - + - 手工 + {{this.$t('global.manual')}} - 缺省运行等级： + {{$t('menu.defaultRunLevel') + $t('global.colon')}} - + - 开始时间： + {{$t('global.startTime') + $t('global.colon')}} - + @@ -138,13 +138,13 @@ - 入库 + {{ $t('menu.inTheLibrary') }} - 出库 + {{ $t('menu.outOfTheLibrary') }} - 末班车 + {{ $t('menu.lastTrain') }} @@ -152,64 +152,64 @@ - 交路： + {{$t('menu.crossing') + $t('global.colon')}} - + - - + + - - + + - 详情： + {{$t('global.details') + $t('global.colon')}} - + - + - + - + - + - 显示默认停站时间和运行等级 + {{$t('menu.displaysDefaultStopTimesAndRunLevels')}} - 确 定 - 取 消 + {{$t('global.confirm')}} + {{$t('global.cancel')}} @@ -248,7 +248,7 @@ export default { }, computed: { title() { - return '修改任务'; + return this.$t('menu.modifyTask'); } }, mounted() { diff --git a/src/jmap/theme/fuzhou_01/planSchedule/menuBar.vue b/src/jmap/theme/fuzhou_01/planSchedule/menuBar.vue index 2ee8bf9a4..1c59e0e01 100644 --- a/src/jmap/theme/fuzhou_01/planSchedule/menuBar.vue +++ b/src/jmap/theme/fuzhou_01/planSchedule/menuBar.vue @@ -142,12 +142,12 @@ export default { tempClassB: -1, menu: [ { - title: '文件（F）', + title: this.$t('menu.file'), children: [ ] }, { - title: '显示（V）', + title: this.$t('menu.view'), children: [ // { // title: '缩放', @@ -161,7 +161,7 @@ export default { ] }, { - title: '编辑（E）', + title: this.$t('menu.edit'), children: [ // { // title: '修改', @@ -186,19 +186,22 @@ export default { ] }, { - title: '工具（T）', + title: this.$t('menu.tool'), children: [ { - title: '查看计划列表', - click: this.handleViewPlanSchedule + title: this.$t('menu.viewPlanList'), + click: this.handleViewPlanSchedule, + width: 150 }, { - title: '创建一周计划', - click: this.handleCreateWeekPlan + title: this.$t('menu.createAWeekPlan'), + click: this.handleCreateWeekPlan, + width: 150 }, { - title: '加载当天计划', - click: this.handleReloadTodayPlan + title: this.$t('menu.loadTheDayPlan'), + click: this.handleReloadTodayPlan, + width: 150 } // { // title: '有效性检查', @@ -207,7 +210,7 @@ export default { ] }, { - title: '帮助（H）', + title: this.$t('menu.help'), children: [ ] } @@ -305,8 +308,8 @@ export default { }, undeveloped() { this.doClose(); - this.$alert('实现中......', '提示', { - confirmButtonText: '确定', + this.$alert(this.$t('menu.achieving'), this.$t('tip.hint'), { + confirmButtonText: this.$t('tip.confirm'), callback: action => { } }); @@ -364,7 +367,7 @@ export default { $height: 20px; $menuPadding: 10px; $menuItemHeight: 30px; - $menuItemWidth: 160px; + $menuItemWidth: 170px; $menuItemPadding: 5px; #PlanMenuBar { diff --git a/src/jmap/theme/fuzhou_01/planSchedule/schedule.vue b/src/jmap/theme/fuzhou_01/planSchedule/schedule.vue index e3a9debb4..5283a579e 100644 --- a/src/jmap/theme/fuzhou_01/planSchedule/schedule.vue +++ b/src/jmap/theme/fuzhou_01/planSchedule/schedule.vue @@ -67,7 +67,7 @@ export default { columns: [ { prop: 'serviceNumber', - label: '表号' + label: this.$t('menu.serviceNumber') }, { width: 40 @@ -82,7 +82,7 @@ export default { columns: [ { prop: 'tripNumber', - label: '车次号' + label: this.$t('menu.tripNumber') }, { width: 40 @@ -322,7 +322,7 @@ export default { } catch (error) { this.viewDisabled = false; - this.$messageBox(`加载运行图数据失败`); + this.$messageBox(this.$t('error.loadingOperationGraphFailed')); } }, async loadInitData(series) { @@ -441,9 +441,9 @@ export default { const station = this.stations[Math.floor((param.data[1] - this.PlanConvert.EdgeHeight) / this.PlanConvert.CoordMultiple)] || { name: '', kmRange: '' }; return [ `Point Data
`, - `车站名称: ${station.name}
`, - `车站公里标: ${station.kmRange} km
`, - `到站时间: ${timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})
` + `${this.$t('menu.stationName') + station.name}
`, + `${this.$t('menu.stationKilometerMark') + station.kmRange} km
`, + `${this.$t('menu.arrivalTime2') + timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})
` ].join(''); }, mouseClick(params) { diff --git a/src/jmap/theme/fuzhou_01/planSchedule/statusBar.vue b/src/jmap/theme/fuzhou_01/planSchedule/statusBar.vue index 4c1418fb3..1ee888d6a 100644 --- a/src/jmap/theme/fuzhou_01/planSchedule/statusBar.vue +++ b/src/jmap/theme/fuzhou_01/planSchedule/statusBar.vue @@ -36,24 +36,24 @@ export default { columns: [ { prop: 'stationName', - label: '站台', + label: this.$t('menu.platform'), width: 400 }, { prop: 'startTime', - label: '到点' + label: this.$t('menu.arrivalTime'), }, { prop: 'stopTime', - label: '停站时间' + label: this.$t('menu.stopTime') }, { prop: 'endTime', - label: '发点' + label: this.$t('menu.departureTime') }, { prop: 'level', - label: '运行等级' + label: this.$t('menu.runLevel') } ] From a362e629c70a54e5b526cae9f7be61a216aef01d Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 12 Sep 2019 17:34:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/en/menu.js | 67 +++++++++++++++++++++++++++++++++++++- src/i18n/langs/zh/menu.js | 68 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 132 insertions(+), 3 deletions(-) diff --git a/src/i18n/langs/en/menu.js b/src/i18n/langs/en/menu.js index d666328d8..87d8fea95 100644 --- a/src/i18n/langs/en/menu.js +++ b/src/i18n/langs/en/menu.js @@ -62,5 +62,70 @@ export default { }, menuTrain: { - } + }, + 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' }; diff --git a/src/i18n/langs/zh/menu.js b/src/i18n/langs/zh/menu.js index 193c90915..659975a5a 100644 --- a/src/i18n/langs/zh/menu.js +++ b/src/i18n/langs/zh/menu.js @@ -122,6 +122,70 @@ export default { // 设置通信故障 // 取消通信故障 // 确认运行至前方站 - } - + }, + platform: '站台', + arrivalTime: '到点', + stopTime: '停站时间', + departureTime: '发点', + runLevel: '运行等级', + serviceNumber: '表号', + tripNumber: '车次号', + stationName: '车站名称：', + stationKilometerMark: '车站公里标：', + arrivalTime2: '到站时间：', + file: '文件（F）', + view: '显示（V）', + edit: '编辑（E）', + tool: '工具（T）', + help: '帮助（H）', + viewPlanList: '查看计划列表', + createAWeekPlan: '创建一周计划', + loadTheDayPlan: '加载当天计划', + achieving: '实现中......', + addToTheFront: '加在前面', + addToTheEnd: '加在最后', + crossing: '交路', + date: '日期', + name: '姓名', + address: '地址', + displaysDefaultStopTimesAndRunLevels: '显示默认停站时间和运行等级', + addTask: '添加任务', + runGraphName: '运行图名称', + skinType: '皮肤类型', + selectTemplateRunGraph: '选择模板运行图', + load: '加载', + plannedDateRange: '计划日期范围', + deleteAllPreviousTasks: '删除以前所有任务（包含本任务）', + deleteAllSubsequentTasks: '删除以后所有任务（包含本任务）', + deleteTask: '删除任务', + deleteTheDayPlan: '删除当天计划', + mapName: '地图名称', + loadDate: '加载日期', + operationChartSchedule: '运行图计划表', + trainLine: '列车线路', + startStation: '起点站', + startPlatform: '起点站台', + terminal: '终点站', + endPlatform: '终点站台', + addTask2: '加任务', + deleteTask2: '删任务', + replace: '替  换', + inTheLibrary: '进库', + outOfTheLibrary: '出库', + changeTripNumber: '改车次号', + lineStartTime: '线路开始时间', + lineEndTime: '线路结束时间', + lineDetails: '线路详细信息', + station: '车站', + affectSubsequentTasks: '影响后续任务', + manual: '手工', + defaultStopTime: '缺省停站时间', + clearGuest: '清客', + continuationPlan: '延续计划', + firstTrain: '首班车', + serialNumber: '序列号', + defaultRunLevel: '缺省运行等级', + lastTrain: '模板车', + description: '描述', + modifyTask: '修改任务' };