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

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

@@ -382,7 +382,7 @@ class VideoIndex extends Component {
 							isAdmin?
 								<Videostatistics {...this.props} {...this.state} statisticsy={(b) => this.statisticsy(b)}></Videostatistics>
 								:
-								<Videostatisticscomtwo {...this.props} {...this.state} ></Videostatisticscomtwo>
+								<Videostatisticscomtwo {...this.props} {...this.state} mytitle={""} ></Videostatisticscomtwo>
 						)
 				}
 				{

public/react/src/modules/courses/videostatistics/Videostatistics.js

@@ -14,6 +14,7 @@ class Videostatistics extends Component{
 			watch_staticsdata:[],
 			tisticsbool:false,
 			tisid:null,
+			mytitle:""
 		}
 
 
@@ -43,16 +44,17 @@ class Videostatistics extends Component{
 		 });
 	 }
 
-	tisticsbools=(bool,id)=>{
+	tisticsbools=(bool,id,mytitle)=>{
 		this.setState({
 			tisticsbool:bool,
 			tisid:id,
+			mytitle:mytitle
 		})
 	}
 
 
 	render(){
-		let {watch_staticsdata,tisticsbool,tisid}= this.state;
+		let {watch_staticsdata,tisticsbool,tisid,mytitle}= this.state;
 
 		return(
 			<React.Fragment>
@@ -79,13 +81,13 @@ class Videostatistics extends Component{
 
 
 								<div>
-									<Videostatisticslist  {...this.state} {...this.props} tisticsbools={(b,id)=>this.tisticsbools(b,id)}></Videostatisticslist>
+									<Videostatisticslist  {...this.state} {...this.props} tisticsbools={(b,id,t)=>this.tisticsbools(b,id,t)}></Videostatisticslist>
 
 
 								</div>
 							</div>
 							:
-            <Videostatisticscomtwo  {...this.state} {...this.props} tisid={tisid} tisticsbools={(b,id)=>this.tisticsbools(b,id)}></Videostatisticscomtwo>
+            <Videostatisticscomtwo  {...this.state} {...this.props} tisid={tisid} mytitle={mytitle} tisticsbools={(b,id,t)=>this.tisticsbools(b,id,t)}></Videostatisticscomtwo>
 					}
 
 				</div>

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

@@ -207,6 +207,7 @@ class Videostatisticscomtwo extends Component {
 								feq: response.data.data[i].feq,
 								start_at: response.data.data[i].start_at,
 								end_at: response.data.data[i].end_at,
+								title: response.data.data[i].title,
 							})
 						}
 
@@ -436,12 +437,21 @@ class Videostatisticscomtwo extends Component {
 				}
 			</Menu>
 		);
+
+		let mytitle="";
+		if(isAdmin){
+			mytitle=this.props&&this.props.mytitle;
+
+		}else{
+			mytitle=this.state.data[0].title;
+		}
+
 		return (
 			<React.Fragment>
 				<div className="ws100s">
 					<div className="ws100s teacherentrydivss edu-back-white ">
 						<div className="ws100s sortinxdirection">
-							<div className="ws50s sptits">视频名称视频名称…</div>
+							<div className="ws50s sptits">{mytitle}</div>
 							<div className="ws50s sptitss xaxisreverseorder font-14" style={{
 								color: "#5091FF",
 								lineHeight: "42px",
@@ -463,9 +473,9 @@ class Videostatisticscomtwo extends Component {
 										 	<span className="mr5 xiaoshou">分班</span>
 										 {
 											 fbbool === true ?
-												 <i className="iconfont icon-sanjiaoxing-down  font-13 mr32 xiaoshou"></i>
-												 :
 												 <i className="iconfont icon-sanjiaoxing-up   font-13 mr32 xiaoshou"></i>
+												 :
+												 <i className="iconfont icon-sanjiaoxing-down  font-13 mr32 xiaoshou"></i>
 										 }
 									 </span>
 											</Dropdown>
@@ -488,7 +498,7 @@ class Videostatisticscomtwo extends Component {
 							}
 						</style>
 
-								<div className="ws100s ysltableo mt10">
+								<div className="ws100s ysltableo mt10" style={{	minHeight: "400px"}}>
 									{
 										data.length === 0 ?
 											<div style={{

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

@@ -97,7 +97,7 @@ class Videostatisticslist extends Component {
 					className: 'font-14',
 					width: '50px',
 					render: (text, record) => (
-						<span style={{width: '50px',color:'#5091FF'}} className="xiaoshou" onClick={()=>this.props.tisticsbools(true,record.id)}>详情</span>
+						<span style={{width: '50px',color:'#5091FF'}} className="xiaoshou" onClick={()=>this.props.tisticsbools(true,record.id,record.title)}>详情</span>
 					),
 				}
 			],
@@ -266,7 +266,7 @@ class Videostatisticslist extends Component {
 							}
 						</style>
 
-								<div className="ws100s ysltableo teacherentrydivs pdinstop0">
+								<div className="ws100s ysltableo teacherentrydivs pdinstop0" style={{	minHeight: "400px"}}>
 									{
 										data.length===0?
 											<div style={{