调整课堂待审批提示

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?"":<div className={"educontent clearfix mt20 "}>
 
@@ -347,7 +347,7 @@ class CompetitionCommon extends Component{
 
 						<Layout className={'teamsLayout mt40'}>
 							<Sider>
-								<Menu mode="inline" className="CompetitionMenu" defaultSelectedKeys={[`${this.state.thiskeys}`]} onClick={(e)=>this.getrightdatas(e)}>
+								<Menu mode="inline" className="CompetitionMenu" selectedKeys={[`${this.state.thiskeys}`]} onClick={(e)=>this.getrightdatas(e)}>
 									{data&&data.competition_modules.map((item,key)=>{
 										if(item.module_type!="enroll"){
 											return(

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 (
           <div>
 						{/*{*/}
@@ -705,18 +706,29 @@ class CoursesBanner extends Component {
 													`}
 												</style>
 												<Breadcrumb separator="|" className={"mt5"}>
-													<Breadcrumb.Item onClick={()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/teachers")} className={"pointer"}>
+
-														<span className="color-grey-c font-16"><span className={"mr10"}>教师</span>  <span className={"mr10"}>{coursedata.teacher_count}</span></span>
+													<Breadcrumb.Item className={"pointer"}>
+														<Tooltip visible={coursedata.teacher_applies_count===undefined?false:coursedata.teacher_applies_count>0?true:false}
+																		 placement="topLeft"
+																		 title={<pre>{coursedata.teacher_applies_count===undefined?"":coursedata.teacher_applies_count>0?<span>您有{coursedata.teacher_applies_count}条新的加入申请<a className={"daishenp"} onClick={()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/teachers?tab=2")}>待审批</a></span>:""}</pre>}>
+																<span className="color-grey-c font-16" onClick={()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/teachers")}>
+																	<span className={"mr10"}>教师</span>
+																	<span className={"mr10"}>{coursedata.teacher_count}</span>
+																</span>
+														</Tooltip>
 													</Breadcrumb.Item>
+
 													<Breadcrumb.Item
 														className={excellent===true&&coursedata.course_end === true?this.props.isAdminOrTeacher()===true?"pointer":"":"pointer"}
 														onClick={excellent===true&&coursedata.course_end === true?this.props.isAdminOrTeacher()===true?()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/students"):"":()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/students")}
 													>
 														<span className="color-grey-c font-16"><span className={"mr10 ml10"}>学生</span>  <span className={"mr10"}>{coursedata.student_count}</span></span>
 													</Breadcrumb.Item>
+
 													<Breadcrumb.Item>{coursedata.credit===null?"":
 														<span className="color-grey-c font-16"><span className={"mr10 ml10"}>学分</span> <span className={"mr10"}>{coursedata.credit}</span></span>
 													}</Breadcrumb.Item>
+
 												</Breadcrumb>
 
                         {/*<li className={"mt7 teachersbox"}  >*/}

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;
 }

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(
       <React.Fragment>
         {/* <AddTeacherModal ref="addTeacherModal" 
@@ -693,7 +708,7 @@ class studentsList extends Component{
           }
           secondRowLeft={
             isAdminOrTeacher ? <div className="fl mt6 task_menu_ul " style={{ width: '600px' }}>
-                <Menu mode="horizontal" defaultSelectedKeys="1" onClick={this.selectedStatus}>
+                <Menu mode="horizontal" selectedKeys={[`${this.state.filterKey}`]} onClick={this.selectedStatus}>
                   <Menu.Item key="1">已审批({total_count})</Menu.Item>
                   <Menu.Item key="2">待审批({apply_size})</Menu.Item>
                 </Menu>