调整

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

@@ -22,7 +22,7 @@ import 'moment/locale/zh-cn';
 import './yslexercisetable.css';
 import {getImageUrl, toPath} from 'educoder';
 import CheckBoxGroup from "../../page/component/CheckBoxGroup";
-
+import NoneData from '../../../modules/courses/coursesPublic/NoneData'
 const Search = Input.Search;
 const RadioGroup = Radio.Group;
 const CheckboxGroup = Checkbox.Group;
@@ -1217,6 +1217,7 @@ class Studentshavecompletedthelist extends Component {
 					)
 				},
 			],
+			exercise_status:0,
 		}
 		// console.log("Studentshavecompletedthelist");
 		// console.log(props.current_status);
@@ -1277,6 +1278,20 @@ 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) => {
@@ -2065,11 +2080,11 @@ class Studentshavecompletedthelist extends Component {
 			this.setState({
 				loadingstate: false,
 			})
-			console.log(response);
-			console.log(1997);
+			// console.log(response);
+			// console.log(1997);
 			this.Generatenewdatasy(response.data.exercise_users, response);
 		}).catch((error) => {
-			console.log(error)
+			// console.log(error)
 			this.setState({
 				loadingstate: false,
 			})
@@ -2472,7 +2487,7 @@ class Studentshavecompletedthelist extends Component {
 	render() {
 		const isAdmin = this.props.isAdmin();
 
-		let {data, datas, page, columns, course_groupyslsthree, columnstwo, styletable, 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;
+		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);
 		return (
@@ -2483,6 +2498,11 @@ class Studentshavecompletedthelist extends Component {
 						" min-width": " 1200px",
 					}}>
 						{/*老师*/}
+						{
+							exercise_status===0 || exercise_status===1 ?
+								<NoneData></NoneData>
+								:
+								<div>
 									<div className="edu-back-white" >
 										<ul className="clearfix" style={{padding: '10px 30px 10px 30px'}}>
 
@@ -2680,6 +2700,8 @@ class Studentshavecompletedthelist extends Component {
 											</div>
 											: ""
 									}
+								</div>
+						}
 
 					</div>
 
@@ -2691,6 +2713,10 @@ class Studentshavecompletedthelist extends Component {
 						<div>
 							<div className=" clearfix "
 									 style={{"margin": "0 auto", "padding-bottom": "100px", " min-width": " 1200px"}}>
+								{
+									exercise_status === 0 || exercise_status === 1 ?
+										<NoneData></NoneData>
+										:
 										<div className={"educontent mb20"}>
 
 											<div className="edu-back-white" id="graduation_work_list"
@@ -2754,7 +2780,7 @@ class Studentshavecompletedthelist extends Component {
 
 
 										</div>
-
+								}
 
 							</div>
 						</div>
@@ -2766,6 +2792,11 @@ class Studentshavecompletedthelist extends Component {
 								"padding-bottom": "100px",
 								" min-width": " 1200px"
 							}}>
+								{
+									exercise_status === 0 || exercise_status === 1 ?
+										<NoneData></NoneData>
+										:
+										<div>
 											<div className={"educontent mb20 edu-back-white"}>
 												<style>
 													{
@@ -2903,6 +2934,8 @@ class Studentshavecompletedthelist extends Component {
 													: ""
 											}
 										</div>
+								}
+							</div>
 
 						</div>
 

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

@@ -436,7 +436,7 @@ class Testpapersettinghomepage extends Component{
                     />
                     {
                         // 教师列表
-                        parseInt(tab[0])==0 && <Studentshavecompletedthelist {...this.props} {...this.state}  triggerRef={this.bindRef}  setcourse_groupysls={(value)=>this.setcourse_groupysls(value)} current_status = {this.state.current_status}></Studentshavecompletedthelist>
+                        parseInt(tab[0])==0 && <Studentshavecompletedthelist {...this.props} {...this.state}  triggerRef={this.bindRef}  setcourse_groupysls={(value)=>this.setcourse_groupysls(value)} current_status = {this.state.current_status} Commonheadofthetestpaper={this.state.Commonheadofthetestpaper}></Studentshavecompletedthelist>
                     }
 
                     {/*统计结果*/}