diff --git a/src/glcc/api.js b/src/glcc/api.js index e7bc7efd8..6730545c9 100644 --- a/src/glcc/api.js +++ b/src/glcc/api.js @@ -1,18 +1,20 @@ import fetch from './fetch'; // 当前glcc -export const currentRound = 3; +export const currentRound = 4; export const rewardMoney = "现金奖励" export const rewardSettingRound = 3; export const yearByRound = { 1: 2022, 2: 2023, - 3: 2024 + 3: 2024, + 4: 2025 } export const roundByYear = { 2022: 1, 2023: 2, - 2024: 3 + 2024: 3, + 2025: 4 } // 获取当前用户项目报名信息(项目、课题) diff --git a/src/glcc/home/index.jsx b/src/glcc/home/index.jsx index 374991354..4ee06f85b 100644 --- a/src/glcc/home/index.jsx +++ b/src/glcc/home/index.jsx @@ -24,7 +24,7 @@ import './index.scss'; // period: 项目报名阶段("repoApply") // match:{params:{id=2023}} 注意默认值记得每届修改 export default (props) => { - const { current_user, history, round, match:{params:{id=2024}}, period, showLoginDialog, glccSettings, repoPublic, showMatchingBut, isResultPublic, hasRole, isMediumExamineByToTutor, isFinalExamineByToTutor, checkedTaskId, mediumExaminationPass} = props; + const { current_user, history, round, match:{params:{id=yearByRound[currentRound]}}, period, showLoginDialog, glccSettings, repoPublic, showMatchingBut, isResultPublic, hasRole, isMediumExamineByToTutor, isFinalExamineByToTutor, checkedTaskId, mediumExaminationPass} = props; useEffect(() => { if (!current_user.user_id) { history.push('/403'); diff --git a/src/glcc/home/timerShaft/index.jsx b/src/glcc/home/timerShaft/index.jsx index 82b4bbb37..006cd41f7 100644 --- a/src/glcc/home/timerShaft/index.jsx +++ b/src/glcc/home/timerShaft/index.jsx @@ -54,7 +54,7 @@ function TimerShaft(props) { }, { title: "Step2", - date: "11月", + date: "10月", content: "优秀项目/学生公布及颁奖", noArrow: true, }] @@ -79,6 +79,9 @@ function TimerShaft(props) { step[0].date = formatParsedResult([{value: repoApply}], "startMonthDay") step[1].date = formatParsedResult([{value: repoApply}], "rangeConcatDot") } + // 审核项目及课题 + const auditProject = setting["auditProject"]; + auditProject && (step[2].date = formatParsedResult([{value: auditProject}], "rangeConcatDot")) // 学生报名 const stuApply = setting["stuApply"]; stuApply && (step[3].date = formatParsedResult([{value: stuApply}], "rangeConcatDot")) diff --git a/src/glcc/index.jsx b/src/glcc/index.jsx index d2320ee48..07f789a39 100644 --- a/src/glcc/index.jsx +++ b/src/glcc/index.jsx @@ -355,7 +355,7 @@ const Glcc = (propsF) => { > {/* 中期/结项审核-结果公示 */} - {(period === "mediumExamine3" || period === "finalExamine3") && + {(period === "mediumExamine3" || period === "finalExamine3" || round !== currentRound) && ( diff --git a/src/glcc/siderBarHelp.js b/src/glcc/siderBarHelp.js index df5535c1c..0645bf2ad 100644 --- a/src/glcc/siderBarHelp.js +++ b/src/glcc/siderBarHelp.js @@ -24,6 +24,11 @@ function SiderBar() { GLCC2023 + + + GLCC2024 + + );