diff --git a/.env.development b/.env.development index fd4fb4605..15b4152ac 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ NODE_ENV = 'development' # VUE_APP_BASE_API = 'https://joylink.club/jlcloud' # VUE_APP_BASE_API = 'http://192.168.3.4:9000' VUE_APP_BASE_API = 'http://192.168.3.6:9000' -VUE_APP_VOICE_API = 'https://test.joylink.club/jlcloud/' +VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink' # VUE_APP_VOICE_API = 'http://192.168.8.110:9008' diff --git a/.env.native b/.env.native index b8a05aae5..f5a79f312 100644 --- a/.env.native +++ b/.env.native @@ -4,4 +4,4 @@ VUE_APP_PRO = 'local' # base api VUE_APP_BASE_API = 'https://joylink.club/jlcloud' -VUE_APP_VOICE_API = 'https://joylink.club/jlcloud/' +VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink' diff --git a/.env.production b/.env.production index 11718e8ad..7319e5802 100644 --- a/.env.production +++ b/.env.production @@ -3,4 +3,4 @@ NODE_ENV = 'production' # base api VUE_APP_BASE_API = 'https://joylink.club/jlcloud' -VUE_APP_VOICE_API = 'https://joylink.club/jlcloud/' +VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink' diff --git a/.env.staging b/.env.staging index dbd2c9181..5051efa45 100644 --- a/.env.staging +++ b/.env.staging @@ -3,4 +3,4 @@ NODE_ENV = 'test' # base api VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud' -VUE_APP_VOICE_API = 'https://test.joylink.club/jlcloud/' +VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink' diff --git a/src/jlmap3d/edit/neweditmodel/StationStandList.js b/src/jlmap3d/edit/neweditmodel/StationStandList.js index 574ee7954..8b85b5e06 100644 --- a/src/jlmap3d/edit/neweditmodel/StationStandList.js +++ b/src/jlmap3d/edit/neweditmodel/StationStandList.js @@ -28,7 +28,7 @@ export function StationStandList() { let newstationstand = new StationStandModel(stationdata[i]); //判断站台是否显示 - + if(stationdata[i].visible == true){ //遍历车站站台数据 @@ -198,16 +198,36 @@ export function StationStandList() { let newstationstand = new StationStandModel(standsdata[i]); let newstationmesh; for(let j=0;j - - + + diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue index d06b39f69..387f497db 100644 --- a/src/views/newMap/chatView/chatBox.vue +++ b/src/views/newMap/chatView/chatBox.vue @@ -941,7 +941,7 @@ export default { resp.data.forEach(conversation => { (conversation.messageList || []).forEach(message => { const member = this.memberData[message.memberId]; - message.src = `/audio/${message.audioPath}`; + message.src = `${message.audioPath}`; message.members = conversation.memberList; if (member) { message.self = this.$store.state.userId == member.userId; @@ -950,7 +950,7 @@ export default { }); const tempMessageList = []; !conversation.over && conversation.messageList.forEach(message => { - message.src = `/audio/${message.audioPath}`; + message.src = `${message.audioPath}`; tempMessageList.push(message); }); !conversation.over && conversation.memberList.forEach(member => { diff --git a/src/views/newMap/chatView/chatContent.vue b/src/views/newMap/chatView/chatContent.vue index 93c57e983..9473f8934 100644 --- a/src/views/newMap/chatView/chatContent.vue +++ b/src/views/newMap/chatView/chatContent.vue @@ -87,11 +87,11 @@ export default { '$store.state.socket.conversationInfo':function (val, old) { // 仿真聊天 const conversationInfo = this.$store.state.socket.conversationInfo; const member = this.$store.state.training.memberData[val.message.memberId]; - conversationInfo.message.src = `/audio/${conversationInfo.message.audioPath}`; + conversationInfo.message.src = `${conversationInfo.message.audioPath}`; this.$emit('changeMessageList', conversationInfo); if (this.conversitionId == val.id) { if (member && member.userId != this.$store.state.user.id) { - this.currentAudioList.push({audioUrl:this.baseUrl + '/audio/' + conversationInfo.message.audioPath, id:val.message.id}); + this.currentAudioList.push({audioUrl:this.baseUrl + conversationInfo.message.audioPath, id:val.message.id}); if (!this.isPlay) { this.isPlay = true; this.$store.dispatch('scriptRecord/updateAudioPlay', true); @@ -101,7 +101,7 @@ export default { this.scrollTop(); } else if (this.userRole === 'AUDIENCE' || this.commonConversation) { if (member && member.userId != this.$store.state.user.id) { - this.currentAudioList.push({audioUrl:this.baseUrl + '/audio/' + conversationInfo.message.audioPath, id:val.message.id}); + this.currentAudioList.push({audioUrl:this.baseUrl + conversationInfo.message.audioPath, id:val.message.id}); if (!this.isPlay) { this.isPlay = true; this.$store.dispatch('scriptRecord/updateAudioPlay', true);