xxq250
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev_military_osredm' of http://106.75.45.236:3000/tongChong/forgeplus-react into expert_review

This commit is contained in:
unknown 2022-01-18 11:04:36 +08:00
parent da18a416c8 ac0fcbdd1f
commit d057729c0a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,12 +9,13 @@ const { SubMenu } = Menu;
export default props => {
const main_web_site_url = JSON.parse(localStorage.chromesetting).main_web_site_url;
const current_main_site_url = JSON.parse(localStorage.chromesetting).current_main_site_url;
const [current,setCurrent]=useState([]);
const [current,setCurrent]=useState(JSON.parse(sessionStorage.adminRouter||'[]'));
function handleClick (e){
setCurrent([e.key]);
sessionStorage.setItem( 'adminRouter',JSON.stringify([e.key]));
};
const projectMenu = useMemo(() => {

4
src/military/task/components/itemListPaper/index.jsx
View File

@ -144,7 +144,7 @@ export default Form.create()((props) => {
{loading || loadingChild ? <Loading /> :
<React.Fragment>
{
list.map(item => {
list.map((item,i) => {
return (
<div className="fileComments df" key={item.id}>
@ -159,6 +159,8 @@ export default Form.create()((props) => {
{item.status === 2 ? <img alt="胜出" className="mr5" src={winpng} /> : <span className="color-blue ml10">{item.checkStatus !== 1 ? paperCheckStatus[item.checkStatus] : applyStatusAllNameArr[item.status]}</span>}
{[5,6,7,8].includes(detailStatus) && item.reviewFinalGrades!==null &&<span className='paper-grades'>评审得分：<span className='paper-grades-num'>{item.reviewFinalGrades}</span></span>}
{[5,6,7,8].includes(detailStatus) && i<3&& <i className={`iconfont icon-a-${i+1}`}></i>}
</li>
<li className="fr">
{((item.needComplain && detailStatus === 3) || (detailStatus === 5 && item.publicTaskComplain && item.checkStatus === 1 && item.status !== 2)) && (current_user.login === item.user.login) &&