From 35eacb299c1ed594a57d3667ba5990158f060111 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 16 Oct 2019 16:36:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E9=A2=84=E8=A7=88=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/script.js                             |  9 +++++++-
 src/i18n/langs/en/scriptRecord.js             |  5 ++++-
 src/i18n/langs/zh/scriptRecord.js             |  5 ++++-
 src/jmap/theme/batong_01/menus/index.vue      |  2 +-
 src/jmap/theme/beijing_01/menus/index.vue     |  2 +-
 src/jmap/theme/chengdu_03/menus/index.vue     |  2 +-
 src/jmap/theme/chengdu_04/menus/index.vue     |  2 +-
 src/jmap/theme/fuzhou_01/menus/index.vue      |  2 +-
 src/views/display/demon/addQuest.vue          |  9 ++++----
 .../scriptManage/display/tipScriptRecord.vue  |  1 +
 src/views/scriptManage/home.vue               | 21 ++++++++++++++-----
 11 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/src/api/script.js b/src/api/script.js
index 752fd889d..93bed7652 100644
--- a/src/api/script.js
+++ b/src/api/script.js
@@ -18,10 +18,17 @@ export function getScriptByIdList(id) {
 	});
 }
 
-/** 通过ID查询剧本的基础信息 */
+/** 通过ID查询发布的剧本的详细信息 */
 export function getScriptById(id) {
 	return request({
 		url: `/api/script/${id}/detail`,
 		method: 'get'
 	});
 }
+/** 通过ID查询未发布剧本的详细信息 */
+export function getDraftScriptById(id) {
+	return request({
+		url: `/api/script/draft/${id}/detail`,
+		method: 'get'
+	});
+}
diff --git a/src/i18n/langs/en/scriptRecord.js b/src/i18n/langs/en/scriptRecord.js
index 35b2df81e..5f866ba40 100644
--- a/src/i18n/langs/en/scriptRecord.js
+++ b/src/i18n/langs/en/scriptRecord.js
@@ -88,5 +88,8 @@ export default {
 	status: 'Status',
 	applyRevoke: 'Revoke',
 	publish: 'Publish',
-	revokeReason: 'Revoke explanation'
+	revokeReason: 'Revoke explanation',
+	language: 'language',
+	chinese: 'Chinese Simplified',
+	english: 'English'
 };
diff --git a/src/i18n/langs/zh/scriptRecord.js b/src/i18n/langs/zh/scriptRecord.js
index c31324c0a..f49cb0215 100644
--- a/src/i18n/langs/zh/scriptRecord.js
+++ b/src/i18n/langs/zh/scriptRecord.js
@@ -89,5 +89,8 @@ export default {
 	status: '状态',
 	applyRevoke: '撤回',
 	publish: '发布',
-	revokeReason: '驳回原因'
+	revokeReason: '驳回原因',
+	language: '语言',
+	chinese: '中文',
+	english: '英文'
 };
diff --git a/src/jmap/theme/batong_01/menus/index.vue b/src/jmap/theme/batong_01/menus/index.vue
index da30810e1..166916cd4 100644
--- a/src/jmap/theme/batong_01/menus/index.vue
+++ b/src/jmap/theme/batong_01/menus/index.vue
@@ -73,7 +73,7 @@ export default {
                     this.$store.state.training.roles == 'BigScreen';
 		},
 		isShowMenu() {
-			return this.$store.state.training.prdType != '';
+			return this.$store.state.training.prdType;
 		}
 	},
 	watch: {
diff --git a/src/jmap/theme/beijing_01/menus/index.vue b/src/jmap/theme/beijing_01/menus/index.vue
index badcb49e5..64aac8c71 100644
--- a/src/jmap/theme/beijing_01/menus/index.vue
+++ b/src/jmap/theme/beijing_01/menus/index.vue
@@ -72,7 +72,7 @@ export default {
                     this.$store.state.training.roles != 'BigScreen';
 		},
 		isShowBar() {
-			return this.$store.state.training.prdType != '';
+			return this.$store.state.training.prdType;
 		}
 	},
 	watch: {
diff --git a/src/jmap/theme/chengdu_03/menus/index.vue b/src/jmap/theme/chengdu_03/menus/index.vue
index 849fe2334..ec218b332 100644
--- a/src/jmap/theme/chengdu_03/menus/index.vue
+++ b/src/jmap/theme/chengdu_03/menus/index.vue
@@ -71,7 +71,7 @@ export default {
                     this.$store.state.training.roles != 'BigScreen';
 		},
 		isShowBar() {
-			return this.$store.state.training.prdType != '';
+			return this.$store.state.training.prdType;
 		}
 	},
 	watch: {
diff --git a/src/jmap/theme/chengdu_04/menus/index.vue b/src/jmap/theme/chengdu_04/menus/index.vue
index 849fe2334..ec218b332 100644
--- a/src/jmap/theme/chengdu_04/menus/index.vue
+++ b/src/jmap/theme/chengdu_04/menus/index.vue
@@ -71,7 +71,7 @@ export default {
                     this.$store.state.training.roles != 'BigScreen';
 		},
 		isShowBar() {
-			return this.$store.state.training.prdType != '';
+			return this.$store.state.training.prdType;
 		}
 	},
 	watch: {
diff --git a/src/jmap/theme/fuzhou_01/menus/index.vue b/src/jmap/theme/fuzhou_01/menus/index.vue
index b46752185..6dc6325fc 100644
--- a/src/jmap/theme/fuzhou_01/menus/index.vue
+++ b/src/jmap/theme/fuzhou_01/menus/index.vue
@@ -66,7 +66,7 @@ export default {
                     this.$store.state.training.roles != 'BigScreen';
 		},
 		isShowBar() {
-			return this.$store.state.training.prdType != '';
+			return this.$store.state.training.prdType;
 		}
 	},
 	watch: {
diff --git a/src/views/display/demon/addQuest.vue b/src/views/display/demon/addQuest.vue
index 55c7195e5..4d54543cc 100644
--- a/src/views/display/demon/addQuest.vue
+++ b/src/views/display/demon/addQuest.vue
@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import { getScriptPageListOnline, getScriptById } from '@/api/script';
+import { getScriptPageListOnline, getScriptById,getDraftScriptById } from '@/api/script';
 
 export default {
 	name: 'AddQuest',
@@ -150,11 +150,12 @@ export default {
 		},
 		async handleLoad(index, row) {
 			this.row = row;
-			const res = await getScriptById(row.id);
+			const res = this.$route.fullPath.includes('design/display/demon')?await getDraftScriptById(row.id):await getScriptById(row.id);
 			let newMemberList = [];
+			debugger;
 			if (res.code == 200) {
-				if (res.data.memberVOList && res.data.memberVOList.length > 0) {
-					newMemberList = res.data.memberVOList.filter(item => item.hasPlay === true);
+				if (res.data.playerVOList && res.data.playerVOList.length > 0) {
+					newMemberList = res.data.playerVOList.filter(item => item.hasPlay === true);
 				}
 				this.memberList = newMemberList || [];
 				this.memberList.unshift({ id: '', name: this.$t('display.script.none'), role: 'no' });
diff --git a/src/views/scriptManage/display/tipScriptRecord.vue b/src/views/scriptManage/display/tipScriptRecord.vue
index 974bbda1f..7d27757e2 100644
--- a/src/views/scriptManage/display/tipScriptRecord.vue
+++ b/src/views/scriptManage/display/tipScriptRecord.vue
@@ -5,6 +5,7 @@
         <el-header style="height:50px;">
           <el-row class="actionList">
             <span class="titleStyle">{{ $t('scriptRecord.scriptRecordTitle') }}</span>
+			<span class="titleStyle">( {{$t('scriptRecord.language')}}: {{ $route.query.lang=="en"?$t('scriptRecord.english'):$t('scriptRecord.chinese') }} )</span>
           </el-row>
         </el-header>
         <el-main style="padding-top:10px;padding-bottom:10px;">
diff --git a/src/views/scriptManage/home.vue b/src/views/scriptManage/home.vue
index 619ebe795..c662a6395 100644
--- a/src/views/scriptManage/home.vue
+++ b/src/views/scriptManage/home.vue
@@ -71,6 +71,7 @@
 </template>
 
 <script>
+import Cookies from 'js-cookie';
 import ConstConfig from '@/scripts/ConstConfig';
 import { UrlConfig } from '@/router/index';
 import { mapGetters } from 'vuex';
@@ -138,7 +139,7 @@ export default {
 		},
 		drawUp(index,row) {
 			scriptRecordNotify(row.id).then(resp => {
-				const query = { mapId: row.mapId, group: resp.data, scriptId: row.id };
+				const query = { mapId: row.mapId, group: resp.data, scriptId: row.id,lang:row.lang };
 				this.$router.push({ path: `${UrlConfig.scriptDisplay}/script`, query });
 				launchFullscreen();
 			}).catch(error => {
@@ -161,11 +162,16 @@ export default {
 		},
 		// 确定创建
 		handleConfirmCreate(data) {
+			if(Cookies.get("user_lang")=="en"){
+				data.lang='en';
+			}else{
+				data.lang='zh';
+			}
 			createQuest(data).then(resp => {
 				this.reloadTable();
-				this.$message.success('创建剧本成功');
+				this.$message.success(this.$t('scriptRecord.createScriptSuccess'));
 			}).catch(error => {
-				this.$messageBox(`创建剧本失败: ${error.message}`);
+				this.$messageBox(`${this.$t('scriptRecord.createScriptFail')}: ${error.message}`);
 			})
 		},
 		//修改
@@ -174,11 +180,16 @@ export default {
 		},
 		//确认修改
 		handleConfirmModify(data){
+			if(Cookies.get("user_lang")=="en"){
+				data.lang='en';
+			}else{
+				data.lang='zh';
+			}
 			updateQuest(data.id,data).then(resp => {
 				this.reloadTable();
-				this.$message.success('修改剧本成功');
+				this.$message.success(this.$t('scriptRecord.modifyScriptSuccess'));
 			}).catch(error => {
-				this.$messageBox(`修改剧本失败: ${error.message}`);
+				this.$messageBox(`${this.$t('scriptRecord.modifyScriptFail')}: ${error.message}`);
 			})
 		},
 		// 创建