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

Compare commits

base: marking:7020974f1a4c4dc382525cd87dbf35721fe2c331
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:b01a0a2035d25b16a6b452747221aeb06ca2d04c
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. "7020974f1a4c4dc382525cd87dbf35721fe2c331" and "b01a0a2035d25b16a6b452747221aeb06ca2d04c" have entirely different histories.
7020974f1a ... b01a0a2035

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

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

@ -125,7 +125,7 @@ const ChatBigWindow: React.FC = () => {
}
})
}}
>{roomUserItem.isRoomManager ? '取消发言' : '允许发言'}</Button> : null}
>{roomUserItem.isRoomManager ? '取消发言人' : '设为发言人'}</Button> : null}
{roomUserItem.isRoomManager ? <Button
type="primary"
className='m-ant-btn'

4
src/page/Meeting/UserListWindow/index.tsx
View File

@ -114,8 +114,8 @@ const UserListWindow: React.FC = () => {
}
}}>
{!item.isRoomManager ?
<img src={ImageUrl.icon50} alt="" title='允许发言' /> :
<img src={ImageUrl.icon51} alt="" title='取消发言' />}
<img src={ImageUrl.icon50} alt="" title='设为发言人' /> :
<img src={ImageUrl.icon51} alt="" title='取消发言人' />}
</div> : null}
{role.ID.includes(item.roleId) || item.isRoomManager ? <div>
<img src={item.enableMicr ? ImageUrl.icon22 : ImageUrl.icon22Active} alt="" onClick={() => {

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

@ -2092,7 +2092,7 @@ const Meeting: React.FC = () => {
})
}
}}
>{item.isRoomManager ? '取消发言' : '允许发言'}</Button> : null}
>{item.isRoomManager ? '取消发言人' : '设为发言人'}</Button> : null}
{item.isRoomManager ? <Button
type="primary"
className='m-ant-btn'
@ -2272,8 +2272,8 @@ const Meeting: React.FC = () => {
}
}}>
{!item.isRoomManager ?
<img src={ImageUrl.icon50} alt="" title='允许发言' /> :
<img src={ImageUrl.icon51} alt="" title='取消发言' />
<img src={ImageUrl.icon50} alt="" title='设为发言人' /> :
<img src={ImageUrl.icon51} alt="" title='取消发言人' />
}
</div> : null}
{role.ID.includes(item.roleId) || item.isRoomManager ? <div>
@ -2397,7 +2397,7 @@ const Meeting: React.FC = () => {
}
})
}}
>{roomUserItem.isRoomManager ? '取消发言' : '允许发言'}</Button> : null}
>{roomUserItem.isRoomManager ? '取消发言人' : '设为发言人'}</Button> : null}
{roomUserItem.isRoomManager ? <Button
type="primary"
className='m-ant-btn'