Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js

@@ -1278,20 +1278,6 @@ class Studentshavecompletedthelist extends Component {
 		}catch (e) {
 
 		}
-		try {
-			if(this.props.Commonheadofthetestpaper.exercise_status !== undefined){
-				this.setState({
-					exercise_status:this.props.Commonheadofthetestpaper.exercise_status,
-				})
-			}else{
-				this.setState({
-					exercise_status:0,
-				})
-			}
-		}catch (e) {
-
-		}
-
 	}
 
 	componentWillReceiveProps = (nextProps) => {
@@ -1330,7 +1316,7 @@ class Studentshavecompletedthelist extends Component {
 				})
 				if (response.data.current_answer_user === undefined || response.data.current_answer_user === null) {
 					// 学生未截止
-
+					// console.log("试卷学生未截止");
 					this.Generatenewdatas(response.data.exercise_users);
 					if (response.data.exercise_types.subjective === 0) {
 						if (this.state.noclassroom === undefined || this.state.noclassroom === "" || this.state.noclassroom === null) {
@@ -1377,6 +1363,7 @@ class Studentshavecompletedthelist extends Component {
 					}
 				} else {
 					//学生已截止
+					// console.log("试卷学生已截止");
 					if (response.data.exercise_types.subjective === 0) {
 						if (this.state.loadingstate === false) {
 							var arr =[];
@@ -1458,7 +1445,7 @@ class Studentshavecompletedthelist extends Component {
 			else if (response.data.exercise_types.user_permission === 0) {
 				// console.log(response.data.exercise_users)
 				//  console.log(response)
-
+        // console.log("试卷老师加载中");
 				if (thiss.state.loadingstate === false) {
 					thiss.setState({
 						loadingstate: true,
@@ -1469,7 +1456,9 @@ class Studentshavecompletedthelist extends Component {
 				thiss.Generatenewdatasy(response.data.exercise_users, response);
 			}
 		}).catch((error) => {
-			console.log(error)
+			console.log(error);
+			console.log("其实数据加载失败了");
+			console.log("1111");
 		});
 
 
@@ -2490,16 +2479,22 @@ class Studentshavecompletedthelist extends Component {
 		let {data, datas, page, columns, course_groupyslsthree, columnstwo, styletable,exercise_status, course_groupyslstwodatas, limit, course_groupysls, course_groupyslstwodata, course_groupyslstwo, teacherlists, Teacherliststudentlist, order, columnss, course_groupsdatas, course_groups, Evaluationarray, unlimited, unlimiteds, unlimitedtwo, teacherlist, searchtext, loadingstate, review, nocomment, commented, unsubmitted, submitted, columnsys, exercise_users,mylistansum} = this.state;
 		// console.log("Studentshavecompletedthelist");
 		// console.log(this.props.current_status);
+		// console.log("获取到的数据");
+		// console.log(datas);
+		// console.log(data);
+		// console.log("this.props.Commonheadofthetestpaper.exercise_status");
+		// console.log(this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status);
+		// console.log(exercise_status);
 		return (
 			isAdmin === true ?
 				(
 					<div style={{
 						"margin": "0 auto",
-						" min-width": " 1200px",
+						minWidth: " 1200px",
 					}}>
 						{/*老师*/}
 						{
-							exercise_status===0 || exercise_status===1 ?
+							this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status===0 || this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status===1 ?
 								<div className="edu-back-white">
 								<NoneData></NoneData>
 								</div>
@@ -2598,9 +2593,9 @@ class Studentshavecompletedthelist extends Component {
 											{course_groups === undefined ? "" : course_groups === null ? "" : course_groups.length < 2 ? "" : JSON.stringify(course_groups) === "[]" ? "" :
 												<li className="clearfix  mt10">
 													<tr>
-														<td className="w80" style={{"vertical-align": "top"}}><span
+														<td className="w80" style={{verticalAlign: "top"}}><span
 															className=" mr10 color-grey-8 ">分班情况：</span></td>
-														<td className="w70" style={{"vertical-align": "top"}}><span><a
+														<td className="w70" style={{verticalAlign: "top"}}><span><a
 															id="graduation_comment_no_limit"
 															className={unlimitedtwo === 0 ? "pl10 pr10 mr20 check_on" : "pl10 pr10 mr20 "}
 															onClick={() => this.funtaskstatustwos()}>不限</a></span>
@@ -2714,9 +2709,9 @@ class Studentshavecompletedthelist extends Component {
 					Teacherliststudentlist === undefined || Teacherliststudentlist.current_answer_user === undefined || Teacherliststudentlist.current_answer_user === null ?
 						<div>
 							<div className=" clearfix "
-									 style={{"margin": "0 auto", "padding-bottom": "100px", " min-width": " 1200px"}}>
+									 style={{"margin": "0 auto", "padding-bottom": "100px", minWidth: " 1200px"}}>
 								{
-									exercise_status === 0 || exercise_status === 1 ?
+									this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status === 0 || this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status === 1 ?
 										<div className="edu-back-white">
 										<NoneData></NoneData>
 										</div>
@@ -2794,10 +2789,10 @@ class Studentshavecompletedthelist extends Component {
 							<div className="clearfix" style={{
 								"margin": "0 auto",
 								"padding-bottom": "100px",
-								" min-width": " 1200px"
+								minWidth: " 1200px"
 							}}>
 								{
-									exercise_status === 0 || exercise_status === 1 ?
+									this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status === 0 || this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status === 1 ?
 										<div className="edu-back-white">
 										<NoneData></NoneData>
 										</div>