marking
/
WGShare.Client.Electron
18
0
Fork 0
Code Pull Requests 1 Actions Releases 4 Activity

Compare commits

base: marking:cfdf042eaf79b1c00f7ccd7b075425c396cf33c5
Branches Tags
marking:master
marking:yangjie
marking:视频监控
marking:master-襄阳四中
marking:0.8.0
marking:0.7.1
marking:0.7.0
marking:0.6.4
..
compare: marking:4550e9da9bf890e09d763510bed9d32ed1ae7a7c
Branches Tags
marking:yangjie
marking:视频监控
marking:master
marking:master-襄阳四中
marking:0.8.0
marking:0.7.1
marking:0.7.0
marking:0.6.4

No commits in common. "cfdf042eaf79b1c00f7ccd7b075425c396cf33c5" and "4550e9da9bf890e09d763510bed9d32ed1ae7a7c" have entirely different histories.
cfdf042eaf ... 4550e9da9b

2 changed files with 3 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
src/page/Meeting/NoticeWindow/index.tsx
View File

@ -22,7 +22,7 @@ const NoticeWindow: React.FC = () => {
message: '', message: '',
description: <div> description: <div>
<span style={{ fontSize: '16px' }}>{noticeItem.uname}申请发言</span> <span style={{ fontSize: '16px' }}>{noticeItem.uname}申请发言</span>
<div style={{ display: 'flex', justifyContent: 'flex-end' }} className='drag'> <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
<Button <Button
type="primary" type="primary"
className='m-ant-btn' className='m-ant-btn'

3
src/page/Meeting/index.tsx
View File

@ -668,6 +668,7 @@ const Meeting: React.FC = () => {
} }
return '' return ''
}) })
await stopScreenCapture() await stopScreenCapture()
} else { } else {
message.success(`管理员${item.user.isRoomManager ? '设置' : '取消'}${item.user.userName}为发言人`) message.success(`管理员${item.user.isRoomManager ? '设置' : '取消'}${item.user.userName}为发言人`)
@ -692,7 +693,7 @@ const Meeting: React.FC = () => {
message: '', message: '',
description: <div> description: <div>
<span style={{ fontSize: '16px' }}>{item.uname}申请发言</span> <span style={{ fontSize: '16px' }}>{item.uname}申请发言</span>
<div style={{ display: 'flex', justifyContent: 'flex-end' }} className='drag'> <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
<Button <Button
type="primary" type="primary"
className='m-ant-btn' className='m-ant-btn'