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 ?
任务名称{decodeURI(name)}
任务链接{`${window.location.origin}/task/taskDetail/${taskId}`}
@@ -150,7 +157,7 @@ function ReviewResult({ history, match }) {