diff --git a/src/page/Meeting/UserListWindow/index.tsx b/src/page/Meeting/UserListWindow/index.tsx index 6f29e5f..2c860c1 100644 --- a/src/page/Meeting/UserListWindow/index.tsx +++ b/src/page/Meeting/UserListWindow/index.tsx @@ -6,7 +6,6 @@ import { Button, Input, Modal, Popover } from 'antd'; import Avatar from '@/components/Avatar'; import { useEffect, useState, useRef } from "react"; import { storage } from '@/utils'; -import { GetRoomUser } from '@/api/Meeting'; import { setKeyOpenChildWindow } from '@/utils/package/public'; import EquipmentManagement from '@/components/EquipmentManagement'; const { confirm } = Modal; @@ -20,7 +19,6 @@ const UserListWindow: React.FC = () => { const userInfo = JSON.parse(storage.getItem('user') as string) useEffect(() => { setUser(userInfo) - getRoomUser() channel.onmessage = function (event) { const { type, roomUserList, showDriverList } = event.data; switch (type) { @@ -32,21 +30,10 @@ const UserListWindow: React.FC = () => { break; } } + channel.postMessage({ + type: 'userListWindowGetRoomUserList' + }); }, []); - // 获取房间用户 - const getRoomUser = async (): Promise => { - const data = JSON.parse(storage.getItem('stateInfo') as string) - GetRoomUser(data.channelId).then(res => { - if (res.code === 200) { - res.data.forEach((item: any) => { - item.isShow = true; - item.isRoom = true; - item.isAdmin = role.ID.includes(item.roleId) || item.isRoomManager - }) - setRoomUserList(res.data) - } - }) - } return ( <>
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 53277b1..ba86194 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -301,6 +301,16 @@ const Meeting: React.FC = () => { userId: userListWindowPostRoomManager.uid }) break; + case 'userListWindowGetRoomUserList': + setRoomUserList(((res: any) => { + channel.postMessage({ + type: 'roomUserList', + roomUserList: res, + }); + return res + })) + break; + break; case 'userListWindowGetRoomKickout': GetRoomKickout(state.channelId, userListWindowGetRoomKickout.uid) break;