diff --git a/src/glcc/checkResult/index.jsx b/src/glcc/checkResult/index.jsx
index df66cff3..e6cd4f57 100644
--- a/src/glcc/checkResult/index.jsx
+++ b/src/glcc/checkResult/index.jsx
@@ -56,11 +56,11 @@ function CheckResult({current_user, history}) {
const columns = [
{ title: '序号', dataIndex: 'index', align: 'center', className:"columnsResult", width: '6%', render: (text, item, index) => {(current-1)*pageSize+index + 1} },
- { title: '入选学生', dataIndex: 'studentName', className:"columnsResult taskName", width: '12%', ellipsis: true},
+ { title: '入选学生', dataIndex: 'studentName', className:"columnsResult taskName", width: '10%', ellipsis: true},
+ { title: '学生院校', dataIndex: 'school', className:"columnsResult taskName", width: '12%', ellipsis: true,render: (text) => {text}},
{ title: '学生专业', dataIndex: 'profession', className:"columnsResult taskName", width: '12%', ellipsis: true, render: (text) => {text}},
- { title: '学生年级', dataIndex: 'grade', className:"columnsResult taskName", width: '10%', ellipsis: true},
{ title: '课题导师', dataIndex: 'tutorName', className:"columnsResult", width: '10%', ellipsis: true},
- { title: '课题名称', dataIndex: 'taskName', className:"columnsResult", width: '20%', ellipsis: true, render: (text, item) => {window.open(`/glcc/subjects/detail/${item.id}`)}}>{text} },
+ { title: '课题名称', dataIndex: 'taskName', className:"columnsResult", width: '20%', ellipsis: true, render: (text, item) => {window.open(`/glcc/subjects/detail/${item.taskId}`)}}>{text} },
{ title: '项目名称', dataIndex: 'projectName', className:"columnsResult", ellipsis: true, width: '14%', render: (text) => {text} },
{ title: '操作', dataIndex: 'action', align: 'center', className:"columnsResult actionBox"},
]
diff --git a/src/glcc/home/index.jsx b/src/glcc/home/index.jsx
index a13b7d7e..35c85a91 100644
--- a/src/glcc/home/index.jsx
+++ b/src/glcc/home/index.jsx
@@ -77,6 +77,14 @@ export default (props) => {
*/}
{/* 报名入口 */}
+ {/* 6.28.-7.1 审核结果仅对导师可见,7.1之后对所有用户可见*/}
+ {resultTime2 &&
+
+

+
名单{resultTime1 ? '预' : ''}公示
+
+
查看各课题入选学生名单
+
}
{/* 项目报名 */}
@@ -87,29 +95,22 @@ export default (props) => {
掌握项目课题详细信息
{/* 学生报名6.24结束第一次报名,6.29 1:00 - 6.30 24:00第二次报名 */}
-
+ {/*
学生报名
选择课题,开启您的开源之旅
-
- {/* 6.28.-7.1 审核结果仅对导师可见,7.1之后对所有用户可见*/}
- {resultTime2 &&
-
-

-
名单{resultTime1 ? '预' : ''}公示
-
-
查看各课题入选学生名单
-
}
+
*/}
+
{/* 导师审核 */}
- {hasRole && new Date().getTime() < new Date('2022-07-01 0:0').getTime() &&
+ {/* {hasRole && new Date().getTime() < new Date('2022-07-01 0:0').getTime() &&
导师审核
以赛代筛,挖掘高潜力人才
-
}
+
} */}
{/*
*/}
diff --git a/src/glcc/student/index.jsx b/src/glcc/student/index.jsx
index b9c6613d..92fc1680 100644
--- a/src/glcc/student/index.jsx
+++ b/src/glcc/student/index.jsx
@@ -41,8 +41,8 @@ function Apply(props) {
const [files, setFiles] = useState([]);
const [files1, setFiles1] = useState([]);
const [files2, setFiles2] = useState([]);
- console.log( new Date());
- console.log('isStudentApplyDate:' + isStudentApplyDate)
+ // console.log( new Date());
+ // console.log('isStudentApplyDate:' + isStudentApplyDate)
const initTask = {
taskId,
memo: '',