diff --git a/src/page/Meeting/index.module.scss b/src/page/Meeting/index.module.scss index f3a07c0..ac1ef37 100644 --- a/src/page/Meeting/index.module.scss +++ b/src/page/Meeting/index.module.scss @@ -303,7 +303,7 @@ // 演讲者模式 .meetingContentBodyLeftSpeakerMode { - width: 18%; + width: 270px; overflow-y: auto; height: 100%; @@ -312,7 +312,7 @@ } .meetingContentSwiperCard { - height: calc(100% / 6); + height: 160px; } } @@ -379,7 +379,7 @@ right: 0; bottom: 0; height: 100% !important; - width: calc(100% - 18%) !important; + width: calc(100% - 270px) !important; z-index: 2; } @@ -390,7 +390,7 @@ .meetingContentSwiperCard { height: 160px; - width: calc(100% / 6); + width: 270px; border-radius: 10px; overflow: hidden; position: relative; @@ -798,7 +798,7 @@ } >img { - height: 50px; + height: 35px; } >span { @@ -820,8 +820,8 @@ } >label { - height: 50px; - height: 50px; + height: 35px; + height: 35px; cursor: pointer; position: relative; diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index f5afd9b..99930e7 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -2376,7 +2376,7 @@ const Meeting: React.FC = () => { //右 } else { - return
setIsVideoFullScreen(true)}> + return
setIsVideoFullScreen(true)}> @@ -2415,6 +2415,13 @@ const Meeting: React.FC = () => { } message.success('操作成功') } + const hasScrollbar = () => { + let element = document.getElementById('videoView') as HTMLDivElement + if (element) { + return element.scrollHeight > element.clientHeight || element.scrollWidth > element.clientWidth; + } + return false + } // 移出房间 const getRoomKickout = async (channelId: string, uid: string, userName: string): Promise => { confirm({ @@ -2769,13 +2776,13 @@ const Meeting: React.FC = () => {
: null) } )} - {isAdmin > 6 ?
+ {hasScrollbar() ?
{meetingMode === "StandardMode" ?
{ const container = document.getElementById('videoView') as HTMLElement; container.scrollLeft -= 100 }}> -
:
{ +
:
{ const container = document.getElementById('videoView') as HTMLElement; container.scrollTop -= 100 }}> @@ -2786,7 +2793,7 @@ const Meeting: React.FC = () => { container.scrollLeft += 100 }}> -
:
{ +
:
{ const container = document.getElementById('videoView') as HTMLElement; container.scrollTop += 100 }}> @@ -3494,7 +3501,7 @@ const meetingContentUser = (item: any, bool?: boolean) => { <>
- {role.ID.includes(item.roleId) || item.isRoomManager ? + {role.ID.includes(item.roleId) ?
: null}