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/display.js b/src/i18n/langs/en/display.js index 05f482613..26b5eef80 100644 --- a/src/i18n/langs/en/display.js +++ b/src/i18n/langs/en/display.js @@ -79,6 +79,7 @@ export default { schema: { selectProduct: 'Please select product type', loadScript: 'Load Script', + selectRoles: 'Select Roles', previewRunDiagram: 'Preview Run Diagram', loadRunDiagram: 'Load Run Diagram', faultSetting: 'Fault Setting', 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/display.js b/src/i18n/langs/zh/display.js index d60dc39e6..59e4962e8 100644 --- a/src/i18n/langs/zh/display.js +++ b/src/i18n/langs/zh/display.js @@ -79,6 +79,7 @@ export default { schema: { selectProduct: '请选择产品类型', loadScript: '加载剧本', + selectRoles: '选择角色', previewRunDiagram: '运行图预览', loadRunDiagram: '运行图加载', faultSetting: '故障设置', 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/designPlatform/demonList.vue b/src/views/designPlatform/demonList.vue index 791e107b4..a2a6cebb3 100644 --- a/src/views/designPlatform/demonList.vue +++ b/src/views/designPlatform/demonList.vue @@ -112,7 +112,7 @@ switch(obj.type){ case 'scriptDesign':{ setSessionStorage('designType', 'scriptDesign'); - this.$router.push({ path: `${UrlConfig.design.scriptHome}/${obj.mapId}` }); + this.$router.push({ path: `${UrlConfig.design.scriptHome}/${obj.mapId}?skinCode=${obj.skinCode}` }); break; } case 'lessonDesign': { 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 @@