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

public/react/src/modules/courses/gradinforms/Eduinforms.js

@@ -398,11 +398,13 @@ class Eduinforms extends Component{
 											<div>
 												{
 													informs === null || informs=== undefined ||informs.length === 0 ?
+														this.state.yslbool===true?
 														<div className="alltask ">
 															<div className="edu-tab-con-box clearfix edu-txt-center"><img className="edu-nodata-img mb20"
 																																														src={getImageUrl("images/educoder/nodata.png")} />
 																<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
 														</div>
+															:""
 														:
 
 														<div  className="edu-back-white ">

public/react/src/modules/courses/new/CoursesNew.js

@@ -808,6 +808,7 @@ class CoursesNew extends Component {
                                             ],
                                         })(
                                             <Checkbox.Group style={{width: "800px", marginTop: "10px"}}>
+                                            <Checkbox value={"announcement"} className="fl">公告栏</Checkbox>
                                             <Checkbox value={"shixun_homework"} className="fl">实训作业</Checkbox>
                                             <Checkbox value={"common_homework"} className="fl">普通作业</Checkbox>
                                             <Checkbox value={"group_homework"} className="fl">分组作业</Checkbox>

public/react/src/modules/courses/poll/PollNew.js

@@ -812,6 +812,7 @@ class PollNew extends Component {
 				problemtopicbool: false,
 				bindingid:undefined,
 				Newdisplay:false,
+				newoption: false,
 			})
 
 		}else{
@@ -821,6 +822,7 @@ class PollNew extends Component {
 				problemtopic: null,
 				problemtopicbool: false,
 				Newdisplay:false,
+				newoption: false,
 			})
 		}
 
@@ -834,12 +836,13 @@ class PollNew extends Component {
 				q_countst: 1,
 				bindingid:undefined,
 				Newdisplay:false,
-
+				newoption: false,
 			})
 		}else {
 			this.setState({
 				q_countst: 1,
 				Newdisplay:false,
+				newoption: false,
 			})
 		}
 
@@ -1350,6 +1353,7 @@ class PollNew extends Component {
 		}
     this.setState({
 			Newdisplay:false,
+			newoption: false,
 		})
 		// console.log("deleteadddom 349")
 		var thiss = this;

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

@@ -60,7 +60,10 @@ class ShixunWorkReport extends Component {
 			console.log(error)
 		});
 	}
-
+	//打开pdf
+	confpdf = (url) =>{
+		window.open(url);
+	}
 	Downloadcal=()=>{
 		this.setState({
 			DownloadType:false,
@@ -69,9 +72,16 @@ class ShixunWorkReport extends Component {
 	}
 
 	componentDidMount() {
+		let query = this.props.location.pathname;
+		const type = query.split('/');
 		this.setState({
+			shixuntypes:type[3],
 			spinning:true
 		})
+		this.getdatalist()
+	}
+
+	getdatalist=()=>{
 		let homeworkid=this.props.match.params.homeworkid;
 		let url = `/student_works/${homeworkid}/shixun_work_report.json`
 		axios.get(url).then((result) => {
@@ -90,11 +100,7 @@ class ShixunWorkReport extends Component {
 				spinning:false
 			})
 		})
-		let query = this.props.location.pathname;
+
-		const type = query.split('/');
-		this.setState({
-			shixuntypes:type[3]
-		})
 	}
 	jumptopic=(anchorName)=>{
 ;		if (anchorName) {
@@ -157,7 +163,8 @@ class ShixunWorkReport extends Component {
 						<a onClick={this.goback} className="color-grey-6 fr font-16 ml30 mt15 mr20">返回</a>
 						{this.props.isAdmin() ? <a
 							className=" color-blue font-16 fr  ml30 mt15 mr20"
-							onClick={()=>this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)}
+							// onClick={()=>this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)}
+							onClick={()=>this.confpdf(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)}
 						>导出实训报告数据</a> : ""}
 					</div>
 
@@ -182,6 +189,7 @@ class ShixunWorkReport extends Component {
 								{...this.props}
 								data={data}
 								jumptopic={this.jumptopic}
+								getdatalist={()=>this.getdatalist()}
 							/>
 
 						</div>

public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js

@@ -23,7 +23,7 @@ class OfficialAcademicTranscript extends Component {
 	}
 
 	editgame_scores=(score,id)=>{
-		if(score!=null&&score!=undefined){
+		if(score!=null&&score!=undefined&&score!=""){
 			let work_id=this.props.data.work_id;
 			let url=`/student_works/${work_id}/adjust_review_score.json`
 			axios.post(url,{
@@ -32,6 +32,7 @@ class OfficialAcademicTranscript extends Component {
 				challenge_id:id
 			}).then((result)=>{
 				if(result.data.status===0){
+					this.props.getdatalist()
 					this.props.showNotification(result.data.message);
 				}else{
 					this.props.showNotification(result.data.message);
@@ -81,7 +82,7 @@ class OfficialAcademicTranscript extends Component {
 			className:"TaskForms",
 			render: (text, record) => (
 				<span>
-					<span className={"task-hide"} style={{color:"#676767"}}><a className="tasknameName font-14" onClick={()=>this.myjumptopic("id"+record.customs)} title={record.taskname.name} >
+					<span className={"task-hide"} style={{color:"#676767"}}><a className="tasknameName font-14" onClick={()=>this.myjumptopic("id"+record.customs)} title={record.taskname.name.length>56?record.taskname.name:""} >
 						{record.taskname.name}{record.taskname.complete_status===2?<span className={"tasknamebox ml10"}>延时</span>:record.taskname.complete_status===3?<span className={"tasknameboxs ml10"}>延时</span>:""}
 					</a></span>
         </span>
@@ -221,11 +222,11 @@ class OfficialAcademicTranscript extends Component {
 					     overflow: hidden;
 								text-overflow: ellipsis;
 								white-space: nowrap;
-						    width: 450px;
+				        max-width: 450px;
 						    text-align: left !important;
 					}
 					.TaskForms{
-					   width: 450px;
+					   max-width: 450px;
 					   text-align: left !important;
 					   padding: 16px !important;
 					}