Merge remote-tracking branch 'origin/master'

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

@@ -753,7 +753,7 @@ class Listofworks extends Component {
 		let {page, limit} = this.state;
 		let datalist = [];
 		let columns = this.state.columns;
-		// var  columns2=[];
+		 var  columns2=[];
 		if (teacherdata !== undefined) {
 			for (var i = 0; i < student_works.length; i++) {
 				var timedata = moment(student_works[i].update_time).format('YYYY-MM-DD HH:mm');
@@ -799,7 +799,7 @@ class Listofworks extends Component {
 						else if(this.props.isNotMember()===true&&item.title==="学号") {
 
 						}else{
-							columns.push(item);
+							columns2.push(item);
 						}
 					}
 
@@ -817,7 +817,7 @@ class Listofworks extends Component {
 							else if(this.props.isNotMember()===true&&item.title==="学号") {
 
 							}else{
-								columns.push(item);
+								columns2.push(item);
 							}
 						}
 
@@ -831,7 +831,7 @@ class Listofworks extends Component {
 							else if(this.props.isNotMember()===true&&item.title==="学号") {
 
 							}else{
-								columns.push(item);
+								columns2.push(item);
 							}
 						}
 					}
@@ -847,7 +847,7 @@ class Listofworks extends Component {
 						else if(this.props.isNotMember()===true&&item.title==="学号") {
 
 						}else{
-							 columns.push(item);
+							 columns2.push(item);
 						}
 					}
 
@@ -863,11 +863,11 @@ class Listofworks extends Component {
 							else if(this.props.isNotMember()===true&&item.title==="学号") {
 
 							}else{
-								columns.push(item);
+								columns2.push(item);
 							}
 						}
 					}
-					columns=this.state.columnss;
+					columns2=this.state.columnss;
 				}
 			}
 
@@ -877,7 +877,7 @@ class Listofworks extends Component {
 		this.setState({
 			data: datalist,
 			teacherlist: teacherlist,
-			columns: columns,
+			columns: columns2,
 			loadingstate: false,
 		})
 	}