From f71137b8f13fa5efa73dc544bc1ce6b283c814c3 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 11 Feb 2022 14:47:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=9E=E8=B5=9B?= =?UTF-8?q?=E4=B8=93=E5=AE=B6=E8=AF=84=E5=AE=A1issue=E4=B9=8B=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/military/expert/reviewResult/index.jsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/military/expert/reviewResult/index.jsx b/src/military/expert/reviewResult/index.jsx index 7aa7e084..47950aad 100644 --- a/src/military/expert/reviewResult/index.jsx +++ b/src/military/expert/reviewResult/index.jsx @@ -65,6 +65,8 @@ function ReviewResult({ history, match, mygetHelmetapi}) { return record.isWin ?
胜出
: status == 4 ? {changeIsWin(record.applicantInfo.id, e.target.checked)}}>胜出 : '未胜出'; } }); + }else{ + columns[1].title = "战队昵称"; } useEffect(()=>{ @@ -197,7 +199,7 @@ function ReviewResult({ history, match, mygetHelmetapi}) {

{status > 3 ? -

应征者排名

+

{containerType ==1 ? '应征者':'战队'}排名

{status == 4 && } - :
暂无数据，此任务暂未进入成果评选阶段。
} + :
暂无数据，此任务暂未进入{containerType ==1 ? '成果':'竞赛'}评选阶段。
} Date: Mon, 14 Feb 2022 13:43:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E4=B8=93=E5=AE=B6=E4=BB=8E=E5=90=8E=E5=BE=80=E5=89=8D=E7=A9=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AEbug=E4=BB=A5=E5=8F=8A=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E9=A1=B5=E6=98=BE=E7=A4=BA=E6=88=98=E9=98=9F?= =?UTF-8?q?=E6=98=B5=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/military/expert/api.js | 1 - .../expert/expertUser/taskDetail/index.jsx | 5 +-- src/military/expert/reviewResult/index.jsx | 2 +- src/military/expert/selectExpert/index.jsx | 31 +++++++++++++------ 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/military/expert/api.js b/src/military/expert/api.js index 183956b4..54b3a6be 100644 --- a/src/military/expert/api.js +++ b/src/military/expert/api.js @@ -221,7 +221,6 @@ export async function assignExperts(data){ //删除指派专家 export function deleteExperts(taskExpertId,isDelete) { - console.log('taskExpertId',taskExpertId,'isDelete',isDelete); return fetch({ url: `/api/taskExpert/${taskExpertId}?isDelete=${isDelete}`, method: 'delete' diff --git a/src/military/expert/expertUser/taskDetail/index.jsx b/src/military/expert/expertUser/taskDetail/index.jsx index ec1185bd..606bb52c 100644 --- a/src/military/expert/expertUser/taskDetail/index.jsx +++ b/src/military/expert/expertUser/taskDetail/index.jsx @@ -222,12 +222,13 @@ function ReviewTasks({ showNotification, match, history, current_user }) { gradesTwo: '', opsContent: item.works_remark, opsFiles: item.work_file.id, - opsFilesAttachments: item.work_file, + opsFilesAttachments: new Array(item.work_file), opsId: item.id, opsParentId: containerId, opsParentType: containerType, opsType: containerType, - status: 2 + status: 2, + competitionTeamName: item.company_name }); } } diff --git a/src/military/expert/reviewResult/index.jsx b/src/military/expert/reviewResult/index.jsx index 47950aad..94a5bc69 100644 --- a/src/military/expert/reviewResult/index.jsx +++ b/src/military/expert/reviewResult/index.jsx @@ -38,7 +38,7 @@ function ReviewResult({ history, match, mygetHelmetapi}) { dataIndex: 'applicantInfo.nickname', key: 'expertName', render: (text, record) => { - return text === null ? record.applicantInfo.login : text + return containerType ==1 ? text === null ? record.applicantInfo.login : text : record.competitionTeamName || '--'; } }, { diff --git a/src/military/expert/selectExpert/index.jsx b/src/military/expert/selectExpert/index.jsx index 15d7d998..48c50ff6 100644 --- a/src/military/expert/selectExpert/index.jsx +++ b/src/military/expert/selectExpert/index.jsx @@ -187,11 +187,17 @@ function SelectExpert(props) { }; expertList(params).then(data => { if (data && Array.isArray(data.rows)) { - let index = 1; - for (const item of data.rows) { - item.reviewAreas = `${item.reviewAreaOne} ${item.reviewAreaTwo ? `、${item.reviewAreaTwo}`:''} ${item.reviewAreaThree ? `、${item.reviewAreaThree}`:''}`; - item.index = (index++) + (curPage > 1 ? (curPage - 1) * 10 : 0); + if(data.rows.length === 0 && curPage > 1 && activeKey == 1){ + // 当前页数据为空跳转到前一页 + setCurPage(curPage-1); + }else{ + let index = 1; + for (const item of data.rows) { + item.reviewAreas = `${item.reviewAreaOne} ${item.reviewAreaTwo ? `、${item.reviewAreaTwo}`:''} ${item.reviewAreaThree ? `、${item.reviewAreaThree}`:''}`; + item.index = (index++) + (curPage > 1 ? (curPage - 1) * 10 : 0); + } } + } setDataList(data && data.rows); setLoading(false); @@ -210,13 +216,18 @@ function SelectExpert(props) { } selectExpertList(params).then(response=>{ if (response && response.data && Array.isArray(response.data.rows)) { - let index = 1; - for (const item of response.data.rows) { - item.reviewAreas = `${item.reviewAreaOne} ${item.reviewAreaTwo ? `、${item.reviewAreaTwo}`:''} ${item.reviewAreaThree ? `、${item.reviewAreaThree}`:''}`; - item.index = (index++) + (curPage > 1 ? (curPage - 1) * 10 : 0); + if(response.data.rows.length === 0 && curPage > 1 && activeKey == 0){ + // 当前页数据为空跳转到前一页 + setCurPage(curPage-1); + }else{ + let index = 1; + for (const item of response.data.rows) { + item.reviewAreas = `${item.reviewAreaOne} ${item.reviewAreaTwo ? `、${item.reviewAreaTwo}`:''} ${item.reviewAreaThree ? `、${item.reviewAreaThree}`:''}`; + item.index = (index++) + (curPage > 1 ? (curPage - 1) * 10 : 0); + } + setSelectExperts(response && response.data.rows); + setSelectedExpertTotal(response && response.data.total); } - setSelectExperts(response && response.data.rows); - setSelectedExpertTotal(response && response.data.total); } }).finally(()=>{ setLoading(false); From 4cf5236fde3d9417c6dfd56c8b01e92c7aa9fd28 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 16 Feb 2022 10:38:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AB=9E=E8=B5=9Bissue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/military/expert/expertUser/taskDetail/index.jsx | 2 +- src/military/expert/reviewResult/gradesModal/index.jsx | 4 +++- src/military/expert/reviewResult/index.jsx | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) 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 ? '成果':'竞赛'}评选阶段。
}