diff --git a/src/api/Home/Index/index.ts b/src/api/Home/Index/index.ts index 4316481..bcb47e7 100644 --- a/src/api/Home/Index/index.ts +++ b/src/api/Home/Index/index.ts @@ -11,6 +11,12 @@ export const PostRoom = (data: any) => method: 'post', data, }) +export const PostRoomInfo = (data: any) => + request({ + url: `/home/room-info`, + method: 'put', + data, + }) export const DeleteRoom = (roomId: string) => request({ url: `/home/room?roomId=${roomId}`, diff --git a/src/api/Home/User/index.ts b/src/api/Home/User/index.ts index a2d9028..2664037 100644 --- a/src/api/Home/User/index.ts +++ b/src/api/Home/User/index.ts @@ -33,6 +33,12 @@ export const PutUserPwd = (data: { id: string, pwd: string }) => data }) +export const GetSubDpList = () => + request({ + url: `/pub/sub-dp-list`, + method: 'get', + }) + export const GetRoleDpList = () => request({ url: `/pub/role-dp-list`, diff --git a/src/page/Home/Index/index.tsx b/src/page/Home/Index/index.tsx index 20d95cf..c50fd46 100644 --- a/src/page/Home/Index/index.tsx +++ b/src/page/Home/Index/index.tsx @@ -1,8 +1,8 @@ import styles from '@/page/Home/Index/index.module.scss' import { useEffect, useState, useRef } from "react"; import Operation from '@/components/Operation'; -import { Button, Input, Modal, Pagination, Empty, message, Popover, Popconfirm, DatePicker } from "antd"; -import { GetRoom, PostRoom, GetCheckoutRoomNum, GetRoomRtcToken, DeleteRoom, GetRecord } from '@/api/Home/Index'; +import { Button, Input, Modal, Pagination, Empty, message, Popover, Popconfirm, DatePicker, Select } from "antd"; +import { GetRoom, PostRoom, GetCheckoutRoomNum, GetRoomRtcToken, DeleteRoom, GetRecord, PostRoomInfo } from '@/api/Home/Index'; import ImageUrl from '@/utils/package/imageUrl' import { ExclamationCircleFilled, ReloadOutlined } from '@ant-design/icons'; import JoinSetting from '@/components/JoinSetting'; @@ -12,6 +12,7 @@ import { useNavigate } from 'react-router-dom'; import { role } from '@/config/role'; import dayjs from 'dayjs'; import StupWizard from '@/components/StupWizard'; +import { GetSubDpList } from '@/api/Home/User'; const fs = require('fs').promises; const { exec } = require('child_process'); const { RangePicker } = DatePicker; @@ -26,15 +27,20 @@ const Index: React.FC = () => { }) const [createRoomModal, setCreateRoomModal] = useState(false) const [timeSelectModal, setTimeSelectModal] = useState(false) - const [createRoomFrom, setCreateRoomFrom] = useState<{ roomName: string, roomNum: string }>({ + const [createRoomFrom, setCreateRoomFrom] = useState<{ id: string, roomName: string, roomNum: string, subject: string, year: string }>({ + id: "", roomName: "", - roomNum: "" + roomNum: "", + subject: "", + year: "" }) const joinSettingRef = useRef(); const stupWizardRef = useRef(); const [user, setUser] = useState({}); const [currentRoomInfo, setCurrentRoomInfo] = useState({}); + const [subjectList, setSubjectList] = useState([]); const [timeData, setTimeData] = useState([]); + const [isCreateRoom, setIsCreateRoom] = useState(false); const userInfo = JSON.parse(storage.getItem('user') as string) useEffect(() => { setUser(userInfo) @@ -62,7 +68,12 @@ const Index: React.FC = () => { setList({ ...list, total: res.data.total, - data: res.data.items, + data: res.data.items.map((item: any) => { + return { + ...item, + open: false + } + }), }) } }) @@ -80,6 +91,13 @@ const Index: React.FC = () => { } }) } + const getSubDpList = async (): Promise => { + await GetSubDpList().then(res => { + if (res.code === 200) { + setSubjectList(res.data.map((item: any) => { return { value: item.value, label: item.name } })) + } + }) + } const getRoomRtcToken = async (roomNum: string, callBack: Function): Promise => { Promise.all([GetRoomRtcToken(roomNum), GetRoomRtcToken(roomNum + 'a')]).then(res => { if (res[0].code === 200 && res[1].code === 200) { @@ -166,8 +184,13 @@ const Index: React.FC = () => { onClick={() => { setCreateRoomFrom({ roomName: "", - roomNum: "" + roomNum: "", + subject: "", + year: "", + id: "", }) + getSubDpList() + setIsCreateRoom(true) setCreateRoomModal(true) }} style={{ marginRight: '22px' }} @@ -234,13 +257,26 @@ const Index: React.FC = () => { okText="确定" cancelText="取消" > -
删除会议室
+
删除会议室
: null} -
{ +
{ changeOpen(index, false) setTimeSelectModal(true) }}>导出参会记录
-
{ +
{ + changeOpen(index, false) + setCreateRoomFrom({ + roomName: item.roomName, + roomNum: item.roomNum, + subject: item.subject, + year: item.year, + id: item.id, + }) + getSubDpList() + setIsCreateRoom(false) + setCreateRoomModal(true) + }}>更新会议信息
+
{ changeOpen(index, false) }}>取消
@@ -298,19 +334,19 @@ const Index: React.FC = () => {
}
- { + { setList({ ...list, pageIndex: e }) - }} pageSize={list.pageSize} showSizeChanger={false}/> + }} pageSize={list.pageSize} showSizeChanger={false} />
- +
- { >获取随机房间号 } - /> + /> : null} { }) }} autoSize /> + { + const regex = /^[0-9]*$/; + if (regex.test(e.target.value)) { + setCreateRoomFrom({ + ...createRoomFrom, + year: e.target.value + }) + } + }} + /> +