From 37f1631585853fd7337620e3fe05a2304307318c Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 11 Sep 2019 14:35:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=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/display.js | 26 +++++++++++++++-- src/i18n/langs/en/scriptRecord.js | 3 -- src/i18n/langs/zh/display.js | 28 ++++++++++++++++--- src/views/display/menuExam.vue | 6 ++-- src/views/display/menuLesson.vue | 9 +++--- src/views/display/menuScreen.vue | 5 ++-- src/views/display/menuSystemTime.vue | 2 +- src/views/display/tipExamList.vue | 6 ++-- .../scriptManage/display/tipScriptRecord.vue | 6 ++-- 9 files changed, 64 insertions(+), 27 deletions(-) diff --git a/src/i18n/langs/en/display.js b/src/i18n/langs/en/display.js index d1ea4db0f..c18b519d5 100644 --- a/src/i18n/langs/en/display.js +++ b/src/i18n/langs/en/display.js @@ -2,9 +2,6 @@ export default { startBtn: 'Start', endBtn: 'End', backBtn: 'Back', - cancelButtonText: 'Cancel', - confirmButtonText: 'Confirm', - prompt: 'Prompt', seconds: 'seconds', lesson: { teachingMode: 'Teaching Mode', @@ -43,5 +40,28 @@ export default { maximumTime: 'Maximum time: ', trainingInstructions: 'Training instructions: ', getCourseInformationFail: 'Failed to get course information' + }, + demon: { + // 试用时间： + // 派班计划 + // 退出剧本 + // 按计划行车 + // 退出计划 + // 返回 + // 三维视图 + // 任务操作成功！ + // 获取时间失败 + // 开始仿真失败，请返回重试 + // 结束仿真失败，请返回 + // 退出任务失败 + // 司机视角 + // 三维视图 + }, + systemTime: { + timePause: 'Pausing' + }, + screen: { + trialTime: 'Trial time: ', + getTimeFail: 'Failed to get time' } }; diff --git a/src/i18n/langs/en/scriptRecord.js b/src/i18n/langs/en/scriptRecord.js index 41e7d06f1..3fdc4ac8f 100644 --- a/src/i18n/langs/en/scriptRecord.js +++ b/src/i18n/langs/en/scriptRecord.js @@ -22,9 +22,6 @@ export default { modifyScriptSuccess: 'Modify script success', modifyScriptFail: 'Modify script failure', deleteScriptTip: 'This action will delete this script, whether to continue?', - operateTip: 'Prompt', - confirmButtonText: 'Confirm', - cancelButtonText: 'Cancle', deleteScriptSucess: 'delete script sucess', deleteScriptFail: 'delete script failure', scriptRecordTitle: 'Script Record', diff --git a/src/i18n/langs/zh/display.js b/src/i18n/langs/zh/display.js index b8054f511..953534954 100644 --- a/src/i18n/langs/zh/display.js +++ b/src/i18n/langs/zh/display.js @@ -2,9 +2,6 @@ export default { startBtn: '开始', endBtn: '结束', backBtn: '返回', - cancelButtonText: '取消', - confirmButtonText: '确定', - prompt: '提示', seconds: '秒', lesson: { teachingMode: '教学模式', @@ -35,7 +32,6 @@ export default { submitExaminationPaper: '提交试卷', autoSubmit: '考试结束自动提交', getTestInformation: '获取试题信息失败', - // Failed to get test information cancleExam: '考试未完成，是否确认退出?' }, training: { @@ -44,6 +40,30 @@ export default { maximumTime: '最大用时：', trainingInstructions: '实训说明：', getCourseInformationFail: '获取课程信息失败' + }, + demon: { + // 试用时间： + // 派班计划 + // 退出剧本 + // 按计划行车 + // 退出计划 + // 返回 + // 三维视图 + // 任务操作成功！ + // 获取时间失败 + // 开始仿真失败，请返回重试 + // 结束仿真失败，请返回 + // 退出任务失败 + // 司机视角 + // 三维视图 + }, + systemTime: { + timePause: '暂停中' + }, + screen: { + trialTime: '试用时间：', + getTimeFail: '获取时间失败' } + }; diff --git a/src/views/display/menuExam.vue b/src/views/display/menuExam.vue index b419a075a..36dbad585 100644 --- a/src/views/display/menuExam.vue +++ b/src/views/display/menuExam.vue @@ -122,9 +122,9 @@ export default { } }, back() { - this.$confirm(this.$t('display.exam.endTestTip'), this.$t('display.prompt'), { - confirmButtonText: this.$t('display.confirmButtonText'), - cancelButtonText: this.$t('display.cancelButtonText'), + this.$confirm(this.$t('display.exam.endTestTip'), this.$t('global.tips'), { + confirmButtonText: this.$t('global.confirm'), + cancelButtonText: this.$t('global.cancel'), type: 'warning' }).then(() => { this.$emit('quit'); diff --git a/src/views/display/menuLesson.vue b/src/views/display/menuLesson.vue index 66307af64..192df29e6 100644 --- a/src/views/display/menuLesson.vue +++ b/src/views/display/menuLesson.vue @@ -99,7 +99,8 @@ export default { if (opt && opt.hasOwnProperty('color') && opt.hasOwnProperty('message')) { const h = this.$createElement; this.$notify({ - title: this.$t('display.prompt'), + title: this.$t('global.tips'), + message: h('i', { style: 'color:' + opt.color }, opt.message) }); } @@ -156,9 +157,9 @@ export default { this.endCommit(); } else { this.backDisable = true; - this.$confirm(this.$t('display.lesson.endTrainingTip'), this.$t('display.prompt'), { - cancelButtonText: this.$t('display.cancelButtonText'), - confirmButtonText: this.$t('display.confirmButtonText'), + this.$confirm(this.$t('display.lesson.endTrainingTip'), this.$t('global.tips'), { + cancelButtonText: this.$t('global.cancel'), + confirmButtonText: this.$t('global.confirm'), type: 'warning', center: true, zIndex: 9999 diff --git a/src/views/display/menuScreen.vue b/src/views/display/menuScreen.vue index 31eb033a6..28203dcf3 100644 --- a/src/views/display/menuScreen.vue +++ b/src/views/display/menuScreen.vue @@ -2,12 +2,11 @@
- 试用时间：{{ countTime }} + {{$t('display.screen.trialTime')}} {{ countTime }}
-