From 6fe3928a6edb7f96bae2db2b0535d1c8265f36d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <1261960504@qq.com> Date: Fri, 31 Dec 2021 09:37:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=91=E7=9A=84=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E4=BF=AE=E6=94=B9issue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/paginationTable/index.jsx | 6 +- src/military/expert.js | 30 +- src/military/expert/api.js | 11 +- src/military/expert/expertList/index.jsx | 21 +- src/military/expert/expertUser/index.jsx | 58 ++ src/military/expert/expertUser/index.scss | 46 ++ src/military/expert/register/index.jsx | 626 +++++++++--------- src/military/expert/register/index.scss | 189 +++--- src/military/expert/registerList/index.jsx | 11 +- src/military/expert/review/review.jsx | 2 +- src/military/expert/reviewTasks/index.jsx | 162 ++++- src/military/expert/reviewTasks/index.scss | 16 + src/military/expert/static.js | 5 + src/military/index.scss | 33 + src/modules/tpm/NewHeader.js | 2 +- 15 files changed, 775 insertions(+), 443 deletions(-) create mode 100644 src/military/expert/expertUser/index.jsx create mode 100644 src/military/expert/expertUser/index.scss create mode 100644 src/military/expert/reviewTasks/index.scss diff --git a/src/military/components/paginationTable/index.jsx b/src/military/components/paginationTable/index.jsx index 770ed8ec..b48ff4f2 100644 --- a/src/military/components/paginationTable/index.jsx +++ b/src/military/components/paginationTable/index.jsx @@ -3,11 +3,12 @@ import { Table, Pagination } from 'antd'; import './index.scss'; export default (props) => { - const { loading, dataSource, columns, handleRow, total, setCurPage, current, rowSelection, expandedRowRender, expandIconColumnIndex } =props; + const { loading, dataSource, columns, handleRow, total, setCurPage, current, rowSelection, expandedRowRender, expandIconColumnIndex, onShowSizeChange,showSizeChanger } = props; return (
row.id} dataSource={dataSource} @@ -17,14 +18,15 @@ export default (props) => { rowSelection={rowSelection} expandedRowRender={expandedRowRender} expandIconColumnIndex={expandIconColumnIndex} - {...props} /> {total > 10 && } diff --git a/src/military/expert.js b/src/military/expert.js index b9c7b0c2..a00e6a5f 100644 --- a/src/military/expert.js +++ b/src/military/expert.js @@ -11,16 +11,6 @@ import { getUserInfo } from './expert/api'; import { ImageLayerOfCommentHOC } from "../modules/page/layers/ImageLayerOfCommentHOC"; import './index.scss'; -const Register = Loadable({ - loader: () => import("./expert/register"), - loading: Loading, -}); - -const ExpertList = Loadable({ - loader: () => import("./expert/expertList"), - loading: Loading, -}); - const Review = Loadable({ loader: () => import("./expert/review/review"), loading: Loading, @@ -31,8 +21,12 @@ const AdminRouter = Loadable({ loading: Loading, }); -const ReviewTasks = Loadable({ - loader: () => import("./expert/reviewTasks"), +// const ReviewTasks = Loadable({ +// loader: () => import("./expert/reviewTasks"), +// loading: Loading, +// }) +const ExpertUser = Loadable({ + loader: () => import("./expert/expertUser"), loading: Loading, }) const Expert = (propsTransmit) => { @@ -54,18 +48,14 @@ const Expert = (propsTransmit) => { return (
+ {/* 专家注册、专家评审任务 */} ( - - )} - > - ( - + )} > + {/* 管理员管理 */} { return [{ title: '姓名', @@ -114,7 +121,7 @@ function RegisterList({ showNotification }) { { title: '邮箱地址', dataIndex: 'expertEmail', - width:200, + width: 200, }, { title: '开户银行', @@ -145,7 +152,7 @@ function RegisterList({ showNotification }) { ]; }, []); - + // 获取列表 useEffect(() => { @@ -164,11 +171,11 @@ function RegisterList({ showNotification }) { setLoading(false); setTotal(data.total); }); - }, [curPage, reload, searchInput, searchReviewArea, expertType]); + }, [curPage, reload, searchInput, searchReviewArea, expertType, pageSize]); // 获取下载数据的列表 useEffect(() => { - if(!download){ + if (!download) { return; } setDownloading(true); @@ -311,6 +318,8 @@ function RegisterList({ showNotification }) { setCurPage={setCurPage} current={curPage} scroll={{ x: 2300 }} + onShowSizeChange={onShowSizeChange} + showSizeChanger />
import("../register"), + loading: Loading, +}); + +const ReviewTasks = Loadable({ + loader: () => import("../reviewTasks"), + loading: Loading, +}) + + +const ExpertUser = (props) => { + const functional = props.match.params.functional; + return ( +
+
+ 专家评审系统 >  + {functional === 'register' && 登记专家资料} + {functional === 'tasks' && 我的评审任务} +
+
+
+ 登记专家资料 + 我的评审任务 +
+ + + ( + + )} + > + + ( + + )} + > + + +
+
+ + ); +} + +export default ExpertUser; diff --git a/src/military/expert/expertUser/index.scss b/src/military/expert/expertUser/index.scss new file mode 100644 index 00000000..86a72401 --- /dev/null +++ b/src/military/expert/expertUser/index.scss @@ -0,0 +1,46 @@ +.centerbox.detail { + font-size: 20px; + .navigation { + font-size: 0.6em; + margin: -35px 0 15px; + } + + .center_flex { + display: flex; + justify-content: space-between; + + .register_left { + display: flex; + flex-direction: column; + height: 10em; + width: 10em; + font-size: 0.7em; + background-color: white; + padding: 0.4vw; + flex: none; + a{ + padding: 0 1.3em; + height: 2.55em; + line-height: 2.55em; + border-radius: 4px; + &:hover{ + color: #4154f1; + } + &.active { + color: white; + background-color: #4154f1; + &:hover{ + opacity: .8; + } + } + + } + + } + .register_right { + flex: auto; + background-color: white; + margin-left: 2em; + } + } +} diff --git a/src/military/expert/register/index.jsx b/src/military/expert/register/index.jsx index db0cb845..66284d57 100644 --- a/src/military/expert/register/index.jsx +++ b/src/military/expert/register/index.jsx @@ -30,6 +30,10 @@ export default Form.create()(({ match, history, showNotification, form, current_ const [reload, setReload] = useState(); + const [reviewAreaOne, setReviewAreaOne] = useState(); + const [reviewAreaTwo, setReviewAreaTwo] = useState(); + const [reviewAreaThree, setReviewAreaThree] = useState(); + // 获取列表 useEffect(() => { let params = {}; @@ -60,7 +64,7 @@ export default Form.create()(({ match, history, showNotification, form, current_ setFieldsValue(params); setExpertRegisterValues(params); setLastRegister(lastRegister); - setForbidden(lastRegister&&lastRegister.status===-1); + setForbidden(lastRegister && lastRegister.status === -1); // 回写文件 if (lastRegister.resume) { @@ -87,7 +91,7 @@ export default Form.create()(({ match, history, showNotification, form, current_ setHonorList(honors); setHonorIds(lastRegister.honors); } - }else{ + } else { setForbidden(false); } }); @@ -234,320 +238,332 @@ export default Form.create()(({ match, history, showNotification, form, current_ return ( -
-
- 专家评审系统 > 登记专家资料 -
-
-
- +
+ { + lastRegister && lastRegister.status === -1 &&

+ 您的资料正在审核，请稍候 +

+ } + { + lastRegister && lastRegister.status === 2 &&

+ 您提交的资料已被拒绝，请完善资料后重新提交 +

+ } + { + lastRegister && lastRegister.status === 1 &&

+ 您已经是专家了，如果修改资料，修改后的资料需要管理员重新审核，审核过程中不会影响您的专家身份 +

+ } + { + (!lastRegister || (lastRegister && lastRegister.status === 3)) &&

专家资料

+ } + + +
+
+ { + helper('姓名', + 'expertName', + [{ required: true, message: "姓名不能为空" }, + { max: 20, message: '长度不能超过20个字符' }], + + ) + } + { + helper('手机号码', + 'phone', + [{ required: true, message: "手机号码不能为空" }, + { + validator: (rule, val, callback) => { + const pattern = /^((\+)?86|((\+)?86)?)0?1[3456789]\d{9}$/; + if (pattern.test(val)) { + callback(); + } else { + callback('请输入正确的手机号码！'); + } + } + }], + + ) + } + { + helper('单位类别', + 'workplaceType', + [{ required: true, message: "请选择单位类别" }], + + ) + } + { + helper('专业职称', + 'professionalTitle', + [{ required: true, message: "专业职称不能为空" }, + { max: 50, message: '长度不能超过50个字符' }], + + ) + } + { + helper('专家类别', + 'expertType', + [{ required: true, message: "请选择专家类别" }], + + ) + } + { + helper('评审领域2', + 'reviewAreaTwo', [], + + ) + } + { + helper('毕业院校', + 'graduatedFrom', [{ max: 50, message: '长度不能超过50个字符' }], + + ) + } + { + helper('身份证号', + 'idNumber', [{ + validator: (rule, val, callback) => { + let _IDRe18 = /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/ + let _IDre15 = /^([1-6][1-9]|50)\d{4}\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}$/ + // 校验身份证： + if (_IDRe18.test(val) || _IDre15.test(val)) { + callback(); + } else { + callback('请输入正确的身份证号码！'); + } + } + }], + + ) + } + { + helper('开户银行', + 'bankName', [{ max: 50, message: '长度不能超过50个字符' }], + + ) + } + + + + + +
-
- {/*

- {lastRegister && lastRegister.status === -1 ? "您的资料正在审核，请稍候" : lastRegister && lastRegister.status === 2 ? "您提交的资料已被拒绝，请完善资料后重新提交" : "专家资料"} -

*/} - +
{ - lastRegister && lastRegister.status === -1 &&

- 您的资料正在审核，请稍候 -

+ helper('最高学历', + 'highestDegree', + [{ required: true, message: '请选择最高学历' }], + + ) } { - lastRegister && lastRegister.status === 2 &&

- 您提交的资料已被拒绝，请完善资料后重新提交 -

+ helper('工作单位', + 'workplace', + [{ required: true, message: "工作单位不能为空" }], + + ) } { - (!lastRegister || (lastRegister && lastRegister.status === 3)) &&

专家资料

+ helper('工作性质', + 'workNature', + [{ required: true, message: "请选择工作性质" }], + + ) } - - - -
- { - helper('姓名', - 'expertName', - [{ required: true, message: "姓名不能为空" }, - { max: 20, message: '长度不能超过20个字符' }], - - ) - } - { - helper('手机号码', - 'phone', - [{ required: true, message: "手机号码不能为空" }, - { - validator: (rule, val, callback) => { - const pattern = /^((\+)?86|((\+)?86)?)0?1[3456789]\d{9}$/; - if (pattern.test(val)) { - callback(); - } else { - callback('请输入正确的手机号码！'); - } - } - }], - - ) - } - { - helper('单位类别', - 'workplaceType', - [{ required: true, message: "请选择单位类别" }], - - ) - } - { - helper('专业职称', - 'professionalTitle', - [{ required: true, message: "专业职称不能为空" }, - { max: 50, message: '长度不能超过50个字符' }], - - ) - } - { - helper('专家类别', - 'expertType', - [{ required: true, message: "请选择专家类别" }], - - ) - } - { - helper('评审领域2', - 'reviewAreaTwo', [], - - ) - } - { - helper('毕业院校', - 'graduatedFrom', [{ max: 50, message: '长度不能超过50个字符' }], - - ) - } - { - helper('身份证号', - 'idNumber', [{ - validator: (rule, val, callback) => { - let _IDRe18 = /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/ - let _IDre15 = /^([1-6][1-9]|50)\d{4}\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}$/ - // 校验身份证： - if (_IDRe18.test(val) || _IDre15.test(val)) { - callback(); - } else { - callback('请输入正确的身份证号码！'); - } - } - }], - - ) - } - { - helper('开户银行', - 'bankName', [{ max: 50, message: '长度不能超过50个字符' }], - - ) - } - - - - - - -
-
- { - helper('最高学历', - 'highestDegree', - [{ required: true, message: '请选择最高学历' }], - - ) - } - { - helper('工作单位', - 'workplace', - [{ required: true, message: "工作单位不能为空" }], - - ) - } - { - helper('工作性质', - 'workNature', - [{ required: true, message: "请选择工作性质" }], - - ) - } - { - helper('职称职级', - 'titleRank', - [{ required: true, message: "请选择职称职级" }], - - ) - } - { - helper('评审领域1', - 'reviewAreaOne', - [{ required: true, message: "请选择评审领域" }], - - ) - } - { - helper('评审领域3', - 'reviewAreaThree', [], - - ) - } - { - helper('院校专业', - 'major', [{ max: 50, message: '长度不能超过50个字符' }], - - ) - } - { - helper('邮箱地址', - 'expertEmail', [{ - validator: (rule, val, callback) => { - const pattern = /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/; - if (pattern.test(val)) { - callback(); - } else { - callback('请输入正确的邮箱地址！'); - } - } - }], - - ) - } - { - helper('银行账号', - 'bankAccount', [{ max: 50, message: '长度不能超过50个字符' }], - - ) - } - - - - - - -
- -
- {/* + { + helper('职称职级', + 'titleRank', + [{ required: true, message: "请选择职称职级" }], + + ) + } + { + helper('评审领域1', + 'reviewAreaOne', + [{ required: true, message: "请选择评审领域" }], + + ) + } + { + helper('评审领域3', + 'reviewAreaThree', [], + + ) + } + { + helper('院校专业', + 'major', [{ max: 50, message: '长度不能超过50个字符' }], + + ) + } + { + helper('邮箱地址', + 'expertEmail', [{ + validator: (rule, val, callback) => { + const pattern = /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/; + if (pattern.test(val)) { + callback(); + } else { + callback('请输入正确的邮箱地址！'); + } + } + }], + + ) + } + { + helper('银行账号', + 'bankAccount', [{ max: 50, message: '长度不能超过50个字符' }], + + ) + } + + + + + + +
+ +
+ {/* */} - - - + + + - setSubmitConfirmValue(false)} - wrapClassName="expert_modal submit" - closeIcon={} - > -

资料提交后无法修改，将等待管理员审核，

-

确认提交？

- + setSubmitConfirmValue(false)} + wrapClassName="expert_modal submit" + closeIcon={} + > +

资料提交后无法修改，将等待管理员审核，

+

确认提交？

+ - { history.go(-1) }} - onCancel={() => setCancelConfirmValue(false)} - wrapClassName="expert_modal" - > -

有内容没有保存，确定退出编辑吗？

-

退出编辑后，更新的内容不会自动保存

- -
-
+ { history.go(-1) }} + onCancel={() => setCancelConfirmValue(false)} + wrapClassName="expert_modal" + > +

有内容没有保存，确定退出编辑吗？

+

退出编辑后，更新的内容不会自动保存

+
) diff --git a/src/military/expert/register/index.scss b/src/military/expert/register/index.scss index e3589ba8..41ea90cb 100644 --- a/src/military/expert/register/index.scss +++ b/src/military/expert/register/index.scss @@ -1,111 +1,102 @@ -.iconfont2 { - font-family: "svgtofont" !important; - font-size: 26px; - font-style: normal; - -webkit-font-smoothing: antialiased; - -webkit-text-stroke-width: 0.2px; - -moz-osx-font-smoothing: grayscale; -} -.centerbox.detail { - font-size: 20px; - .navigation { - font-size: 0.6em; - margin: -35px 0 15px; +.center_flex { + display: flex; + justify-content: space-between; + .register_left { + height: 10em; + font-size: 0.7em; + background-color: white; + padding: 0.4vw; } - - .center_flex { - display: flex; - justify-content: space-between; - .register_left { - height: 10em; - font-size: 0.7em; - background-color: white; - padding: 0.4vw; + .register_right { + flex: auto; + background-color: white; + margin-left: 2em; + & > p { + border-bottom: 1px solid #eeeeee; + padding: 0.5em 2em; + color: #181818; + font-size: 0.8em; + font-weight: bold; } - .register_right { - flex: auto; - background-color: white; - margin-left: 2em; - & > p { - border-bottom: 1px solid #eeeeee; - padding: 0.5em 2em; - color: #181818; - font-size: 0.8em; - font-weight: bold; - } - .fail{ - background: #FFEFEF; - border: 1px solid #FF3838; - color: #FF3838; - } + .fail { + background: #ffefef; + border: 1px solid #ff3838; + color: #ff3838; + } - .checking{ - background: #EDF2FF; - border: 1px solid #4154F1; - color: #4154F1; + .checking { + background: #edf2ff; + border: 1px solid #4154f1; + color: #4154f1; + } + .succeed { + background: #edf2ff; + border: 1px solid green; + color: green; + } + .ant-form { + display: flex; + padding: 1em 2em 1.5em; + } + .expert_Register_form { + width: 43.5%; + &.ml80 { + margin-left: 120px; } - .ant-form{ + .ant-form-item { display: flex; - padding: 1em 2em 1.5em; } - .expert_Register_form { - width: 43.5%; - &.ml80{ - margin-left: 120px; - } - .ant-form-item{ - display: flex; - } - .ant-form-item-label { - width: 6em; - line-height: 2.8em; - } - .ant-form-item-required::before{ - position: relative; - top: -1px; - content: url('./image/required.svg'); - } - .ant-form-item-control-wrapper{ - width: 70%; - display: inline-block; - } - .ant-input, .ant-select-selection{ - // width: 30.1em; - box-shadow: none; - &:focus, &:hover{ - border: 1px solid #4154F1 !important; - } - } - tr td:first-child .ant-row.ant-form-item{ - margin-right: 9em; - } - & .ant-input, .ant-input .ant-input-suffix { - background-color: #FFFFFF !important; - } - & .ant-select-open .ant-select-selection{ - border: 1px solid #4154F1 !important; - } - & .ant-form-item{ - margin-bottom: 0.5em; - } - & td>p{ - margin: 0.3em 0 0.6em !important; - } - & .but41_border{ - margin-bottom: 0.6em; - padding: 0 0.5em; - } - & .ant-cascader-menu-item:hover { - background: #f2f3ff; - } - + .ant-form-item-label { + width: 6em; + line-height: 2.8em; } - & .buts { - font-size: 0.7em; - padding: 1.5em 2em; - background-color: #f5f5f5; + .ant-form-item-required::before { + position: relative; + top: -1px; + content: url("./image/required.svg"); } + .ant-form-item-control-wrapper { + width: 70%; + display: inline-block; + } + .ant-input, + .ant-select-selection { + // width: 30.1em; + box-shadow: none; + &:focus, + &:hover { + border: 1px solid #4154f1 !important; + } + } + tr td:first-child .ant-row.ant-form-item { + margin-right: 9em; + } + & .ant-input, + .ant-input .ant-input-suffix { + background-color: #ffffff !important; + } + & .ant-select-open .ant-select-selection { + border: 1px solid #4154f1 !important; + } + & .ant-form-item { + margin-bottom: 0.5em; + } + & td > p { + margin: 0.3em 0 0.6em !important; + } + & .but41_border { + margin-bottom: 0.6em; + padding: 0 0.5em; + } + & .ant-cascader-menu-item:hover { + background: #f2f3ff; + } + } + & .buts { + font-size: 0.7em; + padding: 1.5em 2em; + background-color: #f5f5f5; } } } diff --git a/src/military/expert/registerList/index.jsx b/src/military/expert/registerList/index.jsx index 5f1a6819..1f12111c 100644 --- a/src/military/expert/registerList/index.jsx +++ b/src/military/expert/registerList/index.jsx @@ -143,6 +143,11 @@ function RegisterList({ showNotification, form }) { ]; }, []); + function onShowSizeChange(current, pageSize){ + setCurPage(current); + setPageSize(pageSize); + } + // 获取列表 useEffect(() => { setLoading(true); @@ -223,15 +228,13 @@ function RegisterList({ showNotification, form }) { return (
-
-
+
{ setSearchInput(value); setCurPage(1); }} /> -
红山开源平台专家评审系统

您尚未被入选本平台专家团队，可提交专家资料进行注册申请加入专家团队

- +
) } diff --git a/src/military/expert/reviewTasks/index.jsx b/src/military/expert/reviewTasks/index.jsx index c3a80ac9..b17ac997 100644 --- a/src/military/expert/reviewTasks/index.jsx +++ b/src/military/expert/reviewTasks/index.jsx @@ -1,9 +1,161 @@ -import React from "react"; -import { Link } from "react-router-dom"; +import React, { useState, useCallback, useMemo, useEffect } from "react"; +import { Input, Select, Button, Form, DatePicker, Table, Pagination, Upload, Modal } from 'antd'; +import cookie from 'react-cookies'; +import { exportExcel } from '../components/exportExcel.js'; +import Paginationtable from "../../components/paginationTable"; +import { Info } from '../../components/ModalFun'; +import { getExpertTasks } from "../api"; +import { taskType } from "../static"; +import { httpUrl } from '../fetch'; + +import './index.scss'; +import '../index.scss'; +const { Search } = Input; +const Option = Select.Option; + +function ReviewTasks({ form, showNotification, match, history }) { + const { getFieldDecorator, setFieldsValue, getFieldsValue } = form; + + const [reload, setReload] = useState(); + const [loading, setLoading] = useState(false); + const [curPage, setCurPage] = useState(1); + const [pageSize, setPageSize] = useState(10); + const [dataList, setDataList] = useState([]); + const [total, setTotal] = useState(0); + + const [searchObj, setSearchObj] = useState({ + containerName: '', + containerType: 1 + }); + + + const columns = useMemo(() => { + return [ + { + title: '序号', + dataIndex: 'index', + render: (text, record, index) => { + return index + 1 + } + }, + { + title: '任务名称', + dataIndex: 'expertName', + width: 75, + key: 'expertName', + // render: (text, record) => { + // return record.user ? record.user.nickname || record.user.login : '' + // } + }, + { + title: '评审截止时间', + dataIndex: 'highestDegree', + key: 'highestDegree', + }, + { + title: '剩余评审时间', + dataIndex: 'phone', + key: 'phone', + }, + { + title: '评审状态', + dataIndex: 'workplace', + key: 'workplace', + + }, + ]; + }, []); + + // 获取列表 + useEffect(() => { + setLoading(true); + let params = { + ...searchObj, + pageSize, + curPage, + statusString: '1,-1', + }; + getExpertTasks(params).then(data => { + setDataList(data.rows || []); + setLoading(false); + setTotal(data.total); + }); + }, [curPage, reload, pageSize]); + + + function onSearch() { + let values = getFieldsValue(['nameInput', 'endTime', 'startTime', 'enterpriseNameInput']); + if (values.checkStatus === '0,1,2') values.checkStatus = ''; + setSearchObj(values); + } + + function clearSearch() { + setFieldsValue({ + containerName: '', + containerType: 1, + }); + setSearchObj({ + containerName: '', + containerType: 1, + }); + } + + + const helper = useCallback( + (label, name, rules, widget, initialValue) => ( + + {getFieldDecorator(name, { rules, initialValue, validateFirst: true, })(widget)} + + ), []); -function ReviewTasks() { return ( -
aaa
+
+

+ 我的评审任务 +

+
+ {helper( + "任务名称", + "containerName", + [{ max: 20, message: '长度不能超过20个字符' }], + + )} + + {helper( + "任务类型", + "containerType", + [], + , + 1 + )} + +
+ {/* 导出 */} + + +
+
+ + +
) } -export default ReviewTasks; \ No newline at end of file +export default Form.create()(ReviewTasks); \ No newline at end of file diff --git a/src/military/expert/reviewTasks/index.scss b/src/military/expert/reviewTasks/index.scss new file mode 100644 index 00000000..feda475a --- /dev/null +++ b/src/military/expert/reviewTasks/index.scss @@ -0,0 +1,16 @@ +.register_right { + flex: auto; + .search-screen > .ant-row { + min-width: 36%; + } + p{ + border-bottom: 1px solid #eeeeee; + padding: 0.5em 2em; + color: #181818; + font-size: 0.8em; + font-weight: bold; + } + .button-div{ + line-height: 1.5; + } +} diff --git a/src/military/expert/static.js b/src/military/expert/static.js index 40344c20..bda254b2 100644 --- a/src/military/expert/static.js +++ b/src/military/expert/static.js @@ -51,4 +51,9 @@ export const reviewArea = [ { value: "人工智能", label: "人工智能" }, { value: "文学交流", label: "文学交流" }, { value: "体育活动", label: "体育活动" } +]; + +export const taskType = [ + { value: 1, label: "创客评审任务" }, + { value: 2, label: "竞赛评审任务" }, ]; \ No newline at end of file diff --git a/src/military/index.scss b/src/military/index.scss index ff361dcf..8b7ad4b3 100644 --- a/src/military/index.scss +++ b/src/military/index.scss @@ -228,6 +228,39 @@ text-align: left; } +.search-screen { + display: flex; + flex-flow: row wrap; + justify-content: space-between; + margin: 1.25rem 0; + padding: 1.25rem; + background-color: #fff; + border-bottom: 1px solid #dedede; + + > .ant-row { + min-width: 41%; + margin-right: 2rem; + .ant-form-item-label { + float: left; + } + .ant-form-item-control-wrapper { + overflow: hidden; + } + } + + .center-right-but { + .ant-form-item { + margin: 0 1rem 0 0; + } + .ant-form-item-control-wrapper { + display: inline-block; + } + } + .button-div { + margin-right: 1.5rem; + } +} + @media screen and (max-width: 1200px) { .centerbox { width: 98%; diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js index 3cafde6d..0c81c735 100644 --- a/src/modules/tpm/NewHeader.js +++ b/src/modules/tpm/NewHeader.js @@ -770,7 +770,7 @@ class NewHeader extends Component {
{this.props.user && this.props.user.login &&