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

Merge branch 'gitlink_server' of https://git.trustie.net/Gitlink/forgeplus-react into gitlink_server

This commit is contained in:
何童崇 2022-08-26 22:23:43 +08:00
parent 2dfb319483 f65d6878b7
commit bf9da54fe8
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/glcc/home/index.jsx
View File

@ -105,7 +105,7 @@ export default (props) => {
<div className="pt6">导师拟定中期考核结果</div> <div className="pt6">导师拟定中期考核结果</div>
</Link>} </Link>}
{/* 中期考核结果公示页 */} {/* 中期考核结果公示页 */}
{checkTime3 && <Link className="apply" to={`/glcc/middle/result`}> {checkTime3 && false && <Link className="apply" to={`/glcc/middle/results`}>
<div> <div>
<img src={img1} alt="" className="applyIcon" /> <img src={img1} alt="" className="applyIcon" />
<span className="til">考核结果</span> <span className="til">考核结果</span>

6
src/glcc/index.jsx
View File

@ -87,8 +87,8 @@ const Glcc = (propsF) => {
const secondStudentApplyDate = new Date().getTime() > new Date('2022-06-29 1:0').getTime() && new Date().getTime() < new Date('2022-06-30 0:0').getTime(); const secondStudentApplyDate = new Date().getTime() > new Date('2022-06-29 1:0').getTime() && new Date().getTime() < new Date('2022-06-30 0:0').getTime();
// 学生中期考核入口可见时间 // 学生中期考核入口可见时间
const checkTime1 = new Date().getTime() > new Date('2022-08-12 8:0').getTime() && new Date().getTime() < new Date('2022-08-25 24:0').getTime(); const checkTime1 = new Date().getTime() > new Date('2022-08-12 8:0').getTime() && new Date().getTime() < new Date('2022-08-25 24:0').getTime();
// 导师中期考核时间 // 导师中期考核时间 && new Date().getTime() < new Date('2022-08-25 24:0').getTime()
const checkTime2 = new Date().getTime() > new Date('2022-08-12 10:0').getTime() && new Date().getTime() < new Date('2022-08-25 24:0').getTime(); const checkTime2 = new Date().getTime() > new Date('2022-08-12 10:0').getTime();
// 中期考核结果公示8月26日0点 // 中期考核结果公示8月26日0点
const checkTime3 = new Date().getTime() > new Date('2022-08-26 0:0').getTime(); const checkTime3 = new Date().getTime() > new Date('2022-08-26 0:0').getTime();
@ -211,7 +211,7 @@ const Glcc = (propsF) => {
{/* 中期审核-结果公示 */} {/* 中期审核-结果公示 */}
<Route <Route
path="/glcc/middle/result" path="/glcc/middle/results"
render={(props) => ( render={(props) => (
<MiddleResult current_user={current_user} history={props.history} checkTime3={checkTime3}/> <MiddleResult current_user={current_user} history={props.history} checkTime3={checkTime3}/>
)} )}

2
src/glcc/interimReview/result.jsx
View File

@ -56,7 +56,7 @@ function CheckResult({current_user, history, checkTime3}) {
{ 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: '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: 'projectName', className:"columnsResult", ellipsis: true, width: '14%', render: (text) => <Tooltip title={text} placement="topLeft"><span className='toolTipSpan'>{text}</span></Tooltip> },
{ title: '项目简介', dataIndex: 'introduce', className:"columnsResult", width: '13%', ellipsis: true}, { title: '项目简介', dataIndex: 'introduce', className:"columnsResult", width: '13%', ellipsis: true},
{ title: '答辩视频', dataIndex: 'defenceVideoUrl', className:"columnsResult", width: '15%', 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: 'defenceVideoUrl', className:"columnsResult", width: '15%', ellipsis: true, render: (text, item) => <Tooltip title={text} placement="topLeft"><span className='toolTipSpan link' onClick={()=>{window.open(text)}}>{text}</span></Tooltip>},
{ title: '考核结果', dataIndex: 'totalityEvaluation', align: 'center', className:"columnsResult actionBox", render: (text, item, index) => <span>{text === 'D' || !text ? '未通过' : '通过'}</span>}, { title: '考核结果', dataIndex: 'totalityEvaluation', align: 'center', className:"columnsResult actionBox", render: (text, item, index) => <span>{text === 'D' || !text ? '未通过' : '通过'}</span>},
] ]