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

src/i18n/langs/en/display.js

@@ -42,20 +42,19 @@ export default {
 		getCourseInformationFail: 'Failed to get course information'
 	},
 	demon: {
-		// 试用时间：
-		// 派班计划
-		// 退出剧本
-		// 按计划行车
-		// 退出计划
-		// 返回
-		// 三维视图
-		// 任务操作成功！
-		// 获取时间失败
-		// 开始仿真失败，请返回重试
-		// 结束仿真失败，请返回
-		// 退出任务失败
-		// 司机视角
-		// 三维视图
+		trialTime: 'Trial time: ',
+		dispatchingPlan: 'Dispatching Plan',
+		exitScript: 'Exit Script',
+		drivingByPlan: 'Driving By Plan',
+		exitPlan: 'Exit Plan',
+		back: 'Back',
+		threeDimensionalView: 'Three-Dimensional View',
+		taskOperateSuccess: 'Task Operate success',
+		getTimeFail: 'Failed to get time',
+		startSimulationFail: 'Start simulation failed, please go back and try again',
+		endSimulationFail: 'End simulation failed, please go back',
+		exitTaskFail: 'Failed to Exit task',
+		driverPerspective: 'Driver Perspective'
 	},
 	systemTime: {
 		timePause: 'Pausing'
@@ -63,5 +62,18 @@ export default {
 	screen: {
 		trialTime: 'Trial time: ',
 		getTimeFail: 'Failed to get time'
+	},
+	replay: {
+		pleaseSelect: 'Please select',
+		back: 'Back',
+		pause: 'Pause',
+		play: 'Play'
+	},
+	plan: {
+		drivingByPlan: 'Driving By Plan',
+		exitPlan: 'Exit Plan',
+		back: 'Back',
+		startPlanFail: 'Start planning failed, please go back and try again',
+		endPlanFail: 'End plan failed, please go back'
 	}
 };

src/i18n/langs/en/global.js

@@ -83,7 +83,40 @@ export default {
 	trainingNotStart: "{name}'s room hasn't started yet",
 	inputRoomNumber: 'Please enter the room number.',
 	chooseRoom: 'Choose Room',
+
 	month: ' month',
+	indexA: ' piece',
+	purchasePrice: 'Total Price: ',
+	permissionNum: 'Permission Num: ',
+	submitOrders: 'Submit orders',
+	completePayment: 'Complete payment',
+	weChatPay: 'WeChat Pay',
+	alipayPayment: 'AliPay',
+	clickRefresh: 'Please click to refresh',
+	checkstand: 'Checkstand',
+	permissionType: 'Permission Type: ',
+	productName: 'Product Name',
+	simulationPrice: 'Simulation Unit Price',
+	yuanMonth: 'yuan/month',
+	permissions: ' permissions',
+	purchaseDuration: 'Purchase Duration: ',
+	custom: 'custom',
+	january: 'One month',
+	march: 'Three months',
+	year: 'One year',
+	twoYears: 'Two years',
+	fiveYears: 'Five years',
+	tenYears: 'Ten years',
+	orderCode: 'Order Code: ',
+	creationTime: 'Create Time: ',
+	amountPayable: 'Amounts Payable: ',
+
+	buyProject: 'The products you will purchase are virtual content services. After purchase, you will not be able to return, transfer or exchange. Please confirm.',
+	relatedServices: 'You can view and use the related services in the “Permissions Details” area after purchase.',
+	paymentSuccessful: 'Payment successful,click to return',
+	cancelSuccessfully: 'Cancel success,click to return',
+	paymentFailed: 'Payment failed,click to return',
+
 	putaway: 'Putaway',
 	soldOut: 'Sold out',
 	exportMap: 'Export Map',

src/i18n/langs/zh/display.js

@@ -42,20 +42,19 @@ export default {
 		getCourseInformationFail: '获取课程信息失败'
 	},
 	demon: {
-		// 试用时间：
-		// 派班计划
-		// 退出剧本
-		// 按计划行车
-		// 退出计划
-		// 返回
-		// 三维视图
-		// 任务操作成功！
-		// 获取时间失败
-		// 开始仿真失败，请返回重试
-		// 结束仿真失败，请返回
-		// 退出任务失败
-		// 司机视角
-		// 三维视图
+		trialTime: '试用时间：',
+		dispatchingPlan: '派班计划',
+		exitScript: '退出剧本',
+		drivingByPlan: '按计划行车',
+		exitPlan: '退出计划',
+		back: '返回',
+		threeDimensionalView: '三维视图',
+		taskOperateSuccess: '任务操作成功',
+		getTimeFail: '获取时间失败',
+		startSimulationFail: '开始仿真失败，请返回重试',
+		endSimulationFail: '结束仿真失败，请返回',
+		exitTaskFail: '退出任务失败',
+		driverPerspective: '司机视角'
 	},
 	systemTime: {
 		timePause: '暂停中'
@@ -63,6 +62,19 @@ export default {
 	screen: {
 		trialTime: '试用时间：',
 		getTimeFail: '获取时间失败'
+	},
+	replay: {
+		pleaseSelect: '请选择',
+		back: '返回',
+		pause: '暂停',
+		play: '播放'
+	},
+	plan: {
+		drivingByPlan: '按计划行车',
+		exitPlan: '退出计划',
+		back: '返回',
+		startPlanFail: '开始计划失败，请返回重试',
+		endPlanFail: '结束计划失败，请返回'
 	}
 
 };

src/views/display/menuDemon.vue

@@ -2,21 +2,21 @@
   <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.demon.trialTime')}} {{ countTime }}</span>
       </el-row>
     </div>
     <div class="display-draft">
       <el-button-group>
-        <el-button v-if="isShowScheduling" type="primary" @click="jumpScheduling">派班计划</el-button>
+        <el-button v-if="isShowScheduling" type="primary" @click="jumpScheduling">{{$t('display.demon.dispatchingPlan')}}</el-button>
         <el-button type="jumpjlmap3d" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
         <template v-if="isShowQuest">
-          <el-button type="danger" @click="handleQuitQuest">退出剧本</el-button>
+          <el-button type="danger" @click="handleQuitQuest">{{$t('display.demon.exitScript')}}</el-button>
         </template>
         <template v-else>
-          <el-button type="success" :disabled="isDisable" @click="selectBeginTime">按计划行车</el-button>
-          <el-button type="danger" :disabled="!isDisable" @click="end">退出计划</el-button>
+          <el-button type="success" :disabled="isDisable" @click="selectBeginTime">{{$t('display.demon.drivingByPlan')}}</el-button>
+          <el-button type="danger" :disabled="!isDisable" @click="end">{{$t('display.demon.exitPlan')}}</el-button>
         </template>
-        <el-button type="primary" @click="back">返回</el-button>
+        <el-button type="primary" @click="back">{{$t('display.demon.back')}}</el-button>
       </el-button-group>
     </div>
     <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
@@ -72,7 +72,7 @@ export default {
 				name: '',
 				remarks: ''
 			},
-			jl3dname: '三维视图'
+			jl3dname: this.$t('display.demon.threeDimensionalView')
 		};
 	},
 	computed: {
@@ -88,8 +88,8 @@ export default {
 			this.group && this.initLoadPage();
 		},
 		'$store.state.socket.tipOperateCount': function (val) {
-			this.$alert('任务操作成功！', '提示', {
-				confirmButtonText: '确定',
+			this.$alert(this.$t('display.demon.taskOperateSuccess') , this.$t('global.tips'), {
+				confirmButtonText: this.$t('global.confirm'),
 				callback: action => {
 				}
 			});
@@ -142,7 +142,7 @@ export default {
 					}, 1000);
 				}
 			}).catch(() => {
-				this.$messageBox(`获取时间失败`);
+				this.$messageBox(this.$t('display.demon.getTimeFail'));
 			});
 		},
 		selectBeginTime() {
@@ -156,7 +156,7 @@ export default {
 				});
 			}).catch(() => {
 				this.isDisable = false;
-				this.$messageBox('开始仿真失败，请返回重试');
+				this.$messageBox(this.$t('display.demon.startSimulationFail'));
 			});
 		},
 		end() {
@@ -170,14 +170,14 @@ export default {
 				});
 			}).catch(() => {
 				this.isDisable = true;
-				this.$messageBox('结束仿真失败，请返回');
+				this.$messageBox(this.$t('display.demon.endSimulationFail'));
 			});
 		},
 		handleQuitQuest() {
 			quitScript(this.group).then(resp => {
 				this.$emit('quitQuest');
 			}).catch(() => {
-				this.$messageBox('退出任务失败');
+				this.$messageBox(this.$t('display.demon.exitTaskFail'));
 			});
 		},
 		back() {
@@ -208,9 +208,9 @@ export default {
 		},
 		change3dname() {
 			if (this.$route.query.prdType == '04') {
-				this.jl3dname = '司机视角';
+				this.jl3dname = this.$t('display.demon.driverPerspective');
 			} else {
-				this.jl3dname = '三维视图';
+				this.jl3dname = this.$t('display.demon.threeDimensionalView');
 			}
 		}
 	}

src/views/display/menuPlan.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="display-draft">
     <el-button-group>
-      <el-button type="success" :disabled="isDisable" @click="selectBeginTime">按计划行车</el-button>
-      <el-button type="danger" :disabled="!isDisable" @click="end">退出计划</el-button>
-      <el-button type="primary" @click="back">返回</el-button>
+      <el-button type="success" :disabled="isDisable" @click="selectBeginTime">{{$t('display.plan.drivingByPlan')}}</el-button>
+      <el-button type="danger" :disabled="!isDisable" @click="end">{{$t('display.plan.exitPlan')}}</el-button>
+      <el-button type="primary" @click="back">{{$t('display.plan.back')}}</el-button>
     </el-button-group>
     <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
   </div>
@@ -74,7 +74,7 @@ export default {
 				});
 			}).catch(() => {
 				this.isDisable = false;
-				this.$messageBox('开始计划失败，请返回重试');
+				this.$messageBox(this.$t('display.plan.startPlanFail'));
 			});
 		},
 		end() {
@@ -88,7 +88,7 @@ export default {
 				});
 			}).catch(() => {
 				this.isDisable = true;
-				this.$messageBox('结束计划失败，请返回');
+				this.$messageBox(this.$t('display.plan.endPlanFail'));
 			});
 		},
 		async back() {

src/views/display/menuReplay.vue

@@ -7,7 +7,7 @@
       <div class="draft-menu">
         <el-row>
           <el-col :span="4">
-            <el-select v-model="speed" placeholder="请选择" @change="changeSpeed">
+            <el-select v-model="speed" :placeholder="$t('display.replay.pleaseSelect')" @change="changeSpeed">
               <el-option
                 v-for="item in optionsList"
                 :key="item.value"
@@ -24,7 +24,7 @@
             <el-progress class="progress" :percentage="progress" style="width: 100%" :show-text="false" />
           </el-col>
           <el-col :span="2">
-            <el-button type="primary" class="back" @click="back">返回</el-button>
+            <el-button type="primary" class="back" @click="back">{{$t('display.replay.back')}}</el-button>
           </el-col>
         </el-row>
       </div>
@@ -92,7 +92,7 @@ export default {
 			'mapDeviceStatus'
 		]),
 		playName() {
-			return this.isPlay ? '暂停' : '播放';
+			return this.isPlay ? this.$t('display.replay.pause') : this.$t('display.replay.play');
 		}
 	},
 	watch: {