修复全屏时视频框尺寸问题、会议结束时主持人结束会议

This commit is contained in:
cxc
2022-06-09 15:47:07 +08:00
parent 74a8f058c1
commit fcc2842b33

View File

@ -9,6 +9,7 @@
:class="{ :class="{
fullscreen: isFullScreen && !isVerticalFullScreen, fullscreen: isFullScreen && !isVerticalFullScreen,
verticalFullScreen: isVerticalFullScreen, verticalFullScreen: isVerticalFullScreen,
notInSharing: !inSharing,
}" }"
> >
<div <div
@ -584,20 +585,24 @@ const initWebSocket = () => {
showQuestionnaireDialog.value = false; showQuestionnaireDialog.value = false;
ElMessageBox.alert("会议已结束"); ElMessageBox.alert("会议已结束");
socket.close(); socket.close();
if (store.getters.bankId && !store.state.joinUser.examSubmited) { if (route.name === "Meeting") {
if (examQuestionsList.value.length === 0) { if (store.getters.bankId && !store.state.joinUser.examSubmited) {
examQuestionsList.value = await loadQuestionsList("1"); if (examQuestionsList.value.length === 0) {
examQuestionsList.value = await loadQuestionsList("1");
}
submitQuestion("1");
} }
submitQuestion("1"); if (
} store.getters.questionnaireId &&
if ( !store.state.joinUser.questionnaireSubmited
store.getters.questionnaireId && ) {
!store.state.joinUser.questionnaireSubmited if (questionnaireQuestionsList.value.length === 0) {
) { questionnaireQuestionsList.value = await loadQuestionsList("2");
if (questionnaireQuestionsList.value.length === 0) { }
questionnaireQuestionsList.value = await loadQuestionsList("2"); submitQuestion("2");
} }
submitQuestion("2"); } else if (route.name === "Host") {
meetingConfig.client.endMeeting();
} }
} }
}); });
@ -921,7 +926,12 @@ $meetingBackgroundHeight: 80vw * 9 / 16;
#meeting-chat-row { #meeting-chat-row {
.fullscreen-wrap { .fullscreen-wrap {
width: 80vw; width: 80vw;
:deep(.notInSharing.fullscreen
div[id*="suspension-view-tabpanel"]
> .zmwebsdk-MuiBox-root.zmwebsdk-MuiBox-root
> div) {
width: 96vw;
}
#meeting-container.fullscreen { #meeting-container.fullscreen {
$meetingComponentWitdh: 96vw; $meetingComponentWitdh: 96vw;
padding-top: calc(100vw * 0.08); padding-top: calc(100vw * 0.08);
@ -988,7 +998,12 @@ $meetingBackgroundHeight: 80vw * 9 / 16;
// height: calc(100vw * 0.9 * 9 / 16); // height: calc(100vw * 0.9 * 9 / 16);
// } // }
} }
:deep(.notInSharing.verticalFullScreen
div[id*="suspension-view-tabpanel"]
> .zmwebsdk-MuiBox-root.zmwebsdk-MuiBox-root
> div) {
width: 96vh;
}
#meeting-container.verticalFullScreen { #meeting-container.verticalFullScreen {
$meetingComponentWitdh: 96vh; $meetingComponentWitdh: 96vh;
$meetingComponentHeight: $meetingComponentWitdh * 9 / 16; $meetingComponentHeight: $meetingComponentWitdh * 9 / 16;
@ -1000,6 +1015,7 @@ $meetingBackgroundHeight: 80vw * 9 / 16;
left: 100vw; left: 100vw;
width: 100vh !important; width: 100vh !important;
height: 100vw; height: 100vw;
#video-element { #video-element {
width: $meetingComponentWitdh; width: $meetingComponentWitdh;
:deep(div[id*="suspension-view-tabpanel"] :deep(div[id*="suspension-view-tabpanel"]