Skip to content

Commit 4e6fabd

Browse files
eleliaukeleliauk
committed
Merge branch 'main' of github.com:Muxi-X/MuXi-Fresh-Fe-2.0
2 parents 03afb57 + e90ad8b commit 4e6fabd

20 files changed

Lines changed: 388 additions & 269 deletions

File tree

‎src/components/Layout/Layout.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ import { UserIdentity, UserIsForm } from '../Verify/UserIdentity.ts';
1616

1717
const { Header, Content, Sider } = LayoutAntd;
1818

19-
const muxi_logo="https://ossfresh-test.muxixyz.com/%E5%B7%A6%E4%B8%8A%E8%A7%92%401x%281%29.png";
19+
const muxi_logo =
20+
'https://ossfresh-test.muxixyz.com/%E5%B7%A6%E4%B8%8A%E8%A7%92%401x%281%29.png';
2021
const logo = 'https://muxi-fresh.muxixyz.com/fe-static/muxilogo.png';
2122
const defaultAvatar = 'https://muxi-fresh.muxixyz.com/fe-static/default_avatar.png';
2223

@@ -302,7 +303,6 @@ const Layout: React.FC<LayoutProps> = ({ identity, isForm }) => {
302303
/>
303304
</ConfigProvider>
304305
</div>
305-
306306
</Sider>
307307
<Content>
308308
<div className={'layoutBox'}>

‎src/pages/Review/Review.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import './Review.less';
22
import { useEffect, useState } from 'react';
33
import { post } from '../../fetch.ts';
4-
import { AdmissionStatus, ExamStatus, Gender, ReviewList, ReviewRow } from './ReviewList.ts';
4+
import { ReviewList, ReviewRow } from './ReviewList.ts';
55
import ReviewYear from './components/ReviewYear/ReviewYear.tsx';
66
import { Group, ReviewFilter, Season, YearSeason } from './ReviewFitler.ts';
77
import ReviewGroupSelect from './components/ReviewGroupSelect/ReviewGroupSelect.tsx';
@@ -61,8 +61,6 @@ const Review = () => {
6161
});
6262
// eslint-disable-next-line react-hooks/exhaustive-deps
6363
}, [reviewFilter]);
64-
65-
6664

6765
return (
6866
<div className={'reviewContent'}>

‎src/pages/Review/ReviewList.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ export enum ExamStatus {
1111
'未提交' = '未提交',
1212
}
1313

14-
export enum Gender{
15-
'male'='男',
16-
'female'='女',
14+
export enum Gender {
15+
'male' = '男',
16+
'female' = '女',
1717
}
1818

1919
export interface ReviewRow {
@@ -26,7 +26,7 @@ export interface ReviewRow {
2626
schedule_id: string;
2727
school: string;
2828
user_id: string;
29-
gender:Gender
29+
gender: Gender;
3030
}
3131

3232
export interface ReviewList {

‎src/pages/Review/components/ReviewTable/ReviewTable.tsx‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import React, { useCallback, useEffect, useMemo, useState } from 'react';
22
import './ReviewTable.less';
33
import type { ColumnsType, TableProps } from 'antd/es/table';
4-
import { AdmissionStatus, ReviewRow,Gender } from '../../ReviewList.ts';
4+
import { AdmissionStatus, ReviewRow, Gender } from '../../ReviewList.ts';
55
import { Link } from 'react-router-dom';
66
import { message, Select, Table } from 'antd';
77
import { post } from '../../../../fetch.ts';
88
import type { FilterValue, SorterResult } from 'antd/es/table/interface';
99

10-
1110
type ReviewTableProps = {
1211
reviewList: ReviewRow[];
1312
loading: boolean;
@@ -31,15 +30,15 @@ const ReviewTable: React.FC<ReviewTableProps> = ({ reviewList, loading }) => {
3130
}, [reviewTable]);
3231

3332
// 缓存gender过滤器
34-
const genderFilters = useMemo(()=>{
33+
const genderFilters = useMemo(() => {
3534
return (
36-
reviewTable &&
37-
[...new Set(reviewTable.map((r)=>r.gender))].map((gender) => ({
35+
reviewTable &&
36+
[...new Set(reviewTable.map((r) => r.gender))].map((gender) => ({
3837
text: Gender[gender as unknown as keyof typeof Gender],
39-
value: gender
38+
value: gender,
4039
}))
41-
)
42-
},[reviewTable])
40+
);
41+
}, [reviewTable]);
4342

4443
// 缓存school过滤器
4544
const schoolFilters = useMemo(() => {
@@ -53,7 +52,6 @@ const ReviewTable: React.FC<ReviewTableProps> = ({ reviewList, loading }) => {
5352
);
5453
}, [reviewTable]);
5554

56-
5755
const groupFilters = useMemo(() => {
5856
// 对reviewTable中的group进行去重和映射操作
5957
return (
@@ -113,9 +111,9 @@ const ReviewTable: React.FC<ReviewTableProps> = ({ reviewList, loading }) => {
113111
key: 'gender',
114112
filters: genderFilters,
115113
filteredValue: filter.gender || null,
116-
onFilter: (value,record) => record.gender === value,
114+
onFilter: (value, record) => record.gender === value,
117115
filterSearch: false,
118-
render: (_, record) => Gender[record.gender as unknown as keyof typeof Gender]
116+
render: (_, record) => Gender[record.gender as unknown as keyof typeof Gender],
119117
},
120118
{
121119
title: '年级',
@@ -176,6 +174,19 @@ const ReviewTable: React.FC<ReviewTableProps> = ({ reviewList, loading }) => {
176174
</div>
177175
),
178176
},
177+
{
178+
title: '面试评价',
179+
key: 'interview_evaluation',
180+
render: (_, record: ReviewRow) => (
181+
<Link
182+
// to={`http://localhost:3000/quicknew?title=${record.name}面试评价`}
183+
to={`https://forum.muxistudio.xyz/quicknew?title=${record.name}面试评价`}
184+
target="_blank"
185+
>
186+
去填写面评
187+
</Link>
188+
),
189+
},
179190
{
180191
title: '录取状态',
181192
dataIndex: 'admission_status',

‎src/pages/SignIn/SignIn.less‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,8 @@
182182
font-weight: 300;
183183
}
184184
}
185+
186+
185187
}
186188
}
187189
}

‎src/pages/SignIn/SignIn.tsx‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ const SignIn: React.FC = () => {
2525

2626
const navigate = useNavigate();
2727

28-
29-
3028
useEffect(() => {
3129
if (isSend) {
3230
const timer = setTimeout(() => {
@@ -159,7 +157,6 @@ const SignIn: React.FC = () => {
159157
};
160158

161159
const signIn = () => {
162-
163160
const testEmail =
164161
/^[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?$/;
165162
const isEmail = testEmail.test(account);
@@ -211,7 +208,6 @@ const SignIn: React.FC = () => {
211208
},
212209
);
213210
}
214-
215211
};
216212

217213
return (
@@ -231,16 +227,28 @@ const SignIn: React.FC = () => {
231227
/>
232228
</div>
233229
<div className="logo-box2">
234-
<img src={'https://ossfresh-test.muxixyz.com/%E7%BB%84%209%402x.png'} alt="" />
230+
<img
231+
src={'https://ossfresh-test.muxixyz.com/%E7%BB%84%209%402x.png'}
232+
alt=""
233+
/>
235234
</div>
236235
<div className="logo-box3">
237-
<img src={'https://ossfresh-test.muxixyz.com/%E7%BB%84%2011%402x.png'} alt="" />
236+
<img
237+
src={'https://ossfresh-test.muxixyz.com/%E7%BB%84%2011%402x.png'}
238+
alt=""
239+
/>
238240
</div>
239241
<div className="logo-box4">
240-
<img src={'https://ossfresh-test.muxixyz.com/%E7%BB%84%2012%402x.png'} alt="" />
242+
<img
243+
src={'https://ossfresh-test.muxixyz.com/%E7%BB%84%2012%402x.png'}
244+
alt=""
245+
/>
241246
</div>
242-
<div className='logo-text'>
243-
<img src={'https://ossfresh-test.muxixyz.com/MUXI%20STUDIO%404x.png'} alt=''/>
247+
<div className="logo-text">
248+
<img
249+
src={'https://ossfresh-test.muxixyz.com/MUXI%20STUDIO%404x.png'}
250+
alt=""
251+
/>
244252
</div>
245253
</div>
246254
<div className="signIn-form">
@@ -252,7 +260,6 @@ const SignIn: React.FC = () => {
252260
setAccount(e.target.value);
253261
}}
254262
value={account}
255-
256263
/>
257264
</div>
258265
<div className="password-box">
@@ -263,7 +270,6 @@ const SignIn: React.FC = () => {
263270
setPassword(e.target.value);
264271
}}
265272
value={password}
266-
267273
/>
268274
</div>
269275
{/* <div className="verification-code-box">

‎src/pages/formW/index.less‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,18 @@
22
position: absolute;
33
right: 0;
44
display: flex;
5-
margin-top: 4vh;
5+
margin-top: 3vh;
66
width: 80vw;
77
height: 83vh;
88
overflow: auto;
9+
@media (max-width:1400px) {
10+
11+
width: 87vw;
12+
}
13+
@media (max-width:789px) {
14+
right: 10px;
15+
width: 87vw;
16+
}
917
}
1018

1119
* {
@@ -15,6 +23,7 @@
1523

1624
.FromForWeb {
1725
width: 90%;
26+
max-width: 1200px;
1827
height: 100%;
1928
background-color: white;
2029
box-sizing: content-box;
@@ -25,6 +34,28 @@
2534
position: relative;
2635
box-shadow: 0 5px 10px #d4d4d4;
2736
border-radius: 0.5vw;
37+
margin: 0 ;
38+
39+
40+
@media (max-width: 1490px) {
41+
width: 100%;
42+
padding: 8px 16px 18px 18px;
43+
border-radius: 0.8vw;
44+
}
45+
46+
@media (max-width: 768px) {
47+
width: 100%;
48+
padding: 6px 12px 15px 15px;
49+
border-radius: 1.2vw;
50+
box-shadow: 0 3px 6px #d4d4d4;
51+
}
52+
53+
@media (max-width: 480px) {
54+
width: 100%;
55+
padding: 4px 8px 12px 12px;
56+
border-radius: 2vw;
57+
margin: 0;
58+
}
2859
}
2960

3061
.title_formweb {
@@ -87,6 +118,7 @@
87118
font-size: 15px;
88119
font-family: MicrosoftYaHei-, MicrosoftYaHei;
89120
margin-right: 10px;
121+
90122
}
91123

92124
.input_formweb,
@@ -97,6 +129,11 @@
97129
text-align: center;
98130
font-size: 16px;
99131
box-shadow: 0 3px 7px #d4d4d4;
132+
133+
}
134+
.academy{
135+
width: 180px;
136+
100137
}
101138

102139
.contactContent {

‎src/pages/formW/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const FormForWeb: React.FC = () => {
3131
qq: '',
3232
phone: '',
3333
}); //联系方式内容
34-
const [contactWayselect1, setcontactWayselect1] = useState('请选择'); //联系方式1
34+
const [contactWayselect1, setcontactWayselect1] = useState('手机'); //联系方式1
3535
const [contactWayselect2, setcontactWayselect2] = useState('邮箱'); //联系方式2
3636
const [reason, setreason] = useState(''); //心动原因
3737
const [knowledge, setknowledge] = useState(''); //组别了解
@@ -736,7 +736,7 @@ const FormForWeb: React.FC = () => {
736736
: debounce(setForm, 400)
737737
}
738738
>
739-
{formSetted ? '提交表格' : '完成修改'}
739+
{formSetted ? '完成修改' : '提交表格'}
740740
</div>
741741
</div>
742742
<div className="alert-text">

‎src/pages/homework/components/dropDown/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const DropDownPure: React.FC<DropDownProps> = (props) => {
3434
/* eslint-disable @typescript-eslint/no-floating-promises */
3535
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
3636
get(`/task/assigned/${item.id}`).then((res) => {
37-
console.log(res.data)
37+
console.log(res.data);
3838
onSwitch && onSwitch(res.data, item.id);
3939
});
4040
else

‎src/pages/homework/components/submitPage/index.tsx‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {
1414
import { message } from 'antd';
1515
import { defData } from '../../utils/deData';
1616
import { useNavigate } from 'react-router-dom';
17+
import { getCurrentSeason } from '../../../../utils/GetYearSeason/getReviewYear.ts';
1718

1819
interface HomeworkSubmitProps {
1920
title?: string;
@@ -31,7 +32,6 @@ const HomeworkSubmit: React.FC<HomeworkSubmitProps> = (props) => {
3132
/* eslint-disable react-hooks/exhaustive-deps */
3233
useEffect(() => {
3334
handleChange(defData[0]);
34-
3535
}, []);
3636
const nav = useNavigate();
3737
const handleChange = (item: dataType) => {
@@ -50,22 +50,24 @@ const HomeworkSubmit: React.FC<HomeworkSubmitProps> = (props) => {
5050
})
5151
.catch((e) => {
5252
message.error(`提交失败`).then(null, null);
53-
console.log(e)
53+
console.log(e);
5454
});
5555
};
5656

5757
const UpdateTaskList = (item: dataType) => {
58-
get(`/task/assigned/list?group=${item.value}`).then(
59-
(res: backType<titleListType>) => {
60-
setLoading(false);
61-
if (res.data.titles) {
62-
setTaskList(res.data.titles.reverse());
63-
} else {
64-
setTaskList([{ id: '', text: '暂时没有作业' }]);
65-
}
66-
},
67-
null,
68-
);
58+
get(
59+
`/task/assigned/list/selected?group=${
60+
item.value
61+
}&year=${new Date().getFullYear()}&semester=${getCurrentSeason()}`,
62+
).then((res: titleListType) => {
63+
console.log(res);
64+
setLoading(false);
65+
if (res?.titles) {
66+
setTaskList(res.titles.reverse());
67+
} else {
68+
setTaskList([{ id: '', text: '暂时没有作业' }]);
69+
}
70+
}, null);
6971
};
7072
return (
7173
<div id="homework-edit-wrap" {...restProps}>
@@ -79,7 +81,6 @@ const HomeworkSubmit: React.FC<HomeworkSubmitProps> = (props) => {
7981
onSubmit={handleSubmit}
8082
choice={choice ? choice : 'edit'}
8183
title={title ? title : '修改作业'}
82-
8384
button_title={button_title ? button_title : '确认修改'}
8485
taskList={taskList}
8586
loading={loading}

0 commit comments

Comments
 (0)