diff --git a/src/military/expert/expertUser/taskDetail/index.jsx b/src/military/expert/expertUser/taskDetail/index.jsx index 606bb52c..f48642ef 100644 --- a/src/military/expert/expertUser/taskDetail/index.jsx +++ b/src/military/expert/expertUser/taskDetail/index.jsx @@ -228,7 +228,7 @@ function ReviewTasks({ showNotification, match, history, current_user }) { opsParentType: containerType, opsType: containerType, status: 2, - competitionTeamName: item.company_name + competitionTeamName: item.name }); } } diff --git a/src/military/expert/reviewResult/gradesModal/index.jsx b/src/military/expert/reviewResult/gradesModal/index.jsx index 53f0d2b5..91fbcfcf 100644 --- a/src/military/expert/reviewResult/gradesModal/index.jsx +++ b/src/military/expert/reviewResult/gradesModal/index.jsx @@ -145,7 +145,9 @@ function GradesModal({ setVisible, visible, taskId, opsDetail, containerType }) >
综合排名: {opsDetail && opsDetail.id} - 应征者:   {opsDetail && (opsDetail.applicantInfo.nickname == null ? opsDetail.applicantInfo.login : opsDetail.applicantInfo.nickname)} + {containerType == 1 ? '应征者': '战队名称'}:   + {containerType == 1 && opsDetail && (opsDetail.applicantInfo.nickname == null ? opsDetail.applicantInfo.login : opsDetail.applicantInfo.nickname)} + {containerType == 2 && opsDetail && opsDetail.competitionTeamName} 平均得分:   {opsDetail && opsDetail.finalGrades || `--`} 是否胜出:   {opsDetail && opsDetail.isWin ?
胜出
: '未胜出'}
diff --git a/src/military/expert/reviewResult/index.jsx b/src/military/expert/reviewResult/index.jsx index 94a5bc69..80f76c68 100644 --- a/src/military/expert/reviewResult/index.jsx +++ b/src/military/expert/reviewResult/index.jsx @@ -66,7 +66,7 @@ function ReviewResult({ history, match, mygetHelmetapi}) { } }); }else{ - columns[1].title = "战队昵称"; + columns[1].title = "战队名称"; } useEffect(()=>{ @@ -206,7 +206,8 @@ function ReviewResult({ history, match, mygetHelmetapi}) { scroll={{ y: 384 }} />
- {status == 4 && } + {/* 公示结果仅保留给创客使用 */} + {containerType == 1 && status == 4 && }
:
暂无数据,此任务暂未进入{containerType ==1 ? '成果':'竞赛'}评选阶段。
}