diff --git a/src/military/components/paginationTable/index.jsx b/src/military/components/paginationTable/index.jsx index 9376a12d..07977e97 100644 --- a/src/military/components/paginationTable/index.jsx +++ b/src/military/components/paginationTable/index.jsx @@ -3,7 +3,7 @@ import { Table, Pagination } from 'antd'; import './index.scss'; export default (props) => { - const { loading, dataSource, columns, handleRow, total, setPage, current } =props; + const { loading, dataSource, columns, handleRow, total, setCurrentPage, current } =props; return ( @@ -18,7 +18,7 @@ export default (props) => { /> {total > 10 && } diff --git a/src/military/expert/expertList/index.jsx b/src/military/expert/expertList/index.jsx index 754e3575..15596c03 100644 --- a/src/military/expert/expertList/index.jsx +++ b/src/military/expert/expertList/index.jsx @@ -7,10 +7,11 @@ import './index.scss'; function List(){ const [loading, setLoading] = useState(false); - const [page, setPage] = useState(1); + const [currentPage, setCurrentPage] = useState(1); const [dataList, setDataList] = useState([]); const [total, setTotal] = useState(0); - const [pageSize,setPageSize] =useState(10); + const [searchObj, setSearchObj] = useState({}); + const [pageSize,setCurrentPageSize] =useState(10); const columns = useMemo(() => { return [{ @@ -43,12 +44,12 @@ function List(){ useEffect(() => { setLoading(true); let params = { - // ...searchObj, - checkStatus: '1', + ...searchObj, pageSize, - page, + currentPage, status: '', - parentId:0, + reviewArea:'', + statusString:'' } expertList(params).then(data => { if (data && Array.isArray(data.rows)) { @@ -60,7 +61,7 @@ function List(){ setLoading(false); setTotal(data.total); }); -}, [page]); +}, [currentPage]); return( @@ -71,8 +72,8 @@ function List(){ columns={columns} // handleRow total={total} - setPage={setPage} - current={page} + setCurrentPage={setCurrentPage} + current={currentPage} /> ) } diff --git a/src/military/expert/fetch.js b/src/military/expert/fetch.js index becee90a..5da4ada2 100644 --- a/src/military/expert/fetch.js +++ b/src/military/expert/fetch.js @@ -3,7 +3,8 @@ import javaFetch from '../javaFetch'; let settings=JSON.parse(localStorage.chromesetting); -let actionUrl = settings.api_urls && settings.api_urls.expert ? settings.api_urls.expert :'http://10.47.38.56:8088'; +let actionUrl = settings.api_urls && settings.api_urls.expert ? settings.api_urls.expert :'http://117.50.100.12:8067'; +// 'http://10.47.38.56:8088'; const service = javaFetch(actionUrl); export const httpUrl = actionUrl; diff --git a/src/military/expert/register/index.jsx b/src/military/expert/register/index.jsx index 415c0b0f..34670666 100644 --- a/src/military/expert/register/index.jsx +++ b/src/military/expert/register/index.jsx @@ -4,6 +4,7 @@ import { Link } from "react-router-dom"; import { unitType, natureOfWork, highestEducation, positionLevel, professionalType, reviewArea } from '../static'; import './index.scss'; import '../index.scss'; +const Option = Select.Option; export default Form.create()(({ match, history, showNotification, form }) => { const { getFieldDecorator, validateFields, setFieldsValue } = form;