From 397b8cbd1b7a1b0d0daf88973e18afc83743d4b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 18 Jul 2019 10:15:33 +0800
Subject: [PATCH 01/15] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exercise/Testpapersettinghomepage.js      |  50 +++++-
 .../courses/shixunHomework/Listofworks.js     |  41 +----
 .../shixunHomework/Listofworksstudentone.js   |  30 +++-
 .../shixunHomework/ShixunHomeworkPage.js      |  54 ++++++-
 .../shixunHomework/ShixunStudentWork.js       |  15 +-
 .../shixunHomework/ShixunWorkReport.js        |  76 +++++----
 .../shixunHomework/Trainingjobsetting.js      |  38 +----
 .../shixunHomework/Workquestionandanswer.js   |  37 +----
 .../src/modules/modals/DownloadMessage.js     | 145 +++++++++---------
 .../src/modules/modals/DownloadMessageysl.js  |  50 ++++++
 10 files changed, 298 insertions(+), 238 deletions(-)
 create mode 100644 public/react/src/modules/modals/DownloadMessageysl.js

diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index 398a45228..f25f02d83 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -7,7 +7,7 @@ import '../css/members.css';
 import '../css/busyWork.css';
 import axios from 'axios';
 import Modals from '../../modals/Modals';
-import DownloadMessage from '../../modals/DownloadMessage';
+import DownloadMessageysl from "../../modals/DownloadMessageysl";
 import Studentshavecompletedthelist from './Studentshavecompletedthelist';
 import WrappedExercisesetting from './Exercisesetting';
 import ExerciseDisplay from './ExerciseDisplay'
@@ -30,6 +30,8 @@ class Testpapersettinghomepage extends Component{
                 visible:false,
                 groupyslsval:"",
                 current_status:undefined,
+                DownloadType:false,
+                DownloadMessageval:undefined,
             }
     }
     //切换tab
@@ -159,7 +161,41 @@ class Testpapersettinghomepage extends Component{
 		}
 
 	}
+    /// 确认是否下载
+    confirmysl(url){
+        axios.get(url).then((response) => {
+            if(response.data.status&&response.data.status===-1){
+
+            }else if(response.data.status&&response.data.status===-2){
+                if(response.data.messages === "100"){
+                    // 已超出文件导出的上限数量（100 ），建议：
+
+                    this.setState({
+                        DownloadType:true,
+                        DownloadMessageval:100
+                    })
+                }else {
+                    //因附件资料超过500M
+                    this.setState({
+                        DownloadType:true,
+                        DownloadMessageval:500
+                    })
+                }
+            }else {
+                this.props.showNotification(`正在下载中`);
+                window.open("/api"+url, '_blank');
+            }
+        }).catch((error) => {
+            console.log(error)
+        });
+    }
 
+    Downloadcal=()=>{
+        this.setState({
+            DownloadType:false,
+            DownloadMessageval:undefined
+        })
+    }
 	cancelmodel=()=>{
 		this.setState({
 			Modalstype:false,
@@ -296,9 +332,9 @@ class Testpapersettinghomepage extends Component{
                                 {isAdmin  === true? <li className="li_line drop_down fr color-blue font-15" style={{"paddingLeft":"0px"}}>
                                     导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
                                     <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
-                                        <li><a onClick={()=>this.experiment(`/exercises/${this.props.match.params.Id}/exercise_lists.xlsx`)}>学生成绩</a></li>
-                                        <li><a onClick={()=>this.experiment(`/exercises/${this.props.match.params.Id}/export_exercise`)} >空白试卷</a></li>
-                                        <li><a onClick={()=>this.experiment(`/zip/export_exercises?exercise_id=${this.props.match.params.Id}${this.state.groupyslsval}`)}>学生答题试卷</a></li>
+                                        <li><a onClick={()=>this.confirmysl(`/exercises/${this.props.match.params.Id}/exercise_lists.xlsx`)}>学生成绩</a></li>
+                                        <li><a onClick={()=>this.confirmysl(`/exercises/${this.props.match.params.Id}/export_exercise`)} >空白试卷</a></li>
+                                        <li><a onClick={()=>this.confirmysl(`/zip/export_exercises?exercise_id=${this.props.match.params.Id}${this.state.groupyslsval}`)}>学生答题试卷</a></li>
                                     </ul>
                                 </li>:""}
                                 </div>
@@ -345,6 +381,12 @@ class Testpapersettinghomepage extends Component{
 
 
                     </div>
+                    <DownloadMessageysl
+                      {...this.props}
+                      value={this.state.DownloadMessageval}
+                      modalCancel={this.Downloadcal}
+                      modalsType={this.state.DownloadType}
+                    />
                     {
                         // 教师列表
                         parseInt(tab[0])==0 && <Studentshavecompletedthelist {...this.props} {...this.state} setcourse_groupysls={(value)=>this.setcourse_groupysls(value)} current_status = {this.state.current_status}></Studentshavecompletedthelist>
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index 68730b0fe..7bdb731e0 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -4,7 +4,6 @@ import {WordsBtn, ActionBtn} from 'educoder';
 import TraineetraininginformationModal from './TraineetraininginformationModal';
 import ModulationModal from "../coursesPublic/ModulationModal";
 import HomeworkModal from "../coursesPublic/HomeworkModal";
-import DownloadMessage from '../../modals/DownloadMessage';
 import {
 	Form,
 	Select,
@@ -1369,39 +1368,9 @@ class Listofworks extends Component {
 		});
 
 	}
-	/// 确认是否下载
-	confirmysl(url){
-		this.refs.DownloadMessage.confirmysl(url);
-		// axios.get(url).then((response) => {
-		// 	if(response.data.status&&response.data.status===-1){
-
-		// 	}else if(response.data.status&&response.data.status===-2){
-		// 		if(response.data.messages === "100"){
-		// 			// 已超出文件导出的上限数量（100 ），建议：
-
-		// 			this.setState({
-		// 				DownloadType:true,
-		// 				DownloadMessageval:100
-		// 			})
-		// 		}else {
-		// 			//因附件资料超过500M
-		// 			this.setState({
-		// 				DownloadType:true,
-		// 				DownloadMessageval:500
-		// 			})
-		// 		}
-		// 	}else {
-		// 		this.props.showNotification(`正在下载中`);
-		// 		window.open("/api"+url, '_blank');
-		// 	}
-		// }).catch((error) => {
-		// 	console.log(error)
-		// });
-	}
 
-	ChangeTab=(e)=>{
-     this.props.ChangeTab(e);
-	}
+
+
 	render() {
 		// console.log("Listofworks.js000")
 
@@ -1426,11 +1395,7 @@ class Listofworks extends Component {
 					issCancel={() => this.hideshowmodel()}
 					updatas={() => this.isupdatas()}
 				/> : ""}
-				
-				<DownloadMessage
-					{...this.props}
-					ref="DownloadMessage"
-				/>
+
 
 				{visibles === true ?
 					<div>
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 7d3c37704..a2343abf8 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -13,6 +13,7 @@ import '../css/busyWork.css'
 import '../poll/pollStyle.css'
 import {getImageUrl} from 'educoder';
 import TraineetraininginformationModal from "./TraineetraininginformationModal";
+import DownloadMessageysl from '../../modals/DownloadMessageysl';
 import Startshixuntask from "../coursesPublic/Startshixuntask";
 
 
@@ -63,6 +64,8 @@ class Listofworksstudentone extends Component {
 			},
 			student_works: [],
 			startbtn: false,
+			DownloadType:false,
+			DownloadMessageval:undefined,
 			columns: [
 				{
 					title: '序号',
@@ -335,8 +338,9 @@ class Listofworksstudentone extends Component {
 		console.log("Listofworksstudentone");
 		console.log("componentDidMount");
 		this.props.triggerRef(this);
-		var homeworkid = this.props.match.params.homeworkid;
-		this.Getalistofworks(homeworkid);
+		// var homeworkid = this.props.match.params.homeworkid;
+		// this.Getalistofworks(homeworkid);
+		this.Getalistofworkstwo("", "", "", "", 1, 20);
 		let query = this.props.location.pathname;
 		const type = query.split('/');
 		this.setState({
@@ -857,16 +861,15 @@ class Listofworksstudentone extends Component {
 
 		axios.get(url).then((response) => {
 			this.props.showNotification(`${response.data.message}`);
-			var homeworkid = this.props.match.params.homeworkid;
-			this.Getalistofworks(homeworkid);
+			// var homeworkid = this.props.match.params.homeworkid;
+			// this.Getalistofworks(homeworkid);
+			this.Getalistofworkstwo("", "", "", "", 1, 20);
 		}).catch((error) => {
 			console.log(error)
 		});
 
 	}
-	ChangeTab=(e)=>{
-		this.props.ChangeTab(e);
-	}
+
 	render() {
 		let {visibles, game_list,columns, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state;
     // console.log(this.state.data);
@@ -920,6 +923,12 @@ class Listofworksstudentone extends Component {
 					</style>
 					{visibles === true ?
 						<div>
+							<DownloadMessageysl
+								{...this.props}
+								value={this.state.DownloadMessageval}
+								modalCancel={this.Downloadcal}
+								modalsType={this.state.DownloadType}
+							/>
 							<style>
 								{
 									`
@@ -1041,6 +1050,13 @@ class Listofworksstudentone extends Component {
 				:
 				// 学生能查看别人的
 				<div className=" clearfix "  style={{margin:  "auto" , minWidth:"1200px"}}>
+					<DownloadMessageysl
+					{...this.props}
+					value={this.state.DownloadMessageval}
+					modalCancel={this.Downloadcal}
+					modalsType={this.state.DownloadType}
+				/>
+
 					{visibles === true ?
 						<TraineetraininginformationModal
 							homeworkid={this.props.match.params.homeworkid}
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index 393d8af05..130410be7 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -19,6 +19,7 @@ import CoursesListType from '../coursesPublic/CoursesListType';
 import ShixunStudentWork from "./ShixunStudentWork";
 import Startshixuntask from "../coursesPublic/Startshixuntask";
 import TPMMDEditor from "../../tpm/challengesnew/TPMMDEditor";
+import DownloadMessageysl from "../../modals/DownloadMessageysl";
 class ShixunHomeworkPage extends Component {
 	constructor(props) {
 		super(props);
@@ -32,6 +33,8 @@ class ShixunHomeworkPage extends Component {
 			visible: false,
 			showmodel:false,
 			child:undefined,
+			DownloadType:false,
+			DownloadMessageval:undefined,
 		}
 
 	}
@@ -84,9 +87,9 @@ class ShixunHomeworkPage extends Component {
 	}
 
 
-	confirmysl(child,url) {
-		child.confirmysl(url);
-	}
+	// confirmysl(child,url) {
+	// 	confirmysl(url);
+	// }
 
 	homeworkendss(child){
 		child.homeworkends();
@@ -99,7 +102,41 @@ class ShixunHomeworkPage extends Component {
 	workshowmodels(child){
 		child.workshowmodel();
 	}
+	/// 确认是否下载
+	confirmysl(url){
+		axios.get(url).then((response) => {
+			if(response.data.status&&response.data.status===-1){
+
+			}else if(response.data.status&&response.data.status===-2){
+				if(response.data.messages === "100"){
+					// 已超出文件导出的上限数量（100 ），建议：
+
+					this.setState({
+						DownloadType:true,
+						DownloadMessageval:100
+					})
+				}else {
+					//因附件资料超过500M
+					this.setState({
+						DownloadType:true,
+						DownloadMessageval:500
+					})
+				}
+			}else {
+				this.props.showNotification(`正在下载中`);
+				window.open("/api"+url, '_blank');
+			}
+		}).catch((error) => {
+			console.log(error)
+		});
+	}
 
+	Downloadcal=()=>{
+		this.setState({
+			DownloadType:false,
+			DownloadMessageval:undefined
+		})
+	}
 	bindRef = ref => { this.child = ref }
 ///////////////教师截止
 
@@ -197,10 +234,10 @@ class ShixunHomeworkPage extends Component {
 										导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
 										<ul className="drop_down_menu" style={{"right": "-0px", "left": "unset", "height": "auto"}}>
 											<li><a
-												onClick={(child) => this.confirmysl(this.child,`/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}&work_status=${this.state.course_groupyslstwo}&course_group=${this.state.checkedValuesineinfo}&search=${this.state.searchtext}`)}>实训报告</a>
+												onClick={(url) => this.confirmysl(`/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}&work_status=${this.state.course_groupyslstwo}&course_group=${this.state.checkedValuesineinfo}&search=${this.state.searchtext}`)}>实训报告</a>
 											</li>
 											<li><a
-												onClick={(child) => this.confirmysl(this.child,`/homework_commons/${this.props.match.params.homeworkid}/works_list.xlsx?group_id=${this.state.checkedValuesineinfo}&search=${this.state.searchtext}`)}>学生成绩</a>
+												onClick={(url) => this.confirmysl(`/homework_commons/${this.props.match.params.homeworkid}/works_list.xlsx?group_id=${this.state.checkedValuesineinfo}&search=${this.state.searchtext}`)}>学生成绩</a>
 											</li>
 
 										</ul>
@@ -237,7 +274,12 @@ class ShixunHomeworkPage extends Component {
 						</div>
 					</div>
 
-
+					<DownloadMessageysl
+						{...this.props}
+						value={this.state.DownloadMessageval}
+						modalCancel={this.Downloadcal}
+						modalsType={this.state.DownloadType}
+					/>
 					{
 						// 教师列表
 						parseInt(tab) === 0 ? (isAdmin === true ?
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
index 37ea4d1c3..81b98a854 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
@@ -4,7 +4,6 @@ import {WordsBtn,ActionBtn} from 'educoder';
 import ShixunWorkModal from './Shixunworkdetails/ShixunWorkModal';
 import HomeworkModal from "../coursesPublic/HomeworkModal";
 import NoneData from '../coursesPublic/NoneData';
-import DownloadMessage from '../../modals/DownloadMessage';
 import {
 	Form,
 	Select,
@@ -474,8 +473,8 @@ class ShixunStudentWork extends Component {
 	}
 // 导出实习报告批量
 	/// 确认是否下载
-	confirmysl(url){
-		this.refs.DownloadMessage.confirmysl(url);
+	// confirmysl(url){
+	// 	this.refs.DownloadMessage.confirmysl(url);
 		// axios.get(url).then((response) => {
 		// 	if(response.data.status&&response.data.status===-1){
 
@@ -501,7 +500,7 @@ class ShixunStudentWork extends Component {
 		// }).catch((error) => {
 		// 	console.log(error)
 		// });
-	}
+	// }
 	ChangeTab=(e)=>{
 		this.props.ChangeTab(e);
 	}
@@ -595,10 +594,10 @@ class ShixunStudentWork extends Component {
 					updatas={()=>this.getupdata()}
         />:""}
 
-				<DownloadMessage
-					{...this.props}
-					refs="DownloadMessage"
-				/>
+				{/*<DownloadMessage*/}
+				{/*	{...this.props}*/}
+				{/*	refs="DownloadMessage"*/}
+				{/*/>*/}
 				{/*立即发布*/}
 				<HomeworkModal
 					modaltype={this.state.modaltype}
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
index b19821e53..945d5ede9 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
@@ -7,8 +7,8 @@ import ConclusionEvaluation from './shixunreport/ConclusionEvaluation';
 import OfficialAcademicTranscript from './shixunreport/OfficialAcademicTranscript';
 import Coursesshixundetails from './shixunreport/Coursesshixundetails';
 import Shixunechart from './shixunreport/Shixunechart';
+import DownloadMessageysl from "../../modals/DownloadMessageysl";
 import {UnControlled as CodeMirror} from 'react-codemirror2';
-import DownloadMessage from '../../modals/DownloadMessage';
 import 'codemirror/mode/cmake/cmake';
 import 'codemirror/mode/xml/xml';
 import 'codemirror/mode/javascript/javascript';
@@ -25,41 +25,48 @@ class ShixunWorkReport extends Component {
 		super(props);
 		this.state = {
 			data:undefined,
-			spinning:true
+			spinning:true,
+			DownloadType:false,
+			DownloadMessageval:undefined,
 		}
+
 	}
-	/// 确认是否下载
-	confirmysl(url){
 
-		this.refs.DownloadMessage.confirmysl(url);
-		
-		// axios.get(url).then((response) => {
-		// 	if(response.data.status&&response.data.status===-1){
+/// 确认是否下载
+	confirmysl(url){
+		axios.get(url).then((response) => {
+			if(response.data.status&&response.data.status===-1){
 
-		// 	}else if(response.data.status&&response.data.status===-2){
-		// 		if(response.data.messages === "100"){
-		// 			// 已超出文件导出的上限数量（100 ），建议：
+			}else if(response.data.status&&response.data.status===-2){
+				if(response.data.messages === "100"){
+					// 已超出文件导出的上限数量（100 ），建议：
 
-		// 			this.setState({
-		// 				DownloadType:true,
-		// 				DownloadMessageval:100
-		// 			})
-		// 		}else {
-		// 			//因附件资料超过500M
-		// 			this.setState({
-		// 				DownloadType:true,
-		// 				DownloadMessageval:500
-		// 			})
-		// 		}
-		// 	}else {
-		// 		this.props.showNotification(`正在下载中`);
-		// 		window.open("/api"+url, '_blank');
-		// 	}
-		// }).catch((error) => {
-		// 	console.log(error)
-		// });
+					this.setState({
+						DownloadType:true,
+						DownloadMessageval:100
+					})
+				}else {
+					//因附件资料超过500M
+					this.setState({
+						DownloadType:true,
+						DownloadMessageval:500
+					})
+				}
+			}else {
+				this.props.showNotification(`正在下载中`);
+				window.open("/api"+url, '_blank');
+			}
+		}).catch((error) => {
+			console.log(error)
+		});
 	}
 
+	Downloadcal=()=>{
+		this.setState({
+			DownloadType:false,
+			DownloadMessageval:undefined
+		})
+	}
 
 	componentDidMount() {
 		this.setState({
@@ -105,7 +112,14 @@ class ShixunWorkReport extends Component {
 				data===undefined?"":<Spin indicator={antIcon} spinning={this.state.spinning}><div className="newMain clearfix ">
 				<div className={"educontent mb20" }>
 					<div className="educontent">
+						<DownloadMessageysl
+							{...this.props}
+							value={this.state.DownloadMessageval}
+							modalCancel={this.Downloadcal}
+							modalsType={this.state.DownloadType}
+						/>
 						<p className="clearfix mt20">
+
 							<WordsBtn to={"/courses/"+this.props.match.params.coursesId+"/students"} className="fl color-grey-9" style="btn colorgrey fl hovercolorblue">
 									<span className={"color-grey-9"}>	{data&&data.course_name}</span>
 							</WordsBtn>
@@ -119,10 +133,6 @@ class ShixunWorkReport extends Component {
 							<WordsBtn className="fl">{data&&data.username}</WordsBtn>
 						</p>
 					</div>
-					<DownloadMessage
-						{...this.props}
-						ref="DownloadMessage"
-					/>
 					<div style={{ width:'100%',height:'75px'}} >
 						<p className=" fl color-black mt25 summaryname">{data&&data.shixun_name}</p>
 						{/*{this.props.isAdmin()?<a className=" fr font-14 ml30 mt10 mr20 color-grey-9 ">导出实训报告数据</a>:""}*/}
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 0456fe451..d10d4db22 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -26,7 +26,6 @@ import '../poll/pollStyle.css'
 import moment from 'moment';
 import 'moment/locale/zh-cn';
 import Modals from "../../modals/Modals";
-import DownloadMessage from '../../modals/DownloadMessage';
 import Startshixuntask from "../coursesPublic/Startshixuntask";
 const RadioGroup = Radio.Group;
 
@@ -1714,35 +1713,6 @@ class Trainingjobsetting extends Component {
         })
     }
 
-    /// 确认是否下载
-    confirmysl(url){
-        this.refs.DownloadMessage.confirmysl(url);
-        // axios.get(url).then((response) => {
-        //     if(response.data.status&&response.data.status===-1){
-
-        //     }else if(response.data.status&&response.data.status===-2){
-        //         if(response.data.messages === "100"){
-        //             // 已超出文件导出的上限数量（100 ），建议：
-		// 							this.setState({
-        //            DownloadType:true,
-		// 								DownloadMessageval:100
-		// 							})
-        //         }else {
-        //             //因附件资料超过500M
-		// 							this.setState({
-        //             DownloadType:true,
-		// 								DownloadMessageval:500
-		// 							})
-        //         }
-        //     }else {
-        //         this.props.showNotification(`正在下载中`);
-        //         window.open("/api"+url, '_blank');
-        //     }
-        // }).catch((error) => {
-        //     console.log(error)
-        // });
-    }
-
 
     testscripttip =(e)=>{
         if(e === 0){
@@ -1802,10 +1772,10 @@ class Trainingjobsetting extends Component {
                   issCancel={()=>this.hideshowmodel()}
                 />:""}
 
-							<DownloadMessage
-								{...this.props}
-								ref="DownloadMessage"
-							/>
+							{/*<DownloadMessage*/}
+							{/*	{...this.props}*/}
+							{/*	ref="DownloadMessage"*/}
+							{/*/>*/}
 
                 {/*立即发布*/}
                 <HomeworkModal
diff --git a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
index 39a963023..813eb160d 100644
--- a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
+++ b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
@@ -34,7 +34,6 @@ import CommonReply from "../common/comments/CommonReply";
 import Homeworddescription from "../shixunHomework/Homeworddescription";
 import ShixunWorkModal from './Shixunworkdetails/ShixunWorkModal';
 import HomeworkModal from "../coursesPublic/HomeworkModal";
-import DownloadMessage from '../../modals/DownloadMessage';
 import Startshixuntask from "../coursesPublic/Startshixuntask";
 const TextArea = Input.TextArea
 
@@ -317,34 +316,6 @@ class Workquestionandanswer extends Component {
 		})
 	}
 
-	/// 确认是否下载
-	confirmysl(url){
-		this.refs.DownloadMessage.confirmysl(url);
-		// axios.get(url).then((response) => {
-		// 	if(response.data.status&&response.data.status===-1){
-
-		// 	}else if(response.data.status&&response.data.status===-2){
-		// 		if(response.data.messages === "100"){
-		// 			// 已超出文件导出的上限数量（100 ），建议：
-		// 			this.setState({
-		// 				DownloadType:true,
-		// 				DownloadMessageval:100
-		// 			})
-		// 		}else {
-		// 			//因附件资料超过500M
-		// 			this.setState({
-		// 				DownloadType:true,
-		// 				DownloadMessageval:500
-		// 			})
-		// 		}
-		// 	}else {
-		// 		this.props.showNotification(`正在下载中`);
-		// 		window.open("/api"+url, '_blank');
-		// 	}
-		// }).catch((error) => {
-		// 	console.log(error)
-		// });
-	}
 	ChangeTab=(e)=>{
 		this.props.ChangeTab(e);
 	}
@@ -376,10 +347,10 @@ class Workquestionandanswer extends Component {
 					issCancel={() => this.hideshowmodel()}
 					updatas={() => this.isupdatas()}
 				/> : ""}
-				<DownloadMessage
-					{...this.props}
-					ref="DownloadMessage"
-				/>
+				{/*<DownloadMessage*/}
+				{/*	{...this.props}*/}
+				{/*	ref="DownloadMessage"*/}
+				{/*/>*/}
 				{/*立即发布*/}
 				<HomeworkModal
 					modaltype={this.state.modaltype}
diff --git a/public/react/src/modules/modals/DownloadMessage.js b/public/react/src/modules/modals/DownloadMessage.js
index d14fccb1e..fe0a0657f 100644
--- a/public/react/src/modules/modals/DownloadMessage.js
+++ b/public/react/src/modules/modals/DownloadMessage.js
@@ -5,96 +5,91 @@ import { Modal} from 'antd';
 import axios from 'axios';
 
 class DownloadMessage extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      funmodalsType:false,
-      istype:false,
-      DownloadMessageval:undefined,
-      DownloadType:false
-    }
-  }
+
+	constructor(props) {
+		super(props);
+		this.state = {
+			funmodalsType:false,
+			istype:false,
+			DownloadMessageval:undefined,
+			DownloadType:false
+		}
+	}
 
 	setDownload=()=>{
 		this.modalCancel();
 		window.open(`/users/${this.props.user.login}/private_messages`)
-  }
-
-	DownloadType=()=>{
-		this.setState({
-			DownloadType:false,
-			DownloadMessageval:undefined
-		})
 	}
+
 	Downloadcal=()=>{
 		this.setState({
 			DownloadType:false,
 			DownloadMessageval:undefined
 		})
 	}
-  
-  /// 确认是否下载
+
+	/// 确认是否下载
 	confirmysl(url,params){
-     axios.get(url,{
-       params
-     }).then((response) => {
-       if(response.data.status&&response.data.status===-1){
- 
-       }else if(response.data.status&&response.data.status===-2){
-         if(response.data.messages === "100"){
-           // 已超出文件导出的上限数量（100 ），建议：
- 
-           this.setState({
-             DownloadType:true,
-             DownloadMessageval:100
-           })
-         }else {
-           //因附件资料超过500M
-           this.setState({
-             DownloadType:true,
-             DownloadMessageval:500
-           })
-         }
-       }else {
-         this.props.showNotification(`正在下载中`);
-         window.open("/api"+url, '_blank');
-       }
-     }).catch((error) => {
-       console.log(error)
-     });
-   }
-render() {
+		axios.get(url,{
+			params
+		}).then((response) => {
+			if(response.data.status&&response.data.status===-1){
+
+			}else if(response.data.status&&response.data.status===-2){
+				if(response.data.messages === "100"){
+					// 已超出文件导出的上限数量（100 ），建议：
 
-    return(
-         <Modal
-         keyboard={false}
-          title="提示"
-          visible={this.props.modalsType===undefined?false:this.props.modalsType}
-          closable={false}
-          footer={null}
-          destroyOnClose={true}
-          centered={true}
-          width="530px"
-        >
+					this.setState({
+						DownloadType:true,
+						DownloadMessageval:100
+					})
+				}else {
+					//因附件资料超过500M
+					this.setState({
+						DownloadType:true,
+						DownloadMessageval:500
+					})
+				}
+			}else {
+				this.props.showNotification(`正在下载中`);
+				window.open("/api"+url, '_blank');
+			}
+		}).catch((error) => {
+			console.log(error)
+		});
+	}
+	render() {
+
+		return(
+			<Modal
+				keyboard={false}
+				title="提示"
+				visible={this.props.modalsType===undefined?false:this.props.modalsType}
+				closable={false}
+				footer={null}
+				destroyOnClose={true}
+				centered={true}
+				width="530px"
+			>
 				<div className="task-popup-content">
-						{this.props.value===500?<p>
-							<p className="task-popup-text-center font-16">因附件资料超过500M，您可以通过检索分批下载</p>
-							<p className="task-popup-text-center font-16 mt5">或者通过微信或者QQ联系管理员辅助您打包下载</p>
-						</p>:this.props.value===100?
-							<p>
-								<p className="task-popup-text-center font-16">已超出文件导出的上限数量（ <span className={"color-orange-tip"}>100</span> ），建议：</p>
-								<p className="task-popup-text-center font-16 mt20">1.通过检索分批次下载</p>
-								<p className="task-popup-text-center font-16 mt5">2.联系管理员辅助下载</p>
-							</p>
-							:""}
-						<div className="clearfix mt30 edu-txt-center">
-							<a  className="task-btn mr30" onClick={this.modalCancel}>取消</a>
-							<a className="task-btn task-btn-orange" onClick={this.setDownload}>立即联系</a>
-						</div>
+					{this.props.value===500?<p>
+						<p className="task-popup-text-center font-16">因附件资料超过500M，您可以通过检索分批下载</p>
+						<p className="task-popup-text-center font-16 mt5">或者通过微信或者QQ联系管理员辅助您打包下载</p>
+					</p>:this.props.value===100?
+						<p>
+							<p className="task-popup-text-center font-16">已超出文件导出的上限数量（ <span className={"color-orange-tip"}>100</span> ），建议：</p>
+							<p className="task-popup-text-center font-16 mt20">1.通过检索分批次下载</p>
+							<p className="task-popup-text-center font-16 mt5">2.联系管理员辅助下载</p>
+						</p>
+						:""}
+					<div className="clearfix mt30 edu-txt-center">
+						<a  className="task-btn mr30" onClick={this.modalCancel}>取消</a>
+						<a className="task-btn task-btn-orange" onClick={this.setDownload}>立即联系</a>
+					</div>
 				</div>
-        </Modal>
-    )
-  }
+			</Modal>
+		)
+	}
 }
 
 export default DownloadMessage;
\ No newline at end of file
diff --git a/public/react/src/modules/modals/DownloadMessageysl.js b/public/react/src/modules/modals/DownloadMessageysl.js
new file mode 100644
index 000000000..3f81a93a6
--- /dev/null
+++ b/public/react/src/modules/modals/DownloadMessageysl.js
@@ -0,0 +1,50 @@
+import React, { Component } from 'react';
+import { Modal} from 'antd';
+class DownloadMessageysl extends Component {
+	constructor(props) {
+		super(props);
+		this.state = {
+			funmodalsType:false,
+			istype:false
+		}
+	}
+
+	setDownload=()=>{
+		this.props.modalCancel();
+		window.open(`/users/${this.props.user.login}/private_messages`)
+	}
+	render() {
+
+		return(
+			<Modal
+				keyboard={false}
+				title="提示"
+				visible={this.props.modalsType===undefined?false:this.props.modalsType}
+				closable={false}
+				footer={null}
+				destroyOnClose={true}
+				centered={true}
+				width="530px"
+			>
+				<div className="task-popup-content">
+					{this.props.value===500?<p>
+						<p className="task-popup-text-center font-16">因附件资料超过500M，您可以通过检索分批下载</p>
+						<p className="task-popup-text-center font-16 mt5">或者通过微信或者QQ联系管理员辅助您打包下载</p>
+					</p>:this.props.value===100?
+						<p>
+							<p className="task-popup-text-center font-16">已超出文件导出的上限数量（ <span className={"color-orange-tip"}>100</span> ），建议：</p>
+							<p className="task-popup-text-center font-16 mt20">1.通过检索分批次下载</p>
+							<p className="task-popup-text-center font-16 mt5">2.联系管理员辅助下载</p>
+						</p>
+						:""}
+					<div className="clearfix mt30 edu-txt-center">
+						<a  className="task-btn mr30" onClick={this.props.modalCancel}>取消</a>
+						<a className="task-btn task-btn-orange" onClick={this.setDownload}>立即联系</a>
+					</div>
+				</div>
+			</Modal>
+		)
+	}
+}
+
+export default DownloadMessageysl;
\ No newline at end of file

From af6aba0328a27f7b9d956d7e13c1f203f9c51af2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 18 Jul 2019 10:49:37 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exercise/Testpapersettinghomepage.js      |  2 +-
 .../modules/courses/members/studentsList.js   | 51 +++++++++++++++++--
 .../shixunHomework/ShixunHomeworkPage.js      |  4 +-
 .../src/modules/modals/DownloadMessage.js     |  2 +-
 4 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index f25f02d83..abea627d3 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -334,7 +334,7 @@ class Testpapersettinghomepage extends Component{
                                     <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
                                         <li><a onClick={()=>this.confirmysl(`/exercises/${this.props.match.params.Id}/exercise_lists.xlsx`)}>学生成绩</a></li>
                                         <li><a onClick={()=>this.confirmysl(`/exercises/${this.props.match.params.Id}/export_exercise`)} >空白试卷</a></li>
-                                        <li><a onClick={()=>this.confirmysl(`/zip/export_exercises?exercise_id=${this.props.match.params.Id}${this.state.groupyslsval}`)}>学生答题试卷</a></li>
+                                        <li><a onClick={()=>this.confirmysl(`/zip/export_exercises?exercise_id=${this.props.match.params.Id}${this.state.groupyslsval===null||this.state.groupyslsval===undefined?null:this.state.groupyslsval}`)}>学生答题试卷</a></li>
                                     </ul>
                                 </li>:""}
                                 </div>
diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index 00e826a5c..c073abf4f 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -13,7 +13,7 @@ import Modals from "../../modals/Modals";
 import axios from 'axios'
 import _ from 'lodash'
 import NoneData from "../coursesPublic/NoneData"
-
+import DownloadMessageysl from "../../modals/DownloadMessageysl";
 import CreateGroupByImportModal from './modal/CreateGroupByImportModal'
 
 const Search =Input.Search;
@@ -131,10 +131,49 @@ class studentsList extends Component{
       modalsBottomval:"",
       modalCancel:"",
       n_And_e:1,
-      isSpin:false
+      isSpin:false,
+      DownloadType:false,
+      DownloadMessageval:undefined,
     }
   }
+/// 确认是否下载
+  confirmysl(url){
+    axios.get(url).then((response) => {
+      if(response === undefined){
+        return
+      }
+      if(response.data.status&&response.data.status===-1){
+
+      }else if(response.data.status&&response.data.status===-2){
+        if(response.data.messages === "100"){
+          // 已超出文件导出的上限数量（100 ），建议：
 
+          this.setState({
+            DownloadType:true,
+            DownloadMessageval:100
+          })
+        }else {
+          //因附件资料超过500M
+          this.setState({
+            DownloadType:true,
+            DownloadMessageval:500
+          })
+        }
+      }else {
+        this.props.showNotification(`正在下载中`);
+        window.open("/api"+url, '_blank');
+      }
+    }).catch((error) => {
+      console.log(error)
+    });
+  }
+
+  Downloadcal=()=>{
+    this.setState({
+      DownloadType:false,
+      DownloadMessageval:undefined
+    })
+  }
   
   inputStudent=(e)=>{
     this.setState({
@@ -490,6 +529,12 @@ class studentsList extends Component{
     exportUrl += paramsString;
     return(
       <React.Fragment >
+        <DownloadMessageysl
+          {...this.props}
+          value={this.state.DownloadMessageval}
+          modalCancel={this.Downloadcal}
+          modalsType={this.state.DownloadType}
+        />
         <Titlesearchsection
           title={isParent ? "学生列表" : 
             <React.Fragment>
@@ -525,7 +570,7 @@ class studentsList extends Component{
               { isAdmin && isParent && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>添加分班</WordsBtn> }
               { isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.deleteDir()}>删除分班</WordsBtn> }
               { isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.renameDir()}>分班重命名</WordsBtn> }
-              { isAdmin && <WordsBtn style="blue" className="" href={`${exportUrl}`}>导出成绩</WordsBtn> }
+              { isAdmin && <WordsBtn style="blue" className=""  onClick={()=>this.confirmysl(exportUrl)} >导出成绩</WordsBtn> }
               {/*  */}
             </React.Fragment>
           }
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index 130410be7..4ff7b2cad 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -234,10 +234,10 @@ class ShixunHomeworkPage extends Component {
 										导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
 										<ul className="drop_down_menu" style={{"right": "-0px", "left": "unset", "height": "auto"}}>
 											<li><a
-												onClick={(url) => this.confirmysl(`/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}&work_status=${this.state.course_groupyslstwo}&course_group=${this.state.checkedValuesineinfo}&search=${this.state.searchtext}`)}>实训报告</a>
+												onClick={(url) => this.confirmysl(`/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}&work_status=${this.state.course_groupyslstwo===undefined ||this.state.course_groupyslstwo===null? null: this.state.course_groupyslstwo}&course_group=${this.state.checkedValuesineinfo===undefined||this.state.checkedValuesineinfo===null? null:his.state.checkedValuesineinfo}&search=${this.state.searchtext===undefined||this.state.searchtext===null?null:this.state.searchtext}`)}>实训报告</a>
 											</li>
 											<li><a
-												onClick={(url) => this.confirmysl(`/homework_commons/${this.props.match.params.homeworkid}/works_list.xlsx?group_id=${this.state.checkedValuesineinfo}&search=${this.state.searchtext}`)}>学生成绩</a>
+												onClick={(url) => this.confirmysl(`/homework_commons/${this.props.match.params.homeworkid}/works_list.xlsx?group_id=${this.state.checkedValuesineinfo===undefined||this.state.checkedValuesineinfo===null?null:this.state.checkedValuesineinfo}&search=${this.state.searchtext===undefined||this.state.searchtext=== null?null:this.state.searchtext}`)}>学生成绩</a>
 											</li>
 
 										</ul>
diff --git a/public/react/src/modules/modals/DownloadMessage.js b/public/react/src/modules/modals/DownloadMessage.js
index fe0a0657f..618250e7c 100644
--- a/public/react/src/modules/modals/DownloadMessage.js
+++ b/public/react/src/modules/modals/DownloadMessage.js
@@ -5,7 +5,7 @@ import { Modal} from 'antd';
 import axios from 'axios';
 
 class DownloadMessage extends Component {
-
+   //没有修改菜世的  最后复原了
 	constructor(props) {
 		super(props);
 		this.state = {

From 6f2901ba6a08a8de749de9c264a7e4ab041dd829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 18 Jul 2019 11:09:50 +0800
Subject: [PATCH 03/15] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/exercise/Exercisesetting.js  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/public/react/src/modules/courses/exercise/Exercisesetting.js b/public/react/src/modules/courses/exercise/Exercisesetting.js
index 0a2ce11ba..8e759f29b 100644
--- a/public/react/src/modules/courses/exercise/Exercisesetting.js
+++ b/public/react/src/modules/courses/exercise/Exercisesetting.js
@@ -65,6 +65,9 @@ class Exercisesetting extends Component{
             publish_timetype:false,
             end_timetype:false
         }
+        console.log("Exercisesetting");
+        console.log("69");
+        console.log(props);
     }
 
     //加载
@@ -183,6 +186,10 @@ class Exercisesetting extends Component{
 //提交form表单
     handleSubmit = (e) => {
         e.preventDefault();
+         if(this.props&&this.props.Commonheadofthetestpaper.exercise_status){
+             console.log("190");
+             console.log(this.props.Commonheadofthetestpaper.exercise_status);
+         }
 
         this.props.form.validateFieldsAndScroll((err, values) => {
             if(!err){

From eef77b214f977e4968c3dfc0891fd493ed9f8843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 18 Jul 2019 11:28:11 +0800
Subject: [PATCH 04/15] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/shixunHomework/Listofworks.js     | 2 +-
 public/react/src/modules/user/LoginRegisterComponent.js   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index 7bdb731e0..466ac0bd9 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -1512,7 +1512,7 @@ class Listofworks extends Component {
 									{teacherdata&&teacherdata.publish_immediately===false&&computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
 												计算成绩
 									</div>:
-										<div>
+										<div >
 										{teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
 											<div className={"computeTimes font-13"}>
 												计算成绩
diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index 707daf1ea..9e2fa6372 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -36,7 +36,7 @@ class LoginRegisterComponent extends Component {
                 activeKey: 0,
                 classpass: "text",
                 // 登录
-                passopens: passopen,
+                passopens: passoff,
                 seconds: 35,
                 discodeBtn: false,
                 clearInterval: false,
@@ -66,7 +66,7 @@ class LoginRegisterComponent extends Component {
                 activeKey: '1',
                 classpass: "text",
                 // 登录
-                passopens: passopen,
+                passopens: passoff,
                 seconds: 35,
                 discodeBtn: false,
                 clearInterval: false,
@@ -355,13 +355,13 @@ class LoginRegisterComponent extends Component {
         console.log("显示于隐藏");
         if (this.state.classpassbool === true) {
             this.setState({
-                passopens: passopen,
+                passopens:passoff ,
                 classpass: "text",
                 classpassbool: false,
             })
         } else {
             this.setState({
-                passopens: passoff ,
+                passopens: passopen ,
                 classpass: "password",
                 classpassbool: true,
             })

From f7b468144870260cd5b2e5c31ce77f8467fb568c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 18 Jul 2019 11:29:09 +0800
Subject: [PATCH 05/15] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/user/LoginRegisterComponent.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index 9e2fa6372..dd2523420 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -23,9 +23,6 @@ const loginInputsyl = {
 class LoginRegisterComponent extends Component {
     constructor(props) {
         super(props)
-
-
-        //
         // console.log("LoginRegisterComponent");
         // console.log("29");
         // console.log(props.loginstatus);

From 3ba3c1f7f5aa3ceb45d528e4c21d4fa0631d85fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 18 Jul 2019 14:04:11 +0800
Subject: [PATCH 06/15] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/shixunHomework/Listofworks.js     |  766 +-----
 .../shixunHomework/Listofworksstudentone.js   | 2378 ++++++++++++++---
 .../shixunHomework/ShixunHomeworkPage.js      |   30 +-
 3 files changed, 2016 insertions(+), 1158 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index 466ac0bd9..070aee271 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -1,6 +1,4 @@
 import React, {Component} from "react";
-import CoursesListType from '../coursesPublic/CoursesListType';
-import {WordsBtn, ActionBtn} from 'educoder';
 import TraineetraininginformationModal from './TraineetraininginformationModal';
 import ModulationModal from "../coursesPublic/ModulationModal";
 import HomeworkModal from "../coursesPublic/HomeworkModal";
@@ -64,7 +62,7 @@ class Listofworks extends Component {
 			computeTimetype:true,
 			limit: 20,
 			loadingstate: true,
-			order: "update_time",
+			orders: "update_time",
 			b_order:"desc",
 			search: null,
 			allow_late:false,
@@ -354,7 +352,7 @@ class Listofworks extends Component {
 						record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A'}}>--</span> :
 							<span>
                        <a style={{"text-align": "center"}} className="color-blue"
-													onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
+													onClick={() => this.Viewstudenttraininginformationt(record)}>{record.operating}</a>
         </span>
 					)
 				},
@@ -616,7 +614,7 @@ class Listofworks extends Component {
 						record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A'}}>--</span> :
 							<span>
                        <a style={{"text-align": "center"}} className="color-blue"
-													onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
+													onClick={() => this.Viewstudenttraininginformationt(record)}>{record.operating}</a>
         </span>
 					)
 				},
@@ -630,751 +628,15 @@ class Listofworks extends Component {
 	componentDidMount() {
 		console.log("Listofworks");
 		console.log("componentDidMount");
-		this.props.triggerRef(this)
-		var homeworkid = this.props.match.params.homeworkid;
-		// console.log(homeworkid)
-		// this.Gettitleinformation(homeworkid);
-		this.Getalistofworks(homeworkid);
-		let query = this.props.location.pathname;
-		const type = query.split('/');
-		this.setState({
-			shixuntypes: type[3]
-		})
+		this.tearchar();
 
 	}
 
-	isupdatas = () => {
-		var homeworkid = this.props.match.params.homeworkid;
-		// this.Gettitleinformation(homeworkid);
-		this.Getalistofworks(homeworkid);
-	}
-
-	// 获取作品列表
-	Getalistofworks = (homeworkid) => {
-		// console.log("获取作品列表");7009
-
-		let urll = `/homework_commons/${homeworkid}/works_list.json`;
-		// console.log(homeworkid);
-
-		// search:搜索关键字
-		// order:排序方式：更新时间：update_time，最终成绩：work_score，学号：student_id
-		// b_order:desc：倒序 ， asc：顺序
-		// work_status:0:未提交， 1:按时提交， 2:延时提交，“”不限
-		// course_group:分班情况 [232, 231]， []:不限（空数组）
-		var data = {
-			search: "",
-			order: this.state.order,
-			b_order: "desc",
-			work_status: "",
-			course_group: "",
-			page:1,
-			limit:20,
-		}
-		axios.post(urll, data).then((result) => {
-
-			if(this.props.isNotMember()===false){
-			if (result !== undefined) {
-				// console.log(url)
-				// console.log("作品列表6789077")
-				// console.log(JSON.stringify(result))
-				this.setState({
-					teacherdata: result.data,
-					task_status: result.data.task_status,
-					allow_late:result.data.allow_late,
-					course_group_info: result.data.course_group_info,
-					loadingstate: false,
-					jobsettingsdata: result,
-					publish_immediately: result.data.publish_immediately,
-					work_efficiency: result.data.work_efficiency,
-					end_immediately: result.data.end_immediately,
-					code_review: result.data.code_review,
-					challenges_count:result.data.challenges_count,
-				})
-				this.props.Getdataback(result,result.data);
-				this.seacthdata(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,1);
-			}		}
-		}).catch((error) => {
-			console.log(error)
-			this.setState({
-				loadingstate: false,
-			})
-		})
-	}
-
-	//开始排序操作
-	Startsorting = (ordervlue, checkedValuesine, checkedValuesineinfo, searchtext, page, limit) => {
-		//要提交的作品状态checkedValuesine
-		//要提交的分班状态checkedValuesineinfo
-		//searchtext 输入的姓名和学号
-		//order 排序时间
-		//debug=t 是老师的意思
-		// console.log(ordervlue)7009
-
-			var homeworkid = this.props.match.params.homeworkid;
-			let urll = `/homework_commons/${homeworkid}/works_list.json?`;
-			var order = "asc";
-			if (ordervlue === "update_time") {
-				order = "desc";
-			}
-			var checkedValuesines = checkedValuesine;
-			var checkedValuesineinfos = checkedValuesineinfo;
-			var searchtexts = searchtext
-			var data = {
-				search: searchtexts,
-				order: ordervlue,
-				b_order: order,
-				work_status: checkedValuesines,
-				course_group: checkedValuesineinfos,
-				page: page,
-				limit: limit,
-			}
-			// console.log("Startsorting");
-			// console.log(data);
-			axios.post(urll, data).then((result) => {
-				// if (result.status === 200) {/]
-				// console.log(url)
-				// console.log("作品列表______________________")
-				// console.log(JSON.stringify(result))
-				if(this.props.isNotMember()===false){
-				if (result !== undefined) {
-					this.setState({
-						teacherdata: result.data,
-						task_status: result.data.task_status,
-						course_group_info: result.data.course_group_info,
-						loadingstate: false,
-						jobsettingsdata: result,
-						allow_late:result.data.allow_late,
-						publish_immediately: result.data.publish_immediately,
-						work_efficiency: result.data.work_efficiency,
-						end_immediately: result.data.end_immediately,
-						code_review: result.data.code_review,
-						challenges_count:result.data.challenges_count,
-					})
-					this.props.Getdataback(result,result.data);
-					this.seacthdata(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,page);
-				}
-				}
-				// }
-			}).catch((error) => {
-				console.log(error)
-				this.setState({
-					loadingstate: false
-				})
-			})
-
-
-
-	}
-
-	TablePagination = (e) => {
-		// console.log(e.current);
-		var teacherlist = {  //分页
-			total: this.state.teacherdata.student_works.length, //数据总数量
-			pageSize: 20,  //一页显示几条
-			current: e.current,
-		}
-		this.setState({
-			page: e.current,
-			teacherlist: teacherlist
-		})
-
-	}
-
-
-	// 设置数据
-	seacthdata = (teacherdata,student_works,work_efficiency,course_group_info) => {
-		let {page, limit} = this.state;
-		let datalist = [];
-		let columns = this.state.columns;
-		 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');
-				datalist.push({
-					myid: student_works[i].id,
-					number: (parseInt(page) - 1) * parseInt(limit) + (i + 1),
-					name: student_works[i].user_name,
-					stduynumber: student_works[i].student_id,
-					classroom: student_works[i].group_name,
-					cost_time: student_works[i].cost_time,
-					submitstate:student_works[i].work_status === 0 ? "未提交" : student_works[i].work_status === 1 ? "按时提交" :student_works[i].work_status === 2 ? "延时提交" : "未提交",
-					// updatetime:this.state.teacherdata.student_works[i].update_time,
-					// updatetime:"",
-					updatetime: timedata === "Invalid date" ? "--" : timedata,
-					completion: student_works[i].complete_count === null ? "0" :student_works[i].complete_count === undefined ? "0": student_works[i].complete_count,
-					levelscore: student_works[i].final_score,
-					efficiencyscore: student_works[i].eff_score==="0.0"?"--":student_works[i].eff_score==="0"?"--":student_works[i].eff_score,
-					finalscore: student_works[i].work_score,
-					operating: "查看",
-					late_penalty: student_works[i].late_penalty=== null?"0":student_works[i].late_penalty === undefined?"0":student_works[i].late_penalty,
-					ultimate_score:student_works[i].ultimate_score,
-					user_name: student_works[i].user_name,
-					user_login: student_works[i].user_login,
-				})
-
-			}
-
-			var teacherlist = {  //分页
-				total: student_works.length, //数据总数量
-				pageSize: 20,  //一页显示几条
-				current: page,
-			}
-			if (work_efficiency === false) {
-				if(JSON.stringify(course_group_info) === "[]"|| course_group_info === undefined||course_group_info === null){
-					//这里没有分班 没有 关卡得分 没有效率分
-					for(var i=0;i< this.state.columns.length;i++){
-						var item =  this.state.columns[i];
-						if(item.title==="分班"){
-						}
-						else if(item.title==="关卡得分"){
-						}
-						else if(item.title==="效率分"){
-						}
-						else if(this.props.isNotMember()===true&&item.title==="学号") {
-
-						}else{
-							columns2.push(item);
-						}
-					}
-
-
-				}else{
-					if(course_group_info.length < 2){
-						for(var i=0;i< this.state.columns.length;i++){
-							var item =  this.state.columns[i];
-							if(item.title==="分班"){
-							}
-							else if(item.title==="关卡得分"){
-							}
-							else if(item.title==="效率分"){
-							}
-							else if(this.props.isNotMember()===true&&item.title==="学号") {
-
-							}else{
-								columns2.push(item);
-							}
-						}
-
-					}else {
-						for(var i=0;i< this.state.columns.length;i++){
-							var item =  this.state.columns[i];
-						  if(item.title==="关卡得分"){
-							}
-							else if(item.title==="效率分"){
-							}
-							else if(this.props.isNotMember()===true&&item.title==="学号") {
-
-							}else{
-								columns2.push(item);
-							}
-						}
-					}
-				}
-			}else {
-				if(JSON.stringify(course_group_info) === "[]"|| course_group_info === undefined || course_group_info === null){
-
-
-					for(var i=0;i< this.state.columns.length;i++){
-						var item =  this.state.columns[i];
-						 if(item.title==="分班"){
-						}
-						else if(this.props.isNotMember()===true&&item.title==="学号") {
-
-						}else{
-							 columns2.push(item);
-						}
-					}
-
-
-
-
-				}else {
-					if(course_group_info.length < 2) {
-						for(var i=0;i< this.state.columns.length;i++){
-							var item =  this.state.columns[i];
-							if(item.title==="分班"){
-							}
-							else if(this.props.isNotMember()===true&&item.title==="学号") {
-
-							}else{
-								columns2.push(item);
-							}
-						}
-					}
-					columns2=this.state.columnss;
-				}
-			}
-
-		} else {
-			var teacherlist = undefined;
-		}
-		this.setState({
-			data: datalist,
-			teacherlist: teacherlist,
-			columns: columns2,
-			loadingstate: false,
-		})
-	}
-	//作品状态
-	funtaskstatus = (checkedValues, data) => {
-
-		if (JSON.stringify(checkedValues) === "[]") {
-			// console.log(checkedValues);
-			this.setState({
-				unlimited: 0,
-				course_groupyslstwo: [],
-				loadingstate: true,
-				page:1,
-			})
-			this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
-		} else if (checkedValues.length === data.length) {
-			this.setState({
-				unlimited: 0,
-				course_groupyslstwo: [],
-				loadingstate: true,
-				page:1,
-			})
-			this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
-		} else {
-			// console.log(checkedValues);
-			this.setState({
-				course_groupyslstwo: checkedValues,
-				unlimited: 1,
-				loadingstate: true,
-				page:1,
-			})
-			this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
-		}
-
-	}
-	//作品状态2
-	funtaskstatustwo = (checkedValues, data) => {
-		// console.log("funtaskstatustwo");
-		// console.log(checkedValues);
-		if (JSON.stringify(checkedValues) === "[]") {
-			// console.log(checkedValues);
-			this.setState({
-				unlimitedtwo: 1,
-				course_groupysls: undefined,
-				checkedValuesineinfo:[],
-				loadingstate: true,
-				page: 1,
-			})
-			this.Startsorting(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.searchtext, 1, this.state.limit);
-		} else if (checkedValues.length === data.length) {
-			this.setState({
-				unlimitedtwo: 1,
-				course_groupysls: undefined,
-				checkedValuesineinfo:[],
-				loadingstate: true,
-				page: 1,
-			})
-			this.Startsorting(this.state.order, this.state.checcourse_groupyslstwokedValuesine, checkedValues, this.state.searchtext, 1, this.state.limit);
-		} else {
-			this.setState({
-				checkedValuesineinfo: checkedValues,
-				course_groupysls: checkedValues,
-				unlimitedtwo: 0,
-				loadingstate: true,
-				page: 1,
-			})
-			this.Startsorting(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.searchtext, 1, this.state.limit);
-
-
-		}
-
-	}
-	//搜索学生 文字输入
-	inputSearchValues = (e) => {
-		// console.log(e.target.value)
-		if (e.target.value === "") {
-			this.setState({
-				searchtext: undefined
-			})
-		} else {
-			this.setState({
-				searchtext: e.target.value
-			})
-		}
-
-	}
-
-	//搜索学生按钮输入
-	searchValues = (value) => {
-		//点击直接搜索
-		//    if(value === ""){
-		//        message.error("请输入姓名或学号搜索");
-		//        return
-		//    }
-		this.setState({
-			loadingstate: true
-		})
-		this.Startsorting(this.state.order, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, value, this.state.page, this.state.limit);
-		// console.log(value)
-
-
-	}
-
-	// 输入关键字后按回车，自动提交
-	onSearchKeywordKeyUp = (e) => {
-		if (e.keyCode === 13) {
-			// this.onSearch();
-			// console.log("使用了回车键");
-			this.setState({
-				loadingstate: true
-			})
-			this.Startsorting(this.state.order, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
-		}
-	}
-	//排序
-	funorder = (e) => {
-		if (e === "update_time") {
-			// 时间
-			// 时间排序是从小到大
-			this.setState({
-				order: "update_time",
-				loadingstate: true,
-			})
-			this.Startsorting("update_time", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
-		}
-
-		if (e === "work_score") {
-			// 成绩
-			//成绩排序是从大到小
-			this.setState({
-				order: "work_score",
-				loadingstate: true,
-			})
-			this.Startsorting("work_score", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
-		}
-
-		if (e === "student_id") {
-			//学号
-			//学号排序是从大到小
-			this.setState({
-				order: "student_id",
-				loadingstate: true,
-			})
-			this.Startsorting("student_id", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
-		}
-	}
-
-
-	// 调分
-
-	// 查看学员实训信息
-	Viewstudenttraininginformation = (e) => {
-		// console.log("Viewstudenttraininginformation");
-		// console.log(e);
-		this.setState({
-			userids: e.myid,
-		})
-		this.viewtraining(e.myid);
-	}
-	// 关闭调分
-	cancelModulationModels = () => {
-		this.setState({visibles: false})
-	}
-	// 关闭查看
-	cancelModulationModel = () => {
-		this.setState({visible: false})
-	}
-	// 调分
-	Viewstudenttraininginformations = (e) => {
-		// console.log("Viewstudenttraininginformations2");
-		// console.log(e.myid);
-		this.setState({
-			visible: true,
-			userid: e.myid,
-			// Tune：
-		})
-	}
-	//确定
-	saveModulationModal = (value, num) => {
-		var userid = this.state.userid;
-		const url = `/student_works/${userid}/adjust_score.json`;
-		// console.log(url);
-		axios.post(url, {
-				score: num,
-				comment: value
-			})
-			.then((response) => {
-				if (response.data.status == '0') {
-					this.setState({visible: false});
-					this.props.showNotification(`调分成功`);
-
-					this.Startsorting(this.state.order, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
-				}
-			})
-			.catch(function (error) {
-				console.log(error);
-			});
-	}
-
-	viewtraining = (userids) => {
-		// console.log(JSON.stringify(this.props.user))
-		var url = `/student_works/${userids}/shixun_work.json`;
-		axios.get(url).then((result) => {
-			if (result.status === 200) {
-				// console.log("TraineetraininginformationModal.js")
-				// console.log(JSON.stringify(result))
-				let datalist = [];
-				var game_list = result.data.game_list
-				var boolgalist=true;
-				var experience=0;
-				for (var i = 0; i < game_list.length; i++) {
-
-					datalist.push({
-						number: "第" + game_list[i].position + "关",
-						name: moment(game_list[i].end_time).format('YYYY-MM-DD HH:mm'),
-						stduynumber: game_list[i].cost_time,
-						classroom: game_list[i].score,
-						complete_status: game_list[i].complete_status,
-					})
-					experience=game_list[i].score+experience;
-
-					if(game_list[i].complete_status === 2 || game_list[i].complete_status===3){
-						boolgalist=false;
-					}
-
-				}
-				// console.log("viewtraining");
-				// console.log(datalist);
-				// console.log(JSON.stringify(datalist));
-				this.setState({
-					viewtrainingdata: result.data,
-					visibles: true,
-					game_list: datalist,
-					experience:experience,
-					boolgalist:boolgalist,
-				})
-			}
-		}).catch((error) => {
-
-		})
-	}
-
-
-	//立即发布
-	homeworkstart = () => {
-		let homeworkid = this.props.match.params.homeworkid;
-		let url = "/homework_commons/" + homeworkid + "/publish_groups.json";
-
-
-		axios.get(url).then((response) => {
-
-			if (response.status === 200) {
-				let starttime = this.props.getNowFormatDates(1);
-				let endtime = this.props.getNowFormatDates(2);
-				this.setState({
-					modalname: "立即发布",
-					modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
-					svisible: true,
-					Topval:"学生将立即收到作业",
-					// Botvalleft:"暂不发布",
-					Botval:`本操作只对"未发布"的分班有效`,
-					starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
-					endtime: "截止时间：" + endtime,
-					starttimes:starttime,
-					typs:"start",
-					Cancelname: "暂不发布",
-					Savesname: "立即发布",
-					Cancel: this.homeworkhide,
-					Saves: this.homeworkstartend,
-					course_groups: response.data.course_groups,
-				})
-			}
-		}).catch((error) => {
-			console.log(error)
-		});
-
-	}
-	//立即截止
-	homeworkends = () => {
-		console.log("1160");
-		let homeworkid = this.props.match.params.homeworkid;
-		let url = "/homework_commons/" + homeworkid + "/end_groups.json";
-
-		axios.get(url).then((response) => {
-
-			if (response.status === 200) {
-				this.setState({})
-				this.setState({
-					modalname: "立即截止",
-					modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
-					svisible: true,
-					Topval:"学生将不能再提交作业",
-					// Botvalleft:"暂不截止",
-					Botval:`本操作只对"提交中"的分班有效`,
-					Cancelname: "暂不截止",
-					Savesname: "立即截止",
-					Cancel: this.homeworkhide,
-					Saves: this.coursetaskend,
-					starttime: undefined,
-					endtime: undefined,
-					course_groups: response.data.course_groups,
-					typs:"end",
-				})
-			}
-		}).catch((error) => {
-			console.log(error)
-		});
-	}
-// 立即发布
-	homeworkstartend = (ds,endtime) => {
-		var homeworkid = this.props.match.params.homeworkid;
-		let {course_groupslist} = this.state;
-
-		let coursesId = this.props.match.params.coursesId;
-		let url = "/courses/" + coursesId + "/homework_commons/publish_homework.json";
-		axios.post(url, {
-			homework_ids: [homeworkid],
-			group_ids: course_groupslist,
-			end_time:endtime,
-		}).then((result) => {
-			if (result.status === 200) {
-				if (result.data.status === 0) {
-					notification.open({
-						message: "提示",
-						description: result.data.message
-					});
-					this.homeworkhide()
-				}
-
-			}
-		}).catch((error) => {
-			console.log(error);
-		})
-	}
-	notlimiteds = () => {
-		this.setState({
-			checkedValuesine: undefined,
-			course_groupyslstwo: [],
-			unlimited: 0,
-			loadingstate: true,
-			page:1,
-		})
-		this.Startsorting(this.state.order, [], this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
-
-	}
-	notlimitedst = () => {
-		// console.log(this.state.course_group_info);
-		this.setState({
-			unlimitedtwo: 1,
-			checkedValuesineinfo: [],
-			course_groupysls: undefined,
-			loadingstate: true,
-		})
-		this.Startsorting(this.state.order, this.state.course_groupyslstwo, [], this.state.searchtext, 1, this.state.limit);
-	}
-	//立即截止确定按钮
-	coursetaskend = () => {
-		var homeworkid = this.props.match.params.homeworkid;
-		let {course_groupslist} = this.state;
-
-
-		const cid = this.props.match.params.coursesId;
-		let url = "/courses/" + cid + "/homework_commons/end_homework.json";
-		axios.post(url, {
-				group_ids: course_groupslist,
-				homework_ids: [homeworkid],
-			})
-			.then((response) => {
-				if (response.data.status == 0) {
-					notification.open({
-						message: "提示",
-						description: response.data.message
-					});
-					this.homeworkhide()
-				}
-			})
-			.catch(function (error) {
-				console.log(error);
-			});
-	}
-
-	getcourse_groupslist = (id) => {
-		this.setState({
-			course_groupslist: id
-		})
-
-	}
-
-	homeworkhide = () => {
-		this.isupdatas()
-		this.setState({
-			modalname: undefined,
-			modaltype: undefined,
-			svisible: false,
-			Topval: undefined,
-			Topvalright: undefined,
-			Botvalleft: undefined,
-			Botval: undefined,
-			starttime: undefined,
-			endtime: undefined,
-			Cancelname: undefined,
-			Savesname: undefined,
-			Cancel: undefined,
-			Saves: undefined,
-			StudentList_value: undefined,
-			addname: undefined,
-			addnametype: false,
-			addnametab: undefined,
-			course_groupyslstwo: undefined,
-			typs:undefined,
-			starttimes:undefined,
-		})
-	}
-
-
-	workshowmodel = () => {
-		this.setState({
-			showmodel: true
-		})
-	}
-
-	hideshowmodel = () => {
-		this.setState({
-			showmodel: false
-		})
-	}
-
-	paginationonChanges = (pageNumber) => {
-		this.setState({
-			page: pageNumber,
-			loadingstate: true,
-		})
-		this.Startsorting(this.state.order, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, pageNumber, this.state.limit);
-
-	}
-
-	setComputeTime=()=>{
-    this.setState({
-			computeTimetype:false
-		})
-		let homeworkid = this.props.match.params.homeworkid;
-		let url = "/homework_commons/"+homeworkid+"/update_score.json";
-
-		axios.get(url).then((response) => {
-			if(response){
-			this.props.showNotification(response.data.message);
-			this.setState({
-				loadingstate: true
-			})
-			this.Startsorting(this.state.order, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
-			}
-			}).catch((error) => {
-			console.log(error)
-		});
-
-	}
-
-
 
 	render() {
 		// console.log("Listofworks.js000")
 
-		let {columns,computeTimetype, page, boolgalist,limit,experience,course_groupysls, course_groupyslstwo, unlimited, unlimitedtwo, loadingstate, viewtrainingdata, game_list, data, course_group_info, order, teacherdata, task_status, checkedValuesine, searchtext, teacherlist, visible, visibles, jobsettingsdata} = this.state;
+		let {columns,computeTimetype, page, boolgalist,limit,experience,course_groupysls, course_groupyslstwo, unlimited, unlimitedtwo, loadingstate, viewtrainingdata, game_list, data, course_group_info, orders, teacherdata, task_status, checkedValuesine, searchtext, teacherlist, visible, visibles, jobsettingsdata} = this.state;
 		//
 		// console.log(teacherdata&&teacherdata.shixun_identifier)
 		// console.log(this.props.teacherdata&&this.props.teacherdata.publish_immediately)
@@ -1527,9 +789,9 @@ class Listofworks extends Component {
 										id="subject_search_input"
 										autoComplete="off"
 										value={searchtext}
-										onKeyUp={(e) => this.onSearchKeywordKeyUp(e)}
-										onInput={this.inputSearchValues}
-										onSearch={this.searchValues}
+										onKeyUp={(e) => this.onSearchKeywordKeyUpt(e)}
+										onInput={this.inputSearchValuest}
+										onSearch={this.searchValuest}
 									></Search>
 								</div>
 							</li>
@@ -1541,7 +803,7 @@ class Listofworks extends Component {
 																				 className={unlimited === 0 ? "pl10 pr10 mr20 check_on" : "pl10 pr10 mr20 "}
 																				 onClick={() => this.notlimiteds()}>不限</a></span>
 								<CheckboxGroup value={course_groupyslstwo}
-															 onChange={(e) => this.funtaskstatus(e, task_status && task_status)}
+															 onChange={(e) => this.funtaskstatust(e, task_status && task_status)}
 															 style={{paddingTop: '4px'}}>
 
 									{task_status === undefined ? "" : task_status.map((item, key) => {
@@ -1572,7 +834,7 @@ class Listofworks extends Component {
 																						 className={unlimitedtwo === 0 ? "pl10 pr10 mr20 " : "pl10 pr10 mr20 check_on"}
 																						 onClick={() => this.notlimitedst()}>不限</a></span>
 										<CheckboxGroup  value={course_groupysls}
-																		onChange={(e) => this.funtaskstatustwo(e, course_group_info && course_group_info)}
+																		onChange={(e) => this.funtaskstatustwot(e, course_group_info && course_group_info)}
 																		style={{paddingTop: '4px',width:'1017px'}}>
 											{course_group_info === undefined ? "" :
 												course_group_info.map((item, key) => {
@@ -1611,12 +873,12 @@ class Listofworks extends Component {
 									<ul>
 										<li className="edu-position edu-position-hidebox">
 											<a className="font-12">
-												{order === "update_time" ? "时间" : order === "work_score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a>
+												{orders === "update_time" ? "时间" : orders === "work_score" ? "成绩" : orders === "student_id" ? "学号" : ""}排序</a>
 											<i className="iconfont icon-xiajiantou ml5 font-12 "></i>
 											<ul className="edu-position-hide undis mt10">
-												<li> <a  onClick={(e) => this.funorder("update_time")} data-remote="true" className=" font-12" style={{"text-align": "center "}}>更新时间</a></li>
-												<li> <a  onClick={(e) => this.funorder("work_score")} data-remote="true" className=" font-12" style={{"text-align": "center "}}>最终成绩</a></li>
-												<li> <a  onClick={(e) => this.funorder("student_id")} data-remote="true" className=" font-12" style={{"text-align": "center "}}>学生学号</a></li>
+												<li> <a  onClick={(e) => this.funordert("update_time")} data-remote="true" className=" font-12" style={{"text-align": "center "}}>更新时间</a></li>
+												<li> <a  onClick={(e) => this.funordert("work_score")} data-remote="true" className=" font-12" style={{"text-align": "center "}}>最终成绩</a></li>
+												<li> <a  onClick={(e) => this.funordert("student_id")} data-remote="true" className=" font-12" style={{"text-align": "center "}}>学生学号</a></li>
 											</ul>
 										</li>
 									</ul>
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index a2343abf8..49c640419 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -2,10 +2,27 @@ import React, {Component} from "react";
 import CoursesListType from '../coursesPublic/CoursesListType';
 import {WordsBtn, ActionBtn} from 'educoder';
 import {
+	Form,
+	Select,
+	Input,
+	Button,
+	Checkbox,
+	Upload,
+	Icon,
+	message,
+	Modal,
 	Table,
 	Pagination,
+	Radio,
+	Tooltip,
+	notification
 } from "antd";
-import {Link} from 'react-router-dom';
+import './style.css';
+import 'moment/locale/zh-cn';
+const Search = Input.Search;
+const RadioGroup = Radio.Group;
+const CheckboxGroup = Checkbox.Group;
+const {Option} = Select;
 import axios from 'axios';
 import moment from 'moment';
 import '../css/members.css'
@@ -15,7 +32,10 @@ import {getImageUrl} from 'educoder';
 import TraineetraininginformationModal from "./TraineetraininginformationModal";
 import DownloadMessageysl from '../../modals/DownloadMessageysl';
 import Startshixuntask from "../coursesPublic/Startshixuntask";
-
+import ModulationModal from "../coursesPublic/ModulationModal";
+import HomeworkModal from "../coursesPublic/HomeworkModal";
+import ShixunWorkModal from "./Shixunworkdetails/ShixunWorkModal";
+import {getImageUrl} from 'educoder';
 
 //GraduationTaskssetting.js
 
@@ -66,7 +86,7 @@ class Listofworksstudentone extends Component {
 			startbtn: false,
 			DownloadType:false,
 			DownloadMessageval:undefined,
-			columns: [
+			columnsstu: [
 				{
 					title: '序号',
 					dataIndex: 'number',
@@ -329,130 +349,1050 @@ class Listofworksstudentone extends Component {
 					),
 				},
 			],
-			work_efficiency:true,
-		}
-		//
-	}
-
-	componentDidMount() {
-		console.log("Listofworksstudentone");
-		console.log("componentDidMount");
-		this.props.triggerRef(this);
-		// var homeworkid = this.props.match.params.homeworkid;
-		// this.Getalistofworks(homeworkid);
-		this.Getalistofworkstwo("", "", "", "", 1, 20);
-		let query = this.props.location.pathname;
-		const type = query.split('/');
-		this.setState({
-			shixuntypes: type[3]
-		})
-	}
 
+			orders: "update_time",
+			b_order:"desc",
+			allow_late:false,
+			checkedValuesine: undefined,
+			checkedValuesineinfo: [],
+			work_efficiency: false,
+			resultint: 0,
+			teacherlist: undefined,
+			searchtext: "",
+			course_groupysls: undefined,
+			course_groupyslstwo: [],
+			visible: false,
+			userid: 0,
+			course_group: null,
+			publish_immediately: undefined,
+			end_immediately: undefined,
+			mystyle: {"display": "block", "color": '#07111B', "text-align": "center"},
+			mystyles: {"display": "none", "color": '#07111B', "text-align": "center"},
+			mystyle1: {"display": "block"},
+			mystyles1: {"display": "none"},
+			unlimited: 0,
+			unlimitedtwo: 1,
+			code_review: false,
+			boolgalist:true,
+			challenges_count:0,
+			experience:0,
+			columns: [
+				{
+					title: '序号',
+					dataIndex: 'number',
+					key: 'number',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span style={{"color": '#07111B', "text-align": "center"}}>{record.number}
+        </span>
+					)
+				},
+				{
+					title: '姓名',
+					dataIndex: 'name',
+					key: 'name',
+					align: 'center',
+					className:'font-14',
+					width:'120px',
+					render: (text, record) => (
+						<span style={{"color": '#07111B', "text-align": "center"}}>{record.name}</span>
+					)
+				},
+				{
+					title: '学号',
+					dataIndex: 'stduynumber',
+					key: 'stduynumber',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span style={{
+							"color": '#9A9A9A',
+							"text-align": "center"
+						}}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}
+        </span>
+					),
+				},
+				{
+					title: '分班',
+					key: 'classroom',
+					dataIndex: 'classroom',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</span>
+					)
+				},
+				{
+					title: '提交状态',
+					dataIndex: 'submitstate',
+					key: 'submitstate',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span style={record.submitstate === "延时提交" ? {
+							"color": '#DD1717',
+							"text-align": "center"
+						} : record.submitstate === "按时提交" ? {"color": '#29BD8B', "text-align": "center"} : {
+							"color": '#747A7F',
+							"text-align": "center"
+						}}>{record.submitstate}
+        </span>
+					)
 
-	//卸载组件取消倒计时
-	componentWillUnmount() {
-		// clearInterval(this.timer);
-	}
-
-	// 获取作品列表
-	Getalistofworks = (homeworkid) => {
-		// console.log("获取作品列表");
+				},
+				{
+					title: '实战耗时',
+					dataIndex: 'cost_time',
+					key: 'cost_time',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span style={
+							{
+								"color": '#747A7F',
+								"text-align": "center"
+							}
+						}>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time }
+        </span>
+					)
 
-		let urll = `/homework_commons/${homeworkid}/works_list.json`;
-		var data = {
-			search: "",
-			order: "",
-			b_order: "desc",
-			page: 1,
-			limit: 20,
-			work_status: "",
-			course_group: "",
-		}
-		axios.post(urll, data).then((result) => {
-          if(result === undefined){
-          	return
-					}
+				},
+				{
+					title: '更新时间',
+					dataIndex: 'updatetime',
+					key: 'updatetime',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</span>
+					),
+				},
+				{
+					title: '完成情况',
+					dataIndex: 'completion',
+					key: 'completion',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span>
 
-				if (result.status === 200) {
-					if(this.props.isNotMember()===false) {
-					this.setState({
-						teacherdata: result.data,
-						task_status: result.data.task_status,
-						course_group_info: result.data.course_group_info,
-						student_works: result.data.student_works,
-						jobsettingsdata: result,
-						publish_immediately: result.data.publish_immediately,
-						end_immediately: result.data.end_immediately,
-						id: result.data.id,
-						work_efficiency: result.data.work_efficiency,
-						code_review: result.data.code_review,
-						challenges_count: result.data.challenges_count,
-						view_report: result.data.view_report,
-					})
-						this.props.Getdataback(result,result.data);
-						if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") {
-						this.seacthdata(result.data);
-					 } else {
-						this.seacthdatas(result.data, result.data.student_works);
-					}
+										<Tooltip  placement="bottom" title={<div>
+											<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
+										</div>}>
+											<span style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count} </span>
+										</Tooltip>
 
-				}
-		  	}
-		}).catch((error) => {
-			console.log(error);
-		})
-	}
+        </span>
+					)
+				},
+				{
+					title: '关卡得分',
+					dataIndex: 'levelscore',
+					key: 'levelscore',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span>
+       	<span style={parseInt(record.levelscore) <= 60 ? {
+					"color": '#747A7F',
+					"text-align": "center"
+				} : parseInt(record.levelscore) < 90 ? {
+					"color": '#FF6800',
+					"text-align": "center"
+				} : parseInt(record.levelscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+					"color": '#747A7F',
+					"text-align": "center"
+				}}>{record.levelscore}</span>
+        </span>
+					)
+				},
+				{
+					title: '效率分',
+					dataIndex: 'efficiencyscore',
+					key: 'efficiencyscore',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span>
+            {
+							record.efficiencyscore&& record.efficiencyscore=== "--"?(
+									this.state.allow_late&&this.state.allow_late===false?
+										<Tooltip placement="bottom" title={<div>
+											<div>作业截止时，系统根据学生在课堂成员中的效率表现自动评分</div>
+										</div>}>
+											<span style={{color:"#9A9A9A"}}>
+												--
+											</span>
+										</Tooltip>
+										:
+										this.state.allow_late&&this.state.allow_late===true?
+											<Tooltip placement="bottom" title={<div>
+												<div>补交结束时，系统根据学生在课堂成员中的效率表现自动评分</div>
+											</div>}>
+												<span style={{color:"#9A9A9A"}}>
+													--
+												</span>
+											</Tooltip>
+											:
+											<span style={{color:"#9A9A9A"}}>
+												--
+											</span>
+								)
+								:
+								<span style={parseInt(record.efficiencyscore) <= 60 ? {
+									"color": '#747A7F',
+									"text-align": "center"
+								} : parseInt(record.efficiencyscore) < 90 ? {
+									"color": '#FF6800',
+									"text-align": "center"
+								} : parseInt(record.efficiencyscore) >= 90 ? {
+									"color": '#DD1717',
+									"text-align": "center"
+								} : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore}</span>
+						}
 
-// 获取作品列表
-	Getalistofworkstwo = (ordervlue, checkedValuesine, checkedValuesineinfo, searchtext, page, limit) => {
-		// console.log("获取作品列表");
-		var homeworkid = this.props.match.params.homeworkid;
-		let urll = `/homework_commons/${homeworkid}/works_list.json`;
-		// console.log(homeworkid);
+        </span>
+					)
+				},
+				{
+					title: '最终成绩',
+					dataIndex: 'finalscore',
+					key: 'finalscore',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span>
+									{
+										record.ultimate_score=== true?
+											<Tooltip placement="bottom" title={<div>
+												<div>{record.user_name}{record.user_login}</div>
+												<div>{record.finalscore === "--"?<span>最终调整成绩：0分</span> :<span>最终调整成绩：{record.finalscore}分</span>}</div>
+											</div>}>
+												{
+													record.finalscore&&record.finalscore==="--"?
+														<span style=
+																		{{
+																			"color": '#9A9A9A',
+																			"text-align": "center"
+																		}}>{record.finalscore}</span>
+														:
+														<span style={parseInt(record.finalscore) <= 60 ? {
+															"color": '#747A7F',
+															"text-align": "center"
+														} : parseInt(record.finalscore) < 90 ? {
+															"color": '#FF6800',
+															"text-align": "center"
+														} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+															"color": '#747A7F',
+															"text-align": "center"
+														}}>{record.finalscore}</span>
+												}
+											</Tooltip>
+											:
+											<Tooltip placement="bottom" title={<div>
+												<div>{record.user_name}{record.user_login}</div>
+												<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
+												<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
+												<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
+												<div>{record.finalscore === "--"?<span>最终成绩：0分</span> :<span>最终成绩：{record.finalscore}分</span>}</div>
+											</div>}>
+												{
+													record.finalscore&&record.finalscore==="--"?
+														<span style=
+																		{{
+																			"color": '#9A9A9A',
+																			"text-align": "center"
+																		}}>{record.finalscore}</span>
+														:
+														<span style={parseInt(record.finalscore) <= 60 ? {
+															"color": '#747A7F',
+															"text-align": "center"
+														} : parseInt(record.finalscore) < 90 ? {
+															"color": '#FF6800',
+															"text-align": "center"
+														} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+															"color": '#747A7F',
+															"text-align": "center"
+														}}>{record.finalscore}</span>
+												}
+											</Tooltip>
 
-		// search:搜索关键字
-		// order:排序方式：更新时间：update_time，最终成绩：work_score，学号：student_id
-		// b_order:desc：倒序 ， asc：顺序
-		// work_status:0:未提交， 1:按时提交， 2:延时提交，“”不限
-		// course_group:分班情况 [232, 231]， []:不限（空数组）
-		var order = "asc";
-		if (ordervlue === "updated_at") {
-			order = "desc";
-		}
-		var data = {
-			search: "",
-			order: ordervlue,
-			b_order: order,
-			work_status: "",
-			course_group: "",
-			page: page,
-			limit: limit,
-		}
-		axios.post(urll, data).then((result) => {
-			if (result.status === 200) {
-				// console.log("学生未截至未公开的作品列表")
-				// console.log(JSON.stringify(result))
-				this.setState({
-					teacherdata: result.data,
-					task_status: result.data.task_status,
-					course_group_info: result.data.course_group_info,
-					student_works: result.data.student_works,
-					loadingstate: false,
-					jobsettingsdata: result,
-					publish_immediately: result.data.publish_immediately,
-					work_efficiency: result.data.work_efficiency,
-					end_immediately: result.data.end_immediately,
-					code_review: result.data.code_review,
+									}
+               </span>
+					)
+				},
+				{
+					title: '操作',
+					dataIndex: 'operating',
+					key: 'operating',
+					display: 'block',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A'}}>--</span> :
+							<span>
+                       <a style={{"text-align": "center"}} className="color-blue"
+													onClick={() => this.Viewstudenttraininginformationt(record)}>{record.operating}</a>
+        </span>
+					)
+				},
+			],
+			columnss: [
+				{
+					title: '序号',
+					dataIndex: 'number',
+					key: 'number',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span style={{"color": '#07111B', "text-align": "center"}}>{record.number}
+        </span>
+					)
+				},
+				{
+					title: '姓名',
+					dataIndex: 'name',
+					key: 'name',
+					align: 'center',
+					className:'font-14',
+					width:'120px',
+					render: (text, record) => (
+						<span style={{"color": '#07111B', "text-align": "center"}}>{record.name}</span>
+					)
+				},
+				{
+					title: '学号',
+					dataIndex: 'stduynumber',
+					key: 'stduynumber',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span style={{
+							"color": '#9A9A9A',
+							"text-align": "center"
+						}}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}
+        </span>
+					),
+				},
+				{
+					title: '分班',
+					key: 'classroom',
+					dataIndex: 'classroom',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</span>
+					)
+				},
+				{
+					title: '提交状态',
+					dataIndex: 'submitstate',
+					key: 'submitstate',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span style={record.submitstate === "延时提交" ? {
+							"color": '#DD1717',
+							"text-align": "center"
+						} : record.submitstate === "按时提交" ? {"color": '#29BD8B', "text-align": "center"} : {
+							"color": '#747A7F',
+							"text-align": "center"
+						}}>{record.submitstate}
+        </span>
+					)
+
+				},
+				{
+					title: '更新时间',
+					dataIndex: 'updatetime',
+					key: 'updatetime',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</span>
+					),
+				},
+				{
+					title: '实战耗时',
+					dataIndex: 'cost_time',
+					key: 'cost_time',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span style={
+							{
+								"color": '#747A7F',
+								"text-align": "center"
+							}
+						}>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time }
+        </span>
+					)
+
+				},
+				{
+					title: '完成情况',
+					dataIndex: 'completion',
+					key: 'completion',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span>
+
+										<Tooltip  placement="bottom" title={<div>
+											<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
+										</div>}>
+											<span style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count} </span>
+										</Tooltip>
+
+        </span>
+					)
+				},
+				{
+					title: '关卡得分',
+					dataIndex: 'levelscore',
+					key: 'levelscore',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span>
+       	<span style={parseInt(record.levelscore) <= 60 ? {
+					"color": '#747A7F',
+					"text-align": "center"
+				} : parseInt(record.levelscore) < 90 ? {
+					"color": '#FF6800',
+					"text-align": "center"
+				} : parseInt(record.levelscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+					"color": '#747A7F',
+					"text-align": "center"
+				}}>{record.levelscore}</span>
+        </span>
+					)
+				},
+				{
+					title: '效率分',
+					dataIndex: 'efficiencyscore',
+					key: 'efficiencyscore',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span>
+            {
+							record.efficiencyscore&& record.efficiencyscore=== "--"?(
+									this.state.allow_late&&this.state.allow_late===false?
+										<Tooltip placement="bottom" title={<div>
+											<div>作业截止时，系统根据学生在课堂成员中的效率表现自动评分</div>
+										</div>}>
+											<span style={{color:"#9A9A9A"}}>
+												--
+											</span>
+										</Tooltip>
+										:
+										this.state.allow_late&&this.state.allow_late===true?
+											<Tooltip placement="bottom" title={<div>
+												<div>补交结束时，系统根据学生在课堂成员中的效率表现自动评分</div>
+											</div>}>
+												<span style={{color:"#9A9A9A"}}>
+													--
+												</span>
+											</Tooltip>
+											:
+											<span style={{color:"#9A9A9A"}}>
+												--
+											</span>
+								)
+								:
+								<span style={parseInt(record.efficiencyscore) <= 60 ? {
+									"color": '#747A7F',
+									"text-align": "center"
+								} : parseInt(record.efficiencyscore) < 90 ? {
+									"color": '#FF6800',
+									"text-align": "center"
+								} : parseInt(record.efficiencyscore) >= 90 ? {
+									"color": '#DD1717',
+									"text-align": "center"
+								} : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore}</span>
+						}
+
+        </span>
+					)
+				},
+				{
+					title: '最终成绩',
+					dataIndex: 'finalscore',
+					key: 'finalscore',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span>
+									{
+										record.ultimate_score=== true?
+											<Tooltip placement="bottom" title={<div>
+												<div>{record.user_name}{record.user_login}</div>
+												<div>{record.finalscore === "--"?<span>最终调整成绩：0分</span> :<span>最终调整成绩：{record.finalscore}分</span>}</div>
+											</div>}>
+												{
+													record.finalscore&&record.finalscore==="--"?
+														<span style=
+																		{{
+																			"color": '#9A9A9A',
+																			"text-align": "center"
+																		}}>{record.finalscore}</span>
+														:
+														<span style={parseInt(record.finalscore) <= 60 ? {
+															"color": '#747A7F',
+															"text-align": "center"
+														} : parseInt(record.finalscore) < 90 ? {
+															"color": '#FF6800',
+															"text-align": "center"
+														} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+															"color": '#747A7F',
+															"text-align": "center"
+														}}>{record.finalscore}</span>
+												}
+											</Tooltip>
+											:
+											<Tooltip placement="bottom" title={<div>
+												<div>{record.user_name}{record.user_login}</div>
+												<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
+												<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
+												<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
+												<div>{record.finalscore === "--"?<span>最终成绩：0分</span> :<span>最终成绩：{record.finalscore}分</span>}</div>
+											</div>}>
+												{
+													record.finalscore&&record.finalscore==="--"?
+														<span style=
+																		{{
+																			"color": '#9A9A9A',
+																			"text-align": "center"
+																		}}>{record.finalscore}</span>
+														:
+														<span style={parseInt(record.finalscore) <= 60 ? {
+															"color": '#747A7F',
+															"text-align": "center"
+														} : parseInt(record.finalscore) < 90 ? {
+															"color": '#FF6800',
+															"text-align": "center"
+														} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+															"color": '#747A7F',
+															"text-align": "center"
+														}}>{record.finalscore}</span>
+												}
+											</Tooltip>
+
+									}
+               </span>
+					)
+				},
+				{
+					title: '操作',
+					dataIndex: 'operating',
+					key: 'operating',
+					display: 'block',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A'}}>--</span> :
+							<span>
+                       <a style={{"text-align": "center"}} className="color-blue"
+													onClick={() => this.Viewstudenttraininginformationt(record)}>{record.operating}</a>
+        </span>
+					)
+				},
+			],
+		}
+		//
+	}
+
+	componentDidMount() {
+		console.log("componentDidMount");
+		if(this.props.isAdmin() === true){
+			this.tearchar();
+		}else{
+			this.student();
+		}
+	}
+	student=()=>{
+		this.props.triggerRef(this);
+		// var homeworkid = this.props.match.params.homeworkid;
+		// this.Getalistofworks(homeworkid);
+		let query = this.props.location.pathname;
+		const type = query.split('/');
+		this.setState({
+			shixuntypes: type[3]
+		})
+	}
+
+
+	//卸载组件取消倒计时
+	componentWillUnmount() {
+		// clearInterval(this.timer);
+	}
+
+	// 获取作品列表
+	Getalistofworks = (homeworkid) => {
+		// console.log("获取作品列表");
+
+		let urll = `/homework_commons/${homeworkid}/works_list.json`;
+		var data = {
+			search: "",
+			order: "",
+			b_order: "desc",
+			page: 1,
+			limit: 20,
+			work_status: "",
+			course_group: "",
+		}
+		axios.post(urll, data).then((result) => {
+          if(result === undefined){
+          	return
+					}
+
+				if (result.status === 200) {
+					if(this.props.isNotMember()===false) {
+					this.setState({
+						teacherdata: result.data,
+						task_status: result.data.task_status,
+						course_group_info: result.data.course_group_info,
+						student_works: result.data.student_works,
+						jobsettingsdata: result,
+						publish_immediately: result.data.publish_immediately,
+						end_immediately: result.data.end_immediately,
+						id: result.data.id,
+						work_efficiency: result.data.work_efficiency,
+						code_review: result.data.code_review,
+						challenges_count: result.data.challenges_count,
+						view_report: result.data.view_report,
+					})
+						this.props.Getdataback(result,result.data);
+						if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") {
+						this.seacthdata(result.data);
+					 } else {
+						this.seacthdatas(result.data, result.data.student_works);
+					}
+
+				}
+		  	}
+		}).catch((error) => {
+			console.log(error);
+		})
+	}
+
+// 获取作品列表
+	Getalistofworkstwo = (ordervlue, checkedValuesine, checkedValuesineinfo, searchtext, page, limit) => {
+		// console.log("获取作品列表");
+		var homeworkid = this.props.match.params.homeworkid;
+		let urll = `/homework_commons/${homeworkid}/works_list.json`;
+		// console.log(homeworkid);
+
+		// search:搜索关键字
+		// order:排序方式：更新时间：update_time，最终成绩：work_score，学号：student_id
+		// b_order:desc：倒序 ， asc：顺序
+		// work_status:0:未提交， 1:按时提交， 2:延时提交，“”不限
+		// course_group:分班情况 [232, 231]， []:不限（空数组）
+		var order = "asc";
+		if (ordervlue === "updated_at") {
+			order = "desc";
+		}
+		var data = {
+			search: "",
+			order: ordervlue,
+			b_order: order,
+			work_status: "",
+			course_group: "",
+			page: page,
+			limit: limit,
+		}
+		axios.post(urll, data).then((result) => {
+			if (result.status === 200) {
+				// console.log("学生未截至未公开的作品列表")
+				// console.log(JSON.stringify(result))
+				this.setState({
+					teacherdata: result.data,
+					task_status: result.data.task_status,
+					course_group_info: result.data.course_group_info,
+					student_works: result.data.student_works,
+					loadingstate: false,
+					jobsettingsdata: result,
+					publish_immediately: result.data.publish_immediately,
+					work_efficiency: result.data.work_efficiency,
+					end_immediately: result.data.end_immediately,
+					code_review: result.data.code_review,
+					challenges_count:result.data.challenges_count,
+					view_report:result.data.view_report,
+				})
+				this.props.Getdataback(result,result.data);
+				if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") {
+					this.seacthdata(result.data);
+				} else {
+					this.seacthdatas(result.data,result.data.student_works);
+				}
+
+			}
+		}).catch((error) => {
+			console.log(error)
+			this.setState({
+				loadingstate: false
+			})
+		})
+	}
+	TablePagination = (e) => {
+		// console.log(e.current);
+		this.setState({
+			page: e.current
+		})
+
+	}
+
+	seacthdatas = (teacherdata,student_works) => {
+		let {page, limit,work_efficiency} = this.state;
+		let datalist = [];
+		let datalists = [];
+		var styletable = {"display": "none"}
+		var arr =[];
+		for(var i=0;i<this.state.columnsstu.length;i++){
+			var item = this.state.columnsstu[i];
+			if (work_efficiency === false) {
+			if(item.title==="关卡得分"){
+			}
+			else if(item.title==="效率分"){
+			}
+			}
+
+		  if(this.props.isNotMember()===true&&item.title==="学号") {
+
+			}else{
+				arr.push(item);
+			}
+		}
+		let columns2=	arr;
+		var teacherlist = undefined;
+		var teacherlists = undefined;
+		if (teacherdata !== undefined) {
+			// console.log("seacthdata设置数据")
+			// console.log(this.state.teacherdata.id )
+			if (teacherdata.id === undefined) {
+				this.setState({
+					data: [],
+					teacherlist: undefined,
+					loadingstate: false,
+					styletable: styletable,
+				})
+
+			} else {
+				console.log(teacherdata)
+				if (teacherdata.id !== undefined || teacherdata.id !== null || teacherdata.id !== "") {
+					// console.log("seacthdata设置数据1")
+					// console.log(this.state.teacherdata )
+					var timedata = moment(teacherdata.update_time).format('YYYY-MM-DD HH:mm');
+					datalist.push({
+						myid: teacherdata.id,
+						number: 1,
+						name: teacherdata.user_name,
+						stduynumber: teacherdata.student_id,
+						classroom: teacherdata.group_name,
+						cost_time: teacherdata.cost_time,
+						submitstate: teacherdata.work_status === 0 ? "未提交" : teacherdata.work_status === 1 ? "按时提交" : teacherdata.work_status === 2 ? "延时提交" : "未提交",
+						// updatetime:this.state.teacherdata.student_works[i].update_time,
+						// updatetime:"",
+						updatetime: timedata === "Invalid date" ? "--" : timedata,
+						completion: teacherdata.complete_count === null ? "0" :teacherdata.complete_count === undefined ? "0": teacherdata.complete_count,
+						levelscore: teacherdata.final_score,
+						efficiencyscore: teacherdata.eff_score,
+						finalscore: teacherdata.work_score,
+						operating: "查看",
+						late_penalty: teacherdata.late_penalty=== null?"0":teacherdata.late_penalty === undefined?"0":teacherdata.late_penalty,
+						ultimate_score:teacherdata.ultimate_score,
+						user_name: teacherdata.user_name,
+						user_login: teacherdata.user_login,
+					})
+
+					// }
+					var teacherlist = {  //分页
+						total: teacherdata.student_works.length, //数据总数量
+						pageSize: teacherdata.student_works.length,  //一页显示几条
+						current: this.state.page,
+					}
+					styletable = {"display": "block",}
+				} else {
+					// console.log("seacthdata设置数据2")
+					teacherlist = undefined;
+
+				}
+			}
+
+		}
+
+
+		if (student_works !== undefined) {
+
+			for (var i = 0; i <student_works.length; i++) {
+
+				var timedata = moment(student_works[i].update_time).format('YYYY-MM-DD HH:mm');
+				datalists.push({
+					myid: student_works[i].id,
+					number: (parseInt(page) - 1) * parseInt(limit) + (i + 1),
+					name: student_works[i].user_name,
+					stduynumber: student_works[i].student_id,
+					classroom: student_works[i].group_name,
+					cost_time: student_works[i].cost_time,
+					submitstate: student_works[i].work_status === 0 ? "未提交" : student_works[i].work_status === 1 ? "按时提交" : student_works[i].work_status === 2 ? "延时提交" : "未提交",
+					// updatetime:this.state.teacherdata.student_works[i].update_time,
+					// updatetime:"",
+					updatetime: timedata === "Invalid date" ? "--" : timedata,
+					completion: student_works[i].complete_count === null ? "0" :student_works[i].complete_count === undefined ? "0":student_works[i].complete_count,
+					levelscore: student_works[i].final_score,
+					efficiencyscore: student_works[i].eff_score==="0.0"?"--":student_works[i].eff_score==="0"?"--":student_works[i].eff_score,
+					finalscore:student_works[i].work_score,
+					operating: "查看",
+					late_penalty: student_works[i].late_penalty=== null?"0":student_works[i].late_penalty === undefined?"0":student_works[i].late_penalty,
+					ultimate_score:student_works[i].ultimate_score,
+					user_name: student_works[i].user_name,
+					user_login: student_works[i].user_login,
+				})
+
+			}
+
+		}
+		console.log("554");
+		console.log(columns2);
+
+
+		this.setState({
+			data: datalist,
+			datas: datalists,
+			teacherlist: teacherlist,
+			teacherlists: teacherlists,
+			loadingstate: false,
+			styletable: styletable,
+			columnsstu:columns2,
+		})
+	}
+	// 设置数据
+	seacthdata = (teacherdata) => {
+		let datalist = [];
+
+
+		var arr =[];
+		for(var i=0;i<this.state.columnsstu.length;i++){
+			var item = this.state.columnsstu[i];
+			if (this.state.work_efficiency === false) {
+				if (item.title === "关卡得分") {
+
+				} else if (item.title === "效率分") {
+
+				}
+			}
+		  if(this.props.isNotMember()===true&&item.title==="学号") {
+
+			}else{
+				arr.push(item);
+			}
+		}
+		let columns2=	arr;
+
+		if (teacherdata !== undefined) {
+			// console.log("seacthdata设置数据")
+			// console.log(this.state.teacherdata.id )
+			if (teacherdata.id === undefined) {
+				this.setState({
+					data: [],
+					teacherlist: undefined,
+					loadingstate: false,
+				})
+				return
+			}
+			// console.log(this.state.teacherdata )
+			if (teacherdata.id !== undefined || teacherdata.id !== null ||teacherdata.id !== "") {
+				// console.log("seacthdata设置数据1")
+				// console.log(this.state.teacherdata )
+				var timedata = moment(teacherdata.update_time).format('YYYY-MM-DD HH:mm');
+				datalist.push({
+					myid: teacherdata.id,
+					number: 1,
+					name: teacherdata.user_name,
+					stduynumber: teacherdata.student_id,
+					classroom: teacherdata.group_name,
+					cost_time: teacherdata.cost_time,
+					submitstate: teacherdata.work_status === 0 ? "未提交" : teacherdata.work_status === 1 ? "按时提交" : teacherdata.work_status === 2 ? "延时提交" : "未提交",
+					// updatetime:this.state.teacherdata.student_works[i].update_time,
+					// updatetime:"",
+					updatetime: timedata === "Invalid date" ? "--" : timedata,
+					completion: teacherdata.complete_count === null ? "0" :teacherdata.complete_count === undefined ? "0": teacherdata.complete_count,
+					levelscore: teacherdata.final_score,
+					efficiencyscore: teacherdata.eff_score,
+					finalscore: teacherdata.work_score,
+					operating: "查看",
+					late_penalty: teacherdata.late_penalty=== null?"0":teacherdata.late_penalty === undefined?"0":teacherdata.late_penalty,
+					ultimate_score:teacherdata.ultimate_score,
+					user_name: teacherdata.user_name,
+					user_login: teacherdata.user_login,
+				})
+
+				// }
+				var teacherlist = {  //分页
+					total: teacherdata.student_works.length, //数据总数量
+					pageSize: teacherdata.student_works.length,  //一页显示几条
+					current: this.state.page,
+				}
+			} else {
+				// console.log("seacthdata设置数据2")
+				var teacherlist = undefined;
+
+			}
+		} else {
+			// console.log("seacthdata设置数据3")
+
+			var teacherlist = undefined;
+		}
+		// console.log("datalistdatalist文件");
+		// console.log(datalist);
+		// console.log("645");
+		// console.log(columns2);
+		this.setState({
+			data: datalist,
+			teacherlist: teacherlist,
+			loadingstate: false,
+			columnsstu:columns2,
+		})
+	}
+	// 查看学员实训信息
+	Viewstudenttraininginformation = (e) => {
+		// console.log("Listofworksstudentone.js");
+		// console.log(e);
+		this.setState({
+			userids: e.myid,
+		})
+		this.viewtraining(e.myid);
+	}
+	viewtraining = (userids) => {
+		// console.log("viewtraining")
+		// console.log(userids)
+		// console.log(JSON.stringify(this.props.user))
+		var url = `/student_works/${userids}/shixun_work.json`;
+		axios.get(url).then((result) => {
+			if (result.status === 200) {
+				// console.log("Listofworksstudentone.js")
+				// console.log(JSON.stringify(result))
+				let datalist = [];
+				var game_list = result.data.game_list
+				var boolgalist=true;
+				var experience=0;
+				for (var i = 0; i < game_list.length; i++) {
+
+					datalist.push({
+						number: "第" + game_list[i].position + "关",
+						name: moment(game_list[i].end_time).format('YYYY-MM-DD HH:mm'),
+						stduynumber: game_list[i].cost_time,
+						classroom: game_list[i].score,
+						complete_status: game_list[i].complete_status,
+					})
+					experience=game_list[i].score+experience;
+
+					if(game_list[i].complete_status === 2 || game_list[i].complete_status===3){
+						boolgalist=false;
+					}
+				}
+				// console.log("viewtraining");
+				// console.log(datalist);
+				// console.log(JSON.stringify(datalist));
+				this.setState({
+					viewtrainingdata: result.data,
+					visibles: true,
+					game_list: datalist,
+					experience:experience,
+					boolgalist:boolgalist,
+				})
+			}
+		}).catch((error) => {
+
+		})
+	}
+
+	// 关闭调分
+	cancelModulationModels = () => {
+		this.setState({visibles: false})
+	}
+	//排序
+	funorder = (e) => {
+		if (e === "updated_at") {
+			// 时间
+			// 时间排序是从小到大
+			this.setState({
+				order: "updated_at",
+				loadingstate: true,
+			})
+			this.Getalistofworkstwo(e, "", "", "", this.state.page, this.state.limit);
+		}
+
+		if (e === "work_score") {
+			// 成绩
+			//成绩排序是从大到小
+			this.setState({
+				order: "work_score",
+				loadingstate: true,
+			})
+			this.Getalistofworkstwo(e, "", "", "", this.state.page, this.state.limit);
+		}
+
+		if (e === "student_id") {
+			//学号
+			//学号排序是从大到小
+			this.setState({
+				order: "student_id",
+				loadingstate: true,
+			})
+			this.Getalistofworkstwo(e, "", "", "", this.state.page, this.state.limit);
+		}
+	}
+
+	Startsorting = (ordervlue, checkedValuesine, checkedValuesineinfo, searchtext, page, limit) => {
+		// console.log("获取作品列表Listofworksstudenttwo");
+		var homeworkid = this.props.match.params.homeworkid;
+		let urll = `/homework_commons/${homeworkid}/works_list.json`;
+		// console.log(homeworkid);
+
+		// search:搜索关键字
+		// order:排序方式：更新时间：update_time，最终成绩：work_score，学号：student_id
+		// b_order:desc：倒序 ， asc：顺序
+		// work_status:0:未提交， 1:按时提交， 2:延时提交，“”不限
+		// course_group:分班情况 [232, 231]， []:不限（空数组）
+		var order = "asc";
+		if (ordervlue === "updated_at") {
+			order = "desc";
+		}
+		var data = {
+			search: "",
+			order: ordervlue,
+			b_order: order,
+			work_status: "",
+			course_group: "",
+			page: page,
+			limit: limit,
+
+		}
+		axios.post(urll, data).then((result) => {
+			if (result !== undefined) {
+				// console.log("学生公开的作品列表")
+				// console.log(JSON.stringify(result))
+				if(this.props.isNotMember()===false) {
+				this.setState({
+					teacherdata: result.data,
+					task_status: result.data.task_status,
+					course_group_info: result.data.course_group_info,
+					student_works: result.data.student_works,
+					loadingstate: false,
+					jobsettingsdata: result,
+					publish_immediately: result.data.publish_immediately,
+					work_efficiency: result.data.work_efficiency,
+					end_immediately: result.data.end_immediately,
+					code_review: result.data.code_review,
 					challenges_count:result.data.challenges_count,
 					view_report:result.data.view_report,
 				})
-				this.props.Getdataback(result,result.data);
-				if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") {
+					this.props.Getdataback(result,result.data);
 					this.seacthdata(result.data);
-				} else {
-					this.seacthdatas(result.data,result.data.student_works);
-				}
-
+			}
 			}
 		}).catch((error) => {
 			console.log(error)
@@ -460,115 +1400,214 @@ class Listofworksstudentone extends Component {
 				loadingstate: false
 			})
 		})
+
 	}
+
 	TablePagination = (e) => {
 		// console.log(e.current);
+		var teacherlists = {  //分页
+			total: this.state.student_works.length, //数据总数量
+			pageSize: 10,  //一页显示几条
+			current: e.current,
+		}
 		this.setState({
-			page: e.current
+			page: e.current,
+			teacherlists: teacherlists
 		})
 
 	}
 
-	seacthdatas = (teacherdata,student_works) => {
-		let {page, limit,work_efficiency} = this.state;
-		let datalist = [];
-		let datalists = [];
-		var styletable = {"display": "none"}
-		var arr =[];
-		for(var i=0;i<this.state.columns.length;i++){
-			var item = this.state.columns[i];
-			if (work_efficiency === false) {
-			if(item.title==="关卡得分"){
-			}
-			else if(item.title==="效率分"){
-			}
-			}
 
-		  if(this.props.isNotMember()===true&&item.title==="学号") {
+	paginationonChanges = (pageNumber) => {
+		this.setState({
+			page: pageNumber,
+			loadingstate: true,
+		})
+		this.Getalistofworkstwo(this.state.order, "", "", "", pageNumber, this.state.limit);
+	}
+   //计算成绩
+	setComputeTime=()=>{
+		let {teacherdata}=this.state;
+		this.setState({
+			computeTimetype:false
+		})
+		let homeworkid = this.props.match.params.homeworkid;
+		let url = "/homework_commons/"+homeworkid+"/update_student_score.json?shixun_id="+teacherdata.shixun_id;
 
-			}else{
-				arr.push(item);
-			}
+		axios.get(url).then((response) => {
+			this.props.showNotification(`${response.data.message}`);
+			// var homeworkid = this.props.match.params.homeworkid;
+			this.Getalistofworks(homeworkid);
+			// this.Getalistofworkstwo("", "", "", "", 1, 20);
+		}).catch((error) => {
+			console.log(error)
+		});
+
+	}
+
+
+	/////////老师操作
+	tearchar=()=>{
+		this.props.triggerRef(this)
+		var homeworkid = this.props.match.params.homeworkid;
+		// console.log(homeworkid)
+		// this.Gettitleinformation(homeworkid);
+		this.Getalistofworkst(homeworkid);
+		let query = this.props.location.pathname;
+		const type = query.split('/');
+		this.setState({
+			shixuntypes: type[3]
+		})
+	}
+
+	isupdatas = () => {
+		var homeworkid = this.props.match.params.homeworkid;
+		// this.Gettitleinformation(homeworkid);
+		this.Getalistofworkst(homeworkid);
+	}
+
+	// 获取作品列表
+	Getalistofworkst = (homeworkid) => {
+		// console.log("获取作品列表");7009
+
+		let urll = `/homework_commons/${homeworkid}/works_list.json`;
+		// console.log(homeworkid);
+
+		// search:搜索关键字
+		// order:排序方式：更新时间：update_time，最终成绩：work_score，学号：student_id
+		// b_order:desc：倒序 ， asc：顺序
+		// work_status:0:未提交， 1:按时提交， 2:延时提交，“”不限
+		// course_group:分班情况 [232, 231]， []:不限（空数组）
+		var data = {
+			search: "",
+			order: this.state.orders,
+			b_order: "desc",
+			work_status: "",
+			course_group: "",
+			page:1,
+			limit:20,
 		}
-		let columns2=	arr;
-		var teacherlist = undefined;
-		var teacherlists = undefined;
-		if (teacherdata !== undefined) {
-			// console.log("seacthdata设置数据")
-			// console.log(this.state.teacherdata.id )
-			if (teacherdata.id === undefined) {
-				this.setState({
-					data: [],
-					teacherlist: undefined,
-					loadingstate: false,
-					styletable: styletable,
-				})
+		axios.post(urll, data).then((result) => {
 
-			} else {
-				console.log(teacherdata)
-				if (teacherdata.id !== undefined || teacherdata.id !== null || teacherdata.id !== "") {
-					// console.log("seacthdata设置数据1")
-					// console.log(this.state.teacherdata )
-					var timedata = moment(teacherdata.update_time).format('YYYY-MM-DD HH:mm');
-					datalist.push({
-						myid: teacherdata.id,
-						number: 1,
-						name: teacherdata.user_name,
-						stduynumber: teacherdata.student_id,
-						classroom: teacherdata.group_name,
-						cost_time: teacherdata.cost_time,
-						submitstate: teacherdata.work_status === 0 ? "未提交" : teacherdata.work_status === 1 ? "按时提交" : teacherdata.work_status === 2 ? "延时提交" : "未提交",
-						// updatetime:this.state.teacherdata.student_works[i].update_time,
-						// updatetime:"",
-						updatetime: timedata === "Invalid date" ? "--" : timedata,
-						completion: teacherdata.complete_count === null ? "0" :teacherdata.complete_count === undefined ? "0": teacherdata.complete_count,
-						levelscore: teacherdata.final_score,
-						efficiencyscore: teacherdata.eff_score,
-						finalscore: teacherdata.work_score,
-						operating: "查看",
-						late_penalty: teacherdata.late_penalty=== null?"0":teacherdata.late_penalty === undefined?"0":teacherdata.late_penalty,
-						ultimate_score:teacherdata.ultimate_score,
-						user_name: teacherdata.user_name,
-						user_login: teacherdata.user_login,
+			if(this.props.isNotMember()===false){
+				if (result !== undefined) {
+					// console.log(url)
+					// console.log("作品列表6789077")
+					// console.log(JSON.stringify(result))
+					this.setState({
+						teacherdata: result.data,
+						task_status: result.data.task_status,
+						allow_late:result.data.allow_late,
+						course_group_info: result.data.course_group_info,
+						loadingstate: false,
+						jobsettingsdata: result,
+						publish_immediately: result.data.publish_immediately,
+						work_efficiency: result.data.work_efficiency,
+						end_immediately: result.data.end_immediately,
+						code_review: result.data.code_review,
+						challenges_count:result.data.challenges_count,
 					})
+					this.props.Getdataback(result,result.data);
+					this.seacthdatat(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,1);
+				}		}
+		}).catch((error) => {
+			console.log(error)
+			this.setState({
+				loadingstate: false,
+			})
+		})
+	}
 
-					// }
-					var teacherlist = {  //分页
-						total: teacherdata.student_works.length, //数据总数量
-						pageSize: teacherdata.student_works.length,  //一页显示几条
-						current: this.state.page,
-					}
-					styletable = {"display": "block",}
-				} else {
-					// console.log("seacthdata设置数据2")
-					teacherlist = undefined;
+	//开始排序操作
+	Startsortingt = (ordervlue, checkedValuesine, checkedValuesineinfo, searchtext, page, limit) => {
+		//要提交的作品状态checkedValuesine
+		//要提交的分班状态checkedValuesineinfo
+		//searchtext 输入的姓名和学号
+		//order 排序时间
+		//debug=t 是老师的意思
+		// console.log(ordervlue)7009
 
+		var homeworkid = this.props.match.params.homeworkid;
+		let urll = `/homework_commons/${homeworkid}/works_list.json?`;
+		var order = "asc";
+		if (ordervlue === "update_time") {
+			order = "desc";
+		}
+		var checkedValuesines = checkedValuesine;
+		var checkedValuesineinfos = checkedValuesineinfo;
+		var searchtexts = searchtext
+		var data = {
+			search: searchtexts,
+			order: ordervlue,
+			b_order: order,
+			work_status: checkedValuesines,
+			course_group: checkedValuesineinfos,
+			page: page,
+			limit: limit,
+		}
+		// console.log("Startsorting");
+		// console.log(data);
+		axios.post(urll, data).then((result) => {
+			// if (result.status === 200) {/]
+			// console.log(url)
+			// console.log("作品列表______________________")
+			// console.log(JSON.stringify(result))
+			if(this.props.isNotMember()===false){
+				if (result !== undefined) {
+					this.setState({
+						teacherdata: result.data,
+						task_status: result.data.task_status,
+						course_group_info: result.data.course_group_info,
+						loadingstate: false,
+						jobsettingsdata: result,
+						allow_late:result.data.allow_late,
+						publish_immediately: result.data.publish_immediately,
+						work_efficiency: result.data.work_efficiency,
+						end_immediately: result.data.end_immediately,
+						code_review: result.data.code_review,
+						challenges_count:result.data.challenges_count,
+					})
+					this.props.Getdataback(result,result.data);
+					this.seacthdatat(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,page);
 				}
 			}
+			// }
+		}).catch((error) => {
+			console.log(error)
+			this.setState({
+				loadingstate: false
+			})
+		})
 
-		}
 
 
-		if (student_works !== undefined) {
+	}
 
-			for (var i = 0; i <student_works.length; i++) {
 
+	// 设置数据
+	seacthdatat = (teacherdata,student_works,work_efficiency,course_group_info) => {
+		let {page, limit} = this.state;
+		let datalist = [];
+		let columns = this.state.columns;
+		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');
-				datalists.push({
+				datalist.push({
 					myid: student_works[i].id,
 					number: (parseInt(page) - 1) * parseInt(limit) + (i + 1),
 					name: student_works[i].user_name,
 					stduynumber: student_works[i].student_id,
 					classroom: student_works[i].group_name,
 					cost_time: student_works[i].cost_time,
-					submitstate: student_works[i].work_status === 0 ? "未提交" : student_works[i].work_status === 1 ? "按时提交" : student_works[i].work_status === 2 ? "延时提交" : "未提交",
+					submitstate:student_works[i].work_status === 0 ? "未提交" : student_works[i].work_status === 1 ? "按时提交" :student_works[i].work_status === 2 ? "延时提交" : "未提交",
 					// updatetime:this.state.teacherdata.student_works[i].update_time,
 					// updatetime:"",
 					updatetime: timedata === "Invalid date" ? "--" : timedata,
-					completion: student_works[i].complete_count === null ? "0" :student_works[i].complete_count === undefined ? "0":student_works[i].complete_count,
+					completion: student_works[i].complete_count === null ? "0" :student_works[i].complete_count === undefined ? "0": student_works[i].complete_count,
 					levelscore: student_works[i].final_score,
 					efficiencyscore: student_works[i].eff_score==="0.0"?"--":student_works[i].eff_score==="0"?"--":student_works[i].eff_score,
-					finalscore:student_works[i].work_score,
+					finalscore: student_works[i].work_score,
 					operating: "查看",
 					late_penalty: student_works[i].late_penalty=== null?"0":student_works[i].late_penalty === undefined?"0":student_works[i].late_penalty,
 					ultimate_score:student_works[i].ultimate_score,
@@ -578,126 +1617,309 @@ class Listofworksstudentone extends Component {
 
 			}
 
-		}
-		console.log("554");
-		console.log(columns2);
+			var teacherlist = {  //分页
+				total: student_works.length, //数据总数量
+				pageSize: 20,  //一页显示几条
+				current: page,
+			}
+			if (work_efficiency === false) {
+				if(JSON.stringify(course_group_info) === "[]"|| course_group_info === undefined||course_group_info === null){
+					//这里没有分班 没有 关卡得分 没有效率分
+					for(var i=0;i< this.state.columns.length;i++){
+						var item =  this.state.columns[i];
+						if(item.title==="分班"){
+						}
+						else if(item.title==="关卡得分"){
+						}
+						else if(item.title==="效率分"){
+						}
+						else if(this.props.isNotMember()===true&&item.title==="学号") {
 
+						}else{
+							columns2.push(item);
+						}
+					}
 
-		this.setState({
-			data: datalist,
-			datas: datalists,
-			teacherlist: teacherlist,
-			teacherlists: teacherlists,
-			loadingstate: false,
-			styletable: styletable,
-			columns:columns2,
-		})
-	}
-	// 设置数据
-	seacthdata = (teacherdata) => {
-		let datalist = [];
 
+				}else{
+					if(course_group_info.length < 2){
+						for(var i=0;i< this.state.columns.length;i++){
+							var item =  this.state.columns[i];
+							if(item.title==="分班"){
+							}
+							else if(item.title==="关卡得分"){
+							}
+							else if(item.title==="效率分"){
+							}
+							else if(this.props.isNotMember()===true&&item.title==="学号") {
 
-		var arr =[];
-		for(var i=0;i<this.state.columns.length;i++){
-			var item = this.state.columns[i];
-			if (this.state.work_efficiency === false) {
-				if (item.title === "关卡得分") {
+							}else{
+								columns2.push(item);
+							}
+						}
 
-				} else if (item.title === "效率分") {
+					}else {
+						for(var i=0;i< this.state.columns.length;i++){
+							var item =  this.state.columns[i];
+							if(item.title==="关卡得分"){
+							}
+							else if(item.title==="效率分"){
+							}
+							else if(this.props.isNotMember()===true&&item.title==="学号") {
 
+							}else{
+								columns2.push(item);
+							}
+						}
+					}
 				}
-			}
-		  if(this.props.isNotMember()===true&&item.title==="学号") {
+			}else {
+				if(JSON.stringify(course_group_info) === "[]"|| course_group_info === undefined || course_group_info === null){
 
-			}else{
-				arr.push(item);
-			}
-		}
-		let columns2=	arr;
 
-		if (teacherdata !== undefined) {
-			// console.log("seacthdata设置数据")
-			// console.log(this.state.teacherdata.id )
-			if (teacherdata.id === undefined) {
-				this.setState({
-					data: [],
-					teacherlist: undefined,
-					loadingstate: false,
-				})
-				return
-			}
-			// console.log(this.state.teacherdata )
-			if (teacherdata.id !== undefined || teacherdata.id !== null ||teacherdata.id !== "") {
-				// console.log("seacthdata设置数据1")
-				// console.log(this.state.teacherdata )
-				var timedata = moment(teacherdata.update_time).format('YYYY-MM-DD HH:mm');
-				datalist.push({
-					myid: teacherdata.id,
-					number: 1,
-					name: teacherdata.user_name,
-					stduynumber: teacherdata.student_id,
-					classroom: teacherdata.group_name,
-					cost_time: teacherdata.cost_time,
-					submitstate: teacherdata.work_status === 0 ? "未提交" : teacherdata.work_status === 1 ? "按时提交" : teacherdata.work_status === 2 ? "延时提交" : "未提交",
-					// updatetime:this.state.teacherdata.student_works[i].update_time,
-					// updatetime:"",
-					updatetime: timedata === "Invalid date" ? "--" : timedata,
-					completion: teacherdata.complete_count === null ? "0" :teacherdata.complete_count === undefined ? "0": teacherdata.complete_count,
-					levelscore: teacherdata.final_score,
-					efficiencyscore: teacherdata.eff_score,
-					finalscore: teacherdata.work_score,
-					operating: "查看",
-					late_penalty: teacherdata.late_penalty=== null?"0":teacherdata.late_penalty === undefined?"0":teacherdata.late_penalty,
-					ultimate_score:teacherdata.ultimate_score,
-					user_name: teacherdata.user_name,
-					user_login: teacherdata.user_login,
-				})
+					for(var i=0;i< this.state.columns.length;i++){
+						var item =  this.state.columns[i];
+						if(item.title==="分班"){
+						}
+						else if(this.props.isNotMember()===true&&item.title==="学号") {
 
-				// }
-				var teacherlist = {  //分页
-					total: teacherdata.student_works.length, //数据总数量
-					pageSize: teacherdata.student_works.length,  //一页显示几条
-					current: this.state.page,
-				}
-			} else {
-				// console.log("seacthdata设置数据2")
-				var teacherlist = undefined;
+						}else{
+							columns2.push(item);
+						}
+					}
+
+
+
+
+				}else {
+					if(course_group_info.length < 2) {
+						for(var i=0;i< this.state.columns.length;i++){
+							var item =  this.state.columns[i];
+							if(item.title==="分班"){
+							}
+							else if(this.props.isNotMember()===true&&item.title==="学号") {
 
+							}else{
+								columns2.push(item);
+							}
+						}
+					}
+					columns2=this.state.columnss;
+				}
 			}
-		} else {
-			// console.log("seacthdata设置数据3")
 
+		} else {
 			var teacherlist = undefined;
 		}
-		// console.log("datalistdatalist文件");
-		// console.log(datalist);
-		// console.log("645");
-		// console.log(columns2);
 		this.setState({
 			data: datalist,
 			teacherlist: teacherlist,
+			columns: columns2,
 			loadingstate: false,
-			columns:columns2,
 		})
 	}
+	//作品状态
+	funtaskstatust = (checkedValues, data) => {
+
+		if (JSON.stringify(checkedValues) === "[]") {
+			// console.log(checkedValues);
+			this.setState({
+				unlimited: 0,
+				course_groupyslstwo: [],
+				loadingstate: true,
+				page:1,
+			})
+			this.Startsortingt(this.state.orders, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
+		} else if (checkedValues.length === data.length) {
+			this.setState({
+				unlimited: 0,
+				course_groupyslstwo: [],
+				loadingstate: true,
+				page:1,
+			})
+			this.Startsortingt(this.state.orders, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
+		} else {
+			// console.log(checkedValues);
+			this.setState({
+				course_groupyslstwo: checkedValues,
+				unlimited: 1,
+				loadingstate: true,
+				page:1,
+			})
+			this.Startsortingt(this.state.orders, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
+		}
+
+	}
+	//作品状态2
+	funtaskstatustwot = (checkedValues, data) => {
+		// console.log("funtaskstatustwo");
+		// console.log(checkedValues);
+		if (JSON.stringify(checkedValues) === "[]") {
+			// console.log(checkedValues);
+			this.setState({
+				unlimitedtwo: 1,
+				course_groupysls: undefined,
+				checkedValuesineinfo:[],
+				loadingstate: true,
+				page: 1,
+			})
+			this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, checkedValues, this.state.searchtext, 1, this.state.limit);
+		} else if (checkedValues.length === data.length) {
+			this.setState({
+				unlimitedtwo: 1,
+				course_groupysls: undefined,
+				checkedValuesineinfo:[],
+				loadingstate: true,
+				page: 1,
+			})
+			this.Startsortingt(this.state.orders, this.state.checcourse_groupyslstwokedValuesine, checkedValues, this.state.searchtext, 1, this.state.limit);
+		} else {
+			this.setState({
+				checkedValuesineinfo: checkedValues,
+				course_groupysls: checkedValues,
+				unlimitedtwo: 0,
+				loadingstate: true,
+				page: 1,
+			})
+			this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, checkedValues, this.state.searchtext, 1, this.state.limit);
+
+
+		}
+
+	}
+	//搜索学生 文字输入
+	inputSearchValuest = (e) => {
+		// console.log(e.target.value)
+		if (e.target.value === "") {
+			this.setState({
+				searchtext: undefined
+			})
+		} else {
+			this.setState({
+				searchtext: e.target.value
+			})
+		}
+
+	}
+
+	//搜索学生按钮输入
+	searchValuest = (value) => {
+		//点击直接搜索
+		//    if(value === ""){
+		//        message.error("请输入姓名或学号搜索");
+		//        return
+		//    }
+		this.setState({
+			loadingstate: true
+		})
+		this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, value, this.state.page, this.state.limit);
+		// console.log(value)
+
+
+	}
+
+	// 输入关键字后按回车，自动提交
+	onSearchKeywordKeyUpt = (e) => {
+		if (e.keyCode === 13) {
+			// this.onSearch();
+			// console.log("使用了回车键");
+			this.setState({
+				loadingstate: true
+			})
+			this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
+		}
+	}
+	//排序
+	funordert = (e) => {
+		if (e === "update_time") {
+			// 时间
+			// 时间排序是从小到大
+			this.setState({
+				orders: "update_time",
+				loadingstate: true,
+			})
+			this.Startsortingt("update_time", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
+		}
+
+		if (e === "work_score") {
+			// 成绩
+			//成绩排序是从大到小
+			this.setState({
+				orders: "work_score",
+				loadingstate: true,
+			})
+			this.Startsortingt("work_score", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
+		}
+
+		if (e === "student_id") {
+			//学号
+			//学号排序是从大到小
+			this.setState({
+				order: "student_id",
+				loadingstate: true,
+			})
+			this.Startsortingt("student_id", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
+		}
+	}
+
+
+	// 调分
+
 	// 查看学员实训信息
-	Viewstudenttraininginformation = (e) => {
-		// console.log("Listofworksstudentone.js");
+	Viewstudenttraininginformationt = (e) => {
+		// console.log("Viewstudenttraininginformation");
 		// console.log(e);
 		this.setState({
-			userids: e.myid,
+			userids: e.myid,
+		})
+		this.viewtrainingt(e.myid);
+	}
+	// 关闭调分
+	cancelModulationModels = () => {
+		this.setState({visibles: false})
+	}
+	// 关闭查看
+	cancelModulationModel = () => {
+		this.setState({visible: false})
+	}
+	// 调分
+	Viewstudenttraininginformations = (e) => {
+		// console.log("Viewstudenttraininginformations2");
+		// console.log(e.myid);
+		this.setState({
+			visible: true,
+			userid: e.myid,
+			// Tune：
 		})
-		this.viewtraining(e.myid);
 	}
-	viewtraining = (userids) => {
-		// console.log("viewtraining")
-		// console.log(userids)
+	//确定
+	saveModulationModal = (value, num) => {
+		var userid = this.state.userid;
+		const url = `/student_works/${userid}/adjust_score.json`;
+		// console.log(url);
+		axios.post(url, {
+				score: num,
+				comment: value
+			})
+			.then((response) => {
+				if (response.data.status == '0') {
+					this.setState({visible: false});
+					this.props.showNotification(`调分成功`);
+
+					this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
+				}
+			})
+			.catch(function (error) {
+				console.log(error);
+			});
+	}
+
+	viewtrainingt = (userids) => {
 		// console.log(JSON.stringify(this.props.user))
 		var url = `/student_works/${userids}/shixun_work.json`;
 		axios.get(url).then((result) => {
 			if (result.status === 200) {
-				// console.log("Listofworksstudentone.js")
+				// console.log("TraineetraininginformationModal.js")
 				// console.log(JSON.stringify(result))
 				let datalist = [];
 				var game_list = result.data.game_list
@@ -717,6 +1939,7 @@ class Listofworksstudentone extends Component {
 					if(game_list[i].complete_status === 2 || game_list[i].complete_status===3){
 						boolgalist=false;
 					}
+
 				}
 				// console.log("viewtraining");
 				// console.log(datalist);
@@ -734,148 +1957,533 @@ class Listofworksstudentone extends Component {
 		})
 	}
 
-	// 关闭调分
-	cancelModulationModels = () => {
-		this.setState({visibles: false})
-	}
-	//排序
-	funorder = (e) => {
-		if (e === "updated_at") {
-			// 时间
-			// 时间排序是从小到大
-			this.setState({
-				order: "updated_at",
-				loadingstate: true,
-			})
-			this.Getalistofworkstwo(e, "", "", "", this.state.page, this.state.limit);
-		}
-
-		if (e === "work_score") {
-			// 成绩
-			//成绩排序是从大到小
-			this.setState({
-				order: "work_score",
-				loadingstate: true,
-			})
-			this.Getalistofworkstwo(e, "", "", "", this.state.page, this.state.limit);
-		}
 
-		if (e === "student_id") {
-			//学号
-			//学号排序是从大到小
-			this.setState({
-				order: "student_id",
-				loadingstate: true,
-			})
-			this.Getalistofworkstwo(e, "", "", "", this.state.page, this.state.limit);
-		}
-	}
+	//立即发布
+	homeworkstart = () => {
+		let homeworkid = this.props.match.params.homeworkid;
+		let url = "/homework_commons/" + homeworkid + "/publish_groups.json";
 
-	Startsorting = (ordervlue, checkedValuesine, checkedValuesineinfo, searchtext, page, limit) => {
-		// console.log("获取作品列表Listofworksstudenttwo");
-		var homeworkid = this.props.match.params.homeworkid;
-		let urll = `/homework_commons/${homeworkid}/works_list.json`;
-		// console.log(homeworkid);
 
-		// search:搜索关键字
-		// order:排序方式：更新时间：update_time，最终成绩：work_score，学号：student_id
-		// b_order:desc：倒序 ， asc：顺序
-		// work_status:0:未提交， 1:按时提交， 2:延时提交，“”不限
-		// course_group:分班情况 [232, 231]， []:不限（空数组）
-		var order = "asc";
-		if (ordervlue === "updated_at") {
-			order = "desc";
-		}
-		var data = {
-			search: "",
-			order: ordervlue,
-			b_order: order,
-			work_status: "",
-			course_group: "",
-			page: page,
-			limit: limit,
+		axios.get(url).then((response) => {
 
-		}
-		axios.post(urll, data).then((result) => {
-			if (result !== undefined) {
-				// console.log("学生公开的作品列表")
-				// console.log(JSON.stringify(result))
-				if(this.props.isNotMember()===false) {
+			if (response.status === 200) {
+				let starttime = this.props.getNowFormatDates(1);
+				let endtime = this.props.getNowFormatDates(2);
 				this.setState({
-					teacherdata: result.data,
-					task_status: result.data.task_status,
-					course_group_info: result.data.course_group_info,
-					student_works: result.data.student_works,
-					loadingstate: false,
-					jobsettingsdata: result,
-					publish_immediately: result.data.publish_immediately,
-					work_efficiency: result.data.work_efficiency,
-					end_immediately: result.data.end_immediately,
-					code_review: result.data.code_review,
-					challenges_count:result.data.challenges_count,
-					view_report:result.data.view_report,
+					modalname: "立即发布",
+					modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
+					svisible: true,
+					Topval:"学生将立即收到作业",
+					// Botvalleft:"暂不发布",
+					Botval:`本操作只对"未发布"的分班有效`,
+					starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
+					endtime: "截止时间：" + endtime,
+					starttimes:starttime,
+					typs:"start",
+					Cancelname: "暂不发布",
+					Savesname: "立即发布",
+					Cancel: this.homeworkhide,
+					Saves: this.homeworkstartend,
+					course_groups: response.data.course_groups,
 				})
-					this.props.Getdataback(result,result.data);
-					this.seacthdata(result.data);
 			}
+		}).catch((error) => {
+			console.log(error)
+		});
+
+	}
+	//立即截止
+	homeworkends = () => {
+		console.log("1160");
+		let homeworkid = this.props.match.params.homeworkid;
+		let url = "/homework_commons/" + homeworkid + "/end_groups.json";
+
+		axios.get(url).then((response) => {
+
+			if (response.status === 200) {
+				this.setState({})
+				this.setState({
+					modalname: "立即截止",
+					modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
+					svisible: true,
+					Topval:"学生将不能再提交作业",
+					// Botvalleft:"暂不截止",
+					Botval:`本操作只对"提交中"的分班有效`,
+					Cancelname: "暂不截止",
+					Savesname: "立即截止",
+					Cancel: this.homeworkhide,
+					Saves: this.coursetaskend,
+					starttime: undefined,
+					endtime: undefined,
+					course_groups: response.data.course_groups,
+					typs:"end",
+				})
 			}
 		}).catch((error) => {
 			console.log(error)
-			this.setState({
-				loadingstate: false
+		});
+	}
+// 立即发布
+	homeworkstartend = (ds,endtime) => {
+		var homeworkid = this.props.match.params.homeworkid;
+		let {course_groupslist} = this.state;
+
+		let coursesId = this.props.match.params.coursesId;
+		let url = "/courses/" + coursesId + "/homework_commons/publish_homework.json";
+		axios.post(url, {
+			homework_ids: [homeworkid],
+			group_ids: course_groupslist,
+			end_time:endtime,
+		}).then((result) => {
+			if (result.status === 200) {
+				if (result.data.status === 0) {
+					notification.open({
+						message: "提示",
+						description: result.data.message
+					});
+					this.homeworkhide()
+				}
+
+			}
+		}).catch((error) => {
+			console.log(error);
+		})
+	}
+	notlimiteds = () => {
+		this.setState({
+			checkedValuesine: undefined,
+			course_groupyslstwo: [],
+			unlimited: 0,
+			loadingstate: true,
+			page:1,
+		})
+		this.Startsortingt(this.state.orders, [], this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
+
+	}
+	notlimitedst = () => {
+		// console.log(this.state.course_group_info);
+		this.setState({
+			unlimitedtwo: 1,
+			checkedValuesineinfo: [],
+			course_groupysls: undefined,
+			loadingstate: true,
+		})
+		this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, [], this.state.searchtext, 1, this.state.limit);
+	}
+	//立即截止确定按钮
+	coursetaskend = () => {
+		var homeworkid = this.props.match.params.homeworkid;
+		let {course_groupslist} = this.state;
+
+
+		const cid = this.props.match.params.coursesId;
+		let url = "/courses/" + cid + "/homework_commons/end_homework.json";
+		axios.post(url, {
+				group_ids: course_groupslist,
+				homework_ids: [homeworkid],
+			})
+			.then((response) => {
+				if (response.data.status == 0) {
+					notification.open({
+						message: "提示",
+						description: response.data.message
+					});
+					this.homeworkhide()
+				}
 			})
+			.catch(function (error) {
+				console.log(error);
+			});
+	}
+
+	getcourse_groupslist = (id) => {
+		this.setState({
+			course_groupslist: id
 		})
 
 	}
 
-	TablePagination = (e) => {
-		// console.log(e.current);
-		var teacherlists = {  //分页
-			total: this.state.student_works.length, //数据总数量
-			pageSize: 10,  //一页显示几条
-			current: e.current,
-		}
+	homeworkhide = () => {
+		this.isupdatas()
 		this.setState({
-			page: e.current,
-			teacherlists: teacherlists
+			modalname: undefined,
+			modaltype: undefined,
+			svisible: false,
+			Topval: undefined,
+			Topvalright: undefined,
+			Botvalleft: undefined,
+			Botval: undefined,
+			starttime: undefined,
+			endtime: undefined,
+			Cancelname: undefined,
+			Savesname: undefined,
+			Cancel: undefined,
+			Saves: undefined,
+			StudentList_value: undefined,
+			addname: undefined,
+			addnametype: false,
+			addnametab: undefined,
+			course_groupyslstwo: undefined,
+			typs:undefined,
+			starttimes:undefined,
 		})
+	}
+
 
+	workshowmodel = () => {
+		this.setState({
+			showmodel: true
+		})
 	}
 
+	hideshowmodel = () => {
+		this.setState({
+			showmodel: false
+		})
+	}
 
 	paginationonChanges = (pageNumber) => {
 		this.setState({
 			page: pageNumber,
 			loadingstate: true,
 		})
-		this.Getalistofworkstwo(this.state.order, "", "", "", pageNumber, this.state.limit);
+		this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, pageNumber, this.state.limit);
+
 	}
-   //计算成绩
+
 	setComputeTime=()=>{
-		let {teacherdata}=this.state;
 		this.setState({
 			computeTimetype:false
 		})
 		let homeworkid = this.props.match.params.homeworkid;
-		let url = "/homework_commons/"+homeworkid+"/update_student_score.json?shixun_id="+teacherdata.shixun_id;
+		let url = "/homework_commons/"+homeworkid+"/update_score.json";
 
 		axios.get(url).then((response) => {
-			this.props.showNotification(`${response.data.message}`);
-			// var homeworkid = this.props.match.params.homeworkid;
-			// this.Getalistofworks(homeworkid);
-			this.Getalistofworkstwo("", "", "", "", 1, 20);
+			if(response){
+				this.props.showNotification(response.data.message);
+				this.setState({
+					loadingstate: true
+				})
+				this.Startsortingt(this.state.order, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
+			}
 		}).catch((error) => {
 			console.log(error)
 		});
 
 	}
 
+
+
 	render() {
-		let {visibles, game_list,columns, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state;
-    // console.log(this.state.data);
+		let {columns,course_groupysls, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state;
+
+
+		// console.log(this.state.data);
 		// console.log("841");
 		// console.log(this.state.columns);
 		return (
+			isAdmin === true ?
+				(
+					<div className=" clearfix " style={{margin:  "auto" , minWidth:"1200px"}}>
+						{visible === true ? <ModulationModal
+							visible={visible}
+							Cancel={this.cancelModulationModel}
+							Saves={(value, num) => this.saveModulationModal(value, num)}
+						/> : ""}
+
+						{this.state.showmodel === true ? <ShixunWorkModal
+							{...this.props}
+							visible={this.state.showmodel}
+							modalname={"代码查重"}
+							data={[]}
+							issCancel={() => this.hideshowmodel()}
+							updatas={() => this.isupdatas()}
+						/> : ""}
+
+
+						{visibles === true ?
+							<div>
+								<style>
+									{
+										`
+              body {
+							 overflow: hidden !important;
+						 }
+              `
+									}
+								</style>
+								<TraineetraininginformationModal
+									{...this.props} {...this.state}
+									homeworkid={this.props.match.params.homeworkid}
+									coursesId={this.props.match.params.coursesId}
+									workid={teacherdata.id}
+									isAdmins={this.props.isAdmin()}
+									userids={this.state.userids}
+									viewtrainingdata={viewtrainingdata}
+									game_list={game_list}
+									visible={visibles}
+									experience={experience}
+									boolgalist={boolgalist}
+									Cancel={() => this.cancelModulationModels()}
+								/>
+
+							</div>
+							: ""
+						}
+
+						{/*立即发布*/}
+						<HomeworkModal
+							modaltype={this.state.modaltype}
+							modalname={this.state.modalname}
+							visible={this.state.svisible}
+							Topval={this.state.Topval}
+							Topvalright={this.state.Topvalright}
+							Botvalleft={this.state.Botvalleft}
+							Botval={this.state.Botval}
+							starttime={this.state.starttime}
+							endtime={this.state.endtime}
+							Cancelname={this.state.Cancelname}
+							Savesname={this.state.Savesname}
+							Cancel={this.state.Cancel}
+							Saves={this.state.Saves}
+							course_groups={this.state.course_groups}
+							getcourse_groupslist={(id) => this.getcourse_groupslist(id)}
+							starttimes={this.state.starttimes}
+							typs={this.state.typs}
+						/>
+						<div className={"educontent "}>
+
+
+							<div className="edu-back-white">
+
+
+								<style>
+									{`
+							.startbox{
+					    height: 48px;
+					    background: rgba(255,104,0,0.1);
+					    line-height: 48px;
+
+					    text-align: center;
+							}
+
+							.startfont{
+							 font-size:14px;
+							font-family:MicrosoftYaHei;
+							font-weight:400;
+							color:rgba(255,104,0,1);
+							}
+
+							.computeTime{
+								width: 73px;
+								height: 24px;
+								display: inline-block;
+								padding: 5px;
+								text-align: center;
+								line-height: 13px;
+								color: #4CACFF;
+								border: 1px solid #4CACFF;
+							  cursor: pointer;
+							}
+
+							.computeTimes{
+							  width: 73px;
+								height: 24px;
+								display: inline-block;
+								padding: 5px;
+								text-align: center;
+								line-height: 13px;
+								color: #C5C5C5;
+								border: 1px solid #EDEDED;
+								background:#EDEDED;
+							  cursor: pointer;
+							}
+
+							`}
+								</style>
+								{computeTimetype===false?<li className="clearfix startbox">
+							<span className={"startfont"}>
+				         	正在执行成绩计算，请稍后刷新页面查看结果
+								  温馨提示：执行时间因作品数量而异
+							</span>
+								</li>:""}
+
+								{/*作品状态GraduationTaskssettinglist*/}
+								<ul className="clearfix" style={{padding: '20px 15px 10px 20px'}}>
+									<li className="clearfix ">
+										<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
+										<span>
+									{teacherdata&&teacherdata.publish_immediately===false&&computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
+											计算成绩
+										</div>:
+										<div >
+											{teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
+												<div className={"computeTimes font-13"}>
+													计算成绩
+												</div>
+											}
+										</div>}
+						  	</span>
+
+										<div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}>
+											<Search
+												placeholder="请输入姓名或学号搜索"
+												id="subject_search_input"
+												autoComplete="off"
+												value={searchtext}
+												onKeyUp={(e) => this.onSearchKeywordKeyUpt(e)}
+												onInput={this.inputSearchValuest}
+												onSearch={this.searchValuest}
+											></Search>
+										</div>
+									</li>
+
+									<li className="clearfix mt10">
+
+										<span className="fl  mr10 color-grey-8 ">作品状态：</span>
+										<span className="fl "><a id="graduation_comment_no_limit"
+																						 className={unlimited === 0 ? "pl10 pr10 mr20 check_on" : "pl10 pr10 mr20 "}
+																						 onClick={() => this.notlimiteds()}>不限</a></span>
+										<CheckboxGroup value={course_groupyslstwo}
+																	 onChange={(e) => this.funtaskstatust(e, task_status && task_status)}
+																	 style={{paddingTop: '4px'}}>
+
+											{task_status === undefined ? "" : task_status.map((item, key) => {
+												return (
+													<span key={key}>
+                                <Checkbox value={item.id}
+																					className="fl ">{item.name}
+																	<span>({item.count})</span>
+                                </Checkbox>
+
+                            </span>
+												)
+											})}
+										</CheckboxGroup>
+										{/*请输入姓名或学号搜索*/}
+
+
+									</li>
+
+
+									{/*分班情况*/}
+
+									<li className="clearfix  mt10 ">
+										{JSON.stringify(course_group_info) === "[]" ? "" : course_group_info === undefined ? "" : course_group_info.length < 2 ? "" :
+											<div>
+												<span className="fl mr10 color-grey-8">分班情况：</span>
+												<span className="fl "><a id="graduation_comment_no_limit"
+																								 className={unlimitedtwo === 0 ? "pl10 pr10 mr20 " : "pl10 pr10 mr20 check_on"}
+																								 onClick={() => this.notlimitedst()}>不限</a></span>
+												<CheckboxGroup  value={course_groupysls}
+																				onChange={(e) => this.funtaskstatustwot(e, course_group_info && course_group_info)}
+																				style={{paddingTop: '4px',width:'1017px'}}>
+													{course_group_info === undefined ? "" :
+														course_group_info.map((item, key) => {
+															return (
+																<span key={key}>
+                                <Checkbox value={item.course_group_id}
+																					className="fl ">{item.group_group_name}
+																	<span>({item.count})</span>
+                                            </Checkbox>
+                            </span>
+															)
+														})
+													}
+												</CheckboxGroup>
+											</div>}
+									</li>
+
+								</ul>
+
+
+								<div id="graduation_work_list" style={{padding: '0px 20px 10px 20px'}}>
+
+									<div className="clearfix">
+                                <span className="fl color-grey-6 font-12"><span
+																	className="color-orange-tip">{teacherdata === undefined ? "" : teacherdata.student_works.length}</span>个检索结果（{teacherdata === undefined ? "" : teacherdata.all_member_count}学生） </span>
+										<style>
+											{
+												`
+										.edu-position-hide li a:hover {
+										  background: #F0F0F0;
+										}
+										`
+											}
+										</style>
+										<div className="fr  edu-menu-panel">
+											<ul>
+												<li className="edu-position edu-position-hidebox">
+													<a className="font-12">
+														{orders === "update_time" ? "时间" : orders === "work_score" ? "成绩" : orders === "student_id" ? "学号" : ""}排序</a>
+													<i className="iconfont icon-xiajiantou ml5 font-12 "></i>
+													<ul className="edu-position-hide undis mt10">
+														<li> <a  onClick={(e) => this.funordert("update_time")} data-remote="true" className=" font-12" style={{"text-align": "center "}}>更新时间</a></li>
+														<li> <a  onClick={(e) => this.funordert("work_score")} data-remote="true" className=" font-12" style={{"text-align": "center "}}>最终成绩</a></li>
+														<li> <a  onClick={(e) => this.funordert("student_id")} data-remote="true" className=" font-12" style={{"text-align": "center "}}>学生学号</a></li>
+													</ul>
+												</li>
+											</ul>
+										</div>
+
+
+									</div>
+
+								</div>
+								{
+									JSON.stringify(data) === "[]" ?
+
+										<div id="forum_list" className="forum_table">
+											<div className="mh650 edu-back-white">
+												<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 mb30">没有数据可以显示！</p>
+												</div>
+											</div>
+
+										</div>
+										:
+
+										<div className={"justify break_full_word new_li edu-back-white"} style={{minHeight: "480px"}}>
+											<style>{`
+              	          .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
+																			top: 72%;}
+						                }
+						                .edu-table thead th,.edu-table tbody tr:last-child td{
+															border-bottom: none!important;
+															height: 85px;
+														}
+														.ant-tables .ant-table-tbody > tr > td {
+														height: 85px;
+															}
+						              `}</style>
+											<div className="edu-table edu-back-white ant-tables">
+												{data === undefined ? "" : <Table
+													dataSource={data}
+													columns={columns}
+													pagination={false}
+													loading={loadingstate}
+												/>}
+											</div>
+										</div>
+								}
+
+
+							</div>
+							{
+								teacherdata && teacherdata.work_count && teacherdata.work_count > limit ?
+									<div className="edu-txt-center mt30 mb20">
+										<Pagination showQuickJumper current={page}
+																onChange={this.paginationonChanges} pageSize={limit}
+																total={teacherdata.work_count}></Pagination>
+									</div>
+									: ""
+							}
+						</div>
+
+					</div>
+				)  :(
+
 			teacherdata === undefined || teacherdata.student_works === undefined || teacherdata.student_works === null || JSON.stringify(teacherdata.student_works) === "[]" ?
 				// 学生不能查看别人的
 				<div className=" clearfix "  style={{margin:  "auto" , minWidth:"1200px"}}>
@@ -996,7 +2604,7 @@ class Listofworksstudentone extends Component {
 													{computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
 														计算成绩
 													</div>:
-														<div>
+														<div className="fl">
 															{teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
 																<div className={"computeTimes font-13"}>
 																	计算成绩
@@ -1021,7 +2629,7 @@ class Listofworksstudentone extends Component {
 										<div className="edu-table edu-back-white ">
 											{data === undefined ? "222222" : <Table
 												dataSource={data}
-												columns={columns}
+												columns={columnsstu}
 												pagination={false}
 												loading={false}
 											/>}
@@ -1087,7 +2695,7 @@ class Listofworksstudentone extends Component {
 								{data === undefined ? "" : <Table
 									style={styletable}
 									dataSource={data}
-									columns={columns}
+									columns={columnsstu}
 									pagination={false}
 									loading={false}
 									showHeader={false}
@@ -1161,7 +2769,7 @@ class Listofworksstudentone extends Component {
 													{computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
 														计算成绩
 													</div>:
-														<div>
+														<div className="fl">
 															{teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
 																<div className={"computeTimes font-13"}>
 																	计算成绩
@@ -1205,7 +2813,7 @@ class Listofworksstudentone extends Component {
 										<div className="edu-table edu-back-white ">
 											{datas === undefined ? "" : <Table
 												dataSource={datas}
-												columns={columns}
+												columns={columnsstu}
 												pagination={false}
 												loading={loadingstate}
 											/>}
@@ -1243,7 +2851,7 @@ class Listofworksstudentone extends Component {
 					</div>
 
 				</div>
-
+		)
 
 		)
 	}
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index 4ff7b2cad..3fbf8254a 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -11,7 +11,6 @@ import '../css/Courses.css';
 import './style.css';
 import '../css/busyWork.css';
 import '../poll/pollStyle.css';
-import Listofworks from "./Listofworks";
 import Listofworksstudentone from './Listofworksstudentone';
 import Trainingjobsetting from './Trainingjobsetting';
 import Workquestionandanswer from './Workquestionandanswer';
@@ -280,26 +279,15 @@ class ShixunHomeworkPage extends Component {
 						modalCancel={this.Downloadcal}
 						modalsType={this.state.DownloadType}
 					/>
-					{
-						// 教师列表
-						parseInt(tab) === 0 ? (isAdmin === true ?
-							<Listofworks triggerRef={this.bindRef} {...this.props} {...this.state}
-													 Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworks>
-							:
-							<Listofworksstudentone    triggerRef={this.bindRef}  {...this.props} {...this.state}
-																			Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworksstudentone>)
-							:
-							parseInt(tab) === 1 ?
-								<Workquestionandanswer   triggerRef={this.bindRef}  {...this.props} {...this.state}
-																			 Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Workquestionandanswer>
-								:
-								parseInt(tab) === 2 ?
-									<ShixunStudentWork   triggerRef={this.bindRef} {...this.props} {...this.state}
-																		 Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></ShixunStudentWork>
-									:
-									<Trainingjobsetting   triggerRef={this.bindRef}  {...this.props} {...this.state}
-																			Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Trainingjobsetting>
-					}
+
+					{parseInt(tab) === 0 &&<Listofworksstudentone    triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworksstudentone>}
+
+					{parseInt(tab) === 1 &&<Workquestionandanswer   triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Workquestionandanswer>}
+
+					{parseInt(tab) === 2 &&<ShixunStudentWork   triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></ShixunStudentWork>}
+
+					{parseInt(tab) === 3 &&<Trainingjobsetting   triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Trainingjobsetting>}
+
 				</div>
 			</div>
 		)

From f80d8884df7a83f9851b8ef224581a53ccfe0841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 18 Jul 2019 14:08:57 +0800
Subject: [PATCH 07/15] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/shixunHomework/ShixunHomeworkPage.js    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index 3fbf8254a..04bc935bc 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -224,16 +224,14 @@ class ShixunHomeworkPage extends Component {
                             padding-top: 10px;
                             padding-bottom: 8px;
                         }
-                        a:hover {
-                        color:#1A0B00 !important;
-                        }
+                       
                         `}</style>
 								{this.props.isAdmin() ?
 									<li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding": "0 20px"}}>
 										导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
 										<ul className="drop_down_menu" style={{"right": "-0px", "left": "unset", "height": "auto"}}>
 											<li><a
-												onClick={(url) => this.confirmysl(`/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}&work_status=${this.state.course_groupyslstwo===undefined ||this.state.course_groupyslstwo===null? null: this.state.course_groupyslstwo}&course_group=${this.state.checkedValuesineinfo===undefined||this.state.checkedValuesineinfo===null? null:his.state.checkedValuesineinfo}&search=${this.state.searchtext===undefined||this.state.searchtext===null?null:this.state.searchtext}`)}>实训报告</a>
+												onClick={(url) => this.confirmysl(`/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}&work_status=${this.state.course_groupyslstwo===undefined ||this.state.course_groupyslstwo===null? null: this.state.course_groupyslstwo}&course_group=${this.state.checkedValuesineinfo===undefined||this.state.checkedValuesineinfo===null? null:this.state.checkedValuesineinfo}&search=${this.state.searchtext===undefined||this.state.searchtext===null?null:this.state.searchtext}`)}>实训报告</a>
 											</li>
 											<li><a
 												onClick={(url) => this.confirmysl(`/homework_commons/${this.props.match.params.homeworkid}/works_list.xlsx?group_id=${this.state.checkedValuesineinfo===undefined||this.state.checkedValuesineinfo===null?null:this.state.checkedValuesineinfo}&search=${this.state.searchtext===undefined||this.state.searchtext=== null?null:this.state.searchtext}`)}>学生成绩</a>

From dcfc2099cfe426335f2954d161a907e87a67f407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 18 Jul 2019 14:15:21 +0800
Subject: [PATCH 08/15] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/shixunHomework/Listofworksstudentone.js   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 49c640419..a56905916 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -2175,14 +2175,14 @@ class Listofworksstudentone extends Component {
 
 
 	render() {
-		let {columns,course_groupysls, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state;
+		let {columns,course_groupysls,isAdmin, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state;
 
 
 		// console.log(this.state.data);
 		// console.log("841");
 		// console.log(this.state.columns);
 		return (
-			isAdmin === true ?
+			this.props.isAdmin === true ?
 				(
 					<div className=" clearfix " style={{margin:  "auto" , minWidth:"1200px"}}>
 						{visible === true ? <ModulationModal

From e6a62caaff1a3f18f009c7d07f57b176d70e7fbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 18 Jul 2019 14:18:56 +0800
Subject: [PATCH 09/15] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/shixunHomework/Listofworksstudentone.js  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index a56905916..42282b950 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -35,7 +35,6 @@ import Startshixuntask from "../coursesPublic/Startshixuntask";
 import ModulationModal from "../coursesPublic/ModulationModal";
 import HomeworkModal from "../coursesPublic/HomeworkModal";
 import ShixunWorkModal from "./Shixunworkdetails/ShixunWorkModal";
-import {getImageUrl} from 'educoder';
 
 //GraduationTaskssetting.js
 

From 97fbb12e9111e39c7271cb3729c7f162db1bf393 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 18 Jul 2019 14:22:22 +0800
Subject: [PATCH 10/15] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shixunHomework/Listofworksstudentone.js   | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 42282b950..a46312bd9 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -2315,13 +2315,11 @@ class Listofworksstudentone extends Component {
 									{teacherdata&&teacherdata.publish_immediately===false&&computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
 											计算成绩
 										</div>:
-										<div >
-											{teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
+										teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
 												<div className={"computeTimes font-13"}>
 													计算成绩
 												</div>
 											}
-										</div>}
 						  	</span>
 
 										<div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}>
@@ -2603,13 +2601,11 @@ class Listofworksstudentone extends Component {
 													{computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
 														计算成绩
 													</div>:
-														<div className="fl">
-															{teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
-																<div className={"computeTimes font-13"}>
-																	计算成绩
-																</div>
-															}
-														</div>
+														teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
+															<div className={"computeTimes font-13"}>
+																计算成绩
+															</div>
+
 													}
 												</span>}
 
@@ -2768,13 +2764,10 @@ class Listofworksstudentone extends Component {
 													{computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
 														计算成绩
 													</div>:
-														<div className="fl">
-															{teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
+															teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
 																<div className={"computeTimes font-13"}>
 																	计算成绩
 																</div>
-															}
-														</div>
 													}
 												 </span>}
 

From 5a7ef71a56f6f31449fe729aab98f8ed1017f75b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 18 Jul 2019 14:27:28 +0800
Subject: [PATCH 11/15] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/exercise/Testpapersettinghomepage.js    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index abea627d3..0b534ac86 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -378,8 +378,6 @@ class Testpapersettinghomepage extends Component{
                         </div>
 
 
-
-
                     </div>
                     <DownloadMessageysl
                       {...this.props}

From 7ae3f3ed6ac3a9dd3f054fa65470e3bd6768065c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 18 Jul 2019 14:37:50 +0800
Subject: [PATCH 12/15] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/shixunHomework/Listofworksstudentone.js      | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index a46312bd9..0cbb33358 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -19,10 +19,6 @@ import {
 } from "antd";
 import './style.css';
 import 'moment/locale/zh-cn';
-const Search = Input.Search;
-const RadioGroup = Radio.Group;
-const CheckboxGroup = Checkbox.Group;
-const {Option} = Select;
 import axios from 'axios';
 import moment from 'moment';
 import '../css/members.css'
@@ -35,7 +31,10 @@ import Startshixuntask from "../coursesPublic/Startshixuntask";
 import ModulationModal from "../coursesPublic/ModulationModal";
 import HomeworkModal from "../coursesPublic/HomeworkModal";
 import ShixunWorkModal from "./Shixunworkdetails/ShixunWorkModal";
-
+const Search = Input.Search;
+const RadioGroup = Radio.Group;
+const CheckboxGroup = Checkbox.Group;
+const {Option} = Select;
 //GraduationTaskssetting.js
 
 //作品列表(学生)

From 50114ddd57b9b531300408fbd51539150ea680b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 18 Jul 2019 14:49:22 +0800
Subject: [PATCH 13/15] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/shixunHomework/Listofworksstudentone.js   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 0cbb33358..a6885eca8 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -912,8 +912,8 @@ class Listofworksstudentone extends Component {
 	}
 	student=()=>{
 		this.props.triggerRef(this);
-		// var homeworkid = this.props.match.params.homeworkid;
-		// this.Getalistofworks(homeworkid);
+		var homeworkid = this.props.match.params.homeworkid;
+		this.Getalistofworks(homeworkid);
 		let query = this.props.location.pathname;
 		const type = query.split('/');
 		this.setState({

From d5ebd9c1669a9fa2ccee0dbcd769f2193dfb755f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 18 Jul 2019 14:49:43 +0800
Subject: [PATCH 14/15] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/exercise/Testpapersettinghomepage.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index 0b534ac86..02d3888ef 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -359,7 +359,7 @@ class Testpapersettinghomepage extends Component{
                                     className={"btn fr color-blue font-16 mt20 mr20"}
                                     checkBoxValues={[parseInt(this.props.match.params.Id)]}
                                     Exercisetype={"exercise"}
-									action={this.Commonheadofthetestpaper}
+									               action={this.Commonheadofthetestpaper}
                                     single={true}
                                 ></ImmediatelyPublish>
                                :"":""}

From 076acddea35d9c36551481e25bb2226ee26cbaf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 18 Jul 2019 15:04:34 +0800
Subject: [PATCH 15/15] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shixunHomework/Listofworksstudentone.js   | 37 ++++++++++++++-----
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index a6885eca8..a23d7249c 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -2149,7 +2149,7 @@ class Listofworksstudentone extends Component {
 
 	}
 
-	setComputeTime=()=>{
+	setComputeTimet=()=>{
 		this.setState({
 			computeTimetype:false
 		})
@@ -2157,18 +2157,37 @@ class Listofworksstudentone extends Component {
 		let url = "/homework_commons/"+homeworkid+"/update_score.json";
 
 		axios.get(url).then((response) => {
-			if(response){
-				this.props.showNotification(response.data.message);
-				this.setState({
-					loadingstate: true
-				})
-				this.Startsortingt(this.state.order, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
-			}
+			this.props.showNotification(`${response.data.message}`);
+			this.setState({
+				loadingstate: true
+			})
+			this.Startsortingt(this.state.order, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
 		}).catch((error) => {
 			console.log(error)
 		});
 
 	}
+	//
+	// setComputeTime=()=>{
+	// 	this.setState({
+	// 		computeTimetype:false
+	// 	})
+	// 	let homeworkid = this.props.match.params.homeworkid;
+	// 	let url = "/homework_commons/"+homeworkid+"/update_score.json";
+	//
+	// 	axios.get(url).then((response) => {
+	// 		if(response){
+	// 			this.props.showNotification(response.data.message);
+	// 			this.setState({
+	// 				loadingstate: true
+	// 			})
+	// 			this.Startsortingt(this.state.order, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
+	// 		}
+	// 	}).catch((error) => {
+	// 		console.log(error)
+	// 	});
+	//
+	// }
 
 
 
@@ -2597,7 +2616,7 @@ class Listofworksstudentone extends Component {
 
 												<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
 												{teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
-													{computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
+													{computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTimet}>
 														计算成绩
 													</div>:
 														teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":