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

src/i18n/langs/en/error.js

@@ -5,5 +5,6 @@ export default {
 	getMapStepsFailed: 'Failed to get map step data',
 	resetFailed: 'Reset failure',
 	startTrainingFailed: 'Failure to start training',
-	saveBackgroundFailed: 'Failed to save background'
+	saveBackgroundFailed: 'Failed to save background',
+	deleteFailed: 'Failed to delete'
 };

src/i18n/langs/en/global.js

@@ -6,5 +6,9 @@ export default {
 	cancel: 'Cancel',
 	reset: 'Reset',
 	coachingModel: 'Coaching model',
-	normalMode: 'Normal mode'
+	normalMode: 'Normal mode',
+	operate: 'Operate',
+	edit: 'Edit',
+	delete: 'Delete',
+	add: 'Add'
 };

src/i18n/langs/zh/error.js

@@ -5,5 +5,6 @@ export default {
 	getMapStepsFailed: '获取地图步骤数据',
 	resetFailed: '重置失败',
 	startTrainingFailed: '开始实训失败',
-	saveBackgroundFailed: '保存背景失败'
+	saveBackgroundFailed: '保存背景失败',
+	deleteFailed: '删除失败'
 };

src/i18n/langs/zh/global.js

@@ -6,5 +6,9 @@ export default {
 	confirm: '确 定',
 	cancel: '取 消',
 	coachingModel: '教练模式',
-	normalMode: '正常模式'
+	normalMode: '正常模式',
+	operate: '操 作',
+	edit: '编 辑',
+	delete: '删 除',
+	add: '新 增'
 };

src/jmap/theme/fuzhou_01/planConvert.js

@@ -64,7 +64,7 @@ export default {
 									}
 
 									/** 设置标志*/
-									[need, flag] = [true, false];
+									[need, flag] = [true, true];
 								} else if (reg2.test(value)) {
 									/** 含有特殊字符的时间格式*/
 									[, begTime, endTime] = reg2.exec(value);

src/main.js

@@ -27,7 +27,7 @@ Vue.use(VueI18n);
 Vue.config.productionTip = false;
 
 export const i18n = new VueI18n({
-	locale: LangStorage.getLang('zh'),
+	locale: LangStorage.getLang('en'),
 	messages
 });
 

src/views/management/dictionary/index.vue

@@ -26,15 +26,15 @@ export default {
 				queryObject: {
 					code: {
 						type: 'text',
-						label: '编码'
+						label: this.$t('system.code')
 					},
 					name: {
 						type: 'text',
-						label: '名称'
+						label: this.$t('system.name')
 					},
 					status: {
 						type: 'select',
-						label: '状态',
+						label: this.$t('system.status'),
 						config: {
 							data: this.$ConstSelect.Status
 						}
@@ -48,27 +48,27 @@ export default {
 				indexShow: true,
 				columns: [
 					{
-						title: '编码',
+						title: this.$t('system.code'),
 						prop: 'code'
 					},
 					{
-						title: '名称',
+						title: this.$t('system.name'),
 						prop: 'name'
 					},
 					{
-						title: '状态',
+						title: this.$t('system.status'),
 						prop: 'status',
 						type: 'tag',
 						columnValue: (row) => { return this.$ConstSelect.translate(row.status, 'Status'); },
 						tagType: (row) => { if (row.status === '0') { return 'danger'; } else { return 'success'; } }
 					},
 					{
-						title: '说明',
+						title: this.$t('system.remarks'),
 						prop: 'remarks'
 					},
 					{
 						type: 'button',
-						title: '操作',
+						title: this.$t('global.operate'),
 						width: '250',
 						buttons: [
 							{
@@ -76,11 +76,11 @@ export default {
 								handleClick: this.handleViewDetail
 							},
 							{
-								name: '编辑',
+								name: this.$t('global.edit'),
 								handleClick: this.handleEdit
 							},
 							{
-								name: '删除',
+								name: this.$t('global.delete'),
 								handleClick: this.handleDelete,
 								type: 'danger'
 							}
@@ -88,7 +88,7 @@ export default {
 					}
 				],
 				actions: [
-					{ text: '新增', handler: this.handleAdd }
+					{ text: this.$t('global.add'), handler: this.handleAdd }
 					// { text: '批量删除', btnCode: 'employee_delete', handler: this.handleBatchDelete, type: 'danger' }
 				]
 			},
@@ -115,8 +115,8 @@ export default {
 
 		handleDelete(index, row) {
 			this.$confirm('此操作将删除该类型, 是否继续?', '提示', {
-				confirmButtonText: '确定',
+				confirmButtonText: this.$t('global.confirm'),
-				cancelButtonText: '取消',
+				cancelButtonText: this.$t('global.cancel'),
 				type: 'warning'
 			}).then(() => {
 				del(row.id).then(response => {
@@ -124,7 +124,7 @@ export default {
 					this.reloadTable();
 				}).catch(() => {
 					this.reloadTable();
-					this.$messageBox('删除失败');
+					this.$messageBox(this.$t('error.deleteFailed'));
 				});
 			});
 		},