Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/educoder into develop

public/react/src/modules/courses/coursesPublic/sendResources.js

@@ -213,17 +213,25 @@ class sendResources extends Component{
 		}
 
 
+		// console.log("description");
+		// console.log(description);
+		if(description===undefined||description===null){
 
-		if(description===undefined){
+		}else {
+			if(description.length>100){
+
+				this.setState({
+					descriptiontype:true
+				})
+				return
+			}
 
-		}else if(description.length>100){
 
-			this.setState({
-				descriptiontype:true
-			})
-			return
 		}
 
+
+
+
 		if(this.props.Exterchainname==="资源设置"){
 			//设置
 			let coursesId=this.props.match.params.coursesId;
@@ -240,13 +248,17 @@ class sendResources extends Component{
 				description:description,
 				delay_publish:Radiovalue,
 			}).then((result)=>{
-				if(result.data.status===0){
-					this.ModalCancelModalCancel();
-					this.props.updataleftNavfun();
-					this.props.showNotification("设置资源成功");
-					this.props.setupdate(1,false)
-				}else{
-					this.props.showNotification(result.data.message);
+				if(result){
+					if(result.data){
+						if(result.data.status===0){
+							this.ModalCancelModalCancel();
+							this.props.updataleftNavfun();
+							this.props.showNotification("设置资源成功");
+							this.props.setupdate(1,false)
+						}else{
+							this.props.showNotification(result.data.message);
+						}
+					}
 				}
 			})
 
@@ -266,22 +278,20 @@ class sendResources extends Component{
 				description:description,
 				delay_publish:Radiovalue,
 			}).then((result)=>{
-
-
-				if(result.data.status===0){
-					this.ModalCancelModalCancel();
-					this.props.updataleftNavfun();
-					this.props.showNotification("上传资源成功");
-					this.props.setupdate(1,false)
-				}else{
-					this.props.showNotification(result.data.message);
+				if(result){
+					if(result.data){
+						if(result.data.status===0){
+							this.ModalCancelModalCancel();
+							this.props.updataleftNavfun();
+							this.props.showNotification("上传资源成功");
+							this.props.setupdate(1,false)
+						}else{
+							this.props.showNotification(result.data.message);
+						}
+					}
 				}
 			})
-
 		}
-
-
-
 	}
 
 	settextarea=(e)=>{
@@ -348,7 +358,7 @@ class sendResources extends Component{
 	}
 
 	handleChangess=(e)=>{
-    this.setState({
+		this.setState({
 			resourceurl:e.target.value,
 			resourceurlbool:false,
 		})

public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js

@@ -38,6 +38,7 @@ class ShixunWorkReport extends Component {
 			work_comment_hidden:undefined,
 			work_comment:undefined,
 			has_commit: false,
+			shixun_detail:[]
 		}
 
 	}
@@ -113,7 +114,8 @@ class ShixunWorkReport extends Component {
 					work_comment_hidden:result.data.work_comment_hidden,
 					work_comment:result.data.work_comment,
 					spinning: false,
-					has_commit: result.data.has_commit
+					has_commit: result.data.has_commit,
+					shixun_detail:result.data.shixun_detail
 				})
 			}
 
@@ -305,7 +307,7 @@ class ShixunWorkReport extends Component {
 
 	}
 	render() {
-		let {data, showAppraiseModaltype, work_comment_hidden, work_comment, has_commit} = this.state;
+		let {data, showAppraiseModaltype, work_comment_hidden, work_comment, has_commit,shixun_detail} = this.state;
 
 		let category_id=data===undefined?"":data.category===null?"":data.category.category_id;
 		let homework_common_id=data===undefined?"":data.homework_common_id;
@@ -313,7 +315,8 @@ class ShixunWorkReport extends Component {
 		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
 
 		// let showAppraiseModals=this.props&&this.props.isAdminOrTeacher()===true?work_comment===null||work_comment===undefined?false:true:work_comment===null||work_comment===undefined?false:true;
-		let showAppraiseModals=work_comment===null||work_comment===undefined?false:true;
+		// let showAppraiseModals=work_comment===null||work_comment===undefined?false:true;
+		// console.log(this.props.isAdmin())
 		document.title=data&&data.course_name;
 
 		return (
@@ -454,7 +457,20 @@ class ShixunWorkReport extends Component {
 					<div className="stud-class-set">
 						<div className="clearfix edu-back-white poll_list">
 
-							<div className="font-16 color-dark-21 shixunreporttitleboxtop pd20">总体评价</div>
+							<div className="font-16 color-dark-21 shixunreporttitleboxtop pd20">
+								<div className={"fl"}>总体评价</div>
+								<div className={"fr"}>
+									{
+										this.props&&this.props.isAdmin()===true?shixun_detail&&shixun_detail.map((item,key)=>{
+											if(key===0){
+												return(
+													<a className={"color-blue  font-16"} href={/tasks/+item.game_identifier} target="_blank" >查看学员实训</a>
+												)
+											}
+										}):""
+									}
+								</div>
+							</div>
 							<div className="font-16 color-dark-21 shixunreporttitleboxbom pd20">
 								<div style={{clear:"both",height:'100px'}}>