joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
zyy 2020-06-05 18:04:42 +08:00
commit c86bb0bff3
3 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/views/jsxt/refereeList/menuReplay.vue
View File

@ -71,10 +71,10 @@ export default {
}
},
beforeDestroy() {
if (this.isPlaying) {
// if (this.isPlaying) {
endPlaying({}).then(res=>{
});
}
// }
},
methods:{
back() {
@ -86,35 +86,35 @@ export default {
addSpeed() {
if (this.playSpeedIndex < this.playSpeedList.length - 1) {
this.playSpeedIndex++;
if (this.isPlaying) {
// 暂停播放
playingPause({}).then(res=>{
this.isPlaying = false;
setPlaySpeed({level:this.playSpeedList[this.playSpeedIndex].level}).then(res=>{
});
});
// if (this.isPlaying) {
// // 暂停播放
// playingPause({}).then(res=>{
// this.isPlaying = false;
// setPlaySpeed({level:this.playSpeedList[this.playSpeedIndex].level}).then(res=>{
// });
// });
} else {
// } else {
setPlaySpeed({level:this.playSpeedList[this.playSpeedIndex].level}).then(res=>{
});
}
// }
}
},
minusSpeed() {
if (this.playSpeedIndex > 0) {
this.playSpeedIndex--;
if (this.isPlaying) {
// 暂停播放
playingPause({}).then(res=>{
this.isPlaying = false;
// if (this.isPlaying) {
// // 暂停播放
// playingPause({}).then(res=>{
// this.isPlaying = false;
// setPlaySpeed({level:this.playSpeedList[this.playSpeedIndex].level}).then(res=>{
// });
// });
// } else {
setPlaySpeed({level:this.playSpeedList[this.playSpeedIndex].level}).then(res=>{
});
});
} else {
setPlaySpeed({level:this.playSpeedList[this.playSpeedIndex].level}).then(res=>{
});
}
// }
}
},

8
src/views/newMap/jointTrainingNew/chatView/chatBox.vue
View File

@ -2,7 +2,7 @@
<!-- v-quickMenuDrag -->
<div class="chatBox" :style="{'bottom':bottom+'px'}">
<div v-show="!minimize" class="chat-box">
<chat-member-list ref="chatMemberList" :group="group" :current-coversition="currentCoversition" />
<chat-member-list v-if="project!='refereeJsxt'" ref="chatMemberList" :group="group" :current-coversition="currentCoversition" />
<div class="chat-box-main">
<chat-coversition-list ref="chatCoversitionList" :user-role="userRole" @hideAddCoversition="hideAddCoversition" @setCurrentCoversition="setCurrentCoversition" @setHeadTitle="setHeadTitle" />
<div class="chat-window">
@ -19,7 +19,7 @@
</div>
</div>
<div class="chat-box-content">
<chat-content ref="chatContent" :current-coversition="currentCoversition" @changeCoversition="changeCoversition" />
<chat-content ref="chatContent" :project="project" :current-coversition="currentCoversition" @changeCoversition="changeCoversition" />
<div v-if="recordSending" class="chat_record_tip">
<div id="record_progress_bar" :style="'width:'+100/60*seconds+'%'" />
<div class="record_icon" />
@ -56,6 +56,7 @@ import ChatCreateGroup from './chatCreateGroup';
import ChatTooltip from './chatTooltip';
import RecordRTC from 'recordrtc';
import {uploadAudioFileNew, quitCoversition} from '@/api/chat';
import { getSessionStorage } from '@/utils/auth';
export default {
name: 'ChatBox',
components:{
@ -101,6 +102,9 @@ export default {
},
isButtonShow() {
return this.userRole != 'ADMIN' && this.userRole != 'AUDIENCE' && this.isHasCoversition;
},
project() {
return getSessionStorage('project');
}
},
watch:{

14
src/views/newMap/jointTrainingNew/chatView/chatContent.vue
View File

@ -26,11 +26,16 @@
import {getSimulationContextListNew} from '@/api/chat';
import ConstConfig from '@/scripts/ConstConfig';
import Cookies from 'js-cookie';
export default {
props:{
currentCoversition:{
type:Object,
required:true
},
project:{
type:String,
required:true
}
},
data() {
@ -73,7 +78,12 @@ export default {
this.playAllAudio();
}
}
} else {
if (this.project == 'refereeJsxt') {
this.chatContentList.push(simulationText);
simulationText.name = '所有人';
this.$emit('changeCoversition', simulationText);
}
}
}
},
@ -81,7 +91,7 @@ export default {
this.inintData();
},
currentCoversition:function (val, old) {
if (val) {
if (val && this.project != 'refereeJsxt') {
this.chatContentList = [];
this.coversition = this.currentCoversition;
this.inintData();