Merge pull request '修改glcc传参等' (#411) from tongChong/forgeplus-react:feature_GLCC into gitlink_server

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) => <span>{(current-1)*pageSize+index + 1}</span> },
-    { 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) => <Tooltip title={text} placement="topLeft"><span className='toolTipSpan'>{text}</span></Tooltip>},
     { title: '学生专业', dataIndex: 'profession', className:"columnsResult taskName", width: '12%', ellipsis: true, render: (text) => <Tooltip title={text} placement="topLeft"><span className='toolTipSpan'>{text}</span></Tooltip>},
-    { 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) => <Tooltip title={text} placement="topLeft"><span className='toolTipSpan link' onClick={()=>{window.open(`/glcc/subjects/detail/${item.id}`)}}>{text}</span></Tooltip> },
+    { title: '课题名称', dataIndex: 'taskName', className:"columnsResult", width: '20%', ellipsis: true, render: (text, item) => <Tooltip title={text} placement="topLeft"><span className='toolTipSpan link' onClick={()=>{window.open(`/glcc/subjects/detail/${item.taskId}`)}}>{text}</span></Tooltip> },
     { title: '项目名称', dataIndex: 'projectName', className:"columnsResult", ellipsis: true, width: '14%', render: (text) => <Tooltip title={text} placement="topLeft"><span className='toolTipSpan'>{text}</span></Tooltip> },
     { title: '操作', dataIndex: 'action', align: 'center', className:"columnsResult actionBox"},
   ]

src/glcc/home/index.jsx

@@ -77,6 +77,14 @@ export default (props) => {
         </div> */}
       {/* 报名入口 */}
       <div className="applyBox">
+         {/* 6.28.-7.1 审核结果仅对导师可见，7.1之后对所有用户可见*/}
+         {resultTime2 && <div className="apply" onClick={goToCheckResult}>
+          <div>
+            <img src={apply2} alt="" className="applyIcon" />
+            <span className="til">名单{resultTime1 ? '预' : ''}公示</span>
+          </div>
+          <div className="pt6">查看各课题入选学生名单</div>
+        </div>}
         {/* 项目报名 */}
         <Link to="/glcc/projects" className="apply project" >
           <div>
@@ -87,29 +95,22 @@ export default (props) => {
           <div className="pt6">掌握项目课题详细信息</div>
         </Link>
         {/* 学生报名6.24结束第一次报名，6.29 1:00 - 6.30 24:00第二次报名 */}
-        <div className="apply" onClick={goToStudent}>
+        {/* <div className="apply" onClick={goToStudent}>
           <div>
             <img src={apply2} alt="" className="applyIcon" />
             <span className="til">学生报名</span>
           </div>
           <div className="pt6">选择课题，开启您的开源之旅</div>
-        </div>
+        </div> */}
-        {/* 6.28.-7.1 审核结果仅对导师可见，7.1之后对所有用户可见*/}
+       
-        {resultTime2 && <div className="apply" onClick={goToCheckResult}>
-          <div>
-            <img src={apply2} alt="" className="applyIcon" />
-            <span className="til">名单{resultTime1 ? '预' : ''}公示</span>
-          </div>
-          <div className="pt6">查看各课题入选学生名单</div>
-        </div>}
         {/* 导师审核 */}
-        {hasRole && new Date().getTime() < new Date('2022-07-01 0:0').getTime() && <div className="apply" onClick={goToCheck}>
+        {/* {hasRole && new Date().getTime() < new Date('2022-07-01 0:0').getTime() && <div className="apply" onClick={goToCheck}>
           <div>
             <img src={teacher} alt="" className="applyIcon" />
             <span className="til">导师审核</span>
           </div>
           <div className="pt6">以赛代筛，挖掘高潜力人才</div>
-        </div>}
+        </div>} */}
       </div>
       {/* </div> */}
       <div className="introduce">

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( new Date());
-  console.log('isStudentApplyDate:' + isStudentApplyDate)
+  // console.log('isStudentApplyDate:' + isStudentApplyDate)
   const initTask = {
     taskId,
     memo: '',