Merge branches 'courseware' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into courseware

public/react/src/modules/courses/ListPageIndex.js

@@ -102,7 +102,8 @@ class ListPageIndex extends Component{
     this.state={
       yslGuideone:undefined,
       yslElearning:false,
-			isexcellent:false
+			isexcellent:false,
+			homedirectory:false,
     }
   }
   comyslElearning(bool){
@@ -183,6 +184,21 @@ class ListPageIndex extends Component{
   updatabanners=()=>{
     this.refs.CoursesBanner.updatabanner()
   }
+
+	//是否点击了目录
+	Callhomedirectoryornot=(bool)=>{
+		this.setState({
+			homedirectory:bool
+		})
+		if(bool===true){
+			setTimeout(() => {
+				this.setState({
+					homedirectory:false,
+				})
+			}, 1000);
+		}
+
+	}
   render() {
     let {yslGuideone} =this.state;
     // console.log("98");
@@ -218,7 +234,7 @@ class ListPageIndex extends Component{
 
                                       {/*left_nav*/}
                                       <div className={"with22 fl setleft"} style={{width:'264px',minHeight:'500px'}}>
-                                         <Coursesleftnav {...this.props} {...this.state}  comyslElearning={(i)=>this.comyslElearning(i)}/>
+																				<Coursesleftnav {...this.props} {...this.state}  comyslElearning={(i)=>this.comyslElearning(i)} myinex={true} Callhomedirectoryornot={(b)=>this.Callhomedirectoryornot(b)}/>
                                       </div>
 
                                       {/*right_concent*/}
@@ -261,16 +277,16 @@ class ListPageIndex extends Component{
                                                     }
                                                 ></Route>
                                                 {/*视频列表*/}
-                                                <Route path="/classrooms/:coursesId/course_video/:videoId"
-                                                       render={
-                                                         (props) => (<CourseVideo {...this.props} {...props} {...this.state} />)
-                                                       }
-                                                ></Route>
-                                                <Route path="/classrooms/:coursesId/course_videos"
-                                                       render={
-                                                         (props) => (<CourseVideo {...this.props} {...props} {...this.state} />)
-                                                       }
-                                                ></Route>
+																								<Route path="/classrooms/:coursesId/course_video/:videoId"
+																											 render={
+																												 (props) => (<CourseVideo {...this.props} {...props} {...this.state} homedirectory={this.state.homedirectory}/>)
+																											 }
+																								></Route>
+																								<Route path="/classrooms/:coursesId/course_videos"
+																											 render={
+																												 (props) => (<CourseVideo {...this.props} {...props} {...this.state} homedirectory={this.state.homedirectory}/>)
+																											 }
+																								></Route>
 																								{/* 教师列表*/}
                                                 <Route path="/classrooms/:coursesId/teachers"
                                                     render={

public/react/src/modules/courses/Video/VideoIndex.js

@@ -41,7 +41,6 @@ class VideoIndex extends Component {
 
 			liveVisible: false,
 			statistics: false,
-
 		}
 	}
 
@@ -75,13 +74,27 @@ class VideoIndex extends Component {
 		}
 	}
 	componentDidUpdate = (prevProps) => {
+		try {
+			if (this.props.homedirectory !== prevProps.homedirectory) {
+				if(this.props.homedirectory ===true){
+					this.setState({
+						statistics:false,
+					})
+				}
+			}
+		}catch (e) {
+
+		}
+
 		if (this.props.match.params.videoId !== prevProps.match.params.videoId) {
 			this.setState({
-				upload: false
+				upload: false,
 			})
 			const {page} = this.state;
 			this.checkType("video", page);
 		}
+
+
 	}
 	// 获取直播列表
 	getLiveList = (page) => {
@@ -239,9 +252,11 @@ class VideoIndex extends Component {
 	}
 	//统计
 	statisticsy = (bool) => {
+
 		this.setState({
-			statistics: bool
+			statistics: bool,
 		})
+
 	}
 
 	render() {
@@ -311,16 +326,20 @@ class VideoIndex extends Component {
 												{
 													newOperation ?
 														<span>
-											  <WordsBtn style="blue" className="ml30 font-16 tongjis"
-																	onClick={() => this.statisticsy(true)}
-												><i className="iconfont icon-tongji1 mr5"></i>统计</WordsBtn>
 															{
 																videoId ?
 																	<WordsBtn style="blue"
 																						onClick={() => this.editDir(videoData && videoData.category_name, videoId)}
 																						className={"ml30 font-16"}>目录重命名</WordsBtn>
 																	:
-																	<WordsBtn style="blue" className="ml30 font-16" onClick={this.addDir}>新建目录</WordsBtn>
+																	<span>
+
+																	<WordsBtn style="blue" className="ml30 font-16 tongjis"
+																						onClick={() => this.statisticsy(true)}
+																	><i className="iconfont icon-tongji1 mr5"></i>统计</WordsBtn>
+																		<WordsBtn style="blue" className="ml30 font-16" onClick={this.addDir}>新建目录</WordsBtn>
+																	</span>
+
 															}
 															<WordsBtn style="blue" className="ml30 font-16"
 																				onClick={() => this.setLinkeVisible(true)}>增加外链</WordsBtn>

public/react/src/modules/courses/common/CourseLayoutComponent.js

@@ -53,7 +53,7 @@ class CourseLayoutcomponent extends Component{
 
                                       {/*left_nav*/}
                                       <div className={"with22 fl setleft"} style={{width:'264px',minHeight:'500px'}}>
-                                         <Coursesleftnav {...this.props} {...this.state}/>
+                                         <Coursesleftnav myinex={false}  {...this.props} {...this.state}/>
                                       </div>
 
                                       {/*right_concent*/}

public/react/src/modules/courses/coursesDetail/CoursesDetail.js

@@ -64,7 +64,8 @@ class CoursesDetail extends Component{
                                       <div className={"with22 fl setleft"} style={{width:'264px',minHeight:'500px'}}>
                                          <Coursesleftnav
                                            {...this.props}
-                                           getleftNavid={this.getleftNavid}
+																					 myinex={false}
+																					 getleftNavid={this.getleftNavid}
                                          />
                                       </div>
 

public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js

@@ -394,7 +394,16 @@ class Coursesleftnav extends Component{
       indexs:index
     })
     // this.props.history.replace(urls);
-    e.stopPropagation();//阻止冒泡
+		try {
+			if(this.props.myinex===true){
+				this.props.Callhomedirectoryornot(true);
+
+			}
+		}catch (e) {
+
+		}
+
+		e.stopPropagation();//阻止冒泡
 
   }
   selectnavids=(e,key,id,type,urls,index,santype)=>{
@@ -409,6 +418,14 @@ class Coursesleftnav extends Component{
     })
 		this.props.updataleftNavfun();
     this.props.history.replace(urls);
+		try {
+			if(this.props.myinex===true){
+				this.props.Callhomedirectoryornot(true);
+
+			}
+		}catch (e) {
+
+		}
     e.stopPropagation();//阻止冒泡
   }
 
@@ -1008,6 +1025,13 @@ class Coursesleftnav extends Component{
 			url:urls,
 			indexs:index
     })
+		try {
+			if(this.props.myinex===true){
+				this.props.Callhomedirectoryornot(true);
+			}
+		}catch (e) {
+
+		}
     this.props.history.replace(urls);
     e.stopPropagation();//阻止冒泡
   }

public/react/src/modules/courses/signin/css/signincdi.css

@@ -188,6 +188,9 @@
     padding-top: 20px;
     padding-bottom: 20px;
 }
+.pdinstop0{
+    padding-top: 0px !important;
+}
 .teacherentrydivss{
     padding-left: 20px;
     padding-right: 20px;
@@ -414,6 +417,14 @@
     white-space:nowrap;
     cursor: default;
 }
+.maxnamewidth200yss{
+    text-align: center;
+    max-width:200px;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    cursor: default;
+}
 .maxnamewidth100s{
     width: 100px;
     max-width: 100px;

public/react/src/modules/courses/signin/teacher/Teachers_signin.js

@@ -49,6 +49,7 @@ class Students_signin extends Component{
 			page:1,
 			limit:5
 		}
+
   this.gogetdatas(data);
 
 		// const query = this.props.location.search;
@@ -58,8 +59,17 @@ class Students_signin extends Component{
 	}
 
 	componentDidUpdate = (prevProps) => {
+		try {
+			if (this.props.homedirectory !== prevProps.homedirectory) {
+				if(this.props.homedirectory ===true){
+					this.setState({
+						switchs:false,
+					})
+				}
+			}
+		}catch (e) {
 
-
+		}
 	}
 
 	callback=(key)=> {

public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js

@@ -404,7 +404,7 @@ class Videostatisticscomtwo extends Component {
 			<Menu>
 				<Menu.Item>
 					<a onClick={() => this.setcourse_groups(null)}>
-						<p className="maxnamewidth200s">全部</p>
+						<p className="maxnamewidth200yss">全部</p>
 					</a>
 				</Menu.Item>
 				{
@@ -414,7 +414,7 @@ class Videostatisticscomtwo extends Component {
 								return (
 									<Menu.Item>
 										<a onClick={() => this.setcourse_groups(item.id)} key={key}>
-											<p className="maxnamewidth200s">{item.name}</p>
+											<p className="maxnamewidth200yss">{item.name}</p>
 										</a>
 									</Menu.Item>
 								)
@@ -472,7 +472,7 @@ class Videostatisticscomtwo extends Component {
 							}
 						</style>
 
-								<div className="ws100s ysltableo">
+								<div className="ws100s ysltableo mt10">
 									{
 										data.length === 0 ?
 											<div style={{

public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js

@@ -266,7 +266,7 @@ class Videostatisticslist extends Component {
 							}
 						</style>
 
-								<div className="ws100s ysltableo teacherentrydivs">
+								<div className="ws100s ysltableo teacherentrydivs pdinstop0">
 									{
 										data.length===0?
 											<div style={{