diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 423481f..528e859 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -426,7 +426,7 @@ const Meeting: React.FC = () => { >拒绝 , - duration: 3, + duration: 10, placement: 'bottomRight', showProgress: true, pauseOnHover: false, @@ -853,13 +853,6 @@ const Meeting: React.FC = () => { case '申请发言': GetApplySpeak(state.channelId) break; - case '结束发言': - DeleteRoomManager({ - roomId: state.roomId, - roomNum: state.channelId, - userId: userInfo.uid - }) - break; case '会议监控': window.electron.oepnWindow({ url: location.origin + '/#/userVideo' @@ -1702,7 +1695,6 @@ const Meeting: React.FC = () => { case '申请发言': - case '结束发言': if (user.roleId !== '1') { return
changeStatusList(row, itemIndex, rowIndex)} key={rowIndex}> @@ -1710,6 +1702,28 @@ const Meeting: React.FC = () => {
} return null + case '结束发言': + if (user.roleId !== '1') { + return { + DeleteRoomManager({ + roomId: state.roomId, + roomNum: state.channelId, + userId: userInfo.uid + }) + }} + okText="确定" + cancelText="取消" + > +
+ + {row.title} +
+
+ } + return null case '会议监控': if (user.roleId === '1') { return
changeStatusList(row, itemIndex, rowIndex)} key={rowIndex}>