diff --git a/src/military/expert/expertList/index.jsx b/src/military/expert/expertList/index.jsx index d6a0efc1..0157151e 100644 --- a/src/military/expert/expertList/index.jsx +++ b/src/military/expert/expertList/index.jsx @@ -1,5 +1,5 @@ import React, { useState, useMemo, useEffect } from "react"; -import { Input, Select, Button, Form, DatePicker, Table, Pagination, Upload, Modal } from 'antd'; +import { Input, Select, Button, Form, Table, Upload, Modal } from 'antd'; import cookie from 'react-cookies'; import { exportExcel } from '../components/exportExcel.js'; import Paginationtable from "../../components/paginationTable"; @@ -24,8 +24,6 @@ function RegisterList({ showNotification }) { const [searchInput, setSearchInput] = useState(''); const [searchReviewArea, setSearchReviewArea] = useState(''); const [expertType, setExpertType] = useState('') - const [uploadExpertList, setUploadExpertList] = useState([]); - const [uploadExpertIds, setUploadExpertIds] = useState([]); const [dataAll, setDataAll] = useState([]); const [download, setDownload] = useState(); const [downloading, setDownloading] = useState(false); @@ -36,7 +34,6 @@ function RegisterList({ showNotification }) { setPageSize(pageSize); } - console.log(pageSize); const columns = useMemo(() => { return [{ title: '姓名', @@ -199,7 +196,6 @@ function RegisterList({ showNotification }) { // 获取列表 useEffect(() => { - console.log('searchReviewArea', searchReviewArea); setLoading(true); let params = { searchInput, @@ -282,7 +278,7 @@ function RegisterList({ showNotification }) { onChange: handleChange, beforeUpload: beforeUpload, accept: ".xlsx,.xls", - showUploadList: false, + showUploadList: true, withCredentials: true, headers: { Authorization: cookie.load('autologin_forge_military') || sessionStorage.osredmToken, @@ -362,6 +358,7 @@ function RegisterList({ showNotification }) { onCancel={() => { setVisible(false) }} className="upload-modal" footer={} + key={Math.random()} > img{ width: 5.5vw; } - & .ne_title{ + .ne_title{ font-size: 1em; font-weight: bold; color: #181818; } - & .ne_tips{ + .ne_tips{ font-size: 0.75em; color: #595959; } - & .ne_bar{ + .ne_bar{ width: 30vw; border-top: 1px solid #EEEEEE; margin: 50px 0 30px !important; } - & .but41_fill{ + .but41_fill{ font-size: 0.7em; } } diff --git a/src/military/expert/reviewResult/gradesModal/index.jsx b/src/military/expert/reviewResult/gradesModal/index.jsx index 98831202..83e17609 100644 --- a/src/military/expert/reviewResult/gradesModal/index.jsx +++ b/src/military/expert/reviewResult/gradesModal/index.jsx @@ -2,11 +2,12 @@ import React, { useState, useEffect } from "react"; import { Modal } from 'antd'; import Paginationtable from "../../../components/paginationTable"; import { getOpsScoringDetails, getRules } from "../../api"; +import sucess from '../image/sucess.svg'; import './index.scss'; import '../../index.scss'; -function GradesModal({ setVisible, visible, opsId, opsType, taskId }) { +function GradesModal({ setVisible, visible, taskId, opsDetail }) { // 主table参数 const [loading, setLoading] = useState(false); const [dataList, setDataList] = useState([]); @@ -106,8 +107,8 @@ function GradesModal({ setVisible, visible, opsId, opsType, taskId }) { useEffect(() => { setLoading(true); let params = { - opsId, - opsType, + opsId: opsDetail && opsDetail.opsId, + opsType: opsDetail && opsDetail.opsType, orderBy: '', containerId: taskId, containerType: 1, @@ -123,13 +124,13 @@ function GradesModal({ setVisible, visible, opsId, opsType, taskId }) { setRules(response.data); } }); - opsId && getOpsScoringDetails(params).then(res => { + opsDetail && opsDetail.opsId && getOpsScoringDetails(params).then(res => { if (res.data && res.data.length) { setDataList(res.data); setLoading(false); } }); - }, [opsId, opsType]); + }, [opsDetail]); return ( @@ -142,6 +143,12 @@ function GradesModal({ setVisible, visible, opsId, opsType, taskId }) { width={1050} wrapClassName="task_review_detail" > +
+ 综合排名: {opsDetail && opsDetail.id} + 应征者: {opsDetail && (opsDetail.applicantInfo.nickname == null ? opsDetail.applicantInfo.login : opsDetail.applicantInfo.nickname)} + 平均得分: {opsDetail && opsDetail.finalGrades} + 是否胜出: {opsDetail && opsDetail.isWin ?
胜出
: '未胜出'} +
)