yangjie #22
|
|
@ -152,4 +152,20 @@
|
|||
letter-spacing: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.createRoom {
|
||||
>div {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 14px;
|
||||
|
||||
>span {
|
||||
color: white;
|
||||
flex-shrink: 0;
|
||||
font-size: 14px;
|
||||
text-align: right;
|
||||
width: 70px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -27,12 +27,12 @@ const Index: React.FC = () => {
|
|||
})
|
||||
const [createRoomModal, setCreateRoomModal] = useState(false)
|
||||
const [timeSelectModal, setTimeSelectModal] = useState(false)
|
||||
const [createRoomFrom, setCreateRoomFrom] = useState<{ id: string, roomName: string, roomNum: string, subject: string, year: string }>({
|
||||
const [createRoomFrom, setCreateRoomFrom] = useState<{ id: string, roomName: string, roomNum: string, subject: number, year: string }>({
|
||||
id: "",
|
||||
roomName: "",
|
||||
roomNum: "",
|
||||
subject: "",
|
||||
year: ""
|
||||
subject: 0,
|
||||
year: "0"
|
||||
})
|
||||
const joinSettingRef = useRef<any>();
|
||||
const stupWizardRef = useRef<any>();
|
||||
|
|
@ -185,8 +185,8 @@ const Index: React.FC = () => {
|
|||
setCreateRoomFrom({
|
||||
roomName: "",
|
||||
roomNum: "",
|
||||
subject: "",
|
||||
year: "",
|
||||
subject: 0,
|
||||
year: "0",
|
||||
id: "",
|
||||
})
|
||||
getSubDpList()
|
||||
|
|
@ -345,79 +345,91 @@ const Index: React.FC = () => {
|
|||
</div>
|
||||
<Modal title={isCreateRoom ? '新建会议室' : '修改会议信息'} open={createRoomModal} footer={null} closable={false} centered width={'400px'}>
|
||||
<div>
|
||||
<div>
|
||||
{isCreateRoom ? <Input
|
||||
placeholder="请输入房间号"
|
||||
style={{ marginBottom: '14px' }}
|
||||
className={styles.letterSpacing}
|
||||
showCount
|
||||
maxLength={8}
|
||||
value={createRoomFrom.roomNum}
|
||||
onChange={(e) => {
|
||||
const regex = /^[0-9]*$/;
|
||||
if (regex.test(e.target.value)) {
|
||||
setCreateRoomFrom({
|
||||
...createRoomFrom,
|
||||
roomNum: e.target.value
|
||||
})
|
||||
}
|
||||
}}
|
||||
suffix={
|
||||
<span
|
||||
style={{ color: '#47D3D0', cursor: 'pointer' }}
|
||||
onClick={() => {
|
||||
function generateTimestampWithRandom(): string {
|
||||
const timestamp = new Date().getTime();
|
||||
const lastSixDigits = timestamp.toString().slice(-6);
|
||||
const randomTwoDigits = ('0' + Math.floor(Math.random() * 100)).slice(-2);
|
||||
return lastSixDigits + randomTwoDigits;
|
||||
}
|
||||
<div className={styles.createRoom}>
|
||||
{isCreateRoom ? <div>
|
||||
<span>房间号：</span>
|
||||
<Input
|
||||
placeholder="请输入房间号"
|
||||
style={{ flexGrow: 1 }}
|
||||
className={styles.letterSpacing}
|
||||
showCount
|
||||
maxLength={8}
|
||||
value={createRoomFrom.roomNum}
|
||||
onChange={(e) => {
|
||||
const regex = /^[0-9]*$/;
|
||||
if (regex.test(e.target.value)) {
|
||||
setCreateRoomFrom({
|
||||
...createRoomFrom,
|
||||
roomNum: generateTimestampWithRandom(),
|
||||
roomNum: e.target.value
|
||||
})
|
||||
}}
|
||||
>获取随机房间号
|
||||
</span>
|
||||
}
|
||||
/> : null}
|
||||
<Input.TextArea
|
||||
placeholder="请输入房间名字"
|
||||
style={{ marginBottom: '14px' }}
|
||||
showCount
|
||||
maxLength={30}
|
||||
value={createRoomFrom.roomName}
|
||||
onChange={(e) => {
|
||||
setCreateRoomFrom({
|
||||
...createRoomFrom,
|
||||
roomName: e.target.value
|
||||
})
|
||||
}}
|
||||
autoSize />
|
||||
<Input
|
||||
placeholder="请输入届"
|
||||
style={{ marginBottom: '14px' }}
|
||||
value={createRoomFrom.year}
|
||||
onChange={(e) => {
|
||||
const regex = /^[0-9]*$/;
|
||||
if (regex.test(e.target.value)) {
|
||||
}
|
||||
}}
|
||||
suffix={
|
||||
<span
|
||||
style={{ color: '#47D3D0', cursor: 'pointer' }}
|
||||
onClick={() => {
|
||||
function generateTimestampWithRandom(): string {
|
||||
const timestamp = new Date().getTime();
|
||||
const lastSixDigits = timestamp.toString().slice(-6);
|
||||
const randomTwoDigits = ('0' + Math.floor(Math.random() * 100)).slice(-2);
|
||||
return lastSixDigits + randomTwoDigits;
|
||||
}
|
||||
setCreateRoomFrom({
|
||||
...createRoomFrom,
|
||||
roomNum: generateTimestampWithRandom(),
|
||||
})
|
||||
}}
|
||||
>获取随机房间号
|
||||
</span>
|
||||
}
|
||||
/>
|
||||
</div> : null}
|
||||
<div>
|
||||
<span>房间名字：</span>
|
||||
<Input.TextArea
|
||||
placeholder="请输入房间名字"
|
||||
style={{ flexGrow: 1 }}
|
||||
showCount
|
||||
maxLength={30}
|
||||
value={createRoomFrom.roomName}
|
||||
onChange={(e) => {
|
||||
setCreateRoomFrom({
|
||||
...createRoomFrom,
|
||||
year: e.target.value
|
||||
roomName: e.target.value
|
||||
})
|
||||
}
|
||||
}}
|
||||
/>
|
||||
<Select
|
||||
placeholder='请选择学科'
|
||||
style={{ width: '100%', marginBottom: '14px' }}
|
||||
options={subjectList}
|
||||
value={createRoomFrom.subject === "" ? null : createRoomFrom.subject} onChange={(e) => {
|
||||
setCreateRoomFrom({
|
||||
...createRoomFrom,
|
||||
subject: e
|
||||
})
|
||||
}} />
|
||||
}}
|
||||
autoSize />
|
||||
</div>
|
||||
<div>
|
||||
<span>届：</span>
|
||||
<Input
|
||||
placeholder="请输入届"
|
||||
style={{ flexGrow: 1 }}
|
||||
value={createRoomFrom.year}
|
||||
onChange={(e) => {
|
||||
const regex = /^[0-9]*$/;
|
||||
if (regex.test(e.target.value)) {
|
||||
setCreateRoomFrom({
|
||||
...createRoomFrom,
|
||||
year: e.target.value
|
||||
})
|
||||
}
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<span>学科：</span>
|
||||
<Select
|
||||
placeholder='请选择学科'
|
||||
style={{ flexGrow: 1 }}
|
||||
options={subjectList}
|
||||
value={createRoomFrom.subject} onChange={(e) => {
|
||||
setCreateRoomFrom({
|
||||
...createRoomFrom,
|
||||
subject: e
|
||||
})
|
||||
}} />
|
||||
</div>
|
||||
</div>
|
||||
<div style={{
|
||||
display: 'flex', justifyContent: 'center'
|
||||
|
|
@ -433,9 +445,6 @@ const Index: React.FC = () => {
|
|||
if (!createRoomFrom.year) {
|
||||
return message.error('请输入届！')
|
||||
}
|
||||
if (createRoomFrom.subject === "") {
|
||||
return message.error('请选择学科！')
|
||||
}
|
||||
if (isCreateRoom) {
|
||||
isGetCheckoutRoomNum(createRoomFrom.roomNum, (bool: boolean) => {
|
||||
if (bool) {
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@ const User: React.FC = () => {
|
|||
RoleId: null,
|
||||
Pwd: "",
|
||||
UserName: "",
|
||||
subject: null,
|
||||
year: "",
|
||||
subject: 0,
|
||||
year: '0',
|
||||
})
|
||||
const [changeUserPawModal, setChangeUserPawModal] = useState(false)
|
||||
const [changeImportModal, setChangeImportModal] = useState(false)
|
||||
|
|
@ -151,8 +151,8 @@ const User: React.FC = () => {
|
|||
RoleId: null,
|
||||
Pwd: "",
|
||||
UserName: "",
|
||||
subject: null,
|
||||
year: "",
|
||||
subject: 0,
|
||||
year: '0',
|
||||
})
|
||||
setAddUserModal(true)
|
||||
}
|
||||
|
|
@ -181,8 +181,8 @@ const User: React.FC = () => {
|
|||
RoleId: null,
|
||||
Pwd: "",
|
||||
UserName: "",
|
||||
subject: null,
|
||||
year: "",
|
||||
subject: 0,
|
||||
year: '0',
|
||||
})
|
||||
setAddUserModal(true)
|
||||
}
|
||||
|
|
@ -426,9 +426,6 @@ const User: React.FC = () => {
|
|||
if (!addUserFrom.year) {
|
||||
return message.error('请输入届！')
|
||||
}
|
||||
if (addUserFrom.subject === null) {
|
||||
return message.error('请选择学科！')
|
||||
}
|
||||
if (isCreateUser === 'add') {
|
||||
await PostUser({
|
||||
...addUserFrom,
|
||||
|
|
|
|||
Loading…
Reference in New Issue