From 96b1ba5b419c281b9442d09a08f80fc89af24d6b Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Fri, 9 Aug 2024 17:57:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Meeting/index.ts     |  6 ++++--
 src/page/Meeting/index.tsx   | 20 ++------------------
 src/utils/package/signalr.ts |  2 --
 3 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/api/Meeting/index.ts b/src/api/Meeting/index.ts
index d3854e9..9c72597 100644
--- a/src/api/Meeting/index.ts
+++ b/src/api/Meeting/index.ts
@@ -61,16 +61,18 @@ export const PostOpenCamera = (data: any) =>
     data
   })
 
-export const PostRoomManager = (roomId: string, roomNum: string) =>
+export const PostRoomManager = (roomId: string, roomNum: string, uid: string) =>
   request({
     url: `/room/manager?roomId=${roomId}&roomNum=${roomNum}`,
     method: 'post',
+    data: uid
   })
 
-export const DeleteRoomManager = (roomId: string, roomNum: string) =>
+export const DeleteRoomManager = (roomId: string, roomNum: string, uid: string) =>
   request({
     url: `/room/manager?roomId=${roomId}&roomNum=${roomNum}`,
     method: 'delete',
+    data: uid
   })
 
 export const GetRoomKickout = (roomNum: string, kickUid: string) =>
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 93c7f04..d54ab39 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -258,14 +258,12 @@ const Meeting: React.FC = () => {
         // 扩展操作
         case 'Operation':
           // 1:全员退出会议
-          // 2:设置取消管理员
           // 3:踢出房间
           // 4:屏幕共享
           switch (item.type) {
             case 1:
               leaveChannel()
               break;
-            case 2:
             case 3:
 
               break;
@@ -1007,14 +1005,7 @@ const Meeting: React.FC = () => {
                                   style={{ marginBottom: '10px', width: '80%' }}
                                   size={'small'}
                                   onClick={() => {
-                                    PostRoomManager(state.roomId, state.channelId).then(res => {
-                                      if (res.code === 200) {
-                                        onInvoke('sendOper', {
-                                          roomNum: state.channelId,
-                                          type: 2,
-                                        })
-                                      }
-                                    })
+                                    PostRoomManager(state.roomId, state.channelId, item.uid)
                                   }}
                                 >设为管理员</Button> : <Button
                                   type="primary"
@@ -1022,14 +1013,7 @@ const Meeting: React.FC = () => {
                                   style={{ marginBottom: '10px', width: '80%' }}
                                   size={'small'}
                                   onClick={() => {
-                                    DeleteRoomManager(state.roomId, state.channelId).then(res => {
-                                      if (res.code === 200) {
-                                        onInvoke('sendOper', {
-                                          roomNum: state.channelId,
-                                          type: 2,
-                                        })
-                                      }
-                                    })
+                                    DeleteRoomManager(state.roomId, state.channelId, item.uid)
                                   }}
                                 >取消管理员</Button>}
 
diff --git a/src/utils/package/signalr.ts b/src/utils/package/signalr.ts
index 149c037..6efeac4 100644
--- a/src/utils/package/signalr.ts
+++ b/src/utils/package/signalr.ts
@@ -131,7 +131,6 @@ export const offSignalr = () => {
     connection.off('ForceExitRoom');
     connection.off('ShowUser');
     connection.off('RefreshView');
-
     connection.off('UserJoined');
     connection.off('UserLeave');
     connection.off('OperAllMicr');
@@ -147,7 +146,6 @@ export const onInvoke = async (str: string, data: any) => {
       break;
     case 'sendOper':
       // 1:全员退出会议
-      // 2:设置取消管理员
       // 3:踢出房间
       // 4:屏幕共享
       await connection.invoke(str, data.roomNum, data.type)