diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index 8c4cdd15..71cb0b50 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -2,12 +2,13 @@ import React, { Component } from 'react'; import AccountProfile from "../../modules/user/AccountProfile"; import { getImageUrl } from 'educoder' import axios from 'axios'; -import { Input , notification , Dropdown , Menu } from 'antd'; +import { Modal, Input, message, notification , Dropdown , Menu } from 'antd'; import LoginDialog from '../../modules/login/LoginDialog'; import GotoQQgroup from '../../modal/GotoQQgroup' import '../../modules/tpm/TPMIndex.css'; +import logo from '../../modules/tpm/images/logo.png'; import './header.scss'; const $ = window.$ @@ -32,9 +33,11 @@ class NewHeader extends Component { Checkboxteachertype: false, Checkboxteachingtype: false, code_notice: false, + checked_notice: false, RadioGroupvalue: undefined, submitapplications: false, isRender: false, + showSearchOpentype: false, showTrial: false, setevaluatinghides: false, occupation: 0, @@ -42,6 +45,7 @@ class NewHeader extends Component { headtypesonClickbool: false, headtypess: "/", settings: null, + goshowqqgtounp: false, visiblemyss: false, openSearch:false, } @@ -126,7 +130,43 @@ class NewHeader extends Component { } } + submitsubmitapplications = () => { + let { + submitapplicationssum, + submitapplicationsvaluedata + } = this.state; + this.setState({ + submitapplications: false, + RadioGroupvalue: undefined + }) + if (submitapplicationssum === 0) { + if (submitapplicationsvaluedata !== undefined) { + window.location.href = "/courses/" + submitapplicationsvaluedata; + } + } else if (submitapplicationssum === 1) { + if (submitapplicationsvaluedata !== undefined) { + window.location.href = "/projects/" + submitapplicationsvaluedata; + } + } + } + hidesubmitapplications = () => { + this.setState({ + Addcoursestypes: false, + tojoinitemtype: false, + tojoinclasstitle: undefined, + rolearr: ["", ""], + Checkboxteacherchecked: false, + Checkboxstudentchecked: false, + Checkboxteachingchecked: false, + Checkboxteachertype: false, + Checkboxteachingtype: false, + code_notice: false, + checked_notice: false, + submitapplications: false, + RadioGroupvalue: undefined + }) + } educoderlogin = () => { //登录账号 this.setState({ @@ -165,6 +205,23 @@ class NewHeader extends Component { }; + hidetojoinclass = () => { + this.setState({ + tojoinclasstype: false, + tojoinitemtype: false, + tojoinclasstitle: undefined, + rolearr: ["", ""], + Checkboxteacherchecked: false, + Checkboxstudentchecked: false, + Checkboxteachingchecked: false, + Checkboxteachertype: false, + Checkboxteachingtype: false, + code_notice: false, + checked_notice: false, + RadioGroupvalue: undefined + }) + } + // 关闭 cancelModulationModels = () => { this.setState({ isRenders: false }) @@ -256,6 +313,14 @@ class NewHeader extends Component { } } + + // 处理弹框 + setgoshowqqgtounp = (bool) => { + this.setState({ + goshowqqgtounp: bool + }) + } + addMenu=(list)=>{ return( list && list.length >0 && @@ -273,25 +338,6 @@ class NewHeader extends Component { ) } - renderMenu=(personal)=>{ - const { current_user } = this.props; - return( - - - {current_user && current_user.username} - - { - personal && personal.length > 0 && personal.map((item,key)=>{ - return( -
  • {item.name}
    • - ) - }) - } - this.educoderloginysl()}>退出 -     - ) - } - render() { const { match} = this.props; let current_user = this.props.user; @@ -299,12 +345,17 @@ class NewHeader extends Component { tojoinitemtype, tojoinclasstitle, code_notice, + checked_notice, AccountProfiletype, + submitapplications, + submitapplicationsvalue, user, isRender, + showSearchOpentype, headtypesonClickbool, headtypess, settings, + goshowqqgtounp, openSearch, } = this.state; /*用户名称 用户头像url*/ @@ -401,6 +452,11 @@ class NewHeader extends Component { {...this.props} {...this.state} /> : ""} + { + goshowqqgtounp === true ? + this.setgoshowqqgtounp(bool)}> + :"" + } { settings && settings.nav_logo_url ? @@ -466,6 +522,32 @@ class NewHeader extends Component { } :"" } + +
    +
    + +
    +
    + {!user || (user && !user.login) ? @@ -476,11 +558,25 @@ class NewHeader extends Component { } : - - - 头像 +
    + + + - + +
    } diff --git a/src/forge/users/GeneralView/ConcentrateBox.jsx b/src/forge/users/GeneralView/ConcentrateBox.jsx index 3ee94194..0ec8d9c6 100644 --- a/src/forge/users/GeneralView/ConcentrateBox.jsx +++ b/src/forge/users/GeneralView/ConcentrateBox.jsx @@ -15,20 +15,13 @@ function ConcentrateBox({ visible , onCancel , onSure , username , choosed }) { const [ value , setValue ]= useState([]); const [ isSpin , setIsSpin ]= useState(true); const [ disable , setDisable ] = useState(false); - - const [ copyList , setCopyList ] = useState([]); - const [ copyAllList , setCopyAllList ] = useState([]); useEffect(()=>{ if(visible){ setIsSpin(true); getProjectList(); - }else{ - setSearch(undefined); - setCopyAllList([]); - setCopyList([]); - setList([]); } + setSearch(undefined); },[visible]) useEffect(()=>{ @@ -38,6 +31,12 @@ function ConcentrateBox({ visible , onCancel , onSure , username , choosed }) { } },[page]) + useEffect(()=>{ + if(search !== undefined){ + setIsSpin(true); + getProjectList(1,search); + } + },[search]) useEffect(()=>{ if(visible && choosed && choosed.length >0 ){ @@ -61,11 +60,11 @@ function ConcentrateBox({ visible , onCancel , onSure , username , choosed }) { } }).then(result=>{ if(result && result.data){ - let e = !search ? mergeArrayMerge(list,result.data.projects) : result.data.projects; - setCopyAllList(!search ? e : copyAllList); + let e = page > 1 ? mergeArrayMerge(list,result.data.projects) : result.data.projects; setTotal(result.data.count); setList(e); setIsSpin(false); + // 查看更多需要页数 let s = parseInt(result.data.count/limit,0); let y = result.data.count%limit; @@ -87,39 +86,28 @@ function ConcentrateBox({ visible , onCancel , onSure , username , choosed }) { return array1 } - function saveList(c) { - // 将选中的复制下来保存到copyList数组里 - if(c && c.length > 0){ - let l = [] - for(var i=0;ij.id === c[i]); - if(filter && filter.length>0){ - l.push(filter[0]); - } - } - setCopyList(l); - } - } - function onOk() { onSure && onSure(value); setValue([]); } - function chooseProject(e) { + function chooseProject(e,p) { setValue(e); } // 搜索 function onSearch(params) { - setCopyAllList(list); - value && value.length > 0 ? saveList(value) : setCopyList([]); setPage(1); + setList([]); setSearch(params); - getProjectList(1,params); + // if(params){ + // setValueCopy(value); + // }else{ + // setValue(valueCopy); + // setValueCopy([]); + // } } - return(
    - - { - copyList && copyList.length >0 && copyList.map((i,k)=>{ - return( - j === i.id).length===0)}>{i.author && i.author.name}/{i.name} - ) - }) - } - { - list && list.length > 0 && list.map((i,k)=>{ - let c = copyList && copyList.length >0 && copyList.filter(j=>j.id === i.id).length !== 0; - return( - !c && j === i.id).length===0)}>{i.author && i.author.name}/{i.name} - ) - }) - } - + { + list && list.length > 0 && + + { + list.map((i,k)=>{ + return( + j === i.id).length===0)}>{i.name} + ) + }) + } + + }
    { total > limit && page < pageSize &&
    setPage(page+1)}>查看更多
    } - { (list && list.length === 0) && (copyList && copyList.length === 0) &&
    您还没有公开的{search && `“${search}”`}项目，先去新建项目
    } + { list && list.length === 0 &&
    您还没有公开的{search && `“${search}”`}项目，先去新建项目
    }     ) diff --git a/src/forge/users/GeneralView/Index.scss b/src/forge/users/GeneralView/Index.scss index 74ca9d78..e79f6858 100644 --- a/src/forge/users/GeneralView/Index.scss +++ b/src/forge/users/GeneralView/Index.scss @@ -45,7 +45,7 @@ } } .ConcentrateTip{ - margin:20px 30px 0px; + margin:20px 20px 0px; padding:5px 20px; border:1px solid rgb(248, 56, 56); border-radius: 4px;