anph
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'glcc 报名两个课题+课题项目url屏蔽' (#538) from durian/forgeplus-react:gitlink_server into gitlink_server

This commit is contained in:
durian 2023-06-02 09:35:20 +08:00
parent 44f18d5b3e 91f2138caa
commit 78cecb54d3
3 changed files with 4365 additions and 5356 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9706
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

10
src/glcc/index.jsx
View File

@ -172,9 +172,9 @@ const Glcc = (propsF) => {
// 判断该学生是否已经被某位导师选中
if(lockedTaskName){
message.error(`由于你已入选 ${lockedTaskName} 课题，无法申请其他课题`);
}else if(applyTaskId && Object.keys(applyTaskId).length >= 3){
// 判断用户是否已经报名三个课题
message.error('最多只能同时报名三个课题');
}else if(applyTaskId && Object.keys(applyTaskId).length >= 2){
// 判断用户是否已经报名两个课题
message.error('最多只能同时报名两个课题');
}else{
// 跳转到学生报名页
window.location.href=`/glcc/student/apply/${id}`;
@ -225,7 +225,7 @@ const Glcc = (propsF) => {
<Route
path="/glcc/:id/projects"
render={(props) => (
<Project period={period} round={round} {...propsF} {...props} isStudentApplyDate={isStudentApplyDate} secondStudentApplyDate={secondStudentApplyDate} applyTaskId={applyTaskId} setStudentInfoReset={setStudentInfoReset} applyTask={applyTask}/>
<Project repoPublic={repoPublic} period={period} round={round} {...propsF} {...props} isStudentApplyDate={isStudentApplyDate} secondStudentApplyDate={secondStudentApplyDate} applyTaskId={applyTaskId} setStudentInfoReset={setStudentInfoReset} applyTask={applyTask}/>
)}
></Route>
@ -233,7 +233,7 @@ const Glcc = (propsF) => {
<Route
path="/glcc/:id/subjects"
render={(props) => (
<Project period={period} round={round} {...propsF} {...props} isStudentApplyDate={isStudentApplyDate} secondStudentApplyDate={secondStudentApplyDate} applyTaskId={applyTaskId} setStudentInfoReset={setStudentInfoReset} cancelCount={cancelCount} applyTask={applyTask}/>
<Project repoPublic={repoPublic} period={period} round={round} {...propsF} {...props} isStudentApplyDate={isStudentApplyDate} secondStudentApplyDate={secondStudentApplyDate} applyTaskId={applyTaskId} setStudentInfoReset={setStudentInfoReset} cancelCount={cancelCount} applyTask={applyTask}/>
)}
></Route>

5
src/glcc/project/index.jsx
View File

@ -20,8 +20,11 @@ const TaskList = Loadable({
});
function Project(propsF) {
const {location, match:{params:{id}}} = propsF;
const {location, match:{params:{id}}, repoPublic, history} = propsF;
const {pathname} = location;
if(id==="2023" && !repoPublic){
history.push('/glcc')
}
useEffect(()=>{
window.scrollTo(0, 0);
},[])