Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev

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'
 	}
 };

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',

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: '获取时间失败'
 	}
+
 };
 

src/views/display/menuExam.vue

@@ -122,9 +122,9 @@ export default {
 			}
 		},
 		back() {
-			this.$confirm(this.$t('display.exam.endTestTip'), this.$t('display.prompt'), {
+			this.$confirm(this.$t('display.exam.endTestTip'), this.$t('global.tips'), {
-				confirmButtonText: this.$t('display.confirmButtonText'),
+				confirmButtonText: this.$t('global.confirm'),
-				cancelButtonText: this.$t('display.cancelButtonText'),
+				cancelButtonText: this.$t('global.cancel'),
 				type: 'warning'
 			}).then(() => {
 				this.$emit('quit');

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'), {
+							this.$confirm(this.$t('display.lesson.endTrainingTip'), this.$t('global.tips'), {
-								cancelButtonText: this.$t('display.cancelButtonText'),
+								cancelButtonText: this.$t('global.cancel'),
-								confirmButtonText: this.$t('display.confirmButtonText'),
+								confirmButtonText: this.$t('global.confirm'),
 								type: 'warning',
 								center: true,
 								zIndex: 9999

src/views/display/menuScreen.vue

@@ -2,12 +2,11 @@
   <div>
     <div class="display-card" :style="{top: offset+'px'}">
       <el-row>
-        <span v-if="countTime" class="display-score">试用时间：{{ countTime }}</span>
+        <span v-if="countTime" class="display-score">{{$t('display.screen.trialTime')}} {{ countTime }}</span>
       </el-row>
     </div>
   </div>
 </template>
-
 <script>
 import { getGoodsTryUse } from '@/api/management/goods';
 import { PermissionType } from '@/scripts/ConstDic';
@@ -77,7 +76,7 @@ export default {
 							}, 1000);
 						}
 					} else {
-						this.$messageBox(`获取时间失败`);
+						this.$messageBox(this.$t('display.screen.getTimeFail'));
 					}
 				}
 

src/views/display/menuSystemTime.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="isShowSystemTime" class="display-card" :style="{top: offset+'px', right: right+'px'}">
     <template v-if="pause">
-      <span class="display-pause">暂停中</span>
+      <span class="display-pause">{{$t('display.systemTime.timePause')}}</span>
     </template>
     <template v-else>
       <system-time

src/views/display/tipExamList.vue

@@ -244,9 +244,9 @@ export default {
 				if (isOver) {
 					this.submit();
 				} else {
-					this.$confirm(this.$t('display.exam.cancleExam'), this.$t('display.prompt'), {
+					this.$confirm(this.$t('display.exam.cancleExam'), this.$t('global.tips'), {
-						cancelButtonText: this.$t('display.cancelButtonText'),
+						cancelButtonText: this.$t('global.cancel'),
-						confirmButtonText: this.$t('display.confirmButtonText'),
+						confirmButtonText: this.$t('global.confirm'),
 						type: 'warning',
 						center: true
 					}).then(() => {

src/views/scriptManage/display/tipScriptRecord.vue

@@ -148,9 +148,9 @@ export default {
 		dumpScenesData() {
 			this.clearAutoSave();
 			const group=this.group;
-			this.$confirm(this.$t('scriptRecord.clearDataTip'), this.$t('scriptRecord.operateTip'), {
+			this.$confirm(this.$t('scriptRecord.clearDataTip'), this.$t('global.tips'), {
-				confirmButtonText: this.$t('scriptRecord.confirmButtonText'),
+				confirmButtonText:  this.$t('global.confirm'),
-				cancelButtonText: this.$t('scriptRecord.cancelButtonText'),
+				cancelButtonText: this.$t('global.cancel'),
 				type: 'warning'
 			}).then(() => {
 				dumpScriptData(group).then(resp => {