Compare commits
1 Commits
5aeff72e9c
...
dev
Author | SHA1 | Date | |
---|---|---|---|
d60cf3f7eb |
@ -19,7 +19,7 @@
|
|||||||
<div class="joinuser-wrap" style="display: flex; flex-wrap: wrap">
|
<div class="joinuser-wrap" style="display: flex; flex-wrap: wrap">
|
||||||
<div class="joinuser-item" v-if="fieldConfig.icCard">
|
<div class="joinuser-item" v-if="fieldConfig.icCard">
|
||||||
<el-form-item label="IC卡号" prop="icCard">
|
<el-form-item label="IC卡号" prop="icCard">
|
||||||
<el-input v-model="appointForm.icCard" placeholder="请输入IC卡号" />
|
<el-input v-model="appointForm.icCard" placeholder="请输入IC卡号,若没有IC卡号可输入手机号" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</div>
|
</div>
|
||||||
<div class="joinuser-item" v-if="fieldConfig.nickname">
|
<div class="joinuser-item" v-if="fieldConfig.nickname">
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
fullscreen: isFullScreen && !isVerticalFullScreen,
|
fullscreen: isFullScreen && !isVerticalFullScreen,
|
||||||
verticalFullScreen: isVerticalFullScreen,
|
verticalFullScreen: isVerticalFullScreen,
|
||||||
notInSharing: !inSharing,
|
notInSharing: !inSharing,
|
||||||
|
'only-share': templateId == 5 && !isShareByMe,
|
||||||
}"
|
}"
|
||||||
>
|
>
|
||||||
<div class="text-label-container" ref="textLabelContainerRef"></div>
|
<div class="text-label-container" ref="textLabelContainerRef"></div>
|
||||||
@ -420,6 +421,7 @@ const switchToVideoOn = () => {
|
|||||||
clearInterval(timer);
|
clearInterval(timer);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
nextBtn.click();
|
nextBtn.click();
|
||||||
isNextBtnHidden = nextBtn.className.includes(
|
isNextBtnHidden = nextBtn.className.includes(
|
||||||
"zmwebsdk-makeStyles-hidePaginationIcon"
|
"zmwebsdk-makeStyles-hidePaginationIcon"
|
||||||
@ -438,6 +440,7 @@ const switchToVideoOn = () => {
|
|||||||
|
|
||||||
const inSharing = ref(false); // 共享屏幕是否开启
|
const inSharing = ref(false); // 共享屏幕是否开启
|
||||||
const attendeeslist = ref("");
|
const attendeeslist = ref("");
|
||||||
|
const isShareByMe = ref(false);
|
||||||
setInterval(() => {
|
setInterval(() => {
|
||||||
// 共享屏幕状态变化
|
// 共享屏幕状态变化
|
||||||
const screenShareEl = document.querySelector(
|
const screenShareEl = document.querySelector(
|
||||||
@ -458,6 +461,27 @@ setInterval(() => {
|
|||||||
}
|
}
|
||||||
// ------
|
// ------
|
||||||
|
|
||||||
|
const stopShareEL = document.querySelector(
|
||||||
|
`div[class*="zmwebsdk-makeStyles-isSharing"]`
|
||||||
|
);
|
||||||
|
//-------------
|
||||||
|
const screenel = document.querySelectorAll(
|
||||||
|
'div[id*="suspension-view-tabpanel"] > .zmwebsdk-MuiBox-root.zmwebsdk-MuiBox-root'
|
||||||
|
)[1];
|
||||||
|
isShareByMe.value = stopShareEL ? true : false;
|
||||||
|
if (templateId.value == 5 && !isShareByMe.value) {
|
||||||
|
videoElementRef.value.style.height = `${
|
||||||
|
(videoElementRef.value.offsetWidth * 850) / 1346 + 42
|
||||||
|
}px`;
|
||||||
|
if (screenel)
|
||||||
|
screenel.style.height = `${
|
||||||
|
(videoElementRef.value.offsetWidth * 850) / 1346
|
||||||
|
}px`;
|
||||||
|
} else {
|
||||||
|
videoElementRef.value.style.height = `${meetingHeight.value + 42}px`;
|
||||||
|
screenel.style.height = "45vw";
|
||||||
|
}
|
||||||
|
//-----------
|
||||||
// TODO:
|
// TODO:
|
||||||
// 检测是否存在"同意被设为嘉宾按钮",存在则自动点击
|
// 检测是否存在"同意被设为嘉宾按钮",存在则自动点击
|
||||||
const isSetAsGuest = document.querySelector(
|
const isSetAsGuest = document.querySelector(
|
||||||
@ -912,6 +936,26 @@ $meetingComponentHeight: $meetingComponentWitdh * 9 / 16;
|
|||||||
$meetingBackgroundWidth: 80vw; //会议背景宽度
|
$meetingBackgroundWidth: 80vw; //会议背景宽度
|
||||||
$meetingBackgroundHeight: 80vw * 9 / 16;
|
$meetingBackgroundHeight: 80vw * 9 / 16;
|
||||||
|
|
||||||
|
// 只有共享屏幕时
|
||||||
|
.only-share {
|
||||||
|
padding-top: 0 !important;
|
||||||
|
// height: $meetingBackgroundHeight;
|
||||||
|
#video-element {
|
||||||
|
width: $meetingBackgroundWidth !important;
|
||||||
|
// height: $meetingBackgroundHeight !important;
|
||||||
|
}
|
||||||
|
:deep(#video-element
|
||||||
|
> div
|
||||||
|
> .zmwebsdk-MuiPaper-root
|
||||||
|
> .zmwebsdk-MuiPaper-root:first-child) {
|
||||||
|
width: $meetingBackgroundWidth !important;
|
||||||
|
}
|
||||||
|
:deep(div[id*="suspension-view-tabpanel"]
|
||||||
|
> .zmwebsdk-MuiBox-root.zmwebsdk-MuiBox-root) {
|
||||||
|
// height: $meetingBackgroundHeight !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
:deep(#right-chat .chat-container .message-list) {
|
:deep(#right-chat .chat-container .message-list) {
|
||||||
// height: $meetingComponentWitdh * 9 / 16;
|
// height: $meetingComponentWitdh * 9 / 16;
|
||||||
// height: 100%;
|
// height: 100%;
|
||||||
|
@ -19,7 +19,10 @@
|
|||||||
<div class="joinuser-wrap" style="display: flex; flex-wrap: wrap">
|
<div class="joinuser-wrap" style="display: flex; flex-wrap: wrap">
|
||||||
<div class="joinuser-item">
|
<div class="joinuser-item">
|
||||||
<el-form-item label="IC卡号" prop="icCard">
|
<el-form-item label="IC卡号" prop="icCard">
|
||||||
<el-input v-model="newJoinUser.icCard" placeholder="请输入IC卡号" />
|
<el-input
|
||||||
|
v-model="newJoinUser.icCard"
|
||||||
|
placeholder="请输入IC卡号,若没有IC卡号可输入手机号"
|
||||||
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</div>
|
</div>
|
||||||
<div class="joinuser-item">
|
<div class="joinuser-item">
|
||||||
|
Reference in New Issue
Block a user