From beb847d2623e7c1623434c6c5b903e3b9dbfc617 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Thu, 22 Aug 2024 17:49:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=8F=91=E8=A8=80=E4=BA=8C?=
 =?UTF-8?q?=E6=AC=A1=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/Meeting/index.tsx | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

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 = () => {
                 >拒绝</Button>
               </div>
             </div>,
-            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 = () => {
                           </div>
                         </Popover>
                       case '申请发言':
-                      case '结束发言':
                         if (user.roleId !== '1') {
                           return <div className='drag' onClick={() => changeStatusList(row, itemIndex, rowIndex)} key={rowIndex}>
                             <img src={row.active ? row.iconActive : row.icon} alt="" />
@@ -1710,6 +1702,28 @@ const Meeting: React.FC = () => {
                           </div>
                         }
                         return null
+                      case '结束发言':
+                        if (user.roleId !== '1') {
+                          return <Popconfirm
+                            title="提示"
+                            description="确定要结束发言吗？"
+                            onConfirm={() => {
+                              DeleteRoomManager({
+                                roomId: state.roomId,
+                                roomNum: state.channelId,
+                                userId: userInfo.uid
+                              })
+                            }}
+                            okText="确定"
+                            cancelText="取消"
+                          >
+                            <div className='drag' key={rowIndex}>
+                              <img src={row.active ? row.iconActive : row.icon} alt="" />
+                              <span>{row.title}</span>
+                            </div>
+                          </Popconfirm>
+                        }
+                        return null
                       case '会议监控':
                         if (user.roleId === '1') {
                           return <div className='drag' onClick={() => changeStatusList(row, itemIndex, rowIndex)} key={rowIndex}>