diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js index 6fa5f0c9f..7b622949e 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js @@ -255,7 +255,7 @@ class CompetitionCommon extends Component{ render() { let {data,thiskeys,Competitionedittype}=this.state; - console.log(thiskeys) + return ( data===undefined?"":
@@ -347,7 +347,7 @@ class CompetitionCommon extends Component{ - this.getrightdatas(e)}> + this.getrightdatas(e)}> {data&&data.competition_modules.map((item,key)=>{ if(item.module_type!="enroll"){ return( diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js index f6e3ce781..97a00068a 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js @@ -477,8 +477,9 @@ class CoursesBanner extends Component { render() { let { Addcoursestypes, coursedata,excellent, modalsType, modalsTopval, loadtype,modalsBottomval,antIcon,is_guide,AccountProfiletype,modalstrsvalue} = this.state; - const isCourseEnd = this.props.isCourseEnd() - document.title=coursedata===undefined || coursedata.status===401 || coursedata.status===407?"":coursedata.name; + + const isCourseEnd = this.props.isCourseEnd(); + document.title=coursedata===undefined || coursedata.status===401 || coursedata.status===407?"":coursedata.name; return (
{/*{*/} @@ -705,18 +706,29 @@ class CoursesBanner extends Component { `} - this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/teachers")} className={"pointer"}> - 教师 {coursedata.teacher_count} + + + 0?true:false} + placement="topLeft" + title={
{coursedata.teacher_applies_count===undefined?"":coursedata.teacher_applies_count>0?您有{coursedata.teacher_applies_count}条新的加入申请this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/teachers?tab=2")}>待审批:""}
}> + this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/teachers")}> + 教师 + {coursedata.teacher_count} + +
+ this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/students"):"":()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/students")} > 学生 {coursedata.student_count} + {coursedata.credit===null?"": 学分 {coursedata.credit} } +
{/*
  • */} diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css index 160104920..d4e3518c6 100644 --- a/public/react/src/modules/courses/css/Courses.css +++ b/public/react/src/modules/courses/css/Courses.css @@ -1744,4 +1744,9 @@ input.ant-input-number-input:focus { line-height: 62px; color: #fff; margin: 0 auto; +} + +.daishenp{ + color: #F79946 !important; + text-decoration: underline !important; } \ No newline at end of file diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js index bc534c61d..5834ae517 100644 --- a/public/react/src/modules/courses/members/teacherList.js +++ b/public/react/src/modules/courses/members/teacherList.js @@ -299,7 +299,18 @@ class studentsList extends Component{ this.setState({ isSpin:true }) - this.fetchAll(1); + let newmenuid=this.props.location.search.replace('?tab=', ''); + if(newmenuid===undefined||newmenuid===""||newmenuid==="1"||newmenuid===1){ + this.setState({ + filterKey:'1' + }) + }else{ + this.setState({ + filterKey:'2' + }) + } + + this.fetchAll(1); const isAdminOrTeacher = this.props.isAdminOrTeacher() const isAdmin = this.props.isAdmin() @@ -385,6 +396,8 @@ class studentsList extends Component{ this.fetchAll() } fetchAll = async (argPage) => { + let { searchValue, filterKey }=this.state + this.setState({ isSpin:true }) @@ -395,7 +408,7 @@ class studentsList extends Component{ const sortedInfo = this.state.sortedInfo; let page = argPage || this.state.page - let { searchValue, filterKey }=this.state + let order = 1; if (sortedInfo.columnKey == 'role') { order = 1; @@ -654,7 +667,9 @@ class studentsList extends Component{ const isSuperAdmin = this.props.isSuperAdmin() const hasGraduationModule = this.hasGraduationModule() const coursesId = this.props.match.params.coursesId - + + + return( {/* - + 已审批({total_count}) 待审批({apply_size})