Gitlink
/
forgeplus-react
39
0
Fork 30
Code Issues Pull Requests Releases 1 Wiki Activity

pull 代码

This commit is contained in:
unknown 2022-02-25 15:31:57 +08:00
parent 7f44d0e115 9b0fd46188
commit fa7c79143a
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/home/FourthSection/index.jsx
View File

@ -33,7 +33,7 @@ function FourthSection({ fourth, history }) {
<h2 className="homePage-blue-tit">开源项目</h2> <h2 className="homePage-blue-tit">开源项目</h2>
<h4 className="homePage-subhead">开源项目版块集项目托管、版本管理等功能于一体，为开源协作和群智汇聚提供创作环境</h4> <h4 className="homePage-subhead">开源项目版块集项目托管、版本管理等功能于一体，为开源协作和群智汇聚提供创作环境</h4>
<Line /> <Line />
<Button className="homepage-btn" type="primary" onClick={()=>{history.push('/projects')}}>查看项目 <i className="iconfont icon-gengduoicon"></i></Button> <Button className="homepage-btn" type="primary" onClick={()=>{history.push('/explore/all')}}>查看项目 <i className="iconfont icon-gengduoicon"></i></Button>
</div> </div>
<div className={fourth ? "code-box clearfix activeCode" : "code-box clearfix"} > <div className={fourth ? "code-box clearfix activeCode" : "code-box clearfix"} >

2
src/military/components/adminRouter/index.jsx
View File

@ -84,7 +84,7 @@ export default props => {
const checkMenu = useMemo(() => { const checkMenu = useMemo(() => {
return <Menu selectedKeys={current} onClick={handleClick}> return <Menu selectedKeys={current} onClick={handleClick}>
<Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/managements/enterprise_authentication`}>企业认证</a></Menu.Item> <Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/managements/enterprise_authentication`}>企业认证</a></Menu.Item>
<Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/admin/reviews/projects_list`}>开源项目</a></Menu.Item> {/* <Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/admin/reviews/projects_list`}>开源项目</a></Menu.Item> */}
<Menu.Item key={"taskManage1"}><Link to="/task/taskManage/1">统筹任务发布审批</Link></Menu.Item> <Menu.Item key={"taskManage1"}><Link to="/task/taskManage/1">统筹任务发布审批</Link></Menu.Item>
<Menu.Item key={"taskManage0"}><Link to="/task/taskManage/0">自主任务发布审批</Link></Menu.Item> <Menu.Item key={"taskManage0"}><Link to="/task/taskManage/0">自主任务发布审批</Link></Menu.Item>
<Menu.Item key={"paperManage"}><Link to="/task/paperManage">成果/评论审批</Link></Menu.Item> <Menu.Item key={"paperManage"}><Link to="/task/paperManage">成果/评论审批</Link></Menu.Item>

4
src/military/javaFetch.js
View File

@ -17,11 +17,11 @@ export default function javaFetch(actionUrl){
// request拦截器 // request拦截器
service.interceptors.request.use(config => { service.interceptors.request.use(config => {
if (cookie.load(TokenKey)) { if (cookie.load(TokenKey)) {
config.headers['Authorization'] = cookie.load(TokenKey); // 让每个请求携带自定义token 请根据实际情况自行修改 config.headers['Authorization'] = cookie.load(TokenKey) ||cookie.load('autologin_trustie'); // 让每个请求携带自定义token 请根据实际情况自行修改
} }
if (window.location.port === "3007") { if (window.location.port === "3007") {
// 模拟token为登录用户 // 模拟token为登录用户
const osredmToken = sessionStorage.osredmToken; const osredmToken = cookie.load(TokenKey) ||cookie.load('autologin_trustie')||sessionStorage.osredmToken;
if (config.url.indexOf('?') === -1) { if (config.url.indexOf('?') === -1) {
config.url = `${config.url}?token=${osredmToken}`; config.url = `${config.url}?token=${osredmToken}`;
} else { } else {

2
src/military/task/taskManage/index.js
View File

@ -52,7 +52,7 @@ export default Form.create()(({ form, showNotification, match, history }) => {
} }
setLoading(false); setLoading(false);
}) })
}, [reload, statusString, curPage, searchObj]); }, [reload, statusString, curPage, searchObj ,publishMode]);
const helper = useCallback( const helper = useCallback(