From c9cd52221ef4c26bb8619da74c90fa3bc78ff646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Mon, 20 Dec 2021 08:59:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E5=88=97=E8=A1=A8=E9=A1=B5?= =?UTF-8?q?=E9=A1=B6=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 21 -------- package.json | 2 +- src/military/expert.js | 11 +++- src/military/expert/components/Upload.jsx | 2 +- src/military/expert/expertList/index.jsx | 65 ++++++++++++++++++++--- src/military/expert/expertList/index.scss | 4 ++ src/military/expert/fetch.js | 6 +-- src/military/expert/reviewTasks/index.jsx | 9 ++++ src/modules/tpm/NewHeader.js | 13 ++++- 9 files changed, 97 insertions(+), 36 deletions(-) create mode 100644 src/military/expert/reviewTasks/index.jsx diff --git a/package-lock.json b/package-lock.json index 29c8e11d6..761d5adcb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -289,15 +289,9 @@ } }, "@babel/runtime-corejs3": { -<<<<<<< HEAD "version": "7.16.5", "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.16.5.tgz", "integrity": "sha512-F1pMwvTiUNSAM8mc45kccMQxj31x3y3P+tA/X8hKNWp3/hUsxdGxZ3D3H8JIkxtfA8qGkaBTKvcmvStaYseAFw==", -======= - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.16.0.tgz", - "integrity": "sha512-Oi2qwQ21X7/d9gn3WiwkDTJmq3TQtYNz89lRnoFy8VeZpWlsyXvzSwiRrRZ8cXluvSwqKxqHJ6dBd9Rv+p0ZGQ==", ->>>>>>> 070f869aa67b4f7d20a6955b6c22d4df6398f516 "requires": { "core-js-pure": "^3.19.0", "regenerator-runtime": "^0.13.4" @@ -3987,15 +3981,9 @@ "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==" }, "core-js-pure": { -<<<<<<< HEAD "version": "3.19.3", "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.3.tgz", "integrity": "sha512-N3JruInmCyt7EJj5mAq3csCgGYgiSqu7p7TQp2KOztr180/OAIxyIvL1FCjzgmQk/t3Yniua50Fsak7FShI9lA==" -======= - "version": "3.19.1", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.1.tgz", - "integrity": "sha512-Q0Knr8Es84vtv62ei6/6jXH/7izKmOrtrxH9WJTHLCMAVeU+8TF8z8Nr08CsH4Ot0oJKzBzJJL9SJBYIv7WlfQ==" ->>>>>>> 070f869aa67b4f7d20a6955b6c22d4df6398f516 }, "core-util-is": { "version": "1.0.3", @@ -18231,22 +18219,13 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", -<<<<<<< HEAD "dev": true -======= - "dev": true, - "optional": true ->>>>>>> 070f869aa67b4f7d20a6955b6c22d4df6398f516 }, "is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, -<<<<<<< HEAD -======= - "optional": true, ->>>>>>> 070f869aa67b4f7d20a6955b6c22d4df6398f516 "requires": { "is-extglob": "^2.1.1" } diff --git a/package.json b/package.json index 068d2ac0b..e8cb3957d 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ }, "scripts": { "start": "node --max_old_space_size=15360 scripts/start.js", - "build": " NODE_ENV=production node --max_old_space_size=15360 scripts/build.js", + "build": "set NODE_ENV=production node --max_old_space_size=15360 scripts/build.js", "test-build": "NODE_ENV=testBuild node --max_old_space_size=15360 scripts/build.js", "pre-build": "NODE_ENV=preBuild node --max_old_space_size=15360 scripts/build.js", "gen_stats": "NODE_ENV=production webpack --profile --config=./config/webpack.config.prod.js --json > stats.json", diff --git a/src/military/expert.js b/src/military/expert.js index 4cf55a7d2..b9c7b0c29 100644 --- a/src/military/expert.js +++ b/src/military/expert.js @@ -31,7 +31,10 @@ const AdminRouter = Loadable({ loading: Loading, }); - +const ReviewTasks = Loadable({ + loader: () => import("./expert/reviewTasks"), + loading: Loading, +}) const Expert = (propsTransmit) => { // 开发时，从代理的位置获取用户信息 @@ -56,6 +59,12 @@ const Expert = (propsTransmit) => { render={(props) => ( )} + > + ( + + )} > {/* 管理员管理 */} { return [{ @@ -121,9 +128,12 @@ function RegisterList({ showNotification }) { // 获取列表 useEffect(() => { + console.log('searchReviewArea', searchReviewArea); setLoading(true); let params = { searchInput, + reviewArea: searchReviewArea, + expertType, pageSize, curPage, statusString: '1', @@ -138,7 +148,7 @@ function RegisterList({ showNotification }) { setLoading(false); setTotal(data.total); }); - }, [curPage, reload, searchInput]); + }, [curPage, reload, searchInput, searchReviewArea, expertType]); function check(record, checkStatus) { Modal.confirm({ @@ -160,17 +170,58 @@ function RegisterList({ showNotification }) { }, }); } + + // 上传附件后得到的文件数组 + function uploadExpert(fileList, files) { + setUploadExpertList(fileList); + setUploadExpertIds(files); + } return (
- { setSearchInput(value); setCurPage(1); }} - /> +
+ 查询条件： + { setSearchInput(value); setCurPage(1); }} + /> + 专家类别： + + 评审领域： + +
+
+ + + +
tr > th, .ant-table-tbody > tr > td{ padding:16px 6px; } + .center-right-but{ + justify-content: space-between; + margin-bottom: 2.5em; + } } \ No newline at end of file diff --git a/src/military/expert/fetch.js b/src/military/expert/fetch.js index 8d833670a..6ebcee6b1 100644 --- a/src/military/expert/fetch.js +++ b/src/military/expert/fetch.js @@ -3,9 +3,9 @@ import javaFetch from '../javaFetch'; let settings=JSON.parse(localStorage.chromesetting); -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 - +let actionUrl = settings.api_urls && settings.api_urls.expert ? settings.api_urls.expert :'http://117.50.100.12:8067'; +// http://10.47.38.39:8088 +// http://117.50.100.12:8067/ const service = javaFetch(actionUrl); export const httpUrl = actionUrl; export default service; \ No newline at end of file diff --git a/src/military/expert/reviewTasks/index.jsx b/src/military/expert/reviewTasks/index.jsx new file mode 100644 index 000000000..c3a80ac9e --- /dev/null +++ b/src/military/expert/reviewTasks/index.jsx @@ -0,0 +1,9 @@ +import React from "react"; +import { Link } from "react-router-dom"; + +function ReviewTasks() { + return ( +
aaa
+ ) +} +export default ReviewTasks; \ No newline at end of file diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js index aa5c2a599..f9e676573 100644 --- a/src/modules/tpm/NewHeader.js +++ b/src/modules/tpm/NewHeader.js @@ -1,7 +1,8 @@ import React, { Component } from 'react'; import { Link } from "react-router-dom"; import AccountProfile from "../user/AccountProfile"; -import { getImageUrl,getLogoImageUrl } from 'educoder' +import { getImageUrl,getLogoImageUrl } from 'educoder'; +import { getUserInfo } from 'src/military/expert/api'; import axios from 'axios'; import { Modal, Input, message, notification, Button } from 'antd'; @@ -51,9 +52,15 @@ class NewHeader extends Component { mygetHelmetapi2: null, goshowqqgtounp: false, visiblemyss: false, + isExpert: false, } } componentDidMount() { + getUserInfo().then(response =>{ + console.log('111',response); + response && this.setState({isExpert: response.data.expert}); + console.log('222',this.state.isExpert); + }); // this.getAppdata(); this.geturlsdata(); window._header_componentHandler = this; @@ -766,7 +773,9 @@ class NewHeader extends Component {
{this.props.user && this.props.user.login &&
- + + +
} {this.props.user && this.props.user.login &&