Merge branch 'expert_review' of https://code.gitlink.org.cn/durian/forgeplus-react into dev_military_osredm

This commit is contained in:
何童崇 2022-01-11 17:35:35 +08:00
commit 2b7497f79f
4 changed files with 10 additions and 2 deletions

View File

@ -0,0 +1 @@
<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 400 400"><defs><style>.cls-1{fill:url(#未命名的渐变_7);}.cls-2{fill:#fedd7c;}.cls-3{fill:#feb448;}.cls-4{fill:#dfac63;}.cls-5{fill:#d9993e;}.cls-6{fill:url(#未命名的渐变_7-2);}.cls-7,.cls-8{fill:#fff;}.cls-8{stroke:#fff;stroke-miterlimit:10;}</style><linearGradient id="未命名的渐变_7" x1="144.96" y1="168.72" x2="257.82" y2="364.21" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffd46e"/><stop offset="1" stop-color="#ffac09"/></linearGradient><linearGradient id="未命名的渐变_7-2" x1="218.84" y1="17.66" x2="186.91" y2="17.66" xlink:href="#未命名的渐变_7"/></defs><title>未标题-1</title><polygon class="cls-1" points="197.56 399 84.04 328.05 84.04 203.89 197.56 157.78 318.17 203.89 318.17 328.05 197.56 399"/><polygon class="cls-2" points="84.04 79.73 133.7 186.16 201.1 186.16 201.1 19.43 147.89 115.21 84.04 79.73"/><polygon class="cls-3" points="318.17 79.73 268.5 186.16 201.1 186.16 201.1 19.43 254.31 115.21 318.17 79.73"/><polygon class="cls-4" points="84.04 79.73 159.19 94.88 147.89 115.21 84.04 79.73"/><polygon class="cls-5" points="318.17 79.73 244.46 97.47 254.31 115.21 318.17 79.73"/><circle class="cls-6" cx="202.88" cy="17.66" r="15.96"/><circle class="cls-3" cx="313.03" cy="81.63" r="15.96"/><circle class="cls-2" cx="86.03" cy="81.64" r="15.96"/><rect class="cls-7" x="186.05" y="121.44" width="30.1" height="30.1" transform="translate(-37.61 182.18) rotate(-45)"/><polygon class="cls-8" points="212.32 258.6 240.8 262.89 220.07 282.88 224.79 311.29 199.37 297.75 173.81 311.01 178.83 282.66 158.32 262.45 186.84 258.46 199.72 232.71 212.32 258.6"/></svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@ -4,6 +4,7 @@ import PaginationTable from "src/military/components/paginationTable";
import GradesModal from "./gradesModal"; import GradesModal from "./gradesModal";
import { getScoringDetails, getWinnersAndPublicists, selectWinnersAndPublicists } from "../api"; import { getScoringDetails, getWinnersAndPublicists, selectWinnersAndPublicists } from "../api";
import { Checkbox, Input, message, Modal } from "antd"; import { Checkbox, Input, message, Modal } from "antd";
import sucess from './image/sucess.svg';
import './index.scss'; import './index.scss';
import '../index.scss'; import '../index.scss';
@ -48,7 +49,7 @@ function ReviewResult({ location, history }) {
ket: 'isWin', ket: 'isWin',
align: 'center', align: 'center',
render: (text, record) => { render: (text, record) => {
return taskRecord.status === 4 ? <Checkbox onChange={(e)=>{changeIsWin(record.applicantInfo.id, e.target.checked)}}>胜出</Checkbox> : record.isWin ? '胜出':'未胜出'; return taskRecord.status === 4 ? <Checkbox onChange={(e)=>{changeIsWin(record.applicantInfo.id, e.target.checked)}}>胜出</Checkbox> : record.isWin ? <div className="sucess df"><img src={sucess}/>胜出</div>:'未胜出';
} }
} }
]; ];
@ -132,7 +133,7 @@ function ReviewResult({ location, history }) {
}) })
} }
} }
return ( return (
<div className="expert_review_system centerbox"> <div className="expert_review_system centerbox">
<div className="head_title mb20"> <div className="head_title mb20">

View File

@ -36,6 +36,11 @@
line-height: 350px; line-height: 350px;
text-align: center; text-align: center;
} }
.sucess{
color: #fd7700;
justify-content: center;
img{width: 20px;}
}
} }
.openResultModal{ .openResultModal{
.ant-modal-body{ .ant-modal-body{

View File

@ -71,6 +71,7 @@ function SelectExpert(props) {
{ {
title: '专业职称', title: '专业职称',
dataIndex: 'professionalTitle', dataIndex: 'professionalTitle',
width: 120,
}, },
{ {
title: '专家类别', title: '专家类别',