From ac689b9548fe0d27e111acb75591ed4b456d8e76 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Tue, 10 Sep 2024 14:04:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/Meeting/index.tsx | 50 +++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index dd3807c..e54a65c 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -1565,6 +1565,14 @@ const Meeting: React.FC = () => {
                             postOpenCamera(!item.enableCamera, item.uid)
                           }}
                         >{item.enableCamera ? '关闭视频' : '打开视频'}</Button> : null}
+                        {item.uid !== user.uid ? <Button
+                          type="primary"
+                          className='m-ant-btn'
+                          size={'small'}
+                          onClick={() => {
+                            equipmentManagement(item.uid, item.userName)
+                          }}
+                        >设备管理</Button> : null}
                         {item.uid !== user.uid ? <Button
                           type="primary"
                           style={{ backgroundColor: '#EC3C3C' }}
@@ -1574,14 +1582,6 @@ const Meeting: React.FC = () => {
                             getRoomKickout(state.channelId, item.uid, item.userName)
                           }}
                         >移出会议</Button> : null}
-                        {item.uid !== user.uid ? <Button
-                          type="primary"
-                          className='m-ant-btn'
-                          size={'small'}
-                          onClick={() => {
-                            equipmentManagement(item.uid, item.userName)
-                          }}
-                        >设备管理</Button> : null}
                       </div>
                     }>
                       <div className={styles.meetingContentOperation}>
@@ -1747,23 +1747,23 @@ const Meeting: React.FC = () => {
                                           }
                                         }}
                                       >{item.isRoomManager ? '取消发言人' : '设为发言人'}</Button> : null}
-                                      <Button
-                                        type="primary"
-                                        style={{ backgroundColor: '#EC3C3C', width: '100%' }}
-                                        size={'small'}
-                                        onClick={() => {
-                                          getRoomKickout(state.channelId, item.uid, item.userName)
-                                        }}
-                                      >移出会议</Button>
                                       <Button
                                         type="primary"
                                         className='m-ant-btn'
-                                        style={{ marginTop: '10px', width: '100%' }}
+                                        style={{ width: '100%' }}
                                         size={'small'}
                                         onClick={() => {
                                           equipmentManagement(item.uid, item.userName)
                                         }}
                                       >设备管理</Button>
+                                      <Button
+                                        type="primary"
+                                        style={{ backgroundColor: '#EC3C3C', width: '100%', marginTop: '10px' }}
+                                        size={'small'}
+                                        onClick={() => {
+                                          getRoomKickout(state.channelId, item.uid, item.userName)
+                                        }}
+                                      >移出会议</Button>
                                     </div>
                                   }>
                                     <EllipsisOutlined style={{
@@ -1887,6 +1887,14 @@ const Meeting: React.FC = () => {
                                         })
                                       }}
                                     >{roomUserItem.enableCamera ? '关闭视频' : '打开视频'}</Button> : null}
+                                    {roomUserItem.uid !== user.uid ? <Button
+                                      type="primary"
+                                      className='m-ant-btn'
+                                      size={'small'}
+                                      onClick={() => {
+                                        equipmentManagement(roomUserItem.uid, roomUserItem.userName)
+                                      }}
+                                    >设备管理</Button> : null}
                                     {roomUserItem.uid !== user.uid ? <Button
                                       type="primary"
                                       style={{ backgroundColor: '#EC3C3C' }}
@@ -1896,14 +1904,6 @@ const Meeting: React.FC = () => {
                                         getRoomKickout(state.channelId, roomUserItem.uid, roomUserItem.userName)
                                       }}
                                     >移出会议</Button> : null}
-                                    {roomUserItem.uid !== user.uid ? <Button
-                                      type="primary"
-                                      className='m-ant-btn'
-                                      size={'small'}
-                                      onClick={() => {
-                                        equipmentManagement(roomUserItem.uid, roomUserItem.userName)
-                                      }}
-                                    >设备管理</Button> : null}
                                   </div> : <div style={{ color: 'white' }}>用户不在房间内</div>
                                 }>
                                 <div>