This commit is contained in:
parent
cb6aa21477
commit
fcefaea359
|
|
@ -283,9 +283,12 @@
|
|||
bottom: 16px;
|
||||
z-index: 2;
|
||||
cursor: pointer;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
background-color: rgba(0, 0, 0, 0.5);
|
||||
padding: 5px;
|
||||
box-sizing: border-box;
|
||||
padding: 0px 5px;
|
||||
}
|
||||
|
||||
.meetingContentSwiperCardShare {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import Operation from '@/components/Operation';
|
|||
import SpeakerModeModal from '@/components/SpeakerModeModal';
|
||||
import InvitingPersonnelModal from '@/components/InvitingPersonnelModal';
|
||||
import { Button, Input, Popover, Modal, Checkbox, message, Popconfirm } from "antd";
|
||||
import { SearchOutlined, SmallDashOutlined } from '@ant-design/icons';
|
||||
import { SearchOutlined, EllipsisOutlined } from '@ant-design/icons';
|
||||
import { useLocation, useNavigate } from 'react-router-dom';
|
||||
import { thumbImageBufferToBase64 } from '@/utils/package/base64'
|
||||
import { storage } from '@/utils';
|
||||
|
|
@ -788,11 +788,11 @@ const Meeting: React.FC = () => {
|
|||
})
|
||||
}
|
||||
// 设置全员观看
|
||||
const setAllUserLook = (): void => {
|
||||
const setAllUserLook = (item: any): void => {
|
||||
if (isShare) {
|
||||
allUserLook(String(isShare) === currentLookUserAccount.screenShareId ? currentLookUserAccount.screenShareId : currentLookUserAccount.uid)
|
||||
allUserLook(String(isShare) === item.screenShareId ? item.screenShareId : item.uid)
|
||||
} else {
|
||||
allUserLook(currentLookUserAccount.uid)
|
||||
allUserLook(item.uid)
|
||||
}
|
||||
}
|
||||
return (
|
||||
|
|
@ -873,6 +873,22 @@ const Meeting: React.FC = () => {
|
|||
{String(isShare) === item.screenShareId ? <div className={styles.meetingContentSwiperCardShare}>
|
||||
屏幕分享中
|
||||
</div> : null}
|
||||
<Popover placement="top" title={''} content={
|
||||
<div>
|
||||
<Button
|
||||
type="primary"
|
||||
className='m-ant-btn'
|
||||
onClick={() => setAllUserLook(item)}
|
||||
>全员看Ta</Button>
|
||||
</div>
|
||||
}>
|
||||
<div className={styles.meetingContentOperation}>
|
||||
<EllipsisOutlined style={{
|
||||
color: '#fff',
|
||||
fontSize: '20px'
|
||||
}} />
|
||||
</div>
|
||||
</Popover>
|
||||
</div>
|
||||
}
|
||||
)}
|
||||
|
|
@ -893,22 +909,6 @@ const Meeting: React.FC = () => {
|
|||
</div>}
|
||||
</div>
|
||||
{meetingContentUser(currentLookUserAccount)}
|
||||
<Popover placement="top" title={''} content={
|
||||
<div>
|
||||
<Button
|
||||
type="primary"
|
||||
className='m-ant-btn'
|
||||
onClick={() => setAllUserLook()}
|
||||
>全员看Ta</Button>
|
||||
</div>
|
||||
}>
|
||||
<div className={styles.meetingContentOperation}>
|
||||
<SmallDashOutlined style={{
|
||||
color: '#fff',
|
||||
fontSize: '30px'
|
||||
}} />
|
||||
</div>
|
||||
</Popover>
|
||||
{currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
|
||||
</div> : null}
|
||||
{currentLookUserStatus === 2 && currentLookUserAccount ?
|
||||
|
|
@ -919,22 +919,6 @@ const Meeting: React.FC = () => {
|
|||
</div>
|
||||
</div>
|
||||
{meetingContentUser(currentLookUserAccount)}
|
||||
<Popover placement="top" title={''} content={
|
||||
<div>
|
||||
<Button
|
||||
type="primary"
|
||||
className='m-ant-btn'
|
||||
onClick={() => setAllUserLook()}
|
||||
>全员看Ta</Button>
|
||||
</div>
|
||||
}>
|
||||
<div className={styles.meetingContentOperation}>
|
||||
<SmallDashOutlined style={{
|
||||
color: '#fff',
|
||||
fontSize: '30px'
|
||||
}} />
|
||||
</div>
|
||||
</Popover>
|
||||
{currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
|
||||
</div> : null}
|
||||
{currentLookUserStatus === 3 && currentLookUserAccount ?
|
||||
|
|
@ -945,22 +929,6 @@ const Meeting: React.FC = () => {
|
|||
</div>
|
||||
</div>
|
||||
{meetingContentUser(currentLookUserAccount)}
|
||||
<Popover placement="top" title={''} content={
|
||||
<div>
|
||||
<Button
|
||||
type="primary"
|
||||
className='m-ant-btn'
|
||||
onClick={() => setAllUserLook()}
|
||||
>全员看Ta</Button>
|
||||
</div>
|
||||
}>
|
||||
<div className={styles.meetingContentOperation}>
|
||||
<SmallDashOutlined style={{
|
||||
color: '#fff',
|
||||
fontSize: '30px'
|
||||
}} />
|
||||
</div>
|
||||
</Popover>
|
||||
{currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
|
||||
</div> : null}
|
||||
{currentLookUserStatus === 4 && currentLookUserAccount ?
|
||||
|
|
@ -971,22 +939,6 @@ const Meeting: React.FC = () => {
|
|||
</div>
|
||||
</div>
|
||||
{meetingContentUser(currentLookUserAccount)}
|
||||
<Popover placement="top" title={''} content={
|
||||
<div>
|
||||
<Button
|
||||
type="primary"
|
||||
className='m-ant-btn'
|
||||
onClick={() => setAllUserLook()}
|
||||
>全员看Ta</Button>
|
||||
</div>
|
||||
}>
|
||||
<div className={styles.meetingContentOperation}>
|
||||
<SmallDashOutlined style={{
|
||||
color: '#fff',
|
||||
fontSize: '30px'
|
||||
}} />
|
||||
</div>
|
||||
</Popover>
|
||||
{currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
|
||||
</div> : null}
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue