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

修复竞赛issue

This commit is contained in:
unknown 2022-02-16 10:38:20 +08:00
parent 93dfd8d120
commit 4cf5236fde
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/military/expert/expertUser/taskDetail/index.jsx
View File

@ -228,7 +228,7 @@ function ReviewTasks({ showNotification, match, history, current_user }) {
opsParentType: containerType, opsParentType: containerType,
opsType: containerType, opsType: containerType,
status: 2, status: 2,
competitionTeamName: item.company_name competitionTeamName: item.name
}); });
} }
} }

4
src/military/expert/reviewResult/gradesModal/index.jsx
View File

@ -145,7 +145,9 @@ function GradesModal({ setVisible, visible, taskId, opsDetail, containerType })
> >
<div className="opsDetail"> <div className="opsDetail">
综合排名: {opsDetail && opsDetail.id} 综合排名: {opsDetail && opsDetail.id}
<span className="ml30">应征者:&nbsp;&nbsp;</span> {opsDetail && (opsDetail.applicantInfo.nickname == null ? opsDetail.applicantInfo.login : opsDetail.applicantInfo.nickname)} <span className="ml30">{containerType == 1 ? '应征者': '战队名称'}:&nbsp;&nbsp;</span>
{containerType == 1 && opsDetail && (opsDetail.applicantInfo.nickname == null ? opsDetail.applicantInfo.login : opsDetail.applicantInfo.nickname)}
{containerType == 2 && opsDetail && opsDetail.competitionTeamName}
<span className="ml30">平均得分:&nbsp;&nbsp;</span> {opsDetail && opsDetail.finalGrades || `--`} <span className="ml30">平均得分:&nbsp;&nbsp;</span> {opsDetail && opsDetail.finalGrades || `--`}
<span className="ml30">是否胜出:&nbsp;&nbsp;</span> {opsDetail && opsDetail.isWin ? <div className="sucess df"><img src={sucess}/>胜出</div> : '未胜出'} <span className="ml30">是否胜出:&nbsp;&nbsp;</span> {opsDetail && opsDetail.isWin ? <div className="sucess df"><img src={sucess}/>胜出</div> : '未胜出'}
</div> </div>

5
src/military/expert/reviewResult/index.jsx
View File

@ -66,7 +66,7 @@ function ReviewResult({ history, match, mygetHelmetapi}) {
} }
}); });
}else{ }else{
columns[1].title = "战队昵称"; columns[1].title = "战队名称";
} }
useEffect(()=>{ useEffect(()=>{
@ -206,7 +206,8 @@ function ReviewResult({ history, match, mygetHelmetapi}) {
scroll={{ y: 384 }} scroll={{ y: 384 }}
/> />
<div className="openResult"> <div className="openResult">
{status == 4 && <button className={(containerType ==1 && winIds && taskModeId == 1 && winIds.length >1) || result === null ? 'disableBut': 'but41_fill'} onClick={openResult}>公示结果</button>} {/* 公示结果仅保留给创客使用 */}
{containerType == 1 && status == 4 && <button className={(containerType ==1 && winIds && taskModeId == 1 && winIds.length >1) || result === null ? 'disableBut': 'but41_fill'} onClick={openResult}>公示结果</button>}
</div> </div>
</React.Fragment>:<div className="nodata font-20">暂无数据，此任务暂未进入{containerType ==1 ? '成果':'竞赛'}评选阶段。</div>} </React.Fragment>:<div className="nodata font-20">暂无数据，此任务暂未进入{containerType ==1 ? '成果':'竞赛'}评选阶段。</div>}
<Modal <Modal