diff --git a/src/military/expert/reviewResult/gradesModal/index.jsx b/src/military/expert/reviewResult/gradesModal/index.jsx index 0ad2757c..98831202 100644 --- a/src/military/expert/reviewResult/gradesModal/index.jsx +++ b/src/military/expert/reviewResult/gradesModal/index.jsx @@ -109,6 +109,8 @@ function GradesModal({ setVisible, visible, opsId, opsType, taskId }) { opsId, opsType, orderBy: '', + containerId: taskId, + containerType: 1, }; //获取评审规则 const paramsRule = { @@ -145,6 +147,7 @@ function GradesModal({ setVisible, visible, opsId, opsType, taskId }) { dataSource={dataList} columns={columns} pagination={false} + scroll={{ y: 384 }} /> ) diff --git a/src/military/expert/reviewResult/index.jsx b/src/military/expert/reviewResult/index.jsx index a66cdfdd..360b0aaf 100644 --- a/src/military/expert/reviewResult/index.jsx +++ b/src/military/expert/reviewResult/index.jsx @@ -11,13 +11,14 @@ import { queryString } from "educoder"; function ReviewResult({ history, match }) { const {taskId} = match.params; - const {status, name, taskModeId} = queryString.parse(window.location.search.slice(1)); + let {status, name, taskModeId} = queryString.parse(window.location.hash.slice(1)); const [dataList, setDateList] = useState(undefined); const [openResultVisible, setOpenResultVisible] = useState(false); const [winIds, setWinIds] = useState(undefined); const [openRange, setOpenRange] = useState(undefined); const [errorMessage,setErrorMessage] = useState(); const [result, setResult] = useState(undefined); + const [goNum, setGoNum] = useState(-1); // 模态框 const [opsId, setOpsId] = useState(); @@ -33,6 +34,9 @@ function ReviewResult({ history, match }) { title: '应征者', dataIndex: 'applicantInfo.nickname', key: 'expertName', + render: (text, record) => { + return text === null ? record.applicantInfo.login : text + } }, { title: '平均得分', @@ -51,7 +55,7 @@ function ReviewResult({ history, match }) { ket: 'isWin', align: 'center', render: (text, record) => { - return status == 4 ? {changeIsWin(record.applicantInfo.id, e.target.checked)}}>胜出 : record.isWin ?
胜出
:'未胜出'; + return record.isWin ?
胜出
: status == 4 ? {changeIsWin(record.applicantInfo.id, e.target.checked)}}>胜出 : '未胜出'; } } ]; @@ -82,7 +86,7 @@ function ReviewResult({ history, match }) { }):setDateList(response.data) } }) - },[]) + },[status]) function detail(item){ setOpsId(item.opsId); @@ -130,6 +134,9 @@ function ReviewResult({ history, match }) { ids.length!=0 && selectWinnersAndPublicists(params).then(response=>{ if(response && response.message === "success"){ message.success("操作成功"); + window.location.href=`${window.location.href.replace('status=4','status=5')}`; + status = 5; + setGoNum(-2); setOpenResultVisible(false); } }) @@ -140,7 +147,7 @@ function ReviewResult({ history, match }) {
评审结果 - +

任务名称{decodeURI(name)}

任务链接{`${window.location.origin}/task/taskDetail/${taskId}`}

@@ -150,7 +157,7 @@ function ReviewResult({ history, match }) {
{status == 4 && } diff --git a/src/military/task/index.scss b/src/military/task/index.scss index a29ae373..107587d2 100644 --- a/src/military/task/index.scss +++ b/src/military/task/index.scss @@ -87,7 +87,7 @@ span.list-gray { background: #bababa; } -.ant-pagination { +.center-content .ant-pagination { margin: 2rem auto; text-align: center; } diff --git a/src/military/task/taskAdmin/index.jsx b/src/military/task/taskAdmin/index.jsx index 0d3e6e78..03665efb 100644 --- a/src/military/task/taskAdmin/index.jsx +++ b/src/military/task/taskAdmin/index.jsx @@ -245,7 +245,7 @@ export default Form.create()(({ form, showNotification, match, history, state }) title: '评审结果', dataIndex: 'expertReview2', render: (text, record) => { - return record.assignRuleAndExperts ? 查看:查看 + return record.assignRuleAndExperts ? 查看:查看 } }, {