diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 72be3b2f1..2e575c51e 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -3,8 +3,8 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; - BASE_API = 'http://192.168.3.5:9000'; // 袁琪 + BASE_API = 'https://test.joylink.club/jlcloud'; + // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.4:9000' // 琰培 } else { diff --git a/src/views/display/index.vue b/src/views/display/index.vue index 4d1a99754..713beb285 100644 --- a/src/views/display/index.vue +++ b/src/views/display/index.vue @@ -470,21 +470,25 @@ export default { }, // 选择脚本 async selectQuest(row, id) { - const res = await loadScript(row.id, id, this.group); - if (res && res.code == 200) { - this.questId = parseInt(row.id); - if (res.data && res.data.mapLocation) { - const mapLocation={'offsetX': res.data.mapLocation.x, 'offsetY': res.data.mapLocation.y, 'scaleRate': res.data.mapLocation.scale}; - Vue.prototype.$jlmap.setOptions(mapLocation); + try { + const res = await loadScript(row.id, id, this.group); + if (res && res.code == 200) { + this.questId = parseInt(row.id); + if (res.data && res.data.mapLocation) { + const mapLocation={'offsetX': res.data.mapLocation.x, 'offsetY': res.data.mapLocation.y, 'scaleRate': res.data.mapLocation.scale}; + Vue.prototype.$jlmap.setOptions(mapLocation); + } } - } - if (this.$refs.menuDemon) { - this.$refs.menuDemon.initLoadPage(); - } + if (this.$refs.menuDemon) { + this.$refs.menuDemon.initLoadPage(); + } - if (this.$refs.menuScript) { - this.$refs.menuScript.initLoadPage(); + if (this.$refs.menuScript) { + this.$refs.menuScript.initLoadPage(); + } + } catch (error) { + this.$messageBox(error.message); } }, // 退出脚本 diff --git a/src/views/trainRoom/index.vue b/src/views/trainRoom/index.vue index 25cd45cf0..38cddd486 100644 --- a/src/views/trainRoom/index.vue +++ b/src/views/trainRoom/index.vue @@ -328,7 +328,6 @@ export default { } }, async mounted() { - this.getRoomState(); this.userId = this.$store.state.user.id; this.getRoomInfo(); // 获取房间信息 info this.getUserList(); // 房间人员 列表 @@ -364,15 +363,6 @@ export default { } this.$store.dispatch('socket/setJointRoomInfo'); // 清空房间信息 }, - // 获取房间状态 - async getRoomState() { - const res = await postRoomDetail(this.$route.query.group); - this.mapId = res.data.mapId; - this.starting = false; - if (res.data.state == '02') { - this.starting = true; - } - }, // 右键点击观众席 showContextMenu(e, obj, node, vueElem) { e.preventDefault(); @@ -503,6 +493,9 @@ export default { async getRoomInfo() { // 获取房间信息 创建人和权限总数 const res = await postRoomDetail(this.$route.query.group); + + this.starting = res.data.state == '02'; + this.mapId = res.data.mapId; this.roomInfo = { creatorId: res.data.creatorId, totalNum: Number(res.data.permissionNum) + Number(res.data.audiencePermissionNum),