From df6f12a8ab04a0877b2f5503e97d97252b313357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 29 Jun 2019 11:14:44 +0800
Subject: [PATCH 1/7] =?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/Studentshavecompletedthelist.js  | 109 ++++-----
 .../exercise/Testpapersettinghomepage.js      |   6 +-
 .../shixunHomework/Listofworksstudentone.js   | 213 +++++++++---------
 3 files changed, 150 insertions(+), 178 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index 33362df65..a84347e25 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -67,14 +67,13 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'number',
 					key: 'number',
 					align: 'center',
-					width: "84px",
-					className: "edu-txt-center",
+					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
 							{record.number === "--" ?
-								<a style={{"color": '#999999', "text-align": "center", "width": "84px",}}>{record.number}</a>
+								<a style={{"color": '#999999', "text-align": "center"}}>{record.number}</a>
 								:
-								<a style={{"color": '#07111B', "text-align": "center", "width": "84px",}}>{record.number}</a>
+								<a style={{"color": '#07111B', "text-align": "center" }}>{record.number}</a>
 
 							}
         </span>
@@ -85,14 +84,13 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'name',
 					key: 'name',
 					align: 'center',
-					className: "edu-txt-center",
-					width: "110px",
+					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
 								{record.name === "--" ?
-									<a style={{"color": '#999999', "text-align": "center", "width": "110px"}}>{record.name}</a>
+									<a style={{"color": '#999999', "text-align": "center" }}>{record.name}</a>
 									:
-									<a style={{"color": '#07111B', "text-align": "center", "width": "110px"}}>{record.name}</a>
+									<a style={{"color": '#07111B', "text-align": "center" }}>{record.name}</a>
 
 								}
         </span>
@@ -103,28 +101,24 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'stduynumber',
 					key: 'stduynumber',
 					align: 'center',
-					className: "edu-txt-center",
-					width: "175px",
+					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
 							{record.stduynumber === null ?
 								<a style={{
 									"color": '#999999',
 									"text-align": "center"
-									, "width": "175px"
-								}}>--</a> :
+ 								}}>--</a> :
 								record.stduynumber ===
 								"" ?
 									<a style={{
 										"color": '#999999',
 										"text-align": "center"
-										, "width": "175px"
-									}}>--</a> :
+ 									}}>--</a> :
 									<a style={{
 										"color": '#9A9A9A',
 										"text-align": "center"
-										, "width": "175px"
-									}}>{record.stduynumber}</a>
+ 									}}>{record.stduynumber}</a>
 							}
 
         </span>
@@ -136,27 +130,23 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'classroom',
 					align: 'center',
 					className: "edu-txt-center",
-					width: "120px",
-					render: (text, record) => (
+ 					render: (text, record) => (
 						<span>
 								{record.classroom === null ?
 									<a style={{
 										"color": '#999999',
 										"text-align": "center"
-										, "width": "120px"
-									}}>--</a> :
+ 									}}>--</a> :
 									record.classroom ===
 									"" ?
 										<a style={{
 											"color": '#999999',
 											"text-align": "center"
-											, "width": "120px"
-										}}>--</a> :
+ 										}}>--</a> :
 										<a style={{
 											"color": '#07111B',
 											"text-align": "center"
-											, "width": "120px"
-										}}>{record.classroom}</a>
+ 										}}>{record.classroom}</a>
 								}
 
         </span>
@@ -167,19 +157,16 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'submitstate',
 					key: 'submitstate',
 					align: 'center',
-					width: "124px",
-					className: "edu-txt-center",
+ 					className: "edu-txt-center",
 					render: (text, record) => (
 						<span>
              <a style={record.submitstate === "未提交" ? {
 							 "color": '#999999',
 							 "text-align": "center",
-							 "width": "124px",
-						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
+ 						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
 							 "color": '#29BD8B',
 							 "text-align": "center",
-							 "width": "124px",
-						 }}>{record.submitstate}</a>
+ 						 }}>{record.submitstate}</a>
         </span>
 					)
 
@@ -190,13 +177,12 @@ class Studentshavecompletedthelist extends Component {
 					key: 'updatetime',
 					align: 'center',
 					className: "edu-txt-center",
-					width: "236.4px",
-					render: (text, record) => (
+ 					render: (text, record) => (
 						<span>
 							{record.updatetime === "--" ?
-								<a style={{"color": '#999999', "text-align": "center", "width": "236.4px",}}>{record.updatetime}</a>
+								<a style={{"color": '#999999', "text-align": "center" }}>{record.updatetime}</a>
 								:
-								<a style={{"color": '#9A9A9A', "text-align": "center", "width": "236.4px",}}>{record.updatetime}</a>
+								<a style={{"color": '#9A9A9A', "text-align": "center" }}>{record.updatetime}</a>
 							}
         </span>
 					),
@@ -207,36 +193,30 @@ class Studentshavecompletedthelist extends Component {
 					key: 'completion',
 					align: 'center',
 					className: "edu-txt-center",
-					width: "124px",
-					render: (text, record) => (
+ 					render: (text, record) => (
 						<span>   {
 							record.completion === "--" ?
 								<a style={{
 									"color": '#999999',
 									"text-align": "center"
-									, "width": "124px"
-								}}>
+ 								}}>
 									{record.completion}
 								</a>
 								:
 								<a style={parseInt(record.completion) > 90 ? {
 									"color": '#DD1717',
 									"text-align": "center"
-									, "width": "124px"
-								} : parseInt(record.completion) <= 90 ? {
+ 								} : parseInt(record.completion) <= 90 ? {
 									"color": '#FF6800',
 									"text-align": "center"
-									, "width": "124px"
-								} : parseInt(record.completion) <= 60 ? {
+ 								} : parseInt(record.completion) <= 60 ? {
 										"color": '#747A7F',
 										"text-align": "center"
-										, "width": "124px"
-									} :
+ 									} :
 									{
 										"color": '#747A7F',
 										"text-align": "center"
-										, "width": "124px"
-									}}>{record.completion}</a>
+ 									}}>{record.completion}</a>
 						}
 
         </span>
@@ -247,32 +227,27 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'levelscore',
 					key: 'levelscore',
 					align: 'center',
-					width: "124px",
-					className: "edu-txt-center",
+ 					className: "edu-txt-center",
 					render: (text, record) => (
 						<span>
 							{record.levelscore === "--" ?
 								<a style={{
 									"color": '#999999',
 									"text-align": "center"
-									, "width": "124px"
-								}}>
+ 								}}>
 									{record.levelscore}
 								</a>
 								:
 								<a style={parseInt(record.levelscore) > 90 ? {
 									"color": '#DD1717',
 									"text-align": "center"
-									, "width": "124px"
-								} : parseInt(record.levelscore) <= 90 ? {
+ 								} : parseInt(record.levelscore) <= 90 ? {
 									"color": '#FF6800',
 									"text-align": "center"
-									, "width": "124px"
-								} : parseInt(record.levelscore) <= 60 ? {
+ 								} : parseInt(record.levelscore) <= 60 ? {
 									"color": '#747A7F',
 									"text-align": "center"
-									, "width": "124px"
-								} : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</a>
+ 								} : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</a>
 							}
         </span>
 					)
@@ -282,35 +257,30 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',
-					width: "124px",
-					className: "edu-txt-center",
+ 					className: "edu-txt-center",
 					render: (text, record) => (
 						<span>
 							{record.efficiencyscore === "--" ?
 								<a style={{
 									"color": '#999999',
 									"text-align": "center"
-									, "width": "124px"
-								}}>
+ 								}}>
 									{record.efficiencyscore}
 								</a>
 								:
 								<a style={parseInt(record.efficiencyscore) > 90 ? {
 									"color": '#DD1717',
 									"text-align": "center"
-									, "width": "124px"
-								} : parseInt(record.efficiencyscore) <= 90 ? {
+ 								} : parseInt(record.efficiencyscore) <= 90 ? {
 									"color": '#FF6800',
 									"text-align": "center"
-									, "width": "124px"
-								} : parseInt(record.efficiencyscore) <= 60 ? {
+ 								} : parseInt(record.efficiencyscore) <= 60 ? {
 									"color": '#747A7F',
 									"text-align": "center",
 								} : {
 									"color": '#747A7F',
 									"text-align": "center"
-									, "width": "124px"
-								}}>{record.efficiencyscore}</a>
+ 								}}>{record.efficiencyscore}</a>
 							}
         </span>
 					)
@@ -1013,6 +983,10 @@ class Studentshavecompletedthelist extends Component {
 		}
 		// console.log("Studentshavecompletedthelist");
 		// console.log(props.current_status);
+		// columnsys 老师列表
+		// columnss 学生只能看自己的 未截止页面
+		// columnstwo 截止显示自己的
+		// columns 截止后显示其他学生
 	}
 
 	paginationonChange = (pageNumber) => {
@@ -4715,8 +4689,9 @@ class Studentshavecompletedthelist extends Component {
 				(
 					<div style={{
 						"margin": "0 auto",
-						" min-width": " 1250px",
+						" min-width": " 1200px",
 					}}>
+						{/*老师*/}
 						<div className="edu-back-white">
 							<ul className="clearfix" style={{padding: '10px 30px 10px 30px'}}>
 
diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index 5ba33032c..3884b1d67 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -159,7 +159,7 @@ class Testpapersettinghomepage extends Component{
 
         return(
             <div className="newMain clearfix ">
-                <div className={"educontent mb20"} style={{width:"1250px"}}>
+                <div className={"educontent mb20"} style={{width:"1200px"}}>
 									{/* 公用的提示弹框 */}
 									{this.state.Modalstype===true?<Modals
 										modalsType={this.state.Modalstype}
@@ -177,7 +177,7 @@ class Testpapersettinghomepage extends Component{
                         callback={this.callback}
                     />:""}
 
-                    <div className="educontent mb20" style={{width:"1250px"}}>
+                    <div className="educontent mb20" style={{width:"1200px"}}>
                         <p className="clearfix mb20 mt10">
                             <ActionBtn className=" btn colorgrey fl hovercolorblue "  to={`/courses/${this.props.match.params.coursesId}/students}`}>{this.props.coursedata.name}</ActionBtn>
                             <span className="color-grey-9 fl ml3 mr3">&gt;</span>
@@ -195,7 +195,7 @@ class Testpapersettinghomepage extends Component{
                         `}
                     </style>
 
-                    <div className="educontent" style={{width:"1250px"}}>
+                    <div className="educontent" style={{width:"1200px"}}>
                         <p className=" fl color-black  summaryname ">
                             {Commonheadofthetestpaper === undefined?"":Commonheadofthetestpaper.exercise_name}
                         </p>
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 29af983e5..1c12130ed 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -112,9 +112,9 @@ class Listofworksstudentone extends Component {
 					challenges_count:result.data.challenges_count,
 				})
 				if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") {
-					this.seacthdata();
+					this.seacthdata(result.data);
 				} else {
-					this.seacthdatas();
+					this.seacthdatas(result.data,result.data.student_works);
 				}
 
 			}
@@ -166,9 +166,9 @@ class Listofworksstudentone extends Component {
 					challenges_count:result.data.challenges_count,
 				})
 				if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") {
-					this.seacthdata();
+					this.seacthdata(result.data);
 				} else {
-					this.seacthdatas();
+					this.seacthdatas(result.data,result.data.student_works);
 				}
 
 			}
@@ -187,7 +187,7 @@ class Listofworksstudentone extends Component {
 
 	}
 
-	seacthdatas = () => {
+	seacthdatas = (teacherdata,student_works) => {
 		let {page, limit} = this.state;
 		let datalist = [];
 		let datalists = [];
@@ -197,10 +197,10 @@ class Listofworksstudentone extends Component {
 
 		var teacherlist = undefined;
 		var teacherlists = undefined;
-		if (this.state.teacherdata !== undefined) {
+		if (teacherdata !== undefined) {
 			// console.log("seacthdata设置数据")
 			// console.log(this.state.teacherdata.id )
-			if (this.state.teacherdata.id === undefined) {
+			if (teacherdata.id === undefined) {
 				this.setState({
 					data: [],
 					teacherlist: undefined,
@@ -209,36 +209,36 @@ class Listofworksstudentone extends Component {
 				})
 
 			} else {
-				console.log(this.state.teacherdata)
-				if (this.state.teacherdata.id !== undefined || this.state.teacherdata.id !== null || this.state.teacherdata.id !== "") {
+				console.log(teacherdata)
+				if (teacherdata.id !== undefined || teacherdata.id !== null || teacherdata.id !== "") {
 					// console.log("seacthdata设置数据1")
 					// console.log(this.state.teacherdata )
-					var timedata = moment(this.state.teacherdata.update_time).format('YYYY-MM-DD HH:mm');
+					var timedata = moment(teacherdata.update_time).format('YYYY-MM-DD HH:mm');
 					datalist.push({
-						myid: this.state.teacherdata.id,
+						myid: teacherdata.id,
 						number: 1,
-						name: this.state.teacherdata.user_name,
-						stduynumber: this.state.teacherdata.student_id,
-						classroom: this.state.teacherdata.group_name,
-						submitstate: this.state.teacherdata.work_status === 0 ? "未提交" : this.state.teacherdata.work_status === 1 ? "按时提交" : this.state.teacherdata.work_status === 2 ? "延时提交" : "未提交",
+						name: teacherdata.user_name,
+						stduynumber: teacherdata.student_id,
+						classroom: teacherdata.group_name,
+						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:  this.state.teacherdata.complete_count === null ? "0" :this.state.teacherdata.complete_count === undefined ? "0": this.state.teacherdata.complete_count,
-						levelscore: this.state.teacherdata.final_score,
-						efficiencyscore: this.state.teacherdata.eff_score,
-						finalscore: this.state.teacherdata.work_score,
+						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: this.state.teacherdata.late_penalty=== null?"0":this.state.teacherdata.late_penalty === undefined?"0":this.state.teacherdata.late_penalty,
-						ultimate_score:this.state.teacherdata.ultimate_score,
-						user_name: this.state.teacherdata.user_name,
-						user_login: this.state.teacherdata.user_login,
+						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: this.state.teacherdata.student_works.length, //数据总数量
-						pageSize: this.state.teacherdata.student_works.length,  //一页显示几条
+						total: teacherdata.student_works.length, //数据总数量
+						pageSize: teacherdata.student_works.length,  //一页显示几条
 						current: this.state.page,
 					}
 					styletable = {"display": "block",}
@@ -252,30 +252,30 @@ class Listofworksstudentone extends Component {
 		}
 
 
-		if (this.state.student_works !== undefined) {
+		if (student_works !== undefined) {
 
-			for (var i = 0; i < this.state.student_works.length; i++) {
+			for (var i = 0; i <student_works.length; i++) {
 
-				var timedata = moment(this.state.student_works[i].update_time).format('YYYY-MM-DD HH:mm');
+				var timedata = moment(student_works[i].update_time).format('YYYY-MM-DD HH:mm');
 				datalists.push({
-					myid: this.state.student_works[i].id,
+					myid: student_works[i].id,
 					number: (parseInt(page) - 1) * parseInt(limit) + (i + 1),
-					name: this.state.student_works[i].user_name,
-					stduynumber: this.state.student_works[i].student_id,
-					classroom: this.state.student_works[i].group_name,
-					submitstate: this.state.student_works[i].work_status === 0 ? "未提交" : this.state.student_works[i].work_status === 1 ? "按时提交" : this.state.student_works[i].work_status === 2 ? "延时提交" : "未提交",
+					name: student_works[i].user_name,
+					stduynumber: student_works[i].student_id,
+					classroom: student_works[i].group_name,
+					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:  this.state.teacherdata.student_works[i].complete_count === null ? "0" :this.state.teacherdata.student_works[i].complete_count === undefined ? "0": this.state.teacherdata.student_works[i].complete_count,
-					levelscore: this.state.student_works[i].final_score,
-					efficiencyscore: this.state.student_works[i].eff_score,
-					finalscore: this.state.student_works[i].work_score,
+					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,
+					finalscore:student_works[i].work_score,
 					operating: "查看",
-					late_penalty: this.state.teacherdata.student_works[i].late_penalty=== null?"0":this.state.teacherdata.student_works[i].late_penalty === undefined?"0":this.state.teacherdata.student_works[i].late_penalty,
-					ultimate_score:this.state.teacherdata.student_works[i].ultimate_score,
-					user_name: this.state.teacherdata.student_works[i].user_name,
-					user_login: this.state.teacherdata.student_works[i].user_login,
+					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,
 				})
 
 			}
@@ -300,12 +300,12 @@ class Listofworksstudentone extends Component {
 		})
 	}
 	// 设置数据
-	seacthdata = () => {
+	seacthdata = (teacherdata) => {
 		let datalist = [];
-		if (this.state.teacherdata !== undefined) {
+		if (teacherdata !== undefined) {
 			// console.log("seacthdata设置数据")
 			// console.log(this.state.teacherdata.id )
-			if (this.state.teacherdata.id === undefined) {
+			if (teacherdata.id === undefined) {
 				this.setState({
 					data: [],
 					teacherlist: undefined,
@@ -314,35 +314,35 @@ class Listofworksstudentone extends Component {
 				return
 			}
 			// console.log(this.state.teacherdata )
-			if (this.state.teacherdata.id !== undefined || this.state.teacherdata.id !== null || this.state.teacherdata.id !== "") {
+			if (teacherdata.id !== undefined || teacherdata.id !== null ||teacherdata.id !== "") {
 				// console.log("seacthdata设置数据1")
 				// console.log(this.state.teacherdata )
-				var timedata = moment(this.state.teacherdata.update_time).format('YYYY-MM-DD HH:mm');
+				var timedata = moment(teacherdata.update_time).format('YYYY-MM-DD HH:mm');
 				datalist.push({
-					myid: this.state.teacherdata.id,
+					myid: teacherdata.id,
 					number: 1,
-					name: this.state.teacherdata.user_name,
-					stduynumber: this.state.teacherdata.student_id,
-					classroom: this.state.teacherdata.group_name,
-					submitstate: this.state.teacherdata.work_status === 0 ? "未提交" : this.state.teacherdata.work_status === 1 ? "按时提交" : this.state.teacherdata.work_status === 2 ? "延时提交" : "未提交",
+					name: teacherdata.user_name,
+					stduynumber: teacherdata.student_id,
+					classroom: teacherdata.group_name,
+					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:  this.state.teacherdata.complete_count === null ? "0" :this.state.teacherdata.complete_count === undefined ? "0": this.state.teacherdata.complete_count,
-					levelscore: this.state.teacherdata.final_score,
-					efficiencyscore: this.state.teacherdata.eff_score,
-					finalscore: this.state.teacherdata.work_score,
+					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: this.state.teacherdata.late_penalty=== null?"0":this.state.teacherdata.late_penalty === undefined?"0":this.state.teacherdata.late_penalty,
-					ultimate_score:this.state.teacherdata.ultimate_score,
-					user_name: this.state.teacherdata.user_name,
-					user_login: this.state.teacherdata.user_login,
+					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: this.state.teacherdata.student_works.length, //数据总数量
-					pageSize: this.state.teacherdata.student_works.length,  //一页显示几条
+					total: teacherdata.student_works.length, //数据总数量
+					pageSize: teacherdata.student_works.length,  //一页显示几条
 					current: this.state.page,
 				}
 			} else {
@@ -495,7 +495,7 @@ class Listofworksstudentone extends Component {
 					code_review: result.data.code_review,
 					challenges_count:result.data.challenges_count,
 				})
-				this.seacthdata();
+				this.seacthdata(result.data);
 			}
 		}).catch((error) => {
 			console.log(error)
@@ -537,31 +537,30 @@ class Listofworksstudentone extends Component {
 				dataIndex: 'number',
 				key: 'number',
 				align: "center",
-				width: '96px',
+				className:'font-14',
 				render: (text, record) => (
 					<span>
 						{record.number === undefined ?
-							<a style={{
+							<span style={{
 								"color": '#9A9A9A',
 								"text-align": "center"
-							}}> --</a>
+							}}> --</span>
 							: record.number === "" ?
-								<a style={{
+								<span style={{
 									"color": '#9A9A9A',
 									"text-align": "center"
-								}}>--</a>
+								}}>--</span>
 								: record.number === "--" ?
-									<a style={{
+									<span style={{
 										"color": '#9A9A9A',
 										"text-align": "center"
-									}}>--</a>
+									}}>--</span>
 									:
-									<a style={{
+									<span style={{
 										"color": '#07111B',
 										"text-align": "center"
-									}}>  {record.number}</a>
+									}}>  {record.number}</span>
 						}
-
         </span>
 				),
 			},
@@ -570,37 +569,37 @@ class Listofworksstudentone extends Component {
 				dataIndex: 'name',
 				key: 'name',
 				align: "center",
-				width: '147px',
+				className:'font-14',
 				render: (text, record) => (
 					<span>
 						{record.name === undefined ?
-							<a style={{
+							<span style={{
 								"color": '#9A9A9A',
 								"text-align": "center"
-							}}>--</a>
+							}}>--</span>
 							:
 							record.name === "" ?
-								<a style={{
+								<span style={{
 									"color": '#9A9A9A',
 									"text-align": "center"
-								}}>--</a>
+								}}>--</span>
 								:
 								record.name === null ?
-									<a style={{
+									<span style={{
 										"color": '#9A9A9A',
 										"text-align": "center"
-									}}>--</a>
+									}}>--</span>
 									:
 									record.name === "--" ?
-										<a style={{
+										<span style={{
 											"color": '#9A9A9A',
 											"text-align": "center"
-										}}>--</a>
+										}}>--</span>
 										:
-										<a style={{
+										<span style={{
 											"color": '#07111B',
 											"text-align": "center"
-										}}>{record.name}</a>
+										}}>{record.name}</span>
 						}
 
         </span>
@@ -611,13 +610,13 @@ class Listofworksstudentone extends Component {
 				dataIndex: 'stduynumber',
 				key: 'stduynumber',
 				align: "center",
-				width: '200px',
+				className:'font-14',
 				render: (text, record) => (
 					<span>
-             <a style={{
+             <span style={{
 							 "color": '#9A9A9A',
 							 "text-align": "center"
-						 }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>
+						 }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</span>
         </span>
 				),
 			},
@@ -626,12 +625,14 @@ class Listofworksstudentone extends Component {
 				key: 'classroom',
 				dataIndex: 'classroom',
 				align: "center",
+				className:'font-14',
+				width:'288px',
 				render: (text, record) => (
 					<span>
-             <a style={{
+             <span style={{
 							 "color": '#9A9A9A',
 							 "text-align": "center"
-						 }}>{record.classroom === undefined ? "--" : record.classroom === "" ? "--" : record.classroom === null ? "--" : record.classroom}</a>
+						 }}>{record.classroom === undefined ? "--" : record.classroom === "" ? "--" : record.classroom === null ? "--" : record.classroom}</span>
         </span>
 				),
 			},
@@ -640,15 +641,16 @@ class Listofworksstudentone extends Component {
 				dataIndex: 'submitstate',
 				key: 'submitstate',
 				align: "center",
+				className:'font-14',
 				render: (text, record) => (
 					<span>
- <a style={record.submitstate === "延时提交" ? {
+ <span style={record.submitstate === "延时提交" ? {
 	 "color": '#DD1717',
 	 "text-align": "center"
  } : record.submitstate === "按时提交" ? {"color": '#29BD8B', "text-align": "center"} : {
 	 "color": '#747A7F',
 	 "text-align": "center"
- }}>{record.submitstate === undefined ? "--" : record.submitstate === "" ? "--" : record.submitstate === null ? "--" : record.submitstate}</a>
+ }}>{record.submitstate === undefined ? "--" : record.submitstate === "" ? "--" : record.submitstate === null ? "--" : record.submitstate}</span>
 
         </span>
 				),
@@ -658,12 +660,13 @@ class Listofworksstudentone extends Component {
 				dataIndex: 'updatetime',
 				key: 'updatetime',
 				align: "center",
+				className:'font-14',
 				render: (text, record) => (
 					<span>
-             <a style={{
+             <span style={{
 							 "color": '#9A9A9A',
 							 "text-align": "center"
-						 }}>{record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime}</a>
+						 }}>{record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime}</span>
         </span>
 				),
 			},
@@ -672,9 +675,10 @@ class Listofworksstudentone extends Component {
 				dataIndex: 'completion',
 				key: 'completion',
 				align: "center",
+				className:'font-14',
 				render: (text, record) => (
 					<span>
-											<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</a>
+											<span style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</span>
         </span>
 				),
 			},
@@ -683,23 +687,20 @@ class Listofworksstudentone extends Component {
 				dataIndex: 'levelscore',
 				key: 'levelscore',
 				align: "center",
+				className:'font-14',
 				render: (text, record) => (
 					<span>
 						{
 							record.levelscore && record.levelscore === "--"?
-								<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.levelscore}</a>
+								<span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.levelscore}</span>
 								:
-								<a style={parseInt(record.levelscore) > 90 ? {
+								<span style={parseInt(record.levelscore) >=90 ? {
 									"color": '#DD1717',
 									"text-align": "center"
-								} : parseInt(record.levelscore) <= 90 ? {
+								} : parseInt(record.levelscore) <= 60?{
 									"color": '#FF6800',
 									"text-align": "center",
-									"margin-left": "20px"
-								} : parseInt(record.levelscore) <= 60 ? {
-									"color": '#747A7F',
-									"text-align": "center"
-								} : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</a>
+								}: {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</span>
 						}
 
         </span>
@@ -710,25 +711,21 @@ class Listofworksstudentone extends Component {
 				dataIndex: 'operating',
 				key: 'operating',
 				align: "center",
-				width: '96px',
+				className:'font-14',
 				render: (text, record) => (
 					<span>
                         {
 													record.submitstate === "未提交" ?<span style={{	color: '#9A9A9A'}}>--</span>
 														:
-														<a style={{"text-align": "center"}}
+														<span style={{"text-align": "center"}}
 															 className="color-blue"
-															 onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
+															 onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</span>
 												}
 
         </span>
 				),
 			},
 		];
-		// console.log("teacherdatateacherdatateacherdata");
-		// console.log(teacherdata);
-		// console.log("teacherdata.work_count");
-		// console.log(teacherdata&&teacherdata.work_count);
 		return (
 			teacherdata === undefined || teacherdata.student_works === undefined || teacherdata.student_works === null || JSON.stringify(teacherdata.student_works) === "[]" ?
 				// 学生不能查看别人的

From d48804e94015d57db0639b01029f8235336fdb1f Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sat, 29 Jun 2019 16:51:47 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=AF=B9=E9=9D=9E=E8=AF=BE=E5=A0=82?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E9=9A=90=E8=97=8F=E5=AD=A6=E5=8F=B7=E5=88=97?=
 =?UTF-8?q?=EF=BC=88=E9=97=AE=E5=8D=B7=E3=80=81=E6=AF=95=E8=AE=BE=E9=80=89?=
 =?UTF-8?q?=E9=A2=98=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/exercise/question/shixunAnswer.js | 36 ++++++++++++-------
 .../graduation/topics/GraduateTopicDetail.js  |  8 ++---
 .../topics/GraduateTopicDetailTable.js        |  8 +++--
 .../graduation/topics/GraduateTopicItem.js    |  6 ++--
 .../courses/poll/PollDetailTabFirst.js        | 33 ++++++++++++++---
 5 files changed, 65 insertions(+), 26 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/question/shixunAnswer.js b/public/react/src/modules/courses/exercise/question/shixunAnswer.js
index 0ce4b3084..a1c4ff44b 100644
--- a/public/react/src/modules/courses/exercise/question/shixunAnswer.js
+++ b/public/react/src/modules/courses/exercise/question/shixunAnswer.js
@@ -200,7 +200,7 @@ class shixunAnswer extends Component{
       className:"edu-txt-center",
       render:(testCount,item,index)=>{
         return( 
-          <span>{ item.testCount ? item.testCount : "--" }</span>
+          <span>{ item.testCount ? item.testCount : <span className="color-grey-9">--</span> }</span>
         )
       }
     }, {
@@ -210,7 +210,7 @@ class shixunAnswer extends Component{
       className:"edu-txt-center",
       render:(endTime,item,index)=>{
         return( 
-          <span>{ item.endTime ? item.endTime : "--" }</span>
+          <span>{ item.endTime ? item.endTime : <span className="color-grey-9">--</span> }</span>
         )
       }
     }, {
@@ -220,7 +220,7 @@ class shixunAnswer extends Component{
       className:"edu-txt-center",
       render:(needTime,item,index)=>{
         return( 
-          <span>{ item.needTime ? item.needTime : "--" }</span>
+          <span>{ item.needTime ? item.needTime : <span className="color-grey-9">--</span> }</span>
         )
       }
     }, {
@@ -259,7 +259,7 @@ class shixunAnswer extends Component{
                   step={0.1} 
                   precision={1}
                   value={item.input_score}
-                  style={{width:"60px",marginRight:"5px"}} 
+                  style={{width:"60px",marginLeft:"5px"}} 
                   placeholder="请输入分数" 
                   onChange={(value)=>{this.changeThis(value,index)}}
                   onBlur={(value)=>this.changeThisScore(value,item.id,index)}
@@ -269,9 +269,9 @@ class shixunAnswer extends Component{
             }
             {
               item.operation ?
-              <a className={isAdmin ? "color-blue ml20":"color-blue"} target="_blank" href='javascript:void(0)' onClick={()=>this.scrollToAnchor(`${questionType.question_id}${index+1}`)}>查看</a>
+              <a className={isAdmin ? "color-blue mt5 fr":"color-blue"} target="_blank" href='javascript:void(0)' onClick={()=>this.scrollToAnchor(`${questionType.question_id}${index+1}`)}>查看</a>
               :
-              <a className={isAdmin ? "color-grey-9 ml20":"color-grey-9"} target="_blank" href='javascript:void(0)'>--</a>
+              <span className={isAdmin ? "color-grey-9 mt5 fr":"color-grey-9"} >--</span>
             }
           </span>
         )
@@ -279,28 +279,38 @@ class shixunAnswer extends Component{
     }];
     return(
       <div>
+        <style>
+          {`
+            .resetTableStyle .ant-table-tbody > tr > td{
+              padding:10px 5px!important;
+            }
+            .resetCodeMirrorStyle .CodeMirror{
+              height:auto!important;
+            }
+          `}
+        </style>
         { exercise && ((exercise.student_commit_status && exercise.student_commit_status != 0) || (exercise.user_exercise_status && exercise.user_exercise_status !=0) ) ?
           <div>
             <p className="padding20-30 font-16 color-grey-6 pl30">阶段成绩</p>
-            <div className="stageTable">
+            <div className={challenge && challenge.length > 0 ? "pl30 pr30 resetTableStyle":"pl30 pr30 resetTableStyle stageTable"}>
               { data && data.length>0 ? <Table columns={columns} dataSource={data} pagination={false}></Table> : "" }
             </div>
             {
               challenge && challenge.length > 0 &&
               <div>
-                <p className="padding20-30 font-16 color-grey-6 pl30">实训详情</p>
+                <p className="mt20 pr30 font-16 color-grey-6 pl30">实训详情</p>
                 {
                   challenge.map((item,key)=>{
                     return(
-                      <div className="pl30 pr30" id={`challenge_${questionType.question_id}${key+1}`}>
+                      <div className="pl30 pr30 mt20" id={`challenge_${questionType.question_id}${key+1}`}>
                         <p className="clearfix mb20">
                           <span className="panel-inner-icon mr15 fl mt3 backgroud4CACFF">
                               <i className="fa fa-code font-16 color_white"></i>
                           </span>
-                          <span className="fl mt3 font-14">
+                          <span className="fl mt3 font-16">
                             <span className="font-bd mr15">第{item[0].position}关</span>
                             <Link to={"/shixuns/"+item[0].game_identifier+"/challenges"}>
-                              <span className={"font-14"}>{item[0].name}</span>
+                              <span className={"font-16"}>{item[0].name}</span>
                             </Link>
                           </span>
                         </p>
@@ -308,7 +318,7 @@ class shixunAnswer extends Component{
                           {...this.props} {...this.state} challenge={item[0].outputs}
                         ></ShixunAnswerDetail>
                         
-                        { item[0].st===0 ? <div className="font-16 color-dark-21 mb10">
+                        { item[0].st===0 ? <div className="font-16 color-dark-21">
                             <div className="bor-grey-e mt15">
                               <p className="clearfix pt5 pb5 pl15 pr15 back-f6-grey codebox">
                                 <span className="fl">最近通过的代码</span>
@@ -316,7 +326,7 @@ class shixunAnswer extends Component{
                               </p>
 
                               <div className="test-code bor-top-greyE">
-                                <li className="clearfix">
+                                <li className="clearfix resetCodeMirrorStyle">
                                   <CodeMirror
                                     value={item[0].passed_code}
                                     options={{
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
index 8764e00ab..06bccde67 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
@@ -103,7 +103,7 @@ class GraduateTopicDetail extends Component{
     return(
       <div className="newMain">
         <div className="educontent mt10 mb50">
-          <p className="clearfix mb10">
+          <p className="clearfix mb15 lineh-20">
             <WordsBtn style="grey" className="fl" to={`/courses/${tableData.course_id}`}>{tableData && tableData.course_name}</WordsBtn>
             <span className="color-grey-9 fl ml3 mr3">&gt;</span>
             <WordsBtn style="grey" className="fl" to={`/courses/${tableData.course_id}/graduation_topics/${tableData.graduation_id}`}>{tableData.graduation_name}</WordsBtn>
@@ -111,9 +111,9 @@ class GraduateTopicDetail extends Component{
             <span>选题详情</span>
           </p>
           <p className="clearfix mb20 lineh-25">
-            <span className="color-grey-3 font-24 fl task-hide" style={{lineHeight:"30px",maxWidth:"900px"}}>{tableData && tableData.graduation_topic_name}</span>
-            <span className="fl mt4" style={{height:"25px"}}><CoursesListType typelist={[`${tableData && tableData.status_name}`]} typesylename={""} /></span>
-            <WordsBtn className="fr font-16 mt2" style="grey" onClick={()=>this.props.history.goBack()}>返回</WordsBtn>
+            <span className="color-grey-3 font-24 fl task-hide" style={{lineHeight:"25px",maxWidth:"900px"}}>{tableData && tableData.graduation_topic_name}</span>
+            <span className="fl mt1" style={{height:"25px"}}><CoursesListType typelist={[`${tableData && tableData.status_name}`]} typesylename={""} /></span>
+            <WordsBtn className="fr font-16 mt1" style="grey" onClick={()=>this.props.history.goBack()}>返回</WordsBtn>
           </p>
           <div>
             <div className="clearfix edu-back-white bor-bottom-greyE" >
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
index 4e92f75ee..c9bd3f496 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
@@ -169,6 +169,7 @@ class GraduateTopicDetailTable extends Component{
     } = this.state
     const isAdmin =this.props.isAdmin();
     const isStudent =this.props.isStudent();
+    const isNotMember=this.props.isNotMember();
     console.log(un_addClass_notice)
     return(
       <div className="minH-560 edu-back-white">
@@ -176,7 +177,7 @@ class GraduateTopicDetailTable extends Component{
         <div className="topHead edu-txt-center">
           <span style={{"width":"5%"}}>序号</span>
           <span style={{"width":"12%"}}>姓名</span>
-          <span style={{"width":"13%"}}>学号</span>
+          {isNotMember ?"" :<span style={{"width":"13%"}}>学号</span>}
           <span style={{"width":"15%"}}>分班</span>
           <span style={{"width":"15%"}}>选题时间</span>
           <span style={{"width":"12%"}} className="fr">操作</span>
@@ -260,7 +261,7 @@ class GraduateTopicDetailTable extends Component{
                 <li className="color-grey-9 clearfix" key={key}>
                   <span style={{"width":"5%"}} className="color-grey-6">{parseInt(key+1)+(parseInt(page-1)*15)}</span>
                   <span style={{"width":"12%"}} className="color-grey-3">{item.student_name}</span>
-                  <span style={{"width":"13%"}}>{item.student_id}</span>
+                  {isNotMember ?"" :<span style={{"width":"13%"}}>{item.student_id}</span>}
                   <span style={{"width":"15%"}}>{item.class_group_name || "--"}</span>
                   <span style={{"width":"15%"}}>{item.selected_time}</span>
                   {
@@ -288,6 +289,9 @@ class GraduateTopicDetailTable extends Component{
                     isAdmin &&
                     <span style={{"width":"12%"}} className={item.result === "已拒绝"?"fr color-orange-tip":"fr"}>{item.result=== "待确认"?"--":item.result}</span>
                   }
+                  {
+                    isNotMember && <span style={{"width":"12%"}} className="fr color-grey-9">--</span>
+                  }
                   
                 </li>
               )
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
index 17a1b070e..7ccfae974 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
@@ -70,9 +70,9 @@ class GraduateTopicItem extends Component{
           `}</style>
             <h6>
               {
-                isNotMember?discussMessage.private_icon===true?
-                  <a className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:<a onClick={() => this.toDetailPage(`${discussMessage.id}`)}
-                        className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
+                isNotMember && discussMessage.private_icon===true ?
+                  <a className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:
+                  <a onClick={() => this.toDetailPage(`${discussMessage.id}`)} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>
               }
 
               {
diff --git a/public/react/src/modules/courses/poll/PollDetailTabFirst.js b/public/react/src/modules/courses/poll/PollDetailTabFirst.js
index ceca9b291..f8846d751 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabFirst.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabFirst.js
@@ -192,7 +192,12 @@ class PollDetailTabFirst extends Component{
       key: 'classes',
       dataIndex: 'classes',
       width:160,
-      className:poll_types && poll_types.groups_count > 0 ? "edu-txt-center":"edu-txt-center none"
+      className:poll_types && poll_types.groups_count > 0 ? "edu-txt-center":"edu-txt-center none",
+      render:(classes,item,index)=>{
+        return(
+          item.classes ? <span>{item.classes}</span> : <span className="color-grey-9">--</span>
+        )
+      }
     }, {
       title: '提交状态',
       dataIndex: 'status',
@@ -212,22 +217,42 @@ class PollDetailTabFirst extends Component{
       width:160,
       render:(time,item,index)=>{
         return(
-          item.time == null ? "--" : moment(item.time).format('YYYY-MM-DD HH:mm')
+          item.time == null ? <span className="color-grey-9">--</span> : moment(item.time).format('YYYY-MM-DD HH:mm')
         )
       }
     },{
       title: '操作',
       dataIndex: 'operation',
       key: 'operation',
-      className:poll_types && poll_types.un_anonymous ? "edu-txt-center":"edu-txt-center none",
+      className:"edu-txt-center",
       width:120,
       render:(operation,item,index)=>{
         return(
-          item.status == 1 ? <WordsBtn style="blue" to={`/courses/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollId}/users/${item.login}`}>查看</WordsBtn>:<span>--</span>
+          item.status == 1 ? <WordsBtn style="blue" to={`/courses/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollId}/users/${item.login}`}>查看</WordsBtn>:<span className="color-grey-9">--</span>
         )
       }
     }];
+    // 非课堂成员不显示学号列
+    let isNotMember =this.props.isNotMember();
+    if(isNotMember){
+      columns.some((item,key)=> {
+        if (item.title === "学号") {
+         columns.splice(key, 1)
+         return true
+        }
+       }
+      )
+    }
     // un_anonymous true为实名问卷，显示操作列，否则隐藏
+    if(poll_types && (isNotMember || poll_types.un_anonymous == false)){
+      columns.some((item,key)=> {
+        if (item.title === "操作") {
+         columns.splice(key, 1)
+         return true
+        }
+       }
+      )
+    }
     return(
           <div>
           {

From 755e9fcc5cbe60929d2ff2e54fcb1c677513e81b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 29 Jun 2019 17:36:20 +0800
Subject: [PATCH 3/7] =?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/Studentshavecompletedthelist.js  | 3639 +++--------------
 .../exercise/Testpapersettinghomepage.js      |   13 +-
 .../courses/shixunHomework/Listofworks.js     |   56 +-
 .../shixunHomework/Listofworksstudentone.js   |  420 +-
 4 files changed, 920 insertions(+), 3208 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index a84347e25..4769cce87 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -8,7 +8,8 @@ import {
 	Checkbox,
 	Table,
 	Radio,
-	Pagination
+	Pagination,
+	Tooltip,
 } from "antd";
 import axios from 'axios';
 import '../css/members.css'
@@ -71,9 +72,9 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{record.number === "--" ?
-								<a style={{"color": '#999999', "text-align": "center"}}>{record.number}</a>
+								<span style={{"color": '#999999', "text-align": "center"}}>{record.number}</span>
 								:
-								<a style={{"color": '#07111B', "text-align": "center" }}>{record.number}</a>
+								<span style={{"color": '#07111B', "text-align": "center" }}>{record.number}</span>
 
 							}
         </span>
@@ -88,9 +89,9 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 								{record.name === "--" ?
-									<a style={{"color": '#999999', "text-align": "center" }}>{record.name}</a>
+									<span style={{"color": '#999999', "text-align": "center" }}>{record.name}</span>
 									:
-									<a style={{"color": '#07111B', "text-align": "center" }}>{record.name}</a>
+									<span style={{"color": '#07111B', "text-align": "center" }}>{record.name}</span>
 
 								}
         </span>
@@ -105,20 +106,20 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{record.stduynumber === null ?
-								<a style={{
+								<span style={{
 									"color": '#999999',
 									"text-align": "center"
- 								}}>--</a> :
+ 								}}>--</span> :
 								record.stduynumber ===
 								"" ?
-									<a style={{
+									<span style={{
 										"color": '#999999',
 										"text-align": "center"
- 									}}>--</a> :
-									<a style={{
+ 									}}>--</span> :
+									<span style={{
 										"color": '#9A9A9A',
 										"text-align": "center"
- 									}}>{record.stduynumber}</a>
+ 									}}>{record.stduynumber}</span>
 							}
 
         </span>
@@ -129,24 +130,25 @@ class Studentshavecompletedthelist extends Component {
 					key: 'classroom',
 					dataIndex: 'classroom',
 					align: 'center',
-					className: "edu-txt-center",
+					className: "edu-txt-center font-14",
+					width:"260px",
  					render: (text, record) => (
 						<span>
 								{record.classroom === null ?
-									<a style={{
+									<span style={{
 										"color": '#999999',
 										"text-align": "center"
- 									}}>--</a> :
+ 									}}>--</span> :
 									record.classroom ===
 									"" ?
-										<a style={{
+										<span style={{
 											"color": '#999999',
 											"text-align": "center"
- 										}}>--</a> :
-										<a style={{
+ 										}}>--</span> :
+										<span style={{
 											"color": '#07111B',
 											"text-align": "center"
- 										}}>{record.classroom}</a>
+ 										}}>{record.classroom}</span>
 								}
 
         </span>
@@ -157,16 +159,16 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'submitstate',
 					key: 'submitstate',
 					align: 'center',
- 					className: "edu-txt-center",
+ 					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
-             <a style={record.submitstate === "未提交" ? {
+             <span style={record.submitstate === "未提交" ? {
 							 "color": '#999999',
 							 "text-align": "center",
  						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
 							 "color": '#29BD8B',
 							 "text-align": "center",
- 						 }}>{record.submitstate}</a>
+ 						 }}>{record.submitstate}</span>
         </span>
 					)
 
@@ -176,13 +178,13 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'updatetime',
 					key: 'updatetime',
 					align: 'center',
-					className: "edu-txt-center",
+					className: "edu-txt-center font-14",
  					render: (text, record) => (
 						<span>
 							{record.updatetime === "--" ?
-								<a style={{"color": '#999999', "text-align": "center" }}>{record.updatetime}</a>
+								<span style={{"color": '#999999', "text-align": "center" }}>{record.updatetime}</span>
 								:
-								<a style={{"color": '#9A9A9A', "text-align": "center" }}>{record.updatetime}</a>
+								<span style={{"color": '#9A9A9A', "text-align": "center" }}>{record.updatetime}</span>
 							}
         </span>
 					),
@@ -192,18 +194,18 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'completion',
 					key: 'completion',
 					align: 'center',
-					className: "edu-txt-center",
+					className: "edu-txt-center font-14",
  					render: (text, record) => (
 						<span>   {
 							record.completion === "--" ?
-								<a style={{
+								<span style={{
 									"color": '#999999',
 									"text-align": "center"
  								}}>
 									{record.completion}
-								</a>
+								</span>
 								:
-								<a style={parseInt(record.completion) > 90 ? {
+								<span style={parseInt(record.completion) > 90 ? {
 									"color": '#DD1717',
 									"text-align": "center"
  								} : parseInt(record.completion) <= 90 ? {
@@ -216,7 +218,7 @@ class Studentshavecompletedthelist extends Component {
 									{
 										"color": '#747A7F',
 										"text-align": "center"
- 									}}>{record.completion}</a>
+ 									}}>{record.completion}</span>
 						}
 
         </span>
@@ -227,18 +229,18 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'levelscore',
 					key: 'levelscore',
 					align: 'center',
- 					className: "edu-txt-center",
+ 					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
 							{record.levelscore === "--" ?
-								<a style={{
+								<span style={{
 									"color": '#999999',
 									"text-align": "center"
  								}}>
 									{record.levelscore}
-								</a>
+								</span>
 								:
-								<a style={parseInt(record.levelscore) > 90 ? {
+								<span style={parseInt(record.levelscore) > 90 ? {
 									"color": '#DD1717',
 									"text-align": "center"
  								} : parseInt(record.levelscore) <= 90 ? {
@@ -247,7 +249,7 @@ class Studentshavecompletedthelist extends Component {
  								} : parseInt(record.levelscore) <= 60 ? {
 									"color": '#747A7F',
 									"text-align": "center"
- 								} : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</a>
+ 								} : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</span>
 							}
         </span>
 					)
@@ -257,18 +259,22 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',
- 					className: "edu-txt-center",
+ 					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
 							{record.efficiencyscore === "--" ?
+								<Tooltip  placement="bottom" title={<div>
+									<div>未评分</div>
+								</div>}>
 								<a style={{
 									"color": '#999999',
 									"text-align": "center"
  								}}>
 									{record.efficiencyscore}
 								</a>
+								</Tooltip>
 								:
-								<a style={parseInt(record.efficiencyscore) > 90 ? {
+								<span style={parseInt(record.efficiencyscore) > 90 ? {
 									"color": '#DD1717',
 									"text-align": "center"
  								} : parseInt(record.efficiencyscore) <= 90 ? {
@@ -280,7 +286,7 @@ class Studentshavecompletedthelist extends Component {
 								} : {
 									"color": '#747A7F',
 									"text-align": "center"
- 								}}>{record.efficiencyscore}</a>
+ 								}}>{record.efficiencyscore}</span>
 							}
         </span>
 					)
@@ -292,16 +298,15 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'number',
 					key: 'number',
 					align: 'center',
-					width: "84px",
-					className: "edu-txt-center tabletd",
+ 					className: "edu-txt-center tabletd font-14",
 					render: (text, record) => (
 						<span>
 							{
 								record.number === "--" ?
-									<a style={{"color": '#999999', "text-align": "center", "width": "84px",}}>{record.number}</a>
+									<span style={{"color": '#999999', "text-align": "center" }}>{record.number}</span>
 
 									:
-									<a style={{"color": '#07111B', "text-align": "center", "width": "84px",}}>{record.number}</a>
+									<span style={{"color": '#07111B', "text-align": "center"}}>{record.number}</span>
 
 							}
         </span>
@@ -312,15 +317,14 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'name',
 					key: 'name',
 					align: 'center',
-					className: "edu-txt-center tabletd",
-					width: "110px",
-					render: (text, record) => (
+					className: "edu-txt-center tabletd font-14",
+ 					render: (text, record) => (
 						<span>
 							{
 								record.name === "--" ?
-									<a style={{"color": '#999999', "text-align": "center", "width": "110px"}}>{record.name}</a>
+									<span style={{"color": '#999999', "text-align": "center" }}>{record.name}</span>
 									:
-									<a style={{"color": '#07111B', "text-align": "center", "width": "110px"}}>{record.name}</a>
+									<span style={{"color": '#07111B', "text-align": "center" }}>{record.name}</span>
 
 							}
         </span>
@@ -331,29 +335,25 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'stduynumber',
 					key: 'stduynumber',
 					align: 'center',
-					className: "edu-txt-center tabletd",
-					width: "175px",
-					render: (text, record) => (
+					className: "edu-txt-center tabletd font-14",
+ 					render: (text, record) => (
 						<span>
 							{record.stduynumber === null ?
-								<a style={{
+								<span style={{
 									"color": '#999999',
 									"text-align": "center"
-									, "width": "175px"
-								}}>--</a>
+ 								}}>--</span>
 								:
 								record.stduynumber === "" ?
-									<a style={{
+									<span style={{
 										"color": '#999999',
 										"text-align": "center"
-										, "width": "175px"
-									}}>--</a>
+ 									}}>--</span>
 									:
-									<a style={{
+									<span style={{
 										"color": '#9A9A9A',
 										"text-align": "center"
-										, "width": "175px"
-									}}>{record.stduynumber}</a>
+ 									}}>{record.stduynumber}</span>
 							}
 
         </span>
@@ -364,26 +364,23 @@ class Studentshavecompletedthelist extends Component {
 					key: 'classroom',
 					dataIndex: 'classroom',
 					align: 'center',
-					className: "edu-txt-center tabletd",
-					width: "120px",
-					render: (text, record) => (
+					className: "edu-txt-center tabletd font-14",
+					width:"260px",
+ 					render: (text, record) => (
 						<span>
 							{record.classroom === null ?
-								<a style={{
+								<span style={{
 									"color": '#999999',
 									"text-align": "center"
-									, "width": "120px"
-								}}>--</a>: record.classroom === "" ?
-									<a style={{
+ 								}}>--</span>: record.classroom === "" ?
+									<span style={{
 										"color": '#999999',
 										"text-align": "center"
-										, "width": "120px"
-									}}>--</a>:
-									<a style={{
+ 									}}>--</span>:
+									<span tyle={{
 										"color": '#07111B',
 										"text-align": "center"
-										, "width": "120px"
-									}}>{record.classroom}</a>
+ 									}}>{record.classroom}</span>
 									}
 
         </span>
@@ -394,19 +391,16 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'submitstate',
 					key: 'submitstate',
 					align: 'center',
-					width: "124px",
-					className: "edu-txt-center tabletd",
+ 					className: "edu-txt-center tabletd font-14",
 					render: (text, record) => (
 						<span>
-             <a style={record.submitstate === "未提交" ? {
+             <span style={record.submitstate === "未提交" ? {
 							 "color": '#999999',
 							 "text-align": "center",
-							 "width": "124px",
-						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
+ 						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
 							 "color": '#29BD8B',
 							 "text-align": "center",
-							 "width": "124px",
-						 }}>{record.submitstate}</a>
+ 						 }}>{record.submitstate}</span>
         </span>
 					)
 
@@ -416,14 +410,13 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'updatetime',
 					key: 'updatetime',
 					align: 'center',
-					className: "edu-txt-center tabletd",
-					width: "236.4px",
-					render: (text, record) => (
+					className: "edu-txt-center tabletd font-14",
+ 					render: (text, record) => (
 						<span>
 							{record.updatetime === "--"?
-								<a style={{"color": '#999999', "text-align": "center", "width": "236.4px",}}>--</a>
+								<span style={{"color": '#999999', "text-align": "center", }}>--</span>
 								:
-								<a style={{"color": '#9A9A9A', "text-align": "center", "width": "236.4px",}}>{record.updatetime}</a>
+								<span style={{"color": '#9A9A9A', "text-align": "center",  }}>{record.updatetime}</span>
 							}
         </span>
 					),
@@ -433,37 +426,31 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'completion',
 					key: 'completion',
 					align: 'center',
-					className: "edu-txt-center tabletd",
-					width: "124px",
-					render: (text, record) => (
+					className: "edu-txt-center tabletd font-14",
+ 					render: (text, record) => (
 						<span>
 							             			{record.completion === "--" ?
-																  <a style={{
+																  <span style={{
 																		"color": '#999999',
 																		"text-align": "center"
-																		, "width": "124px"
-																	}}>
+ 																	}}>
 																		--
-																	</a>
+																	</span>
 
 																	:
-																	<a style={parseInt(record.completion) > 90 ? {
+																	<span style={parseInt(record.completion) > 90 ? {
 																		"color": '#DD1717',
 																		"text-align": "center"
-																		, "width": "124px"
-																	} : parseInt(record.completion) <= 90 ? {
+ 																	} : parseInt(record.completion) <= 90 ? {
 																		"color": '#FF6800',
 																		"text-align": "center"
-																		, "width": "124px"
-																	} : parseInt(record.completion) <= 60 ? {
+ 																	} : parseInt(record.completion) <= 60 ? {
 																		"color": '#747A7F',
 																		"text-align": "center"
-																		, "width": "124px"
-																	} : {
+ 																	} : {
 																		"color": '#747A7F',
 																		"text-align": "center"
-																		, "width": "124px"
-																	}}>{record.completion}</a>
+ 																	}}>{record.completion}</span>
 																}
         </span>
 					)
@@ -473,32 +460,27 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'levelscore',
 					key: 'levelscore',
 					align: 'center',
-					width: "124px",
-					className: "edu-txt-center tabletd",
+ 					className: "edu-txt-center tabletd font-14",
 					render: (text, record) => (
 						<span>
 							{record.levelscore === "--"?
-								<a style={{
+								<span style={{
 									"color": '#999999',
 									"text-align": "center"
-									, "width": "124px"
-								}}>
+ 								}}>
 									--
-								</a>
+								</span>
 								:
-								<a style={parseInt(record.levelscore) > 90 ? {
+								<span style={parseInt(record.levelscore) > 90 ? {
 									"color": '#DD1717',
 									"text-align": "center"
-									, "width": "124px"
-								} : parseInt(record.levelscore) <= 90 ? {
+ 								} : parseInt(record.levelscore) <= 90 ? {
 									"color": '#FF6800',
 									"text-align": "center"
-									, "width": "124px"
-								} : parseInt(record.levelscore) <= 60 ? {
+ 								} : parseInt(record.levelscore) <= 60 ? {
 									"color": '#747A7F',
 									"text-align": "center"
-									, "width": "124px"
-								} : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</a>
+ 								} : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</span>
 							}
         </span>
 					)
@@ -508,34 +490,33 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',
-					width: "124px",
-					className: "edu-txt-center tabletd",
+ 					className: "edu-txt-center tabletd font-14",
 					render: (text, record) => (
 						<span>
 							{
 								record.efficiencyscore === "--"?
+									<Tooltip  placement="bottom" title={<div>
+										<div>未评分</div>
+									</div>}>
 									<a style={{
 										"color": '#DD1717',
 										"text-align": "center"
-										, "width": "124px"
-									}}>--</a>
+ 									}}>--</a>
+									</Tooltip>
 									:
-									<a style={parseInt(record.efficiencyscore) > 90 ? {
+									<span style={parseInt(record.efficiencyscore) > 90 ? {
 										"color": '#DD1717',
 										"text-align": "center"
-										, "width": "124px"
-									} : parseInt(record.efficiencyscore) <= 90 ? {
+ 									} : parseInt(record.efficiencyscore) <= 90 ? {
 										"color": '#FF6800',
 										"text-align": "center"
-										, "width": "124px"
-									} : parseInt(record.efficiencyscore) <= 60 ? {
+ 									} : parseInt(record.efficiencyscore) <= 60 ? {
 										"color": '#747A7F',
 										"text-align": "center",
 									} : {
 										"color": '#747A7F',
 										"text-align": "center"
-										, "width": "124px"
-									}}>{record.efficiencyscore}</a>
+ 									}}>{record.efficiencyscore}</span>
 							}
 
         </span>
@@ -548,14 +529,14 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'number',
 					key: 'number',
 					align: 'center',
-					className: "edu-txt-center",
+					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
 							{
 								record.number=== "--"?
-									<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+									<span style={{"color": '#999999', "text-align": "center"}}>--</span>
 									:
-								<a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
+								<span style={{"color": '#07111B', "text-align": "center"}}>{record.number}</span>
 							}
 
         </span>
@@ -566,14 +547,14 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'name',
 					key: 'name',
 					align: 'center',
-					className: "edu-txt-center",
+					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
 											{
 												record.name === "--" ?
-													<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+													<span style={{"color": '#999999', "text-align": "center"}}>--</span>
 													:
-													<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+													<span style={{"color": '#07111B', "text-align": "center"}}>{record.name}</span>
 											}
         </span>
 					)
@@ -583,24 +564,24 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'stduynumber',
 					key: 'stduynumber',
 					align: 'center',
-					className: "edu-txt-center",
+					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
 							{record.stduynumber === null ?
-								<a style={{
+								<span style={{
 								"color": '#999999',
 								"text-align": "center"
-							}}>--</a>
+							}}>--</span>
 								: record.stduynumber === "" ?
-									<a style={{
+									<span style={{
 								"color": '#999999',
 								"text-align": "center"
-							}}>--</a>
+							}}>--</span>
 									:
-									<a style={{
+									<span style={{
 										"color": '#9A9A9A',
 										"text-align": "center"
-									}}>{record.stduynumber}</a>
+									}}>{record.stduynumber}</span>
 									}
 
         </span>
@@ -611,22 +592,23 @@ class Studentshavecompletedthelist extends Component {
 					key: 'classroom',
 					dataIndex: 'classroom',
 					align: 'center',
-					className: "edu-txt-center",
+					className: "edu-txt-center font-14",
+					width:"260px",
 					render: (text, record) => (
 						<span>
 							{record.classroom === null ?
-								<a style={{
+								<span style={{
 									"color": '#999999',
 									"text-align": "center"
-								}}>--</a>  : record.classroom === "" ?
-									<a style={{
+								}}>--</span>  : record.classroom === "" ?
+									<span style={{
 										"color": '#999999',
 										"text-align": "center"
-									}}>--</a> :
-									<a style={{
+									}}>--</span> :
+									<span style={{
 										"color": '#07111B',
 										"text-align": "center"
-									}}>{record.classroom}</a>
+									}}>{record.classroom}</span>
 								}
 
         </span>
@@ -637,16 +619,16 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'submitstate',
 					key: 'submitstate',
 					align: 'center',
-					className: "edu-txt-center",
+					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
-             <a style={record.submitstate === "未提交" ? {
+             <span style={record.submitstate === "未提交" ? {
 							 "color": '#999999',
 							 "text-align": "center"
 						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
 							 "color": '#29BD8B',
 							 "text-align": "center"
-						 }}>{record.submitstate}</a>
+						 }}>{record.submitstate}</span>
         </span>
 					)
 
@@ -656,15 +638,15 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'updatetime',
 					key: 'updatetime',
 					align: 'center',
-					className: "edu-txt-center",
+					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
 							{
 								record.updatetime === "--" ?
-									<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+									<span style={{"color": '#999999', "text-align": "center"}}>--</span>
 
 									:
-									<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+									<span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</span>
 
 							}
         </span>
@@ -675,17 +657,17 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'completion',
 					key: 'completion',
 					align: 'center',
-					className: "edu-txt-center",
+					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
 							{
 								record.completion === "--"?
-									 <a style={{
+									 <span style={{
 										 "color": '#999999',
 										 "text-align": "center",
-									 }}>--</a>
+									 }}>--</span>
 									:
-									<a style={parseInt(record.completion) > 90 ? {
+									<span style={parseInt(record.completion) > 90 ? {
 										"color": '#DD1717',
 										"text-align": "center",
 									} : parseInt(record.completion) <= 90 ? {
@@ -697,7 +679,7 @@ class Studentshavecompletedthelist extends Component {
 									} : {
 										"color": '#747A7F',
 										"text-align": "center",
-									}}>{record.completion}</a>
+									}}>{record.completion}</span>
 							}
 
         </span>
@@ -708,16 +690,16 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'levelscore',
 					key: 'levelscore',
 					align: 'center',
-					className: "edu-txt-center",
+					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
 									{
 										record.levelscore === "--" ?
-											<a style={{
+											<span style={{
 												"color": '#999999',
 												"text-align": "center",
-											}}>--</a> :
-											<a style={parseInt(record.levelscore) > 90 ? {
+											}}>--</span> :
+											<span style={parseInt(record.levelscore) > 90 ? {
 												"color": '#DD1717',
 												"text-align": "center",
 											} : parseInt(record.levelscore) <= 90 ? {
@@ -726,7 +708,7 @@ class Studentshavecompletedthelist extends Component {
 											} : parseInt(record.levelscore) <= 60 ? {
 												"color": '#747A7F',
 												"text-align": "center",
-											} : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</a>
+											} : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</span>
 									}
 
         </span>
@@ -737,16 +719,21 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',
-					className: "edu-txt-center",
+					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
 							              {
 															record.efficiencyscore === "--" ?
+																<Tooltip  placement="bottom" title={<div>
+																	<div>未评分</div>
+																</div>}>
 																<a style={{
 																	"color": '#999999',
 																	"text-align": "center",
-																}}>--</a> :
-																<a style={parseInt(record.efficiencyscore) > 90 ? {
+																}}>--</a>
+																</Tooltip>
+																	:
+																<span style={parseInt(record.efficiencyscore) > 90 ? {
 																	"color": '#DD1717',
 																	"text-align": "center",
 																} : parseInt(record.efficiencyscore) <= 90 ? {
@@ -758,7 +745,7 @@ class Studentshavecompletedthelist extends Component {
 																} : {
 																	"color": '#747A7F',
 																	"text-align": "center",
-																}}>{record.efficiencyscore}</a>
+																}}>{record.efficiencyscore}</span>
 														}
 						</span>
 					)
@@ -768,11 +755,11 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'operating',
 					key: 'operating',
 					align: 'center',
-					className: "edu-txt-center",
+					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
 							       {record.operating==="--"?
-											 <a style={{"text-align": "center","color": '#999999',}}>{record.operating}</a>
+											 <span style={{"text-align": "center","color": '#999999',}}>{record.operating}</span>
 											 :
 											 <a style={{"text-align": "center"}} className="color-blue"
 													href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.operating}</a>
@@ -795,14 +782,13 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'number',
 					key: 'number',
 					align: 'center',
-					className: "edu-txt-center",
-					width: '76px',
-					render: (text, record) => (
+					className: "edu-txt-center font-14",
+ 					render: (text, record) => (
 						<span>
 							 {record.number === "--" ?
-								 <a style={{"color": '#999999', "text-align": "center"}}>--</a>
+								 <span style={{"color": '#999999', "text-align": "center"}}>--</span>
 								 :
-								 <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
+								 <span style={{"color": '#07111B', "text-align": "center"}}>{record.number}</span>
 							 }
         </span>
 					)
@@ -812,14 +798,13 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'name',
 					key: 'name',
 					align: 'center',
-					className: "edu-txt-center",
-					width: '149px',
-					render: (text, record) => (
+					className: "edu-txt-center font-14",
+ 					render: (text, record) => (
 						<span>
 							{record.name==="--"?
-								<a style={{"color": '#999999', "text-align": "center"}}>{record.name}</a>
+								<span style={{"color": '#999999', "text-align": "center"}}>{record.name}</span>
 								:
-								<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+								<span style={{"color": '#07111B', "text-align": "center"}}>{record.name}</span>
 							}
         </span>
 					)
@@ -829,14 +814,13 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'stduynumber',
 					key: 'stduynumber',
 					align: 'center',
-					className: "edu-txt-center",
-					width: '159px',
-					render: (text, record) => (
+					className: "edu-txt-center font-14",
+ 					render: (text, record) => (
 				<span>
 						{record.stduynumber === "--" ?
-						<a style={{"color": '#999999', "text-align": "center"}}>{record.stduynumber}</a>
+						<span style={{"color": '#999999', "text-align": "center"}}>{record.stduynumber}</span>
 						:
-						<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.stduynumber}</a>
+						<span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.stduynumber}</span>
 						}
         </span>
 					),
@@ -846,13 +830,14 @@ class Studentshavecompletedthelist extends Component {
 					key: 'classroom',
 					dataIndex: 'classroom',
 					align: 'center',
-					className: "edu-txt-center",
+					className: "edu-txt-center font-14",
+					width:'260px',
 					render: (text, record) => (
 						<span>
 							{record.classroom==="--"?
-								<a style={{"color": '#999999', "text-align": "center"}}>{record.classroom}</a>
+								<span style={{"color": '#999999', "text-align": "center"}}>{record.classroom}</span>
 								:
-								<a style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</a>
+								<span style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</span>
 							}
         </span>
 					)
@@ -862,17 +847,16 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'submitstate',
 					key: 'submitstate',
 					align: 'center',
-					className: "edu-txt-center",
-					width: '112px',
-					render: (text, record) => (
+					className: "edu-txt-center font-14",
+ 					render: (text, record) => (
 						<span>
-								<a style={record.submitstate === "未提交" ? {
+								<span style={record.submitstate === "未提交" ? {
 									"color": '#999999',
 									"text-align": "center"
 								} : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
 									"color": '#29BD8B',
 									"text-align": "center"
-								}}>{record.submitstate}</a>
+								}}>{record.submitstate}</span>
 
         </span>
 					)
@@ -883,14 +867,13 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'updatetime',
 					key: 'updatetime',
 					align: 'center',
-					width: '194px',
-					className: "edu-txt-center",
+ 					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
 							{record.updatetime==="--"?
-								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+								<span style={{"color": '#999999', "text-align": "center"}}>--</span>
 								:
-								<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+								<span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</span>
 							}
         </span>
 					),
@@ -900,14 +883,13 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'completion',
 					key: 'completion',
 					align: 'center',
-					className: "edu-txt-center",
-					width: '112px',
-					render: (text, record) => (
+					className: "edu-txt-center font-14",
+ 					render: (text, record) => (
 						<span>
 							{record.completion=== "--"?
-								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+								<span style={{"color": '#999999', "text-align": "center"}}>--</span>
 								:
-								<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion}</a>
+								<span style={{"color": '#07111B', "text-align": "center"}}>{record.completion}</span>
 							}
         </span>
 					)
@@ -917,14 +899,13 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'levelscore',
 					key: 'levelscore',
 					align: 'center',
-					className: "edu-txt-center",
-					width: '130px',
-					render: (text, record) => (
+					className: "edu-txt-center font-14",
+ 					render: (text, record) => (
 						<span>
 							{record.levelscore==="--"?
-								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+								<span style={{"color": '#999999', "text-align": "center"}}>--</span>
 								:
-								<a style={{"color": '#FF6800', "text-align": "center"}}>{record.levelscore}</a>
+								<span style={{"color": '#FF6800', "text-align": "center"}}>{record.levelscore}</span>
 							}
         </span>
 					)
@@ -934,15 +915,18 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',
-					className: "edu-txt-center",
-					width: '112px',
-					render: (text, record) => (
+					className: "edu-txt-center font-14",
+ 					render: (text, record) => (
 						<span>
 															{record.efficiencyscore === "--" ?
+																<Tooltip  placement="bottom" title={<div>
+																	<div>未评分</div>
+																</div>}>
                                   <a style={{"color": '#999999',
 																		"text-align": "center",}}>--</a>
+																</Tooltip>
 																	:
-															<a style={parseInt(record.efficiencyscore) > 90 ? {
+															<span style={parseInt(record.efficiencyscore) > 90 ? {
 																"color": '#DD1717',
 																"text-align": "center",
 															} : parseInt(record.efficiencyscore) <= 90 ? {
@@ -954,7 +938,7 @@ class Studentshavecompletedthelist extends Component {
 															} : {
 																"color": '#747A7F',
 																"text-align": "center",
-															}}>{record.efficiencyscore}</a>
+															}}>{record.efficiencyscore}</span>
 														}
         </span>
 					)
@@ -964,13 +948,199 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'finalscore',
 					key: 'finalscore',
 					align: 'center',
-					className: "edu-txt-center",
-					width: '78px',
+					className: "edu-txt-center font-14",
+ 					render: (text, record) => (
+						<span>
+							{record.finalscore==="--"?
+								<span style={{"text-align": "center","color": '#999999'}}
+								>--</span>
+								:
+								<a style={{"text-align": "center"}} className="color-blue"
+									 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
+							}
+
+                    </span>
+					)
+				},
+			],
+			columnsystwo: [
+				{
+					title: '序号',
+					dataIndex: 'number',
+					key: 'number',
+					align: 'center',
+					className: "edu-txt-center font-14",
+					render: (text, record) => (
+						<span>
+							 {record.number === "--" ?
+								 <span style={{"color": '#999999', "text-align": "center"}}>--</span>
+								 :
+								 <span style={{"color": '#07111B', "text-align": "center"}}>{record.number}</span>
+							 }
+        </span>
+					)
+				},
+				{
+					title: '姓名',
+					dataIndex: 'name',
+					key: 'name',
+					align: 'center',
+					className: "edu-txt-center font-14",
+					render: (text, record) => (
+						<span>
+							{record.name==="--"?
+								<span style={{"color": '#999999', "text-align": "center"}}>{record.name}</span>
+								:
+								<span style={{"color": '#07111B', "text-align": "center"}}>{record.name}</span>
+							}
+        </span>
+					)
+				},
+				{
+					title: '学号',
+					dataIndex: 'stduynumber',
+					key: 'stduynumber',
+					align: 'center',
+					className: "edu-txt-center font-14",
+					render: (text, record) => (
+						<span>
+						{record.stduynumber === "--" ?
+							<span style={{"color": '#999999', "text-align": "center"}}>{record.stduynumber}</span>
+							:
+							<span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.stduynumber}</span>
+						}
+        </span>
+					),
+				},
+				{
+					title: '分班',
+					key: 'classroom',
+					dataIndex: 'classroom',
+					align: 'center',
+					className: "edu-txt-center font-14",
+					width:'260px',
+					render: (text, record) => (
+						<span>
+							{record.classroom==="--"?
+								<span style={{"color": '#999999', "text-align": "center"}}>{record.classroom}</span>
+								:
+								<span style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</span>
+							}
+        </span>
+					)
+				},
+				{
+					title: '提交状态',
+					dataIndex: 'submitstate',
+					key: 'submitstate',
+					align: 'center',
+					className: "edu-txt-center font-14",
+					render: (text, record) => (
+						<span>
+								<span style={record.submitstate === "未提交" ? {
+									"color": '#999999',
+									"text-align": "center"
+								} : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
+									"color": '#29BD8B',
+									"text-align": "center"
+								}}>{record.submitstate}</span>
+
+        </span>
+					)
+
+				},
+				{
+					title: '提交时间',
+					dataIndex: 'updatetime',
+					key: 'updatetime',
+					align: 'center',
+					className: "edu-txt-center font-14",
+					render: (text, record) => (
+						<span>
+							{record.updatetime==="--"?
+								<span style={{"color": '#999999', "text-align": "center"}}>--</span>
+								:
+								<span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</span>
+							}
+        </span>
+					),
+				},
+				{
+					title: '客观题得分',
+					dataIndex: 'completion',
+					key: 'completion',
+					align: 'center',
+					className: "edu-txt-center font-14",
+					render: (text, record) => (
+						<span>
+							{record.completion=== "--"?
+								<span style={{"color": '#999999', "text-align": "center"}}>--</span>
+								:
+								<span style={{"color": '#07111B', "text-align": "center"}}>{record.completion}</span>
+							}
+        </span>
+					)
+				},
+				{
+					title: '主观题得分',
+					dataIndex: 'levelscore',
+					key: 'levelscore',
+					align: 'center',
+					className: "edu-txt-center font-14",
+					render: (text, record) => (
+						<span>
+							{record.levelscore==="--"?
+								<span style={{"color": '#999999', "text-align": "center"}}>--</span>
+								:
+								<span style={{"color": '#FF6800', "text-align": "center"}}>{record.levelscore}</span>
+							}
+        </span>
+					)
+				},
+				{
+					title: '最终成绩',
+					dataIndex: 'efficiencyscore',
+					key: 'efficiencyscore',
+					align: 'center',
+					className: "edu-txt-center font-14",
+					render: (text, record) => (
+						<span>
+															{record.efficiencyscore === "--" ?
+																<Tooltip  placement="bottom" title={<div>
+																	<div>未评分</div>
+																</div>}>
+																<a style={{"color": '#999999',
+																	"text-align": "center",}}>--</a>
+																</Tooltip>
+																:
+																<span style={parseInt(record.efficiencyscore) > 90 ? {
+																	"color": '#DD1717',
+																	"text-align": "center",
+																} : parseInt(record.efficiencyscore) <= 90 ? {
+																	"color": '#FF6800',
+																	"text-align": "center",
+																} : parseInt(record.efficiencyscore) <= 60 ? {
+																	"color": '#747A7F',
+																	"text-align": "center",
+																} : {
+																	"color": '#747A7F',
+																	"text-align": "center",
+																}}>{record.efficiencyscore}</span>
+															}
+        </span>
+					)
+				},
+				{
+					title: '操作',
+					dataIndex: 'finalscore',
+					key: 'finalscore',
+					align: 'center',
+					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
 							{record.finalscore==="--"?
-								<a style={{"text-align": "center","color": '#999999'}}
-								>--</a>
+								<span style={{"text-align": "center","color": '#999999'}}
+								>--</span>
 								:
 								<a style={{"text-align": "center"}} className="color-blue"
 									 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
@@ -979,7 +1149,7 @@ class Studentshavecompletedthelist extends Component {
                     </span>
 					)
 				},
-			]
+			],
 		}
 		// console.log("Studentshavecompletedthelist");
 		// console.log(props.current_status);
@@ -1076,1019 +1246,118 @@ class Studentshavecompletedthelist extends Component {
 					this.Generatenewdatas(response.data.exercise_users);
 					if (response.data.exercise_types.subjective === 0) {
 						if (this.state.noclassroom === undefined || this.state.noclassroom === "" || this.state.noclassroom === null) {
+							this.state.columnss.map((item,key)=>{
+								if(item.title==="分班"){
+									this.state.columnss.splice(key,1)
+								}
+								if(item.title==="客观题得分"){
+									this.state.columnss.splice(key,1)
+								}
+								if(item.title==="主观题得分"){
+									this.state.columnss.splice(key,1)
+								}
+								if(this.props.isNotMember()===true) {
+									if(item.title==="学号"){
+										this.state.columnss.splice(key,1)
+									}
+								}
+								})
+							let columnss2=this.state.columnss;
 							this.setState({
-								columnss: [
-									{
-										title: '序号',
-										dataIndex: 'number',
-										key: 'number',
-										align: 'center',
-										className: "edu-txt-center",
-										render: (text, record) => (
-											<span>
-												{record.number==="--"?
-													<a style={{
-														"color": '#999999',
-														"text-align": "center",
-													}}>--</a>
-													:
-													<a style={{
-														"color": '#07111B',
-														"text-align": "center",
-													}}>{record.number}</a>
-												}
-                    </span>
-										)
-									},
-									{
-										title: '姓名',
-										dataIndex: 'name',
-										key: 'name',
-										align: 'center',
-										className: "edu-txt-center",
-										render: (text, record) => (
-											<span>
-												{record.name==="--"?
-													<a style={{"color": '#999999', "text-align": "center"}}>--</a>
-													:
-													<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-
-												}
-                    </span>
-										)
-									},
-									{
-										title: '学号',
-										dataIndex: 'stduynumber',
-										key: 'stduynumber',
-										align: 'center',
-										className: "edu-txt-center",
-										render: (text, record) => (
-											<span>
-													{record.stduynumber === null ?
-														<a style={{
-															"color": '#999999',
-															"text-align": "center"
-														}}>--</a>
-														: record.stduynumber === "" ?
-															<a style={{
-																"color": '#999999',
-																"text-align": "center"
-															}}>--</a>
-															:
-															<a style={{
-																"color": '#9A9A9A',
-																"text-align": "center"
-															}}>{record.stduynumber}</a>
-													}
-                    </span>
-										),
-									},
-									{
-										title: '提交状态',
-										dataIndex: 'submitstate',
-										key: 'submitstate',
-										align: 'center',
-										className: "edu-txt-center",
-										render: (text, record) => (
-											<span>
-                         <a style={record.submitstate === "未提交" ? {
-													 "color": '#999999',
-													 "text-align": "center"
-												 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-													 "color": '#747A7F',
-													 "text-align": "center"
-												 }}>{record.submitstate}</a>
-                    </span>
-										)
-
-									},
-									{
-										title: '提交时间',
-										dataIndex: 'updatetime',
-										key: 'updatetime',
-										align: 'center',
-										className: "edu-txt-center",
-										render: (text, record) => (
-											<span>
-												{record.updatetime==="--"?
-													<a style={{"color": '#999999', "text-align": "center"}}></a>
-													:
-													<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-												}
-                    </span>
-										),
-									},
-									{
-										title: '最终成绩',
-										dataIndex: 'efficiencyscore',
-										key: 'efficiencyscore',
-										align: 'center',
-										className: "edu-txt-center",
-										render: (text, record) => (
-											<span>
-                        {record.efficiencyscore === "--" ?
-													<a style={{"color": '#999999',
-														"text-align": "center",}}>--</a>
-													:
-													<a style={parseInt(record.efficiencyscore) > 90 ? {
-														"color": '#DD1717',
-														"text-align": "center",
-													} : parseInt(record.efficiencyscore) <= 90 ? {
-														"color": '#FF6800',
-														"text-align": "center",
-													} : parseInt(record.efficiencyscore) <= 60 ? {
-														"color": '#747A7F',
-														"text-align": "center",
-													} : {
-														"color": '#747A7F',
-														"text-align": "center",
-													}}>{record.efficiencyscore}</a>
-												}
-                    </span>
-										)
-									},
-									{
-										title: '操作',
-										dataIndex: 'operating',
-										key: 'operating',
-										align: 'center',
-										className: "edu-txt-center",
-										render: (text, record) => (
-											<span>
-                                            {
-																							this.props.current_status === 1 ?
-																								<a style={{"text-align": "center"}} className="color-blue"
-																									 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>查看</a>
-																								:
-																								<a style={{"text-align": "center","color": '#999999'}}
-																									 className="color-blue">{"--"}</a>
-																						}
-
-                    </span>
-										)
-									},
-								]
-							})
-						} else {
-							this.setState({
-								columnss: [
-									{
-										title: '序号',
-										dataIndex: 'number',
-										key: 'number',
-										align: 'center',
-										className: "edu-txt-center",
-										render: (text, record) => (
-											<span>
-												{record.number==="--"?
-													<a style={{
-														"color": '#999999',
-														"text-align": "center",
-													}}>--</a>
-													:
-													<a style={{
-														"color": '#07111B',
-														"text-align": "center",
-													}}>{record.number}</a>
-												}
-
-                    </span>
-										)
-									},
-									{
-										title: '姓名',
-										dataIndex: 'name',
-										key: 'name',
-										align: 'center',
-										className: "edu-txt-center",
-										render: (text, record) => (
-											<span>
-                        	{record.name==="--"?
-														<a style={{"color": '#999999', "text-align": "center"}}>--</a>
-														:
-														<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-
-													}
-                    </span>
-										)
-									},
-									{
-										title: '学号',
-										dataIndex: 'stduynumber',
-										key: 'stduynumber',
-										align: 'center',
-										className: "edu-txt-center",
-										render: (text, record) => (
-											<span>
-                        	{record.stduynumber === null ?
-														<a style={{
-															"color": '#999999',
-															"text-align": "center"
-														}}>--</a>
-														: record.stduynumber === "" ?
-															<a style={{
-																"color": '#999999',
-																"text-align": "center"
-															}}>--</a>
-															:
-															<a style={{
-																"color": '#9A9A9A',
-																"text-align": "center"
-															}}>{record.stduynumber}</a>
-													}
-                    </span>
-										),
-									},
-									{
-										title: '分班',
-										key: 'classroom',
-										dataIndex: 'classroom',
-										align: 'center',
-										className: "edu-txt-center",
-										render: (text, record) => (
-											<span>
-                         {record.classroom === null ?
-													 <a style={{
-														 "color": '#999999',
-														 "text-align": "center"
-													 }}>--</a>  : record.classroom === "" ?
-														 <a style={{
-															 "color": '#999999',
-															 "text-align": "center"
-														 }}>--</a> :
-														 <a style={{
-															 "color": '#07111B',
-															 "text-align": "center"
-														 }}>{record.classroom}</a>
-												 }
-
-                    </span>
-										)
-									},
-									{
-										title: '提交状态',
-										dataIndex: 'submitstate',
-										key: 'submitstate',
-										align: 'center',
-										className: "edu-txt-center",
-										render: (text, record) => (
-											<span>
-                         <a style={record.submitstate === "未提交" ? {
-													 "color": '#999999',
-													 "text-align": "center"
-												 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-													 "color": '#29BD8B',
-													 "text-align": "center"
-												 }}>{record.submitstate}</a>
-                    </span>
-										)
-
-									},
-									{
-										title: '提交时间',
-										dataIndex: 'updatetime',
-										key: 'updatetime',
-										align: 'center',
-										className: "edu-txt-center",
-										render: (text, record) => (
-											<span>
-                        {record.updatetime==="--"?
-													<a style={{"color": '#999999', "text-align": "center"}}></a>
-													:
-													<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-												}
-                    </span>
-										),
-									},
-									{
-										title: '最终成绩',
-										dataIndex: 'efficiencyscore',
-										key: 'efficiencyscore',
-										align: 'center',
-										className: "edu-txt-center",
-										render: (text, record) => (
-											<span>
-                        {record.efficiencyscore === "--" ?
-													<a style={{"color": '#999999',
-														"text-align": "center",}}>--</a>
-													:
-													<a style={parseInt(record.efficiencyscore) > 90 ? {
-														"color": '#DD1717',
-														"text-align": "center",
-													} : parseInt(record.efficiencyscore) <= 90 ? {
-														"color": '#FF6800',
-														"text-align": "center",
-													} : parseInt(record.efficiencyscore) <= 60 ? {
-														"color": '#747A7F',
-														"text-align": "center",
-													} : {
-														"color": '#747A7F',
-														"text-align": "center",
-													}}>{record.efficiencyscore}</a>
-												}
-                    </span>
-										)
-									},
-									{
-										title: '操作',
-										dataIndex: 'operating',
-										key: 'operating',
-										align: 'center',
-										className: "edu-txt-center",
-										render: (text, record) => (
-											<span>
-                                            {
-																							this.props.current_status === 1 ?
-																								<a style={{"text-align": "center"}} className="color-blue"
-																									 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>查看</a>
-																								:
-																								<a style={{"text-align": "center","color": '#999999'}}
-																									 className="color-blue">{"--"}</a>
-																						}
-
-                    </span>
-										)
-									},
-								]
-							})
-						}
+								columnss: columnss2,
+							})
+						} else {
+							this.state.columnss.map((item,key)=>{
+								if(item.title==="客观题得分"){
+									this.state.columnss.splice(key,1)
+								}
+								if(item.title==="主观题得分"){
+									this.state.columnss.splice(key,1)
+								}
+								if(this.props.isNotMember()===true) {
+									if(item.title==="学号"){
+										this.state.columnss.splice(key,1)
+									}
+								}
+							})
+							let columnss2=this.state.columnss;
+							this.setState({
+								columnss: columnss2
+							})
+						}
 
 					}
 				} else {
 					//学生已截止
 					if (response.data.exercise_types.subjective === 0) {
 						if (this.state.loadingstate === false) {
-							thiss.setState({
-								columns: [
-									{
-										title: '序号',
-										dataIndex: 'number',
-										key: 'number',
-										align: 'center',
-										className: "edu-txt-center ",
-										width: "84px",
-										render: (text, record) => (
-											<span>
-             	{record.number==="--"?
-								<a style={{
-									"color": '#999999',
-									"text-align": "center",
-								}}>--</a>
-								:
-								<a style={{
-									"color": '#07111B',
-									"text-align": "center",
-								}}>{record.number}</a>
-							}
-
-        </span>
-										)
-									},
-									{
-										title: '姓名',
-										dataIndex: 'name',
-										key: 'name',
-										align: 'center',
-										width: "110px",
-										className: "edu-txt-center",
-										render: (text, record) => (
-											<span>
-           {record.name==="--"?
-						 <a style={{"color": '#999999', "text-align": "center"}}>--</a>
-						 :
-						 <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-
-					 }
-        </span>
-										)
-									},
-									{
-										title: '学号',
-										dataIndex: 'stduynumber',
-										key: 'stduynumber',
-										align: 'center',
-										className: "edu-txt-center",
-										width: "175px",
-										render: (text, record) => (
-											<span>
-											{record.stduynumber === null ?
-												<a style={{
-													"color": '#999999',
-													"text-align": "center"
-												}}>--</a>
-												: record.stduynumber === "" ?
-													<a style={{
-														"color": '#999999',
-														"text-align": "center"
-													}}>--</a>
-													:
-													<a style={{
-														"color": '#9A9A9A',
-														"text-align": "center"
-													}}>{record.stduynumber}</a>
-											}
-                     </span>
-										),
-									},
-									{
-										title: '分班',
-										key: 'classroom',
-										dataIndex: 'classroom',
-										align: 'center',
-										className: "edu-txt-center",
-										width: "120px",
-										render: (text, record) => (
-											<span>
-										 {record.classroom === null ?
-											 <a style={{
-												 "color": '#999999',
-												 "text-align": "center"
-											 }}>--</a>  : record.classroom === "" ?
-												 <a style={{
-													 "color": '#999999',
-													 "text-align": "center"
-												 }}>--</a> :
-												 <a style={{
-													 "color": '#07111B',
-													 "text-align": "center"
-												 }}>{record.classroom}</a>
-										 }
-        </span>
-										)
-									},
-									{
-										title: '提交状态',
-										dataIndex: 'submitstate',
-										key: 'submitstate',
-										align: 'center',
-										className: "edu-txt-center",
-										width: "175px",
-										render: (text, record) => (
-											<span>
-             <a style={record.submitstate === "未提交" ? {
-							 "color": '#999999',
-							 "text-align": "center",
-							 "width": "124px",
-						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center", "width": "124px",} : {
-							 "color": '#29BD8B',
-							 "text-align": "center",
-							 "width": "124px",
-						 }}>{record.submitstate}</a>
-        </span>
-										)
-
-									},
-									{
-										title: '提交时间',
-										dataIndex: 'updatetime',
-										key: 'updatetime',
-										align: 'center',
-										className: "edu-txt-center",
-										width: "236.4px",
-										render: (text, record) => (
-											<span>
-               {record.updatetime==="--"?
-								 <a style={{"color": '#999999', "text-align": "center"}}></a>
-								 :
-								 <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-							 }
-        </span>
-										),
-									},
-									{
-										title: '最终成绩',
-										dataIndex: 'efficiencyscore',
-										key: 'efficiencyscore',
-										align: 'center',
-										className: "edu-txt-center",
-										width: "124px",
-										render: (text, record) => (
-											<span>
-             {record.efficiencyscore === "--" ?
-							 <a style={{"color": '#999999',
-								 "text-align": "center",}}>--</a>
-							 :
-							 <a style={parseInt(record.efficiencyscore) > 90 ? {
-								 "color": '#DD1717',
-								 "text-align": "center",
-							 } : parseInt(record.efficiencyscore) <= 90 ? {
-								 "color": '#FF6800',
-								 "text-align": "center",
-							 } : parseInt(record.efficiencyscore) <= 60 ? {
-								 "color": '#747A7F',
-								 "text-align": "center",
-							 } : {
-								 "color": '#747A7F',
-								 "text-align": "center",
-							 }}>{record.efficiencyscore}</a>
-						 }
-        </span>
-										)
-									}
-								],
-								columnstwo: [
-									{
-										title: '序号',
-										dataIndex: 'number',
-										key: 'number',
-										align: 'center',
-										className: "edu-txt-center tabletd",
-										width: "84px",
-										render: (text, record) => (
-											<span>
-            	{record.number==="--"?
-								<a style={{
-									"color": '#999999',
-									"text-align": "center",
-								}}>--</a>
-								:
-								<a style={{
-									"color": '#07111B',
-									"text-align": "center",
-								}}>{record.number}</a>
-							}
-        </span>
-										)
-									},
-									{
-										title: '姓名',
-										dataIndex: 'name',
-										key: 'name',
-										align: 'center',
-										width: "110px",
-										className: "edu-txt-center tabletd",
-										render: (text, record) => (
-											<span>
-              {record.name==="--"?
-								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
-								:
-								<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-
-							}
-        </span>
-										)
-									},
-									{
-										title: '学号',
-										dataIndex: 'stduynumber',
-										key: 'stduynumber',
-										align: 'center',
-										className: "edu-txt-center tabletd",
-										width: "175px",
-										render: (text, record) => (
-											<span>
-									 {record.stduynumber === null ?
-										 <a style={{
-											 "color": '#999999',
-											 "text-align": "center"
-										 }}>--</a>
-										 : record.stduynumber === "" ?
-											 <a style={{
-												 "color": '#999999',
-												 "text-align": "center"
-											 }}>--</a>
-											 :
-											 <a style={{
-												 "color": '#9A9A9A',
-												 "text-align": "center"
-											 }}>{record.stduynumber}</a>
-									 }
-        </span>
-										),
-									},
-									{
-										title: '分班',
-										key: 'classroom',
-										dataIndex: 'classroom',
-										align: 'center',
-										className: "edu-txt-center tabletd",
-										width: "120px",
-										render: (text, record) => (
-											<span>
-									{record.classroom === null ?
-										<a style={{
-											"color": '#999999',
-											"text-align": "center"
-										}}>--</a>  : record.classroom === "" ?
-											<a style={{
-												"color": '#999999',
-												"text-align": "center"
-											}}>--</a> :
-											<a style={{
-												"color": '#07111B',
-												"text-align": "center"
-											}}>{record.classroom}</a>
+							this.state.columnstwo.map((item,key)=>{
+								if(item.title==="客观题得分"){
+									this.state.columnstwo.splice(key,1)
+								}
+								if(item.title==="主观题得分"){
+									this.state.columnstwo.splice(key,1)
+								}
+								if(this.props.isNotMember()===true) {
+									if(item.title==="学号"){
+										this.state.columnstwo.splice(key,1)
 									}
-        </span>
-										)
-									},
-									{
-										title: '提交状态',
-										dataIndex: 'submitstate',
-										key: 'submitstate',
-										align: 'center',
-										className: "edu-txt-center tabletd",
-										width: "175px",
-										render: (text, record) => (
-											<span>
-             <a style={record.submitstate === "未提交" ? {
-							 "color": '#999999',
-							 "text-align": "center",
-							 "width": "124px",
-						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center", "width": "124px",} : {
-							 "color": '#29BD8B',
-							 "text-align": "center",
-							 "width": "124px",
-						 }}>{record.submitstate}</a>
-        </span>
-										)
-
-									},
-									{
-										title: '提交时间',
-										dataIndex: 'updatetime',
-										key: 'updatetime',
-										align: 'center',
-										className: "edu-txt-center tabletd",
-										width: "236.4px",
-										render: (text, record) => (
-											<span>
-             {record.updatetime==="--"?
-							 <a style={{"color": '#999999', "text-align": "center"}}></a>
-							 :
-							 <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-						 }
-        </span>
-										),
-									},
-									{
-										title: '最终成绩',
-										dataIndex: 'efficiencyscore',
-										key: 'efficiencyscore',
-										align: 'center',
-										className: "edu-txt-center tabletd",
-										width: "124px",
-										render: (text, record) => (
-											<span>
-                {record.efficiencyscore === "--" ?
-									<a style={{"color": '#999999',
-										"text-align": "center",}}>--</a>
-									:
-									<a style={parseInt(record.efficiencyscore) > 90 ? {
-										"color": '#DD1717',
-										"text-align": "center",
-									} : parseInt(record.efficiencyscore) <= 90 ? {
-										"color": '#FF6800',
-										"text-align": "center",
-									} : parseInt(record.efficiencyscore) <= 60 ? {
-										"color": '#747A7F',
-										"text-align": "center",
-									} : {
-										"color": '#747A7F',
-										"text-align": "center",
-									}}>{record.efficiencyscore}</a>
 								}
-        </span>
-										)
+							})
+							let columnstwo2=this.state.columnstwo;
+							this.state.columns.map((item,key)=>{
+								if(item.title==="客观题得分"){
+									this.state.columns.splice(key,1)
+								}
+								if(item.title==="主观题得分"){
+									this.state.columns.splice(key,1)
+								}
+								if(this.props.isNotMember()===true) {
+									if(item.title==="学号"){
+										this.state.columns.splice(key,1)
 									}
-								],
+								}
+							})
+							let columns2=this.state.columns
+							thiss.setState({
+								columns: columns2,
+								columnstwo: columnstwo2,
 								loadingstate: true,
 							})
 						} else {
-							thiss.setState({
-								columns: [
-									{
-										title: '序号',
-										dataIndex: 'number',
-										key: 'number',
-										align: 'center',
-										className: "edu-txt-center ",
-										width: "84px",
-										render: (text, record) => (
-											<span>
-            	{record.number==="--"?
-								<a style={{
-									"color": '#999999',
-									"text-align": "center",
-								}}>--</a>
-								:
-								<a style={{
-									"color": '#07111B',
-									"text-align": "center",
-								}}>{record.number}</a>
-							}
-        </span>
-										)
-									},
-									{
-										title: '姓名',
-										dataIndex: 'name',
-										key: 'name',
-										align: 'center',
-										width: "110px",
-										className: "edu-txt-center",
-										render: (text, record) => (
-											<span>
-             {record.name==="--"?
-							 <a style={{"color": '#999999', "text-align": "center"}}>--</a>
-							 :
-							 <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-
-						 }
-        </span>
-										)
-									},
-									{
-										title: '学号',
-										dataIndex: 'stduynumber',
-										key: 'stduynumber',
-										align: 'center',
-										className: "edu-txt-center",
-										width: "175px",
-										render: (text, record) => (
-											<span>
-									 {record.stduynumber === null ?
-										 <a style={{
-											 "color": '#999999',
-											 "text-align": "center"
-										 }}>--</a>
-										 : record.stduynumber === "" ?
-											 <a style={{
-												 "color": '#999999',
-												 "text-align": "center"
-											 }}>--</a>
-											 :
-											 <a style={{
-												 "color": '#9A9A9A',
-												 "text-align": "center"
-											 }}>{record.stduynumber}</a>
-									 }
-        </span>
-										),
-									},
-									{
-										title: '分班',
-										key: 'classroom',
-										dataIndex: 'classroom',
-										align: 'center',
-										className: "edu-txt-center",
-										width: "120px",
-										render: (text, record) => (
-											<span>
-										{record.classroom === null ?
-											<a style={{
-												"color": '#999999',
-												"text-align": "center"
-											}}>--</a>  : record.classroom === "" ?
-												<a style={{
-													"color": '#999999',
-													"text-align": "center"
-												}}>--</a> :
-												<a style={{
-													"color": '#07111B',
-													"text-align": "center"
-												}}>{record.classroom}</a>
-										}
-        </span>
-										)
-									},
-									{
-										title: '提交状态',
-										dataIndex: 'submitstate',
-										key: 'submitstate',
-										align: 'center',
-										className: "edu-txt-center",
-										width: "175px",
-										render: (text, record) => (
-											<span>
-             <a style={record.submitstate === "未提交" ? {
-							 "color": '#999999',
-							 "text-align": "center",
-							 "width": "124px",
-						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center", "width": "124px",} : {
-							 "color": '#29BD8B',
-							 "text-align": "center",
-							 "width": "124px",
-						 }}>{record.submitstate}</a>
-        </span>
-										)
-
-									},
-									{
-										title: '提交时间',
-										dataIndex: 'updatetime',
-										key: 'updatetime',
-										align: 'center',
-										className: "edu-txt-center",
-										width: "236.4px",
-										render: (text, record) => (
-											<span>
-             {record.updatetime==="--"?
-							 <a style={{"color": '#999999', "text-align": "center"}}></a>
-							 :
-							 <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-						 }
-        </span>
-										),
-									},
-									{
-										title: '最终成绩',
-										dataIndex: 'efficiencyscore',
-										key: 'efficiencyscore',
-										align: 'center',
-										className: "edu-txt-center",
-										width: "124px",
-										render: (text, record) => (
-											<span>
-									{record.efficiencyscore === "--" ?
-										<a style={{"color": '#999999',
-											"text-align": "center",}}>--</a>
-										:
-										<a style={parseInt(record.efficiencyscore) > 90 ? {
-											"color": '#DD1717',
-											"text-align": "center",
-										} : parseInt(record.efficiencyscore) <= 90 ? {
-											"color": '#FF6800',
-											"text-align": "center",
-										} : parseInt(record.efficiencyscore) <= 60 ? {
-											"color": '#747A7F',
-											"text-align": "center",
-										} : {
-											"color": '#747A7F',
-											"text-align": "center",
-										}}>{record.efficiencyscore}</a>
+							this.state.columnstwo.map((item,key)=>{
+								if(item.title==="客观题得分"){
+									this.state.columnstwo.splice(key,1)
+								}
+								if(item.title==="主观题得分"){
+									this.state.columnstwo.splice(key,1)
+								}
+								if(this.props.isNotMember()===true) {
+									if(item.title==="学号"){
+										this.state.columnstwo.splice(key,1)
 									}
-        </span>
-										)
+								}
+							})
+							let columnstwo2=this.state.columnstwo;
+							this.state.columns.map((item,key)=>{
+								if(item.title==="客观题得分"){
+									this.state.columns.splice(key,1)
+								}
+								if(item.title==="主观题得分"){
+									this.state.columns.splice(key,1)
+								}
+								if(this.props.isNotMember()===true) {
+									if(item.title==="学号"){
+										this.state.columns.splice(key,1)
 									}
-								],
-								columnstwo: [
-									{
-										title: '序号',
-										dataIndex: 'number',
-										key: 'number',
-										align: 'center',
-										className: "edu-txt-center tabletd",
-										width: "84px",
-										render: (text, record) => (
-											<span>
-             {record.number==="--"?
-							 <a style={{
-								 "color": '#999999',
-								 "text-align": "center",
-							 }}>--</a>
-							 :
-							 <a style={{
-								 "color": '#07111B',
-								 "text-align": "center",
-							 }}>{record.number}</a>
-						 }
-        </span>
-										)
-									},
-									{
-										title: '姓名',
-										dataIndex: 'name',
-										key: 'name',
-										align: 'center',
-										width: "110px",
-										className: "edu-txt-center tabletd",
-										render: (text, record) => (
-											<span>
-              {record.name==="--"?
-								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
-								:
-								<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+								}
+							})
+							let columns2=this.state.columns
 
-							}
-        </span>
-										)
-									},
-									{
-										title: '学号',
-										dataIndex: 'stduynumber',
-										key: 'stduynumber',
-										align: 'center',
-										className: "edu-txt-center tabletd",
-										width: "175px",
-										render: (text, record) => (
-											<span>
-									 {record.stduynumber === null ?
-										 <a style={{
-											 "color": '#999999',
-											 "text-align": "center"
-										 }}>--</a>
-										 : record.stduynumber === "" ?
-											 <a style={{
-												 "color": '#999999',
-												 "text-align": "center"
-											 }}>--</a>
-											 :
-											 <a style={{
-												 "color": '#9A9A9A',
-												 "text-align": "center"
-											 }}>{record.stduynumber}</a>
-									 }
-        </span>
-										),
-									},
-									{
-										title: '分班',
-										key: 'classroom',
-										dataIndex: 'classroom',
-										align: 'center',
-										className: "edu-txt-center tabletd",
-										width: "120px",
-										render: (text, record) => (
-											<span>
-										{record.classroom === null ?
-											<a style={{
-												"color": '#999999',
-												"text-align": "center"
-											}}>--</a>  : record.classroom === "" ?
-												<a style={{
-													"color": '#999999',
-													"text-align": "center"
-												}}>--</a> :
-												<a style={{
-													"color": '#07111B',
-													"text-align": "center"
-												}}>{record.classroom}</a>
-										}
-        </span>
-										)
-									},
-									{
-										title: '提交状态',
-										dataIndex: 'submitstate',
-										key: 'submitstate',
-										align: 'center',
-										className: "edu-txt-center tabletd",
-										width: "175px",
-										render: (text, record) => (
-											<span>
-             <a style={record.submitstate === "未提交" ? {
-							 "color": '#999999',
-							 "text-align": "center",
-							 "width": "124px",
-						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center", "width": "124px",} : {
-							 "color": '#29BD8B',
-							 "text-align": "center",
-							 "width": "124px",
-						 }}>{record.submitstate}</a>
-        </span>
-										)
 
-									},
-									{
-										title: '提交时间',
-										dataIndex: 'updatetime',
-										key: 'updatetime',
-										align: 'center',
-										className: "edu-txt-center tabletd",
-										width: "236.4px",
-										render: (text, record) => (
-											<span>
-										{record.updatetime==="--"?
-											<a style={{"color": '#999999', "text-align": "center"}}></a>
-											:
-											<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-										}
-        </span>
-										),
-									},
-									{
-										title: '最终成绩',
-										dataIndex: 'efficiencyscore',
-										key: 'efficiencyscore',
-										align: 'center',
-										className: "edu-txt-center tabletd",
-										width: "124px",
-										render: (text, record) => (
-											<span>
-                  {record.efficiencyscore === "--" ?
-										<a style={{"color": '#999999',
-											"text-align": "center",}}>--</a>
-										:
-										<a style={parseInt(record.efficiencyscore) > 90 ? {
-											"color": '#DD1717',
-											"text-align": "center",
-										} : parseInt(record.efficiencyscore) <= 90 ? {
-											"color": '#FF6800',
-											"text-align": "center",
-										} : parseInt(record.efficiencyscore) <= 60 ? {
-											"color": '#747A7F',
-											"text-align": "center",
-										} : {
-											"color": '#747A7F',
-											"text-align": "center",
-										}}>{record.efficiencyscore}</a>
-									}
-        </span>
-										)
-									}
-								],
+							thiss.setState({
+								columns: columns2,
+								columnstwo:columnstwo2,
 							})
 						}
 
@@ -2341,340 +1610,37 @@ class Studentshavecompletedthelist extends Component {
 				current_answer_user: response.data.current_answer_user,
 			})
 			if (response.data.exercise_types.subjective === 0) {
-
-				this.setState({
-					columns: [
-						{
-							title: '序号',
-							dataIndex: 'number',
-							key: 'number',
-							align: 'center',
-							className: "edu-txt-center ",
-							width: "84px",
-							render: (text, record) => (
-								<span>
-            {record.number==="--"?
-							<a style={{
-								"color": '#999999',
-								"text-align": "center",
-							}}>--</a>
-							:
-							<a style={{
-								"color": '#07111B',
-								"text-align": "center",
-							}}>{record.number}</a>
-						}
-        </span>
-							)
-						},
-						{
-							title: '姓名',
-							dataIndex: 'name',
-							key: 'name',
-							align: 'center',
-							className: "edu-txt-center",
-							width: "110px",
-							render: (text, record) => (
-								<span>
-            {record.name==="--"?
-							<a style={{"color": '#999999', "text-align": "center"}}>--</a>
-							:
-							<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-
-						}
-        </span>
-							)
-						},
-						{
-							title: '学号',
-							dataIndex: 'stduynumber',
-							key: 'stduynumber',
-							align: 'center',
-							width: "175px",
-							className: "edu-txt-center",
-							render: (text, record) => (
-								<span>
-            {record.stduynumber === null ?
-							<a style={{
-								"color": '#999999',
-								"text-align": "center"
-							}}>--</a>
-							: record.stduynumber === "" ?
-								<a style={{
-									"color": '#999999',
-									"text-align": "center"
-								}}>--</a>
-								:
-								<a style={{
-									"color": '#9A9A9A',
-									"text-align": "center"
-								}}>{record.stduynumber}</a>
-						}
-        </span>
-							),
-						},
-						{
-							title: '分班',
-							key: 'classroom',
-							dataIndex: 'classroom',
-							align: 'center',
-							width: "120px",
-							className: "edu-txt-center",
-							render: (text, record) => (
-								<span>
-							{record.classroom === null ?
-								<a style={{
-									"color": '#999999',
-									"text-align": "center"
-								}}>--</a>  : record.classroom === "" ?
-									<a style={{
-										"color": '#999999',
-										"text-align": "center"
-									}}>--</a> :
-									<a style={{
-										"color": '#07111B',
-										"text-align": "center"
-									}}>{record.classroom}</a>
-							}
-        </span>
-							)
-						},
-						{
-							title: '提交状态',
-							dataIndex: 'submitstate',
-							key: 'submitstate',
-							align: 'center',
-							className: "edu-txt-center",
-							width: "124px",
-							render: (text, record) => (
-								<span>
-             <a style={record.submitstate === "未提交" ? {
-							 "color": '#999999',
-							 "text-align": "center",
-							 "width": "124px",
-						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center", "width": "124px",} : {
-							 "color": '#29BD8B',
-							 "text-align": "center",
-							 "width": "124px",
-						 }}>{record.submitstate}</a>
-        </span>
-							)
-
-						},
-						{
-							title: '提交时间',
-							dataIndex: 'updatetime',
-							key: 'updatetime',
-							align: 'center',
-							className: "edu-txt-center",
-							width: "236px",
-							render: (text, record) => (
-								<span>
-            	{record.updatetime==="--"?
-								<a style={{"color": '#999999', "text-align": "center"}}></a>
-								:
-								<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-							}
-        </span>
-							),
-						},
-						{
-							title: '最终成绩',
-							dataIndex: 'efficiencyscore',
-							key: 'efficiencyscore',
-							align: 'center',
-							className: "edu-txt-center",
-							width: "124px",
-							render: (text, record) => (
-								<span>
-              {record.efficiencyscore === "--" ?
-								<a style={{"color": '#999999',
-									"text-align": "center",}}>--</a>
-								:
-								<a style={parseInt(record.efficiencyscore) > 90 ? {
-									"color": '#DD1717',
-									"text-align": "center",
-								} : parseInt(record.efficiencyscore) <= 90 ? {
-									"color": '#FF6800',
-									"text-align": "center",
-								} : parseInt(record.efficiencyscore) <= 60 ? {
-									"color": '#747A7F',
-									"text-align": "center",
-								} : {
-									"color": '#747A7F',
-									"text-align": "center",
-								}}>{record.efficiencyscore}</a>
-							}
-        </span>
-							)
-						}
-					],
-					columnstwo: [
-						{
-							title: '序号',
-							dataIndex: 'number',
-							key: 'number',
-							align: 'center',
-							className: "edu-txt-center tabletd",
-							width: "84px",
-							render: (text, record) => (
-								<span>
-              {record.number==="--"?
-								<a style={{
-									"color": '#999999',
-									"text-align": "center",
-								}}>--</a>
-								:
-								<a style={{
-									"color": '#07111B',
-									"text-align": "center",
-								}}>{record.number}</a>
-							}
-        </span>
-							)
-						},
-						{
-							title: '姓名',
-							dataIndex: 'name',
-							key: 'name',
-							align: 'center',
-							className: "edu-txt-center tabletd",
-							width: "110px",
-							render: (text, record) => (
-								<span>
-              {record.name==="--"?
-								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
-								:
-								<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-
-							}
-        </span>
-							)
-						},
-						{
-							title: '学号',
-							dataIndex: 'stduynumber',
-							key: 'stduynumber',
-							align: 'center',
-							width: "175px",
-							className: "edu-txt-center tabletd",
-							render: (text, record) => (
-								<span>
-             {record.stduynumber === null ?
-							 <a style={{
-								 "color": '#999999',
-								 "text-align": "center"
-							 }}>--</a>
-							 : record.stduynumber === "" ?
-								 <a style={{
-									 "color": '#999999',
-									 "text-align": "center"
-								 }}>--</a>
-								 :
-								 <a style={{
-									 "color": '#9A9A9A',
-									 "text-align": "center"
-								 }}>{record.stduynumber}</a>
-						 }
-        </span>
-							),
-						},
-						{
-							title: '分班',
-							key: 'classroom',
-							dataIndex: 'classroom',
-							align: 'center',
-							width: "120px",
-							className: "edu-txt-center tabletd",
-							render: (text, record) => (
-								<span>
-            {record.classroom === null ?
-							<a style={{
-								"color": '#999999',
-								"text-align": "center"
-							}}>--</a>  : record.classroom === "" ?
-								<a style={{
-									"color": '#999999',
-									"text-align": "center"
-								}}>--</a> :
-								<a style={{
-									"color": '#07111B',
-									"text-align": "center"
-								}}>{record.classroom}</a>
+				this.state.columnstwo.map((item,key)=>{
+					if(item.title==="客观题得分"){
+						this.state.columnstwo.splice(key,1)
+					}
+					if(item.title==="主观题得分"){
+						this.state.columnstwo.splice(key,1)
+					}
+					if(this.props.isNotMember()===true) {
+						if(item.title==="学号"){
+							this.state.columnstwo.splice(key,1)
 						}
-        </span>
-							)
-						},
-						{
-							title: '提交状态',
-							dataIndex: 'submitstate',
-							key: 'submitstate',
-							align: 'center',
-							className: "edu-txt-center tabletd",
-							width: "124px",
-							render: (text, record) => (
-								<span>
-             <a style={record.submitstate === "未提交" ? {
-							 "color": '#999999',
-							 "text-align": "center",
-							 "width": "124px",
-						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center", "width": "124px",} : {
-							 "color": '#29BD8B',
-							 "text-align": "center",
-							 "width": "124px",
-						 }}>{record.submitstate}</a>
-        </span>
-							)
-
-						},
-						{
-							title: '提交时间',
-							dataIndex: 'updatetime',
-							key: 'updatetime',
-							align: 'center',
-							className: "edu-txt-center tabletd",
-							width: "236px",
-							render: (text, record) => (
-								<span>
-            	{record.updatetime==="--"?
-								<a style={{"color": '#999999', "text-align": "center"}}></a>
-								:
-								<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-							}
-        </span>
-							),
-						},
-						{
-							title: '最终成绩',
-							dataIndex: 'efficiencyscore',
-							key: 'efficiencyscore',
-							align: 'center',
-							className: "edu-txt-center tabletd",
-							width: "124px",
-							render: (text, record) => (
-								<span>
-             {record.efficiencyscore === "--" ?
-							 <a style={{"color": '#999999',
-								 "text-align": "center",}}>--</a>
-							 :
-							 <a style={parseInt(record.efficiencyscore) > 90 ? {
-								 "color": '#DD1717',
-								 "text-align": "center",
-							 } : parseInt(record.efficiencyscore) <= 90 ? {
-								 "color": '#FF6800',
-								 "text-align": "center",
-							 } : parseInt(record.efficiencyscore) <= 60 ? {
-								 "color": '#747A7F',
-								 "text-align": "center",
-							 } : {
-								 "color": '#747A7F',
-								 "text-align": "center",
-							 }}>{record.efficiencyscore}</a>
-						 }
-        </span>
-							)
+					}
+				})
+				let columnstwo2=this.state.columnstwo;
+				this.state.columns.map((item,key)=>{
+					if(item.title==="客观题得分"){
+						this.state.columns.splice(key,1)
+					}
+					if(item.title==="主观题得分"){
+						this.state.columns.splice(key,1)
+					}
+					if(this.props.isNotMember()===true) {
+						if(item.title==="学号"){
+							this.state.columns.splice(key,1)
 						}
-					],
+					}
+				})
+				let columns2=this.state.columns
+				this.setState({
+					columns: columns2,
+					columnstwo: columnstwo2,
 					loadingstate: false,
 				})
 			}
@@ -2749,6 +1715,19 @@ class Studentshavecompletedthelist extends Component {
 					// console.log("77771111111");
 					//分班大于0显示分班
 					//7ge
+					this.state.columnsys.map((item,key)=>{
+						if(item.title==="客观题得分"){
+							this.state.columnsys.splice(key,1)
+						}
+						if(item.title==="主观题得分"){
+							this.state.columnsys.splice(key,1)
+						}
+						if(this.props.isNotMember()===true) {
+							if(item.title==="学号"){
+								this.state.columnsys.splice(key,1)
+							}
+						}
+					})
 					thiss.setState({
 						data: datalist,
 						teacherlist: teacherlist,
@@ -2758,174 +1737,28 @@ class Studentshavecompletedthelist extends Component {
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
 						loadingstate: false,
-						columnsys: [
-							{
-								title: '序号',
-								dataIndex: 'number',
-								key: 'number',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '110px',
-								render: (text, record) => (
-									<span>
-               {record.number==="--"?
-								 <a style={{
-									 "color": '#999999',
-									 "text-align": "center",
-								 }}>--</a>
-								 :
-								 <a style={{
-									 "color": '#07111B',
-									 "text-align": "center",
-								 }}>{record.number}</a>
-							 }
-        </span>
-								)
-							},
-							{
-								title: '姓名',
-								dataIndex: 'name',
-								key: 'name',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '183px',
-								render: (text, record) => (
-									<span>
-              {record.name==="--"?
-								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
-								:
-								<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-
-							}
-        </span>
-								)
-							},
-							{
-								title: '学号',
-								dataIndex: 'stduynumber',
-								key: 'stduynumber',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '193px',
-								render: (text, record) => (
-									<span>
-								{record.stduynumber === null ?
-									<a style={{
-										"color": '#999999',
-										"text-align": "center"
-									}}>--</a>
-									: record.stduynumber === "" ?
-										<a style={{
-											"color": '#999999',
-											"text-align": "center"
-										}}>--</a>
-										:
-										<a style={{
-											"color": '#9A9A9A',
-											"text-align": "center"
-										}}>{record.stduynumber}</a>
-								}
-        </span>
-								),
-							},
-							{
-								title: '分班',
-								key: 'classroom',
-								dataIndex: 'classroom',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '193px',
-								render: (text, record) => (
-									<span>
-								{record.classroom === null ?
-									<a style={{
-										"color": '#999999',
-										"text-align": "center"
-									}}>--</a>  : record.classroom === "" ?
-										<a style={{
-											"color": '#999999',
-											"text-align": "center"
-										}}>--</a> :
-										<a style={{
-											"color": '#07111B',
-											"text-align": "center"
-										}}>{record.classroom}</a>
-								}
-        </span>
-								)
-							},
-							{
-								title: '提交状态',
-								dataIndex: 'submitstate',
-								key: 'submitstate',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '146px',
-								render: (text, record) => (
-									<span>
-             <a style={record.submitstate === "未提交" ? {
-							 "color": '#999999',
-							 "text-align": "center"
-						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#29BD8B',
-							 "text-align": "center"
-						 }}>{record.submitstate}</a>
-        </span>
-								)
-
-							},
-							{
-								title: '提交时间',
-								dataIndex: 'updatetime',
-								key: 'updatetime',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '228px',
-								render: (text, record) => (
-									<span>
-             	{record.updatetime==="--"?
-								<a style={{"color": '#999999', "text-align": "center"}}></a>
-								:
-								<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-							}
-        </span>
-								),
-							},
-							{
-								title: '最终成绩',
-								dataIndex: 'efficiencyscore',
-								key: 'efficiencyscore',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '146px',
-								render: (text, record) => (
-									<span>
-                         {record.efficiencyscore === "--" ?
-													 <a style={{"color": '#999999',
-														 "text-align": "center",}}>--</a>
-													 :
-													 <a style={parseInt(record.efficiencyscore) > 90 ? {
-														 "color": '#DD1717',
-														 "text-align": "center",
-													 } : parseInt(record.efficiencyscore) <= 90 ? {
-														 "color": '#FF6800',
-														 "text-align": "center",
-													 } : parseInt(record.efficiencyscore) <= 60 ? {
-														 "color": '#747A7F',
-														 "text-align": "center",
-													 } : {
-														 "color": '#747A7F',
-														 "text-align": "center",
-													 }}>{record.efficiencyscore}</a>
-												 }
-        </span>
-								)
-							}
-						]
+						columnsys: this.state.columnsys,
 					})
 				} else {
 					//分班小于0不显示分班
 					//6ge
+					this.state.columnsys.map((item,key)=>{
+						if(item.title==="分班"){
+							this.state.columnsys.splice(key,1)
+						}
+						if(item.title==="客观题得分"){
+							this.state.columnsys.splice(key,1)
+						}
+						if(item.title==="主观题得分"){
+							this.state.columnsys.splice(key,1)
+						}
+						if(this.props.isNotMember()===true) {
+							if(item.title==="学号"){
+								this.state.columnsys.splice(key,1)
+							}
+						}
+					})
+
 					thiss.setState({
 						data: datalist,
 						teacherlist: teacherlist,
@@ -2935,144 +1768,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						columnsys: [
-							{
-								title: '序号',
-								dataIndex: 'number',
-								key: 'number',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '76px',
-								render: (text, record) => (
-									<span>
-              {record.number==="--"?
-								<a style={{
-									"color": '#999999',
-									"text-align": "center",
-								}}>--</a>
-								:
-								<a style={{
-									"color": '#07111B',
-									"text-align": "center",
-								}}>{record.number}</a>
-							}
-        </span>
-								)
-							},
-							{
-								title: '姓名',
-								dataIndex: 'name',
-								key: 'name',
-								align: 'center',
-								width: '149px',
-								className: "edu-txt-center",
-								render: (text, record) => (
-									<span>
-            {record.name==="--"?
-							<a style={{"color": '#999999', "text-align": "center"}}>--</a>
-							:
-							<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-
-						}
-        </span>
-								)
-							},
-							{
-								title: '学号',
-								dataIndex: 'stduynumber',
-								key: 'stduynumber',
-								align: 'center',
-								width: '159px',
-								className: "edu-txt-center",
-								render: (text, record) => (
-									<span>
-             {record.stduynumber === null ?
-							 <a style={{
-								 "color": '#999999',
-								 "text-align": "center"
-							 }}>--</a>
-							 : record.stduynumber === "" ?
-								 <a style={{
-									 "color": '#999999',
-									 "text-align": "center"
-								 }}>--</a>
-								 :
-								 <a style={{
-									 "color": '#9A9A9A',
-									 "text-align": "center"
-								 }}>{record.stduynumber}</a>
-						 }
-        </span>
-								),
-							},
-							{
-								title: '提交状态',
-								dataIndex: 'submitstate',
-								key: 'submitstate',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '112px',
-								render: (text, record) => (
-									<span>
-             <a style={record.submitstate === "未提交" ? {
-							 "color": '#999999',
-							 "text-align": "center"
-						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#29BD8B',
-							 "text-align": "center"
-						 }}>{record.submitstate}</a>
-        </span>
-								)
-
-							},
-							{
-								title: '提交时间',
-								dataIndex: 'updatetime',
-								key: 'updatetime',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '194px',
-								render: (text, record) => (
-									<span>
-           	{record.updatetime==="--"?
-							<a style={{"color": '#999999', "text-align": "center"}}></a>
-							:
-							<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-						}
-        </span>
-								),
-							},
-							{
-								title: '最终成绩',
-								dataIndex: 'efficiencyscore',
-								key: 'efficiencyscore',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '112px',
-								render: (text, record) => (
-									<span>
-                             {record.efficiencyscore === "--" ?
-															 <a style={{"color": '#999999',
-																 "text-align": "center",}}>--</a>
-															 :
-															 <a style={parseInt(record.efficiencyscore) > 90 ? {
-																 "color": '#DD1717',
-																 "text-align": "center",
-															 } : parseInt(record.efficiencyscore) <= 90 ? {
-																 "color": '#FF6800',
-																 "text-align": "center",
-															 } : parseInt(record.efficiencyscore) <= 60 ? {
-																 "color": '#747A7F',
-																 "text-align": "center",
-															 } : {
-																 "color": '#747A7F',
-																 "text-align": "center",
-															 }}>{record.efficiencyscore}</a>
-														 }
-        </span>
-								)
-							}
-						]
+						columnsys: this.state.columnsys,
 					})
 				}
 
@@ -3082,6 +1778,19 @@ class Studentshavecompletedthelist extends Component {
 				if (response.data.exercise_types.groups_count > 0) {
 					//显示分班
 					//8ge
+					this.state.columnsys.map((item,key)=>{
+						if(item.title==="客观题得分"){
+							this.state.columnsys.splice(key,1)
+						}
+						if(item.title==="主观题得分"){
+							this.state.columnsys.splice(key,1)
+						}
+						if(this.props.isNotMember()===true) {
+							if(item.title==="学号"){
+								this.state.columnsys.splice(key,1)
+							}
+						}
+					})
 					this.setState({
 						data: datalist,
 						teacherlist: teacherlist,
@@ -3090,195 +1799,28 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						loadingstate: false,
-						columnsys: [
-							{
-								title: '序号',
-								dataIndex: 'number',
-								key: 'number',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '96px',
-								render: (text, record) => (
-									<span>
-             {record.number==="--"?
-							 <a style={{
-								 "color": '#999999',
-								 "text-align": "center",
-							 }}>--</a>
-							 :
-							 <a style={{
-								 "color": '#07111B',
-								 "text-align": "center",
-							 }}>{record.number}</a>
-						 }
-        </span>
-								)
-							},
-							{
-								title: '姓名',
-								dataIndex: 'name',
-								key: 'name',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '169px',
-								render: (text, record) => (
-									<span>
-              {record.name==="--"?
-								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
-								:
-								<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-
-							}
-        </span>
-								)
-							},
-							{
-								title: '学号',
-								dataIndex: 'stduynumber',
-								key: 'stduynumber',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '179px',
-								render: (text, record) => (
-									<span>
-              {record.stduynumber === null ?
-								<a style={{
-									"color": '#999999',
-									"text-align": "center"
-								}}>--</a>
-								: record.stduynumber === "" ?
-									<a style={{
-										"color": '#999999',
-										"text-align": "center"
-									}}>--</a>
-									:
-									<a style={{
-										"color": '#9A9A9A',
-										"text-align": "center"
-									}}>{record.stduynumber}</a>
-							}
-        </span>
-								),
-							},
-							{
-								title: '分班',
-								key: 'classroom',
-								dataIndex: 'classroom',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '179px',
-								render: (text, record) => (
-									<span>
-             {record.classroom === null ?
-							 <a style={{
-								 "color": '#999999',
-								 "text-align": "center"
-							 }}>--</a>  : record.classroom === "" ?
-								 <a style={{
-									 "color": '#999999',
-									 "text-align": "center"
-								 }}>--</a> :
-								 <a style={{
-									 "color": '#07111B',
-									 "text-align": "center"
-								 }}>{record.classroom}</a>
-						 }
-        </span>
-								)
-							},
-							{
-								title: '提交状态',
-								dataIndex: 'submitstate',
-								key: 'submitstate',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '132px',
-								render: (text, record) => (
-									<span>
-             <a style={record.submitstate === "未提交" ? {
-							 "color": '#999999',
-							 "text-align": "center"
-						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#29BD8B',
-							 "text-align": "center"
-						 }}>{record.submitstate}</a>
-        </span>
-								)
-
-							},
-							{
-								title: '提交时间',
-								dataIndex: 'updatetime',
-								key: 'updatetime',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '214px',
-								render: (text, record) => (
-									<span>
-              	{record.updatetime==="--"?
-									<a style={{"color": '#999999', "text-align": "center"}}></a>
-									:
-									<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-								}
-        </span>
-								),
-							},
-							{
-								title: '最终成绩',
-								dataIndex: 'efficiencyscore',
-								key: 'efficiencyscore',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '132px',
-								render: (text, record) => (
-									<span>
-                             {record.efficiencyscore === "--" ?
-															 <a style={{"color": '#999999',
-																 "text-align": "center",}}>--</a>
-															 :
-															 <a style={parseInt(record.efficiencyscore) > 90 ? {
-																 "color": '#DD1717',
-																 "text-align": "center",
-															 } : parseInt(record.efficiencyscore) <= 90 ? {
-																 "color": '#FF6800',
-																 "text-align": "center",
-															 } : parseInt(record.efficiencyscore) <= 60 ? {
-																 "color": '#747A7F',
-																 "text-align": "center",
-															 } : {
-																 "color": '#747A7F',
-																 "text-align": "center",
-															 }}>{record.efficiencyscore}</a>
-														 }
-        </span>
-								)
-							},
-							{
-								title: '操作',
-								dataIndex: 'finalscore',
-								key: 'finalscore',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '98px',
-								render: (text, record) => (
-									<span>
-										{record.finalscore==="--"?
-											<a style={{"text-align": "center","color": '#999999'}}
-												>--</a>
-											:
-											<a style={{"text-align": "center"}} className="color-blue"
-												 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
-										}
-
-                    </span>
-								)
-							},
-						]
+						loadingstate: false,
+						columnsys:	this.state.columnsys,
 					})
 				} else {
 					//不显示分班
 					//7ge
+					this.state.columnsys.map((item,key)=>{
+						if(item.title==="分班"){
+							this.state.columnsys.splice(key,1)
+						}
+						if(item.title==="客观题得分"){
+							this.state.columnsys.splice(key,1)
+						}
+						if(item.title==="主观题得分"){
+							this.state.columnsys.splice(key,1)
+						}
+						if(this.props.isNotMember()===true) {
+							if(item.title==="学号"){
+								this.state.columnsys.splice(key,1)
+							}
+						}
+					})
 					this.setState({
 						data: datalist,
 						teacherlist: teacherlist,
@@ -3288,164 +1830,7 @@ class Studentshavecompletedthelist extends Component {
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
 						loadingstate: false,
-						columnsys: [
-							{
-								title: '序号',
-								dataIndex: 'number',
-								key: 'number',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '110px',
-								render: (text, record) => (
-									<span>
-             {record.number==="--"?
-							 <a style={{
-								 "color": '#999999',
-								 "text-align": "center",
-							 }}>--</a>
-							 :
-							 <a style={{
-								 "color": '#07111B',
-								 "text-align": "center",
-							 }}>{record.number}</a>
-						 }
-        </span>
-								)
-							},
-							{
-								title: '姓名',
-								dataIndex: 'name',
-								key: 'name',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '228px',
-								render: (text, record) => (
-									<span>
-             {record.name==="--"?
-							 <a style={{"color": '#999999', "text-align": "center"}}>--</a>
-							 :
-							 <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-
-						 }
-        </span>
-								)
-							},
-							{
-								title: '学号',
-								dataIndex: 'stduynumber',
-								key: 'stduynumber',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '193px',
-								render: (text, record) => (
-									<span>
-           {record.stduynumber === null ?
-						 <a style={{
-							 "color": '#999999',
-							 "text-align": "center"
-						 }}>--</a>
-						 : record.stduynumber === "" ?
-							 <a style={{
-								 "color": '#999999',
-								 "text-align": "center"
-							 }}>--</a>
-							 :
-							 <a style={{
-								 "color": '#9A9A9A',
-								 "text-align": "center"
-							 }}>{record.stduynumber}</a>
-					 }
-        </span>
-								),
-							},
-							{
-								title: '提交状态',
-								dataIndex: 'submitstate',
-								key: 'submitstate',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '146px',
-								render: (text, record) => (
-									<span>
-             <a style={record.submitstate === "未提交" ? {
-							 "color": '#999999',
-							 "text-align": "center"
-						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#29BD8B',
-							 "text-align": "center"
-						 }}>{record.submitstate}</a>
-        </span>
-								)
-
-							},
-							{
-								title: '提交时间',
-								dataIndex: 'updatetime',
-								key: 'updatetime',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '193px',
-								render: (text, record) => (
-									<span>
-             	{record.updatetime==="--"?
-								<a style={{"color": '#999999', "text-align": "center"}}></a>
-								:
-								<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-							}
-        </span>
-								),
-							},
-							{
-								title: '最终成绩',
-								dataIndex: 'efficiencyscore',
-								key: 'efficiencyscore',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '183px',
-								render: (text, record) => (
-									<span>
-                            {record.efficiencyscore === "--" ?
-															<a style={{"color": '#999999',
-																"text-align": "center",}}>--</a>
-															:
-															<a style={parseInt(record.efficiencyscore) > 90 ? {
-																"color": '#DD1717',
-																"text-align": "center",
-															} : parseInt(record.efficiencyscore) <= 90 ? {
-																"color": '#FF6800',
-																"text-align": "center",
-															} : parseInt(record.efficiencyscore) <= 60 ? {
-																"color": '#747A7F',
-																"text-align": "center",
-															} : {
-																"color": '#747A7F',
-																"text-align": "center",
-															}}>{record.efficiencyscore}</a>
-														}
-        </span>
-								)
-							},
-							{
-								title: '操作',
-								dataIndex: 'finalscore',
-								key: 'finalscore',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '146px',
-								render: (text, record) => (
-									<span>
-										{record.finalscore==="--"?
-											<a style={{"text-align": "center","color": '#999999'}}
-											>--</a>
-											:
-											<a style={{"text-align": "center"}} className="color-blue"
-												 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
-										}
-
-                    </span>
-								)
-							},
-						]
+						columnsys: this.state.columnsys,
 					})
 				}
 
@@ -3455,7 +1840,15 @@ class Studentshavecompletedthelist extends Component {
 			//包括主观题
 			if (indexi === exercise_users.length) {
 				console.log("2548包含主观题不包含分班");
+
 				if (response.data.exercise_types.groups_count > 0) {
+					this.state.columnsys.map((item,key)=>{
+						if(this.props.isNotMember()===true) {
+							if(item.title==="学号"){
+								this.state.columnsys.splice(key,1)
+							}
+						}
+					})
 					this.setState({
 						data: datalist,
 						teacherlist: teacherlist,
@@ -3464,205 +1857,19 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						columnsys: [
-							{
-								title: '序号',
-								dataIndex: 'number',
-								key: 'number',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '76px',
-								render: (text, record) => (
-									<span>
-              {record.number==="--"?
-								<a style={{
-									"color": '#999999',
-									"text-align": "center",
-								}}>--</a>
-								:
-								<a style={{
-									"color": '#07111B',
-									"text-align": "center",
-								}}>{record.number}</a>
-							}
-        </span>
-								)
-							},
-							{
-								title: '姓名',
-								dataIndex: 'name',
-								key: 'name',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '149px',
-								render: (text, record) => (
-									<span>
-              {record.name==="--"?
-								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
-								:
-								<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-
-							}
-        </span>
-								)
-							},
-							{
-								title: '学号',
-								dataIndex: 'stduynumber',
-								key: 'stduynumber',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '159px',
-								render: (text, record) => (
-									<span>
-            {record.stduynumber === null ?
-							<a style={{
-								"color": '#999999',
-								"text-align": "center"
-							}}>--</a>
-							: record.stduynumber === "" ?
-								<a style={{
-									"color": '#999999',
-									"text-align": "center"
-								}}>--</a>
-								:
-								<a style={{
-									"color": '#9A9A9A',
-									"text-align": "center"
-								}}>{record.stduynumber}</a>
+						columnsys: this.state.columnsys,
+					})
+				} else {
+					this.state.columnsys.map((item,key)=>{
+						if(item.title==="分班"){
+							this.state.columnsys.splice(key,1)
 						}
-        </span>
-								),
-							},
-							{
-								title: '分班',
-								key: 'classroom',
-								dataIndex: 'classroom',
-								align: 'center',
-								className: "edu-txt-center",
-								render: (text, record) => (
-									<span>
-              {record.classroom === null ?
-								<a style={{
-									"color": '#999999',
-									"text-align": "center"
-								}}>--</a>  : record.classroom === "" ?
-									<a style={{
-										"color": '#999999',
-										"text-align": "center"
-									}}>--</a> :
-									<a style={{
-										"color": '#07111B',
-										"text-align": "center"
-									}}>{record.classroom}</a>
-							}
-        </span>
-								)
-							},
-							{
-								title: '提交状态',
-								dataIndex: 'submitstate',
-								key: 'submitstate',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '112px',
-								render: (text, record) => (
-									<span>
-             <a style={record.submitstate === "未提交" ? {
-							 "color": '#999999',
-							 "text-align": "center"
-						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#29BD8B',
-							 "text-align": "center"
-						 }}>{record.submitstate}</a>
-        </span>
-								)
-
-							},
-							{
-								title: '提交时间',
-								dataIndex: 'updatetime',
-								key: 'updatetime',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '194px',
-								render: (text, record) => (
-									<span>
-            	{record.updatetime==="--"?
-								<a style={{"color": '#999999', "text-align": "center"}}></a>
-								:
-								<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+						if(this.props.isNotMember()===true) {
+							if(item.title==="学号"){
+								this.state.columnsys.splice(key,1)
 							}
-        </span>
-								),
-							},
-							{
-								title: '客观题得分',
-								dataIndex: 'completion',
-								key: 'completion',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '112px',
-								render: (text, record) => (
-									<span>
-            {record.completion=== "--"?
-							<a style={{"color": '#999999', "text-align": "center"}}>--</a>
-							:
-							<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion}</a>
-						}
-        </span>
-								)
-							},
-							{
-								title: '主观题得分',
-								dataIndex: 'levelscore',
-								key: 'levelscore',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '130px',
-								render: (text, record) => (
-									<span>
-           	{record.levelscore==="--"?
-							<a style={{"color": '#999999', "text-align": "center"}}>--</a>
-							:
-							<a style={{"color": '#FF6800', "text-align": "center"}}>{record.levelscore}</a>
 						}
-        </span>
-								)
-							},
-							{
-								title: '最终成绩',
-								dataIndex: 'efficiencyscore',
-								key: 'efficiencyscore',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '112px',
-								render: (text, record) => (
-									<span>
-                                {record.efficiencyscore === "--" ?
-																	<a style={{"color": '#999999',
-																		"text-align": "center",}}>--</a>
-																	:
-																	<a style={parseInt(record.efficiencyscore) > 90 ? {
-																		"color": '#DD1717',
-																		"text-align": "center",
-																	} : parseInt(record.efficiencyscore) <= 90 ? {
-																		"color": '#FF6800',
-																		"text-align": "center",
-																	} : parseInt(record.efficiencyscore) <= 60 ? {
-																		"color": '#747A7F',
-																		"text-align": "center",
-																	} : {
-																		"color": '#747A7F',
-																		"text-align": "center",
-																	}}>{record.efficiencyscore}</a>
-																}
-        </span>
-								)
-							},
-						]
 					})
-				} else {
 					this.setState({
 						data: datalist,
 						teacherlist: teacherlist,
@@ -3671,178 +1878,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						columnsys: [
-							{
-								title: '序号',
-								dataIndex: 'number',
-								key: 'number',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '76px',
-								render: (text, record) => (
-									<span>
-              {record.number==="--"?
-								<a style={{
-									"color": '#999999',
-									"text-align": "center",
-								}}>--</a>
-								:
-								<a style={{
-									"color": '#07111B',
-									"text-align": "center",
-								}}>{record.number}</a>
-							}
-        </span>
-								)
-							},
-							{
-								title: '姓名',
-								dataIndex: 'name',
-								key: 'name',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '149px',
-								render: (text, record) => (
-									<span>
-             {record.name==="--"?
-							 <a style={{"color": '#999999', "text-align": "center"}}>--</a>
-							 :
-							 <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-
-						 }
-        </span>
-								)
-							},
-							{
-								title: '学号',
-								dataIndex: 'stduynumber',
-								key: 'stduynumber',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '159px',
-								render: (text, record) => (
-									<span>
-             {record.stduynumber === null ?
-							 <a style={{
-								 "color": '#999999',
-								 "text-align": "center"
-							 }}>--</a>
-							 : record.stduynumber === "" ?
-								 <a style={{
-									 "color": '#999999',
-									 "text-align": "center"
-								 }}>--</a>
-								 :
-								 <a style={{
-									 "color": '#9A9A9A',
-									 "text-align": "center"
-								 }}>{record.stduynumber}</a>
-						 }
-        </span>
-								),
-							},
-							{
-								title: '提交状态',
-								dataIndex: 'submitstate',
-								key: 'submitstate',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '112px',
-								render: (text, record) => (
-									<span>
-             <a style={record.submitstate === "未提交" ? {
-							 "color": '#999999',
-							 "text-align": "center"
-						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#29BD8B',
-							 "text-align": "center"
-						 }}>{record.submitstate}</a>
-        </span>
-								)
-
-							},
-							{
-								title: '提交时间',
-								dataIndex: 'updatetime',
-								key: 'updatetime',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '194px',
-								render: (text, record) => (
-									<span>
-             	{record.updatetime==="--"?
-								<a style={{"color": '#999999', "text-align": "center"}}></a>
-								:
-								<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-							}
-        </span>
-								),
-							},
-							{
-								title: '客观题得分',
-								dataIndex: 'completion',
-								key: 'completion',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '112px',
-								render: (text, record) => (
-									<span>
-             {record.completion=== "--"?
-							 <a style={{"color": '#999999', "text-align": "center"}}>--</a>
-							 :
-							 <a style={{"color": '#07111B', "text-align": "center"}}>{record.completion}</a>
-						 }
-        </span>
-								)
-							},
-							{
-								title: '主观题得分',
-								dataIndex: 'levelscore',
-								key: 'levelscore',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '130px',
-								render: (text, record) => (
-									<span>
-             	{record.levelscore==="--"?
-								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
-								:
-								<a style={{"color": '#FF6800', "text-align": "center"}}>{record.levelscore}</a>
-							}
-        </span>
-								)
-							},
-							{
-								title: '最终成绩',
-								dataIndex: 'efficiencyscore',
-								key: 'efficiencyscore',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '112px',
-								render: (text, record) => (
-									<span>
-                            {record.efficiencyscore === "--" ?
-															<a style={{"color": '#999999',
-																"text-align": "center",}}>--</a>
-															:
-															<a style={parseInt(record.efficiencyscore) > 90 ? {
-																"color": '#DD1717',
-																"text-align": "center",
-															} : parseInt(record.efficiencyscore) <= 90 ? {
-																"color": '#FF6800',
-																"text-align": "center",
-															} : parseInt(record.efficiencyscore) <= 60 ? {
-																"color": '#747A7F',
-																"text-align": "center",
-															} : {
-																"color": '#747A7F',
-																"text-align": "center",
-															}}>{record.efficiencyscore}</a>
-														}
-        </span>
-								)
-							},
-						]
+						columnsys: this.state.columnsys,
 					})
 				}
 			} else {
@@ -3857,223 +1893,19 @@ class Studentshavecompletedthelist extends Component {
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
 						loadingstate: false,
-						columnsys: [
-							{
-								title: '序号',
-								dataIndex: 'number',
-								key: 'number',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '76px',
-								render: (text, record) => (
-									<span>
-             {record.number==="--"?
-							 <a style={{
-								 "color": '#999999',
-								 "text-align": "center",
-							 }}>--</a>
-							 :
-							 <a style={{
-								 "color": '#07111B',
-								 "text-align": "center",
-							 }}>{record.number}</a>
-						 }
-        </span>
-								)
-							},
-							{
-								title: '姓名',
-								dataIndex: 'name',
-								key: 'name',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '149px',
-								render: (text, record) => (
-									<span>
-             {record.name==="--"?
-							 <a style={{"color": '#999999', "text-align": "center"}}>--</a>
-							 :
-							 <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-
-						 }
-        </span>
-								)
-							},
-							{
-								title: '学号',
-								dataIndex: 'stduynumber',
-								key: 'stduynumber',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '159px',
-								render: (text, record) => (
-									<span>
-            {record.stduynumber === null ?
-							<a style={{
-								"color": '#999999',
-								"text-align": "center"
-							}}>--</a>
-							: record.stduynumber === "" ?
-								<a style={{
-									"color": '#999999',
-									"text-align": "center"
-								}}>--</a>
-								:
-								<a style={{
-									"color": '#9A9A9A',
-									"text-align": "center"
-								}}>{record.stduynumber}</a>
+						columnsys: this.state.columnsystwo,
+					})
+				} else {
+					this.state.columnsys.map((item,key)=>{
+						if(item.title==="分班"){
+							this.state.columnsys.splice(key,1)
 						}
-        </span>
-								),
-							},
-							{
-								title: '分班',
-								key: 'classroom',
-								dataIndex: 'classroom',
-								align: 'center',
-								className: "edu-txt-center",
-								render: (text, record) => (
-									<span>
-               {record.classroom === null ?
-								 <a style={{
-									 "color": '#999999',
-									 "text-align": "center"
-								 }}>--</a>  : record.classroom === "" ?
-									 <a style={{
-										 "color": '#999999',
-										 "text-align": "center"
-									 }}>--</a> :
-									 <a style={{
-										 "color": '#07111B',
-										 "text-align": "center"
-									 }}>{record.classroom}</a>
-							 }
-        </span>
-								)
-							},
-							{
-								title: '提交状态',
-								dataIndex: 'submitstate',
-								key: 'submitstate',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '112px',
-								render: (text, record) => (
-									<span>
-             <a style={record.submitstate === "未提交" ? {
-							 "color": '#999999',
-							 "text-align": "center"
-						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#29BD8B',
-							 "text-align": "center"
-						 }}>{record.submitstate}</a>
-        </span>
-								)
-
-							},
-							{
-								title: '提交时间',
-								dataIndex: 'updatetime',
-								key: 'updatetime',
-								align: 'center',
-								width: '194px',
-								className: "edu-txt-center",
-								render: (text, record) => (
-									<span>
-            	{record.updatetime==="--"?
-								<a style={{"color": '#999999', "text-align": "center"}}></a>
-								:
-								<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-							}
-        </span>
-								),
-							},
-							{
-								title: '客观题得分',
-								dataIndex: 'completion',
-								key: 'completion',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '112px',
-								render: (text, record) => (
-									<span>
-              {record.completion=== "--"?
-								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
-								:
-								<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion}</a>
+						if(this.props.isNotMember()===true) {
+							if(item.title==="学号"){
+								this.state.columnsys.splice(key,1)
 							}
-        </span>
-								)
-							},
-							{
-								title: '主观题得分',
-								dataIndex: 'levelscore',
-								key: 'levelscore',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '130px',
-								render: (text, record) => (
-									<span>
-             {record.levelscore==="--"?
-							 <a style={{"color": '#999999', "text-align": "center"}}>--</a>
-							 :
-							 <a style={{"color": '#FF6800', "text-align": "center"}}>{record.levelscore}</a>
-						 }
-        </span>
-								)
-							},
-							{
-								title: '最终成绩',
-								dataIndex: 'efficiencyscore',
-								key: 'efficiencyscore',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '112px',
-								render: (text, record) => (
-									<span>
-                      {record.efficiencyscore === "--" ?
-												<a style={{"color": '#999999',
-													"text-align": "center",}}>--</a>
-												:
-												<a style={parseInt(record.efficiencyscore) > 90 ? {
-													"color": '#DD1717',
-													"text-align": "center",
-												} : parseInt(record.efficiencyscore) <= 90 ? {
-													"color": '#FF6800',
-													"text-align": "center",
-												} : parseInt(record.efficiencyscore) <= 60 ? {
-													"color": '#747A7F',
-													"text-align": "center",
-												} : {
-													"color": '#747A7F',
-													"text-align": "center",
-												}}>{record.efficiencyscore}</a>
-											}
-        </span>
-								)
-							},
-							{
-								title: '操作',
-								dataIndex: 'finalscore',
-								key: 'finalscore',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '78px',
-								render: (text, record) => (
-									<span>
-										{record.finalscore==="--"?
-											<a style={{"text-align": "center","color": '#999999'}}>{record.finalscore}</a>
-											:
-											<a style={{"text-align": "center"}} className="color-blue"
-												 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
-										}
-                    </span>
-								)
-							},
-						]
+						}
 					})
-				} else {
 					this.setState({
 						data: datalist,
 						teacherlist: teacherlist,
@@ -4083,197 +1915,7 @@ class Studentshavecompletedthelist extends Component {
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
 						loadingstate: false,
-						columnsys: [
-							{
-								title: '序号',
-								dataIndex: 'number',
-								key: 'number',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '76px',
-								render: (text, record) => (
-									<span>
-              {record.number==="--"?
-								<a style={{
-									"color": '#999999',
-									"text-align": "center",
-								}}>--</a>
-								:
-								<a style={{
-									"color": '#07111B',
-									"text-align": "center",
-								}}>{record.number}</a>
-							}
-        </span>
-								)
-							},
-							{
-								title: '姓名',
-								dataIndex: 'name',
-								key: 'name',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '149px',
-								render: (text, record) => (
-									<span>
-              {record.name==="--"?
-								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
-								:
-								<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-
-							}
-        </span>
-								)
-							},
-							{
-								title: '学号',
-								dataIndex: 'stduynumber',
-								key: 'stduynumber',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '159px',
-								render: (text, record) => (
-									<span>
-             {record.stduynumber === null ?
-							 <a style={{
-								 "color": '#999999',
-								 "text-align": "center"
-							 }}>--</a>
-							 : record.stduynumber === "" ?
-								 <a style={{
-									 "color": '#999999',
-									 "text-align": "center"
-								 }}>--</a>
-								 :
-								 <a style={{
-									 "color": '#9A9A9A',
-									 "text-align": "center"
-								 }}>{record.stduynumber}</a>
-						 }
-        </span>
-								),
-							},
-							{
-								title: '提交状态',
-								dataIndex: 'submitstate',
-								key: 'submitstate',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '112px',
-								render: (text, record) => (
-									<span>
-             <a style={record.submitstate === "未提交" ? {
-							 "color": '#999999',
-							 "text-align": "center"
-						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#29BD8B',
-							 "text-align": "center"
-						 }}>{record.submitstate}</a>
-        </span>
-								)
-
-							},
-							{
-								title: '提交时间',
-								dataIndex: 'updatetime',
-								key: 'updatetime',
-								align: 'center',
-								width: '194px',
-								className: "edu-txt-center",
-								render: (text, record) => (
-									<span>
-             {record.updatetime==="--"?
-							 <a style={{"color": '#999999', "text-align": "center"}}></a>
-							 :
-							 <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-						 }
-        </span>
-								),
-							},
-							{
-								title: '客观题得分',
-								dataIndex: 'completion',
-								key: 'completion',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '112px',
-								render: (text, record) => (
-									<span>
-             {record.completion=== "--"?
-							 <a style={{"color": '#999999', "text-align": "center"}}>--</a>
-							 :
-							 <a style={{"color": '#07111B', "text-align": "center"}}>{record.completion}</a>
-						 }
-        </span>
-								)
-							},
-							{
-								title: '主观题得分',
-								dataIndex: 'levelscore',
-								key: 'levelscore',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '130px',
-								render: (text, record) => (
-									<span>
-            {record.levelscore==="--"?
-							<a style={{"color": '#999999', "text-align": "center"}}>--</a>
-							:
-							<a style={{"color": '#FF6800', "text-align": "center"}}>{record.levelscore}</a>
-						}
-        </span>
-								)
-							},
-							{
-								title: '最终成绩',
-								dataIndex: 'efficiencyscore',
-								key: 'efficiencyscore',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '112px',
-								render: (text, record) => (
-									<span>
-                            {record.efficiencyscore === "--" ?
-															<a style={{"color": '#999999',
-																"text-align": "center",}}>--</a>
-															:
-															<a style={parseInt(record.efficiencyscore) > 90 ? {
-																"color": '#DD1717',
-																"text-align": "center",
-															} : parseInt(record.efficiencyscore) <= 90 ? {
-																"color": '#FF6800',
-																"text-align": "center",
-															} : parseInt(record.efficiencyscore) <= 60 ? {
-																"color": '#747A7F',
-																"text-align": "center",
-															} : {
-																"color": '#747A7F',
-																"text-align": "center",
-															}}>{record.efficiencyscore}</a>
-														}
-        </span>
-								)
-							},
-							{
-								title: '操作',
-								dataIndex: 'finalscore',
-								key: 'finalscore',
-								align: 'center',
-								className: "edu-txt-center",
-								width: '78px',
-								render: (text, record) => (
-									<span>
-										{record.finalscore==="--"?
-											<a style={{"text-align": "center","color": '#999999'}}>{record.finalscore}</a>
-											:
-											<a style={{"text-align": "center"}} className="color-blue"
-												 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
-										}
-
-                    </span>
-								)
-							},
-						]
+						columnsys: this.state.columnsys,
 					})
 				}
 
@@ -4332,14 +1974,16 @@ class Studentshavecompletedthelist extends Component {
 				unlimited: 0,
 				course_groupyslsthree: undefined,
 				loadingstate: true,
+				page:1
 			})
 		} else {
 			this.setState({
 				unlimited: 0,
 				course_groupyslsthree: undefined,
+				page:1,
 			})
 		}
-		this.Searchdatasys(this.state.order, this.state.commit_status, null, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
+		this.Searchdatasys(this.state.order, this.state.commit_status, null, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
 	}
 	// notlimiteds = () => {
 	//     this.setState({
@@ -4356,15 +2000,17 @@ class Studentshavecompletedthelist extends Component {
 				unlimiteds: 0,
 				course_groupyslstwo: undefined,
 				loadingstate: true,
+				page:1,
 			})
 		} else {
 			this.setState({
 				unlimiteds: 0,
 				course_groupyslstwo: undefined,
+				page:1,
 			})
 		}
 
-		this.Searchdatasys(this.state.order, undefined, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
+		this.Searchdatasys(this.state.order, undefined, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
 	}
 	checkeboxstwo = (checkedValues, data) => {
 		// console.log(checkedValues)
@@ -4375,43 +2021,49 @@ class Studentshavecompletedthelist extends Component {
 					loadingstate: true,
 					course_groupyslstwo: undefined,
 					unlimiteds: 0,
+					page:1
 				})
 			} else {
 				this.setState({
 					course_groupyslstwo: undefined,
 					unlimiteds: 0,
+					page:1,
 				})
 			}
 
-			this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
+			this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
 		} else if (checkedValues.length === data.length) {
 			if (this.state.loadingstate === false) {
 				this.setState({
 					loadingstate: true,
 					course_groupyslstwo: undefined,
 					unlimiteds: 0,
+					page:1
 				})
 			} else {
 				this.setState({
 					course_groupyslstwo: undefined,
 					unlimiteds: 0,
+					page:1,
 				})
 			}
 
-			this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
+			this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
 		} else {
 			// console.log(checkedValues);
-			this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
+			this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
 			if (this.state.loadingstate === false) {
 				this.setState({
 					loadingstate: true,
 					course_groupyslstwo: checkedValues,
-					unlimiteds: 1
+					unlimiteds: 1,
+					page:1,
 				})
 			} else {
 				this.setState({
 					course_groupyslstwo: checkedValues,
-					unlimiteds: 1
+					unlimiteds: 1,
+					page:1,
 				})
 			}
 
@@ -4448,30 +2100,34 @@ class Studentshavecompletedthelist extends Component {
 					unlimited: 0,
 					course_groupyslsthree: undefined,
 					loadingstate: true,
+					page:1
 				})
 			} else {
 				this.setState({
 					unlimited: 0,
 					course_groupyslsthree: undefined,
+					page:1
 				})
 			}
 
-			this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
+			this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
 		} else if (checkedValues.length === data.length) {
 			if (this.state.loadingstate === false) {
 				this.setState({
 					unlimited: 0,
 					course_groupyslsthree: undefined,
 					loadingstate: true,
+					page:1
 				})
 			} else {
 				this.setState({
 					unlimited: 0,
 					course_groupyslsthree: undefined,
+					page:1
 				})
 			}
 
-			this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
+			this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
 		} else {
 			// console.log(checkedValues);
 			if (this.state.loadingstate === false) {
@@ -4479,15 +2135,17 @@ class Studentshavecompletedthelist extends Component {
 					unlimited: 1,
 					loadingstate: true,
 					course_groupyslsthree: checkedValues,
+					page:1
 				})
 			} else {
 				this.setState({
 					unlimited: 1,
 					course_groupyslsthree: checkedValues,
+					page:1
 				})
 			}
 
-			this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
+			this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
 
 		}
 	}
@@ -4499,16 +2157,18 @@ class Studentshavecompletedthelist extends Component {
 				checkedValuesineinfo: undefined,
 				course_groupysls: undefined,
 				loadingstate: true,
+				page:1,
 			})
 		} else {
 			this.setState({
 				unlimitedtwo: 0,
 				checkedValuesineinfo: undefined,
 				course_groupysls: undefined,
+				page:1,
 			})
 		}
 
-		this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, undefined, this.state.searchtext, null, null)
+		this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, undefined, this.state.searchtext, 1, this.state.limit)
 	}
 
 	funtaskstatustwo = (checkedValues, data) => {
@@ -4521,30 +2181,34 @@ class Studentshavecompletedthelist extends Component {
 					course_groupysls: undefined,
 					unlimitedtwo: 0,
 					loadingstate: true,
+					page:1,
 				})
 			} else {
 				this.setState({
 					course_groupysls: undefined,
 					unlimitedtwo: 0,
+					page:1,
 				})
 			}
 
-			this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, null, null)
+			this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
 		} else if (checkedValues.length === data.length) {
 			if (this.state.loadingstate === false) {
 				this.setState({
 					course_groupysls: undefined,
 					unlimitedtwo: 0,
 					loadingstate: true,
+					page:1,
 				})
 			} else {
 				this.setState({
 					course_groupysls: undefined,
 					unlimitedtwo: 0,
+					page:1,
 				})
 			}
 
-			this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, null, null)
+			this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
 		} else {
 			// console.log(checkedValues);
 			if (this.state.loadingstate === false) {
@@ -4553,17 +2217,19 @@ class Studentshavecompletedthelist extends Component {
 					course_groupysls: checkedValues,
 					unlimitedtwo: 1,
 					loadingstate: true,
+					page:1
 				})
 			} else {
 				this.setState({
 					checkedValuesineinfo: checkedValues,
 					course_groupysls: checkedValues,
 					unlimitedtwo: 1,
+					page:1
 				})
 
 			}
 
-			this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, null, null)
+			this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
 			this.props.setcourse_groupysls(checkedValues)
 		}
 
@@ -4580,10 +2246,11 @@ class Studentshavecompletedthelist extends Component {
 			if (this.state.loadingstate === false) {
 				this.setState({
 					loadingstate: true,
+					page:1
 				})
 			}
 
-			this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
+			this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
 		}
 	}
 	//搜索学生 文字输入
@@ -4591,11 +2258,11 @@ class Studentshavecompletedthelist extends Component {
 		// console.log(e.target.value)
 		if (e.target.value === "") {
 			this.setState({
-				searchtext: undefined
+				searchtext: undefined,
 			})
 		} else {
 			this.setState({
-				searchtext: e.target.value
+				searchtext: e.target.value,
 			})
 		}
 
@@ -4610,10 +2277,11 @@ class Studentshavecompletedthelist extends Component {
 		if (this.state.loadingstate === false) {
 			this.setState({
 				loadingstate: true,
+				page:1,
 			})
 		}
 
-		this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, value, null, null);
+		this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, value, 1, this.state.limit);
 		// this.Startsorting(this.state.order,this.state.checkedValuesine,this.state.checkedValuesineinfo,value);
 		// console.log(value)
 
@@ -4636,7 +2304,7 @@ class Studentshavecompletedthelist extends Component {
 				})
 			}
 
-			this.Searchdatasys(e, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null)
+			this.Searchdatasys(e, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page,this.state.limit)
 		}
 
 		if (e === "score") {
@@ -4823,16 +2491,16 @@ class Studentshavecompletedthelist extends Component {
 									<div className="fr color-grey-6 edu-menu-panel">
 										<ul>
 											<li className="edu-position edu-position-hidebox">
-												<a className="font-12 color-grey-6">
+												<a className="font-12">
 													{order === "end_at" ? "时间" : order === "score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a>
-												<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i>
+												<i className="iconfont icon-xiajiantou ml5 font-12"></i>
 												<ul className="edu-position-hide undis mt10">
 													<li><a onClick={(e) => this.funordersy("end_at")} data-remote="true"
-																 className="color-grey-6 font-12" style={{"text-align": "center "}}>提交时间</a></li>
+																 className=" font-12" style={{"text-align": "center "}}>提交时间</a></li>
 													<li><a onClick={(e) => this.funordersy("score")} data-remote="true"
-																 className="color-grey-6 font-12" style={{"text-align": "center "}}>最终成绩</a></li>
+																 className=" font-12" style={{"text-align": "center "}}>最终成绩</a></li>
 													<li><a onClick={(e) => this.funordersy("student_id")} data-remote="true"
-																 className="color-grey-6 font-12" style={{"text-align": "center "}}>学生学号</a></li>
+																 className=" font-12" style={{"text-align": "center "}}>学生学号</a></li>
 												</ul>
 											</li>
 										</ul>
@@ -4855,7 +2523,7 @@ class Studentshavecompletedthelist extends Component {
 											columns={columnsys}
 											pagination={false}
 											loading={loadingstate}
-											onChange={this.TablePaginationsy}
+											// onChange={this.TablePaginationsy}
 										/>}
 									</div>
 								</div>
@@ -4950,7 +2618,6 @@ class Studentshavecompletedthelist extends Component {
 													columns={columnss}
 													pagination={false}
 													loading={false}
-													onChange={this.TablePaginations}
 												/>}
 											</div>
 										</div>
@@ -5023,18 +2690,18 @@ class Studentshavecompletedthelist extends Component {
 													<div className="fr color-grey-6 edu-menu-panel">
 														<ul>
 															<li className="edu-position edu-position-hidebox">
-																<a className="font-12 color-grey-6">
+																<a className="font-12 ">
 																	{order === "end_at" ? "时间" : order === "score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a>
 																<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i>
 																<ul className="edu-position-hide undis mt10">
 																	<li><a onClick={(e) => this.funorder("end_at")} data-remote="true"
-																				 className="color-grey-6 font-12" style={{"text-align": "center "}}>提交时间</a>
+																				 className=" font-12" style={{"text-align": "center "}}>提交时间</a>
 																	</li>
 																	<li><a onClick={(e) => this.funorder("score")} data-remote="true"
-																				 className="color-grey-6 font-12" style={{"text-align": "center "}}>最终成绩</a>
+																				 className=" font-12" style={{"text-align": "center "}}>最终成绩</a>
 																	</li>
 																	<li><a onClick={(e) => this.funorder("student_id")} data-remote="true"
-																				 className="color-grey-6 font-12" style={{"text-align": "center "}}>学生学号</a>
+																				 className=" font-12" style={{"text-align": "center "}}>学生学号</a>
 																	</li>
 																</ul>
 															</li>
diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index 3884b1d67..ac9c2ac60 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -250,19 +250,18 @@ class Testpapersettinghomepage extends Component{
                                                 padding-top: 10px;
                                                 padding-bottom: 8px;
                                              }
+                                              a:hover {
+                                                color:#1A0B00 !important;
+                                                }
                                           `}
                                 </style>
                                 <div className={"studentList_operation_ul mt23"}>
                                 {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(`/api/exercises/${this.props.match.params.Id}/exercise_lists.xlsx`)}
-																					className="color-dark">学生成绩</a></li>
-                                        <li><a href={`/api/exercises/${this.props.match.params.Id}/export_exercise`} className="color-dark">空白试卷</a></li>
-                                        <li><a className="color-dark"
-                                          onClick={()=>this.experiment(`/api/zip/export_exercises?exercise_id=${this.props.match.params.Id}${this.state.groupyslsval}`)}
-                                        >学生答题试卷</a></li>
+                                        <li><a onClick={()=>this.experiment(`/api/exercises/${this.props.match.params.Id}/exercise_lists.xlsx`)}>学生成绩</a></li>
+                                        <li><a href={`/api/exercises/${this.props.match.params.Id}/export_exercise`} >空白试卷</a></li>
+                                        <li><a onClick={()=>this.experiment(`/api/zip/export_exercises?exercise_id=${this.props.match.params.Id}${this.state.groupyslsval}`)}>学生答题试卷</a></li>
                                     </ul>
                                 </li>:""}
                                 </div>
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index f2eaa7696..636214885 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -796,6 +796,11 @@ class Listofworks extends Component {
 						if(item.title==="效率分"){
 							columns.splice(key,1)
 						}
+						if(this.props.isNotMember()===true) {
+							if(item.title==="学号"){
+								this.state.columnss.splice(key,1)
+							}
+						}
 					})
 				}else{
 					if(course_group_info.length < 2){
@@ -810,6 +815,11 @@ class Listofworks extends Component {
 							if(item.title==="效率分"){
 								columns.splice(key,1)
 							}
+							if(this.props.isNotMember()===true) {
+								if(item.title==="学号"){
+									this.state.columnss.splice(key,1)
+								}
+							}
 						})
 					}else {
 
@@ -820,6 +830,11 @@ class Listofworks extends Component {
 							if(item.title==="效率分"){
 								columns.splice(key,1)
 							}
+							if(this.props.isNotMember()===true) {
+								if(item.title==="学号"){
+									this.state.columnss.splice(key,1)
+								}
+							}
 						})
 					}
 				}
@@ -830,6 +845,11 @@ class Listofworks extends Component {
 						if(item.title==="分班"){
 							columns.splice(key,1)
 						}
+						if(this.props.isNotMember()===true) {
+							if(item.title==="学号"){
+								this.state.columnss.splice(key,1)
+							}
+						}
 					})
 				}else {
 					if(course_group_info.length < 2) {
@@ -838,6 +858,11 @@ class Listofworks extends Component {
 							if(item.title==="分班"){
 								columns.splice(key,1)
 							}
+							if(this.props.isNotMember()===true) {
+								if(item.title==="学号"){
+									this.state.columnss.splice(key,1)
+								}
+							}
 						})
 					}
 					columns=this.state.columnss;
@@ -1192,8 +1217,9 @@ class Listofworks extends Component {
 			course_groupyslstwo: [],
 			unlimited: 0,
 			loadingstate: true,
+			page:1,
 		})
-		this.Startsorting(this.state.order, [], this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
+		this.Startsorting(this.state.order, [], this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
 
 	}
 	notlimitedst = () => {
@@ -1204,7 +1230,7 @@ class Listofworks extends Component {
 			course_groupysls: undefined,
 			loadingstate: true,
 		})
-		this.Startsorting(this.state.order, this.state.course_groupyslstwo, [], this.state.searchtext, this.state.page, this.state.limit);
+		this.Startsorting(this.state.order, this.state.course_groupyslstwo, [], this.state.searchtext, 1, this.state.limit);
 	}
 	//立即截止确定按钮
 	coursetaskend = () => {
@@ -1417,22 +1443,25 @@ class Listofworks extends Component {
                             font-size: 14px;
                         }
                         .drop_down_menu {
-                            width: 121px;
+                            width: 93px;
                         }
                         .drop_down_menu li {
                             overflow: visible;
-                            width: 121px;
+                            width: 93px;
                         }
                         .drop_down_menu, .drop_down_normal {
                             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":"-34px","left":"unset","height":"auto"}}>
-										<li><a href={`/api/student_works/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id}/export_shixun_work_report.pdf`} calssName="color-dark">实训报告</a></li>
-										<li><a href={`/api/homework_commons/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id}/works_list.xlsx`} calssName="color-dark">学生成绩</a></li>
+									<ul className="drop_down_menu" style={{"right":"-0px","left":"unset","height":"auto"}}>
+										<li><a href={`/api/student_works/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id}/export_shixun_work_report.pdf`} >实训报告</a></li>
+										<li><a href={`/api/homework_commons/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id}/works_list.xlsx`} >学生成绩</a></li>
 									</ul>
 								</li>:""}
 								{this.props.isAdmin() ?
@@ -1529,16 +1558,16 @@ class Listofworks extends Component {
 							<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>
-								<div className="fr color-grey-6 edu-menu-panel">
+								<div className="fr  edu-menu-panel">
 									<ul>
 										<li className="edu-position edu-position-hidebox">
-											<a className="font-12 color-grey-6">
+											<a className="font-12">
 												{order === "update_time" ? "时间" : order === "work_score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a>
-											<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i>
+											<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="color-grey-6 font-12" style={{"text-align": "center "}}>更新时间</a></li>
-												<li> <a  onClick={(e) => this.funorder("work_score")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>最终成绩</a></li>
-												<li> <a  onClick={(e) => this.funorder("student_id")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>学生学号</a></li>
+												<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>
 											</ul>
 										</li>
 									</ul>
@@ -1581,7 +1610,6 @@ class Listofworks extends Component {
 											columns={columns}
 											pagination={false}
 											loading={loadingstate}
-											onChange={this.TablePagination}
 										/>}
 									</div>
 								</div>
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 1c12130ed..8659bc472 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -60,7 +60,202 @@ class Listofworksstudentone extends Component {
 				"display": "none"
 			},
 			student_works: [],
-			startbtn: false
+			startbtn: false,
+			columns: [
+				{
+					title: '序号',
+					dataIndex: 'number',
+					key: 'number',
+					align: "center",
+					className:'font-14',
+					render: (text, record) => (
+						<span>
+						{record.number === undefined ?
+							<span style={{
+								"color": '#9A9A9A',
+								"text-align": "center"
+							}}> --</span>
+							: record.number === "" ?
+								<span style={{
+									"color": '#9A9A9A',
+									"text-align": "center"
+								}}>--</span>
+								: record.number === "--" ?
+									<span style={{
+										"color": '#9A9A9A',
+										"text-align": "center"
+									}}>--</span>
+									:
+									<span style={{
+										"color": '#07111B',
+										"text-align": "center"
+									}}>  {record.number}</span>
+						}
+        </span>
+					),
+				},
+				{
+					title: '姓名',
+					dataIndex: 'name',
+					key: 'name',
+					align: "center",
+					className:'font-14',
+					render: (text, record) => (
+						<span>
+						{record.name === undefined ?
+							<span style={{
+								"color": '#9A9A9A',
+								"text-align": "center"
+							}}>--</span>
+							:
+							record.name === "" ?
+								<span style={{
+									"color": '#9A9A9A',
+									"text-align": "center"
+								}}>--</span>
+								:
+								record.name === null ?
+									<span style={{
+										"color": '#9A9A9A',
+										"text-align": "center"
+									}}>--</span>
+									:
+									record.name === "--" ?
+										<span style={{
+											"color": '#9A9A9A',
+											"text-align": "center"
+										}}>--</span>
+										:
+										<span style={{
+											"color": '#07111B',
+											"text-align": "center"
+										}}>{record.name}</span>
+						}
+
+        </span>
+					),
+				},
+				{
+					title: '学号',
+					dataIndex: 'stduynumber',
+					key: 'stduynumber',
+					align: "center",
+					className:'font-14',
+					render: (text, record) => (
+						<span>
+             <span style={{
+							 "color": '#9A9A9A',
+							 "text-align": "center"
+						 }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</span>
+        </span>
+					),
+				},
+				{
+					title: '分班',
+					key: 'classroom',
+					dataIndex: 'classroom',
+					align: "center",
+					className:'font-14',
+					width:'288px',
+					render: (text, record) => (
+						<span>
+             <span style={{
+							 "color": '#9A9A9A',
+							 "text-align": "center"
+						 }}>{record.classroom === undefined ? "--" : record.classroom === "" ? "--" : record.classroom === null ? "--" : record.classroom}</span>
+        </span>
+					),
+				},
+				{
+					title: '提交状态',
+					dataIndex: 'submitstate',
+					key: 'submitstate',
+					align: "center",
+					className:'font-14',
+					render: (text, record) => (
+						<span>
+ <span style={record.submitstate === "延时提交" ? {
+	 "color": '#DD1717',
+	 "text-align": "center"
+ } : record.submitstate === "按时提交" ? {"color": '#29BD8B', "text-align": "center"} : {
+	 "color": '#747A7F',
+	 "text-align": "center"
+ }}>{record.submitstate === undefined ? "--" : record.submitstate === "" ? "--" : record.submitstate === null ? "--" : record.submitstate}</span>
+
+        </span>
+					),
+				},
+				{
+					title: '更新时间',
+					dataIndex: 'updatetime',
+					key: 'updatetime',
+					align: "center",
+					className:'font-14',
+					render: (text, record) => (
+						<span>
+             <span style={{
+							 "color": '#9A9A9A',
+							 "text-align": "center"
+						 }}>{record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime}</span>
+        </span>
+					),
+				},
+				{
+					title: '完成情况',
+					dataIndex: 'completion',
+					key: 'completion',
+					align: "center",
+					className:'font-14',
+					render: (text, record) => (
+						<span>
+											<span style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</span>
+        </span>
+					),
+				},
+				{
+					title: '最终成绩',
+					dataIndex: 'levelscore',
+					key: 'levelscore',
+					align: "center",
+					className:'font-14',
+					render: (text, record) => (
+						<span>
+						{
+							record.levelscore && record.levelscore === "--"?
+								<span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.levelscore}</span>
+								:
+								<span style={parseInt(record.levelscore) >=90 ? {
+									"color": '#DD1717',
+									"text-align": "center"
+								} : parseInt(record.levelscore) <= 60?{
+									"color": '#FF6800',
+									"text-align": "center",
+								}: {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</span>
+						}
+
+        </span>
+					),
+				},
+				{
+					title: '操作',
+					dataIndex: 'operating',
+					key: 'operating',
+					align: "center",
+					className:'font-14',
+					render: (text, record) => (
+						<span>
+                        {
+													record.submitstate === "未提交" ?<span style={{	color: '#9A9A9A'}}>--</span>
+														:
+														<span style={{"text-align": "center"}}
+																	className="color-blue"
+																	onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</span>
+												}
+
+        </span>
+					),
+				},
+			],
 		}
 		//
 	}
@@ -193,7 +388,14 @@ class Listofworksstudentone extends Component {
 		let datalists = [];
 		var styletable = {"display": "none"}
 
-		// console.log("seacthdata设置数据3")
+		this.state.columns.map((item,key)=>{
+			if(this.props.isNotMember()===true) {
+				if(item.title==="学号"){
+					this.state.columns.splice(key,1)
+				}
+			}
+		})
+		let columns2=this.state.columns;
 
 		var teacherlist = undefined;
 		var teacherlists = undefined;
@@ -297,11 +499,21 @@ class Listofworksstudentone extends Component {
 			teacherlists: teacherlists,
 			loadingstate: false,
 			styletable: styletable,
+			columns:columns2,
 		})
 	}
 	// 设置数据
 	seacthdata = (teacherdata) => {
 		let datalist = [];
+		this.state.columns.map((item,key)=>{
+			if(this.props.isNotMember()===true) {
+				if(item.title==="学号"){
+					this.state.columns.splice(key,1)
+				}
+			}
+		})
+		let columns2=this.state.columns;
+
 		if (teacherdata !== undefined) {
 			// console.log("seacthdata设置数据")
 			// console.log(this.state.teacherdata.id )
@@ -361,6 +573,7 @@ class Listofworksstudentone extends Component {
 			data: datalist,
 			teacherlist: teacherlist,
 			loadingstate: false,
+			columns:columns2,
 		})
 	}
 	// 查看学员实训信息
@@ -530,202 +743,8 @@ class Listofworksstudentone extends Component {
 	}
 
 	render() {
-		let {visibles, game_list, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate} = this.state;
-		let columns = [
-			{
-				title: '序号',
-				dataIndex: 'number',
-				key: 'number',
-				align: "center",
-				className:'font-14',
-				render: (text, record) => (
-					<span>
-						{record.number === undefined ?
-							<span style={{
-								"color": '#9A9A9A',
-								"text-align": "center"
-							}}> --</span>
-							: record.number === "" ?
-								<span style={{
-									"color": '#9A9A9A',
-									"text-align": "center"
-								}}>--</span>
-								: record.number === "--" ?
-									<span style={{
-										"color": '#9A9A9A',
-										"text-align": "center"
-									}}>--</span>
-									:
-									<span style={{
-										"color": '#07111B',
-										"text-align": "center"
-									}}>  {record.number}</span>
-						}
-        </span>
-				),
-			},
-			{
-				title: '姓名',
-				dataIndex: 'name',
-				key: 'name',
-				align: "center",
-				className:'font-14',
-				render: (text, record) => (
-					<span>
-						{record.name === undefined ?
-							<span style={{
-								"color": '#9A9A9A',
-								"text-align": "center"
-							}}>--</span>
-							:
-							record.name === "" ?
-								<span style={{
-									"color": '#9A9A9A',
-									"text-align": "center"
-								}}>--</span>
-								:
-								record.name === null ?
-									<span style={{
-										"color": '#9A9A9A',
-										"text-align": "center"
-									}}>--</span>
-									:
-									record.name === "--" ?
-										<span style={{
-											"color": '#9A9A9A',
-											"text-align": "center"
-										}}>--</span>
-										:
-										<span style={{
-											"color": '#07111B',
-											"text-align": "center"
-										}}>{record.name}</span>
-						}
+		let {visibles, game_list,columns, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate} = this.state;
 
-        </span>
-				),
-			},
-			{
-				title: '学号',
-				dataIndex: 'stduynumber',
-				key: 'stduynumber',
-				align: "center",
-				className:'font-14',
-				render: (text, record) => (
-					<span>
-             <span style={{
-							 "color": '#9A9A9A',
-							 "text-align": "center"
-						 }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</span>
-        </span>
-				),
-			},
-			{
-				title: '分班',
-				key: 'classroom',
-				dataIndex: 'classroom',
-				align: "center",
-				className:'font-14',
-				width:'288px',
-				render: (text, record) => (
-					<span>
-             <span style={{
-							 "color": '#9A9A9A',
-							 "text-align": "center"
-						 }}>{record.classroom === undefined ? "--" : record.classroom === "" ? "--" : record.classroom === null ? "--" : record.classroom}</span>
-        </span>
-				),
-			},
-			{
-				title: '提交状态',
-				dataIndex: 'submitstate',
-				key: 'submitstate',
-				align: "center",
-				className:'font-14',
-				render: (text, record) => (
-					<span>
- <span style={record.submitstate === "延时提交" ? {
-	 "color": '#DD1717',
-	 "text-align": "center"
- } : record.submitstate === "按时提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-	 "color": '#747A7F',
-	 "text-align": "center"
- }}>{record.submitstate === undefined ? "--" : record.submitstate === "" ? "--" : record.submitstate === null ? "--" : record.submitstate}</span>
-
-        </span>
-				),
-			},
-			{
-				title: '更新时间',
-				dataIndex: 'updatetime',
-				key: 'updatetime',
-				align: "center",
-				className:'font-14',
-				render: (text, record) => (
-					<span>
-             <span style={{
-							 "color": '#9A9A9A',
-							 "text-align": "center"
-						 }}>{record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime}</span>
-        </span>
-				),
-			},
-			{
-				title: '完成情况',
-				dataIndex: 'completion',
-				key: 'completion',
-				align: "center",
-				className:'font-14',
-				render: (text, record) => (
-					<span>
-											<span style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</span>
-        </span>
-				),
-			},
-			{
-				title: '最终成绩',
-				dataIndex: 'levelscore',
-				key: 'levelscore',
-				align: "center",
-				className:'font-14',
-				render: (text, record) => (
-					<span>
-						{
-							record.levelscore && record.levelscore === "--"?
-								<span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.levelscore}</span>
-								:
-								<span style={parseInt(record.levelscore) >=90 ? {
-									"color": '#DD1717',
-									"text-align": "center"
-								} : parseInt(record.levelscore) <= 60?{
-									"color": '#FF6800',
-									"text-align": "center",
-								}: {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</span>
-						}
-
-        </span>
-				),
-			},
-			{
-				title: '操作',
-				dataIndex: 'operating',
-				key: 'operating',
-				align: "center",
-				className:'font-14',
-				render: (text, record) => (
-					<span>
-                        {
-													record.submitstate === "未提交" ?<span style={{	color: '#9A9A9A'}}>--</span>
-														:
-														<span style={{"text-align": "center"}}
-															 className="color-blue"
-															 onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</span>
-												}
-
-        </span>
-				),
-			},
-		];
 		return (
 			teacherdata === undefined || teacherdata.student_works === undefined || teacherdata.student_works === null || JSON.stringify(teacherdata.student_works) === "[]" ?
 				// 学生不能查看别人的
@@ -978,12 +997,12 @@ class Listofworksstudentone extends Component {
 																				style={{"color": '#FF6800'}}>{teacherdata.left_time.time}</span>}
 
                               </span>
-											<div className="fr color-grey-6 edu-menu-panel">
+											<div className="fr  edu-menu-panel">
 												<ul>
 													<li className="edu-position edu-position-hidebox">
-														<a className="font-12 color-grey-6">
+														<a className="font-12 ">
 															{order === "updated_at" ? "时间" : order === "work_score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a>
-														<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i>
+														<i className="iconfont icon-xiajiantou ml5 font-12 "></i>
 														<ul className="edu-position-hide undis mt10">
 															<li><a onClick={(e) => this.funorder("updated_at")} data-remote="true"
 																		 className="color-grey-6 font-12" style={{"text-align": "center "}}>更新时间</a></li>
@@ -1013,7 +1032,6 @@ class Listofworksstudentone extends Component {
 												columns={columns}
 												pagination={false}
 												loading={loadingstate}
-												onChange={this.TablePagination}
 											/>}
 										</div>
 										{

From 2d89702df26921db47bff2e33c59ea1285b579e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 29 Jun 2019 18:13:10 +0800
Subject: [PATCH 4/7] =?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/coursesPublic/AccessoryModal.js   | 35 ++++++++++++++++---
 .../exercise/Studentshavecompletedthelist.js  |  2 +-
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
index 26d4499aa..72512be43 100644
--- a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
+++ b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
@@ -17,7 +17,8 @@ class AccessoryModal extends Component{
       ModalSave:"",
       loadtype:false,
 			updatas:false,
-      shixunsreplace:false
+      shixunsreplace:false,
+      Errormessage:false,
     }
   }
 
@@ -41,7 +42,10 @@ class AccessoryModal extends Component{
     // for(var list of fileList ){
     //   console.log(fileList)
     // }
-    this.setState({ fileList });
+    this.setState({
+      fileList:fileList,
+      Errormessage:false,
+    });
   }
 
   onAttachmentRemove = (file) => {
@@ -121,10 +125,23 @@ class AccessoryModal extends Component{
 
         if (newfileList.length == 0) {
           // this.props.showNotification('请先上传附件')
-					this.setState({
-            shixunsreplace:true,
-					})
+          if(this.props.modalname === "补交附件"){
+            this.setState({
+              Errormessage:true,
+              shixunsreplace:false,
+            })
+          }else{
+            this.setState({
+              shixunsreplace:true,
+              Errormessage:false,
+            })
+          }
           return;
+        }else{
+          this.setState({
+            shixunsreplace:false,
+            Errormessage:false,
+          })
         }
 
         let url= this.props.reviseAttachmentUrl || "/graduation_works/"+id+"/revise_attachment.json"
@@ -326,6 +343,14 @@ class AccessoryModal extends Component{
               border:'1px solid rgba(234,234,234,1)',
               padding: '10px'
             }}></textarea>
+            {
+              this.state.Errormessage && this.state.Errormessage === true ?
+                <p className="color-red  mt5 mb5  " style={{width: " 100%", height: "20px"}}>
+                  <span className="fl" style={{textAlign:"left",width: " 100%"}}>还未上传附件</span>
+                </p>
+                : <div style={{height:"25px"}}></div>
+
+            }
 						{this.state.updatas===true?<span className={"color-red"}>请上传附件</span>:""}
             <div className="clearfix mt30 edu-txt-center mb10">
               <a  className="task-btn color-white mr70" onClick={this.props.Cancel}>{this.props.Cancelname || '取消'}</a>
diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index 4769cce87..c2930bcdf 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -55,7 +55,7 @@ class Studentshavecompletedthelist extends Component {
 			unsubmitted: false,
 			exercise_users: undefined,
 			loadingstate: true,
-			order: undefined,
+			order: "end_at",
 			current_answer_user: undefined,
 			course_groups: undefined,
 			course_groupsdatas: false,

From 65ee882d656188f967aeb9fb9c98c09d73846033 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 29 Jun 2019 18:13:26 +0800
Subject: [PATCH 5/7] =?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/busyWork/UseBank.js   | 13 +++--
 .../src/modules/courses/exercise/Exercise.js  |  2 +-
 .../exercise/Exercisestatisticalresult.js     | 22 ++++----
 .../tasks/GraduationTaskssetting.js           | 52 +++++++++++--------
 public/react/src/modules/tpm/NewHeader.js     |  2 +-
 5 files changed, 52 insertions(+), 39 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/UseBank.js b/public/react/src/modules/courses/busyWork/UseBank.js
index 142c65c5c..3a60b23b0 100644
--- a/public/react/src/modules/courses/busyWork/UseBank.js
+++ b/public/react/src/modules/courses/busyWork/UseBank.js
@@ -103,7 +103,14 @@ class UseBank extends Component{
   }
   closeSelectBank=()=>{
     this.setState({
-      flag:false
+      flag:false,
+			nav_my: 'myself',
+			search: '',
+			page: 1,
+			checkBoxValues: [],
+			isChecked:'',
+			is_teacher:undefined,
+			hometypepvisible:false
     })
   }
 
@@ -190,7 +197,7 @@ class UseBank extends Component{
           width:218px !important;
         }
         .bankwidth{
-					width:29% !important;
+					width:24% !important;
 					overflow:hidden;
 					text-overflow:ellipsis;
 					white-space:nowrap
@@ -275,7 +282,7 @@ class UseBank extends Component{
                           <span className="fl with65">
                             <label className="task-hide fl" title={item.name && item.name.length > 30 ? item.name:""} style={{"maxWidth":"100%"}}>{item.name}</label>
                           </span>
-                          <span title={item.course_list_name && item.course_list_name.length > 14 && item.course_list_name}
+                          <span title={item.course_list_name && item.course_list_name.length > 10 && item.course_list_name}
 																className={nav_my==='myself'?"fl with30 color-grey-6 task-hide pl5 bankwidth":"fl with30 color-grey-6 task-hide pl5 bankwidth"}
 
 													>{item.course_list_name}</span>
diff --git a/public/react/src/modules/courses/exercise/Exercise.js b/public/react/src/modules/courses/exercise/Exercise.js
index 4a2426f3d..5058b5719 100644
--- a/public/react/src/modules/courses/exercise/Exercise.js
+++ b/public/react/src/modules/courses/exercise/Exercise.js
@@ -193,7 +193,7 @@ class Exercise extends Component{
     }
     // 题库选用成功后刷新页面
     useBankSuccess=(checkValue,value)=>{
-debugger
+
         let{type,StudentList_value,page,limit}=this.state;
         let coursesId=this.props.match.params.coursesId;
         let url=`/courses/${coursesId}/exercises/publish_modal.json`;
diff --git a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js
index 8c9a9cec6..ca7b8e403 100644
--- a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js
+++ b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js
@@ -197,18 +197,18 @@ class Exercisestatisticalresult extends Component {
 
 									item.ques_details.map((ite,k)=>{
 										return(
-											<div>
-											<div className="clearfix edu-back-white poll_list"  style={{padding: '0px 20px'}}>
-												<div className="font-16 shixunreporttitle  fl" >
-													<span> {ite.challenge_position}：{ite.challenge_name}</span>
+											<div className={"mt20"}>
+												<div className="clearfix edu-back-white poll_list"  style={{padding: '0px 20px'}}>
+													<div className="font-16 shixunreporttitle  fl" >
+														<span> {ite.challenge_position}：{ite.challenge_name}</span>
+													</div>
 												</div>
-											</div>
-											<Exercisetablesmubu
-												data={ite.challenge_details}
-												type={item.ques_type}
-												effictive_counts={item.effictive_counts}
-												choicetype={choicetype}
-											/>
+												<Exercisetablesmubu
+													data={ite.challenge_details}
+													type={item.ques_type}
+													effictive_counts={item.effictive_counts}
+													choicetype={choicetype}
+												/>
 											</div>
 										)
 									}):
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
index 6b5930bc2..5c57602e5 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
@@ -316,6 +316,30 @@ class GraduationTaskssettingapp extends Component{
     })
   }
 
+  updatesfuncrosscomment=(types,checked,newlatetime,newcommenttime)=>{
+		let {endtimetype}=this.state;
+		if(types===1){
+				this.setState({
+					latetime:newlatetime,
+					crosscomment:checked,
+					commenttime:newcommenttime
+				})
+		}else{
+			if(endtimetype===true){
+				this.setState({
+					crosscomment:e.target.checked,
+					commenttime:newcommenttime
+				})
+			}else{
+				this.setState({
+					end_time:newlatetime,
+					crosscomment:e.target.checked,
+					commenttime:newcommenttime
+				})
+			}
+		}
+
+	}
   funcrosscomment=(e)=>{
 
     let {latetime,end_time,allowlate}=this.state;
@@ -325,41 +349,23 @@ class GraduationTaskssettingapp extends Component{
        if(latetime===null||latetime===""){
 				 let newlatetime=moment(new Date()).add(7, 'days').format("YYYY-MM-DD HH:mm");
 				 let newcommenttime=moment(new Date()).format("YYYY-MM-DD HH:mm");
-				 this.setState({
-					 latetime:newlatetime,
-					 crosscomment:e.target.checked,
-					 commenttime:newcommenttime
-				 })
+				 this.updatesfuncrosscomment=(1,e.target.checked,newlatetime,newcommenttime)
 			 }else{
 				 let newlatetime=moment(latetime).add(7, 'days').format("YYYY-MM-DD HH:mm");
 				 let newcommenttime=moment(latetime).format("YYYY-MM-DD HH:mm");
-				 this.setState({
-					 latetime:newlatetime,
-					 crosscomment:e.target.checked,
-					 commenttime:newcommenttime
-				 })
+				 this.updatesfuncrosscomment=(1,e.target.checked,newlatetime,newcommenttime)
 			 }
-
-
 			}else{
 				if(end_time===null||end_time===""){
 					let newend_time=moment(new Date()).add(7, 'days').format("YYYY-MM-DD HH:mm");
 					let newcommenttime=moment(new Date()).add(8, 'days').format("YYYY-MM-DD HH:mm");
-					this.setState({
-						end_time:newend_time,
-						crosscomment:e.target.checked,
-						commenttime:newcommenttime
-					})
+					this.updatesfuncrosscomment=(2,e.target.checked,newend_time,newcommenttime)
+
 				}else{
 					let newend_time=moment(end_time).add(7, 'days').format("YYYY-MM-DD HH:mm");
 					let newcommenttime=moment(end_time).add(8, 'days').format("YYYY-MM-DD HH:mm");
-					this.setState({
-						end_time:newend_time,
-						crosscomment:e.target.checked,
-						commenttime:newcommenttime
-					})
+					this.updatesfuncrosscomment=(2,e.target.checked,newend_time,newcommenttime)
 				}
-
 			}
 
 
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index a2ddb242a..ff0ece9f9 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -671,7 +671,7 @@ submittojoinclass=(value)=>{
                 </div>
               </li>
 
-
+							<li className=""><a href={"/libraries"}>教学案例</a></li>
               <li className=""><a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>竞赛</a></li>
 
               <li className={`${activeForums === true ? 'active' : ''}`}><a href={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>问答</a></li>

From 5377f4dc74e86a9be5759c0b82ab8267c5c321ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sun, 30 Jun 2019 22:18:17 +0800
Subject: [PATCH 6/7] =?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/config/webpack.config.dev.js     |  30 ++--
 public/react/src/Loading.js                   |  34 ++--
 .../courses/exercise/ExerciseListItem.js      |   2 +-
 .../tasks/GraduationTasksSubmitedit.js        |   2 +-
 .../graduation/tasks/GraduationTasksedit.js   | 149 ++++++++++++------
 .../graduation/tasks/GraduationTasksnew.js    |  90 +++++++----
 .../tasks/GraduationTaskssetting.js           |   4 +-
 .../graduation/topics/GraduateTopicItem.js    |   2 +-
 .../shixunHomework/Listofworksstudentone.js   |  12 +-
 .../shixunreport/Shixunechart.js              |  28 ++--
 10 files changed, 226 insertions(+), 127 deletions(-)

diff --git a/public/react/config/webpack.config.dev.js b/public/react/config/webpack.config.dev.js
index ceddbd81b..dfd54f38b 100644
--- a/public/react/config/webpack.config.dev.js
+++ b/public/react/config/webpack.config.dev.js
@@ -114,21 +114,21 @@ module.exports = {
       // First, run the linter.
       // It's important to do this before Babel processes the JS.
         // 上线然后要注释回来
-      // {
-      //   test: /\.(js|jsx|mjs)$/,
-      //   enforce: 'pre',
-      //   use: [
-      //     {
-      //       options: {
-      //         formatter: eslintFormatter,
-      //         eslintPath: require.resolve('eslint'),
-			//
-      //       },
-      //       loader: require.resolve('eslint-loader'),
-      //     },
-      //   ],
-      //   include: paths.appSrc,
-      // },
+      {
+        test: /\.(js|jsx|mjs)$/,
+        enforce: 'pre',
+        use: [
+          {
+            options: {
+              formatter: eslintFormatter,
+              eslintPath: require.resolve('eslint'),
+
+            },
+            loader: require.resolve('eslint-loader'),
+          },
+        ],
+        include: paths.appSrc,
+      },
       {
         // "oneOf" will traverse all following loaders until one will
         // match the requirements. When no loader matches it will fall
diff --git a/public/react/src/Loading.js b/public/react/src/Loading.js
index a524ccf63..07ab19a4a 100644
--- a/public/react/src/Loading.js
+++ b/public/react/src/Loading.js
@@ -1,16 +1,18 @@
-import React, { Component } from 'react';
-
-import { BrowserRouter as Router, Route, Link } from "react-router-dom";
-
-class Loading extends Component {
-  render() {
-  	// Loading
-    return (
-      <div className="App" style={{minHeight: '800px'}}>
-        
-      </div>
-    );
-  }
-}
-
-export default Loading;
+import React, { Component } from 'react';
+
+import { BrowserRouter as Router, Route, Link } from "react-router-dom";
+
+import { Spin } from 'antd';
+
+class Loading extends Component {
+  render() {
+  	// Loading
+    return (
+      <div className="App" style={{minHeight: '800px'}}>
+				<Spin size="large" />
+      </div>
+    );
+  }
+}
+
+export default Loading;
diff --git a/public/react/src/modules/courses/exercise/ExerciseListItem.js b/public/react/src/modules/courses/exercise/ExerciseListItem.js
index afa0669d4..f11509fc8 100644
--- a/public/react/src/modules/courses/exercise/ExerciseListItem.js
+++ b/public/react/src/modules/courses/exercise/ExerciseListItem.js
@@ -116,7 +116,7 @@ class ExerciseListItem extends Component{
 
                         {
                          item.lock_status === 0 ?
-                                <Tooltip title={ this.props.isNotMember()?"私有属性，非课堂成员不能访问":"私有属性"} placement="bottom">
+                                <Tooltip title={ this.props.isNotMember()===true?"私有属性，非课堂成员不能访问":"私有属性"} placement="bottom">
                                   <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl"></i>
                                 </Tooltip>
                                 :""
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
index 63865c577..be8586d66 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
@@ -613,7 +613,7 @@ class GraduationTasksSubmitedit extends Component{
                         {item.delete===true?
                         <i className="font-14 iconfont  icon-guanbi "
                            id={item.id}
-                           onClick={()=>this.onAttachmentRemove(item)}
+                           onClick={()=>this.onAttachmentRemove(item.id)}
                            aria-hidden="true">
                         </i>:""}
                       </div>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index 660ef1c71..9be6b9b06 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -2,7 +2,7 @@ import React,{Component} from "React";
 import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal} from "antd";
 import {Link} from 'react-router-dom';
 import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
-import { WordsBtn,getUrl } from 'educoder';
+import { WordsBtn,getUrl ,bytesToSize} from 'educoder';
 import axios from 'axios';
 import Modals from '../../../modals/Modals';
 import '../../css/Courses.css';
@@ -40,27 +40,28 @@ class GraduationTasksedit extends Component{
     axios.get(url).then((result)=>{
         // console.log(result)
 
-        let newfilelist=[];
-        if(result.data.attachments.length!=0){
-          for(var list of result.data.attachments){
-            newfilelist.push({
-              uid:list.id,
-              name:list.title,
-              status: 'done',
-              url:list.url,
-            })
-          }
-
-        }
+        // let newfilelist=[];
+        // if(result.data.attachments.length!=0){
+        //   for(var list of result.data.attachments){
+        //     newfilelist.push({
+        //       uid:list.id,
+        //       name:list.title,
+        //       status: 'done',
+        //       url:list.url,
+        //     })
+        //   }
+				//
+        // }
 			let namelength=result.data.task_name.length;
       let sixlength=title_num-namelength
       this.setState({
-          fileList:newfilelist,
+          // fileList:newfilelist,
           description:result.data.description,
           tasktype:result.data.task_type,
           name:result.data.task_name,
           data:result.data,
-				  title_num:sixlength
+				  title_num:sixlength,
+			  	attachments:result.data.attachments,
       })
 
 
@@ -100,36 +101,36 @@ class GraduationTasksedit extends Component{
   // 附件相关 START
   handleChange = (info) => {
     let fileList = info.fileList;
-    console.log(fileList)
+    // console.log(fileList)
     // for(var list of fileList ){
     //   console.log(fileList)
     // }
     this.setState({ fileList });
   }
 
-  onAttachmentRemove = (file) => {
-    // confirm({
-    //   title: '确定要删除这个附件吗?',
-    //   okText: '确定',
-    //   cancelText: '取消',
-    //   // content: 'Some descriptions',
-    //   onOk: () => {
-    //     this.deleteAttachment(file)
-    //   },
-    //   onCancel() {
-    //     console.log('Cancel');
-    //   },
-    // });
-    // return false;
-
-    this.setState({
-      Modalstype:true,
-      Modalstopval:'确定要删除这个附件吗?',
-      ModalSave: ()=>this.deleteAttachment(file),
-      ModalCancel:this.cancelAttachment
-    })
-    return false;
-  }
+  // onAttachmentRemove = (file) => {
+  //   // confirm({
+  //   //   title: '确定要删除这个附件吗?',
+  //   //   okText: '确定',
+  //   //   cancelText: '取消',
+  //   //   // content: 'Some descriptions',
+  //   //   onOk: () => {
+  //   //     this.deleteAttachment(file)
+  //   //   },
+  //   //   onCancel() {
+  //   //     console.log('Cancel');
+  //   //   },
+  //   // });
+  //   // return false;
+	//
+  //   this.setState({
+  //     Modalstype:true,
+  //     Modalstopval:'确定要删除这个附件吗?',
+  //     ModalSave: ()=>this.deleteAttachment(file),
+  //     ModalCancel:this.cancelAttachment
+  //   })
+  //   return false;
+  // }
 
   cancelAttachment=()=>{
     this.setState({
@@ -141,10 +142,11 @@ class GraduationTasksedit extends Component{
     })
   }
 
-  deleteAttachment = (file) => {
+	onAttachmentRemove = (file) => {
 
     this.cancelAttachment();
-    const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
+    // const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
+		const url = `/attachments/${file}.json`
     axios.delete(url, {
     })
       .then((response) => {
@@ -268,7 +270,7 @@ class GraduationTasksedit extends Component{
   }
   render(){
     const { getFieldDecorator } = this.props.form;
-    let {title_num,pageType,name,description,Loadtype,
+    let {title_num,pageType,name,description,Loadtype,attachments,
       Modalstype,Modalstopval,ModalCancel,ModalSave,shixunsreplace} =this.state;
 
     let {coursedata}=this.props;
@@ -279,7 +281,7 @@ class GraduationTasksedit extends Component{
       width: 600,
       // https://github.com/ant-design/ant-design/issues/15505
       // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
-      // showUploadList: false,
+      showUploadList: false,
       action: `${getUrl()}/api/attachments.json`,
       onChange: this.handleChange,
       onRemove: this.onAttachmentRemove,
@@ -418,8 +420,65 @@ class GraduationTasksedit extends Component{
                     </Button>
                     (单个文件150M以内)
                   </Upload>
-
-
+									{attachments&&attachments.map((item,key)=>{
+
+										return(
+											<div className="color-grey mt5"
+													 key={key}
+											>
+												<a className="color-grey ml3">
+													<i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
+												</a>
+												<a
+													href={item.url}
+													className="mr12 color9B9B" length="58">
+													{item.title}
+
+												</a>
+												<span className="color656565 mt2 color-grey-6 font-12 mr8">
+                      {item.filesize}
+
+                    </span>
+												{item.delete===true?
+													<i className="font-14 iconfont  icon-guanbi "
+														 id={item.id}
+														 onClick={()=>this.onAttachmentRemove(item.id)}
+														 aria-hidden="true">
+													</i>:""}
+											</div>
+										)
+									})}
+									<style>
+										{
+											`
+								.maxwidth500{
+										max-width:500px;
+										overflow: hidden;
+										text-overflow: ellipsis;
+										white-space: nowrap;
+										 color: #05101a;
+								}
+								`
+										}
+									</style>
+									{this.state.fileList.length===0?"":this.state.fileList.map((item,key)=>{
+										return(
+											<p className="color-grey mt10" key={key}  >
+												<a className="color-grey fl">
+													<i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
+												</a>
+												<span className="mr12 color9B9B maxwidth500 fl" length="58">
+										{item.name}
+									</span>
+												<span className="color656565 mt2 color-grey-6 font-12 mr8">
+										{item.response===undefined?"":bytesToSize(item.size)}
+									</span>
+												<i className="font-14 iconfont  icon-guanbi "
+													 id={item.response===undefined?"":item.response.id}
+													 aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.response===undefined?"":item.response.id&&item.response.id)}></i>
+											</p>
+										)
+									})}
                   {/*{attachments&&attachments.map((item,key)=>{*/}
 
                     {/*return(*/}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
index e6185188a..585986fb2 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
@@ -2,7 +2,7 @@ import React, {Component} from "React";
 import {Form, Select, Input, Button, Checkbox, Upload, Icon, message, Modal} from "antd";
 import {Link} from 'react-router-dom';
 import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
-import {WordsBtn, getUrl} from 'educoder';
+import {WordsBtn, getUrl,bytesToSize} from 'educoder';
 import axios from 'axios';
 import Modals from '../../../modals/Modals';
 import '../../css/Courses.css';
@@ -133,29 +133,29 @@ class GraduationTasksnew extends Component {
 		this.setState({fileList});
 	}
 
-	onAttachmentRemove = (file) => {
-		// confirm({
-		//   title: '确定要删除这个附件吗?',
-		//   okText: '确定',
-		//   cancelText: '取消',
-		//   // content: 'Some descriptions',
-		//   onOk: () => {
-		//     this.deleteAttachment(file)
-		//   },
-		//   onCancel() {
-		//     console.log('Cancel');
-		//   },
-		// });
-		// return false;
-
-		this.setState({
-			Modalstype: true,
-			Modalstopval: '确定要删除这个附件吗?',
-			ModalSave: () => this.deleteAttachment(file),
-			ModalCancel: this.cancelAttachment
-		})
-		return false;
-	}
+	// onAttachmentRemove = (file) => {
+	// 	// confirm({
+	// 	//   title: '确定要删除这个附件吗?',
+	// 	//   okText: '确定',
+	// 	//   cancelText: '取消',
+	// 	//   // content: 'Some descriptions',
+	// 	//   onOk: () => {
+	// 	//     this.deleteAttachment(file)
+	// 	//   },
+	// 	//   onCancel() {
+	// 	//     console.log('Cancel');
+	// 	//   },
+	// 	// });
+	// 	// return false;
+	//
+	// 	this.setState({
+	// 		Modalstype: true,
+	// 		Modalstopval: '确定要删除这个附件吗?',
+	// 		ModalSave: () => this.deleteAttachment(file),
+	// 		ModalCancel: this.cancelAttachment
+	// 	})
+	// 	return false;
+	// }
 
 	cancelAttachment = () => {
 		this.setState({
@@ -166,8 +166,9 @@ class GraduationTasksnew extends Component {
 		})
 	}
 
-	deleteAttachment = (file) => {
-		const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
+	onAttachmentRemove = (file) => {
+		// const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
+		const url = `/attachments/${file}.json`
 		axios.delete(url, {})
 			.then((response) => {
 				if (response.data) {
@@ -256,7 +257,7 @@ class GraduationTasksnew extends Component {
 			multiple: true,
 			// https://github.com/ant-design/ant-design/issues/15505
 			// showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
-			// showUploadList: false,
+	    showUploadList: false,
 			action: `${getUrl()}/api/attachments.json`,
 			onChange: this.handleChange,
 			onRemove: this.onAttachmentRemove,
@@ -385,7 +386,7 @@ class GraduationTasksnew extends Component {
 								</div>
 
 
-								<div className="stud-class-set pt20 pl20 pr20  coursenavbox edu-back-white">
+								<div className="stud-class-set pd20  coursenavbox edu-back-white">
 									<style>{`
                 .uploadBtn.ant-btn {
                   border: none;
@@ -428,6 +429,39 @@ class GraduationTasksnew extends Component {
 										</Button>
 										(单个文件150M以内)
 									</Upload>
+
+									<style>
+										{
+											`
+								.maxwidth500{
+										max-width:500px;
+										overflow: hidden;
+										text-overflow: ellipsis;
+										white-space: nowrap;
+										 color: #05101a;
+								}
+								`
+										}
+									</style>
+									{this.state.fileList.length===0?"":this.state.fileList.map((item,key)=>{
+										return(
+											<p className="color-grey mt10" key={key}  >
+												<a className="color-grey fl">
+													<i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
+												</a>
+												<span className="mr12 color9B9B maxwidth500 fl" length="58">
+										{item.name}
+									</span>
+												<span className="color656565 mt2 color-grey-6 font-12 mr8">
+										{item.response===undefined?"":bytesToSize(item.size)}
+									</span>
+												<i className="font-14 iconfont  icon-guanbi "
+													 id={item.response===undefined?"":item.response.id}
+													 aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.response===undefined?"":item.response.id&&item.response.id)}></i>
+											</p>
+										)
+									})}
+
 								</div>
 
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
index 5c57602e5..9917e18f6 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
@@ -327,13 +327,13 @@ class GraduationTaskssettingapp extends Component{
 		}else{
 			if(endtimetype===true){
 				this.setState({
-					crosscomment:e.target.checked,
+					crosscomment:checked,
 					commenttime:newcommenttime
 				})
 			}else{
 				this.setState({
 					end_time:newlatetime,
-					crosscomment:e.target.checked,
+					crosscomment:checked,
 					commenttime:newcommenttime
 				})
 			}
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
index 7ccfae974..5a3efaa63 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
@@ -86,7 +86,7 @@ class GraduateTopicItem extends Component{
 
               {
                discussMessage.private_icon===true?
-                  <Tooltip  title={ this.props.isNotMember?"私有属性，非课堂成员不能访问":"私有属性"}  placement="bottom">
+                  <Tooltip  title={ this.props.isNotMember()===true?"私有属性，非课堂成员不能访问":"私有属性"}  placement="bottom">
                     <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
                   </Tooltip>
                   :""
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 8659bc472..7636db4e3 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -40,6 +40,7 @@ class Listofworksstudentone extends Component {
 			props: props,
 			data: [],
 			datas: [],
+			view_report:false,
 			page: 1,
 			pages: 1,
 			limit: 20,
@@ -305,6 +306,7 @@ class Listofworksstudentone extends Component {
 					work_efficiency: result.data.work_efficiency,
 					code_review: result.data.code_review,
 					challenges_count:result.data.challenges_count,
+					view_report:result.data.view_report,
 				})
 				if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") {
 					this.seacthdata(result.data);
@@ -359,6 +361,7 @@ class Listofworksstudentone extends Component {
 					end_immediately: result.data.end_immediately,
 					code_review: result.data.code_review,
 					challenges_count:result.data.challenges_count,
+					view_report:result.data.view_report,
 				})
 				if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") {
 					this.seacthdata(result.data);
@@ -707,6 +710,7 @@ class Listofworksstudentone extends Component {
 					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.seacthdata(result.data);
 			}
@@ -810,10 +814,10 @@ class Listofworksstudentone extends Component {
 									<Link
 										to={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${this.state.props.match.params.homeworkid}/settings`}
 									>设置</Link>
-									<Link className="fr color-blue font-16" target={"_blank"}
+									{this.state.view_report===true?<Link className="fr color-blue font-16" target={"_blank"}
 												to={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${teacherdata === undefined ? "" : teacherdata.id}/shixun_work_report`}>
 										查看实训报告
-									</Link>
+									</Link>:""}
 									{/*<a className="fr color-blue font-16">查看实训报告</a>*/}
 									{
 										teacherdata === undefined ? ""
@@ -941,10 +945,10 @@ class Listofworksstudentone extends Component {
 									<Link
 										to={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${this.state.props.match.params.homeworkid}/settings`}
 									>设置</Link>
-									<Link className="fr color-blue font-16" target={"_blank"}
+									{this.state.view_report===true?<Link className="fr color-blue font-16" target={"_blank"}
 												to={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${this.state.props.match.params.homeworkid}/shixun_work_report`}>
 										查看实训报告
-									</Link>
+									</Link>:""}
 									{
 										teacherdata === undefined ? ""
 											: teacherdata.commit_des === null || teacherdata.commit_des === undefined ? "" :
diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js b/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js
index dcb10a301..dff7c6859 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js
@@ -80,7 +80,7 @@ function startechart(data){
 			{
 				name:'',
 				type:'scatter',
-				data:data.echart_data.efficiency_list,
+				data:data.echart_data===undefined?"":data.echart_data.efficiency_list,
 				itemStyle:{
 					normal:{color:'#2e65ad'}
 				},
@@ -106,9 +106,9 @@ function startechart(data){
 					data : [
 						{
 							name: data.username,
-							xAxis:data.echart_data.myself_eff[0],
-							yAxis:data.echart_data.myself_eff[1],
-							value:data.echart_data.myself_eff[1],
+							xAxis:data.echart_data===undefined?"":data.echart_data.myself_eff[0],
+							yAxis:data.echart_data===undefined?"":data.echart_data.myself_eff[1],
+							value:data.echart_data===undefined?"":data.echart_data.myself_eff[1],
 						}
 					],
 					itemStyle: {
@@ -132,7 +132,7 @@ function startechart(data){
 			{
 				name:'二班',
 				type:'scatter',
-				data: data.echart_data.myself_eff,
+				data: data.echart_data===undefined?"":data.echart_data.myself_eff,
 				itemStyle:{
 					color:'#c23531'
 				}}
@@ -141,7 +141,7 @@ function startechart(data){
 
 
 	var ablChart = echarts.init(document.getElementById('shixun_overall_ablility_chart'));
-	var dataBJ = data.echart_data.consume_list;
+	var dataBJ = data.echart_data===undefined?"":data.echart_data.consume_list;
 
 
 	var itemStyle = {
@@ -188,7 +188,7 @@ function startechart(data){
 			formatter: function (obj) {
 				var value = obj.value;
 				if(obj.name ==data.username){
-					return  "姓名："+data.username + "<br/>"+'学号： '+data.user_id + "<br/>"+'得分：'+ data.echart_data.myself_object[1];
+					return  "姓名："+data.username + "<br/>"+'学号： '+data.user_id + "<br/>"+'得分：'+ data.echart_data===undefined?"":data.echart_data.myself_object[1];
 				}
 
 			}
@@ -241,9 +241,9 @@ function startechart(data){
 					data : [
 						{
 							name: data.username,
-							xAxis: data.echart_data.myself_object[0],
-							yAxis:data.echart_data.myself_object[1],
-							value:data.echart_data.myself_object[1]
+							xAxis: data.echart_data===undefined?"":data.echart_data.myself_object[0],
+							yAxis:data.echart_data===undefined?"":data.echart_data.myself_object[1],
+							value:data.echart_data===undefined?"":data.echart_data.myself_object[1]
 						}
 					],
 					itemStyle: {
@@ -256,7 +256,7 @@ function startechart(data){
 			{
 				name: '能力1',
 				type: 'scatter',
-				data: data.echart_data.myself_object,
+				data: data.echart_data===undefined?"":data.echart_data.myself_object,
 				itemStyle:itemStyle1,
 				symbolSize: function (val){
 					return Math.round(val[2]);
@@ -367,8 +367,8 @@ class Shixunechart extends Component {
 						<div className="fl with65" style={{paddingLeft: "5%"}}>
 							<li className="mt5 mb5">{data&&data.username}</li>
 							<li className="mt5 mb5">{data&&data.user_id}</li>
-							<li className="mt5 mb5 color-orange03"><span className="color-orange03">{data&&data.echart_data.myself_eff[1]}</span></li>
-							<li className="mt5 mb5 color-orange03"><span className="color-orange03">{data&&data.echart_data.myself_eff[0]}</span></li>
+							<li className="mt5 mb5 color-orange03"><span className="color-orange03">{data&&data.echart_data===undefined?"":data&&data.echart_data.myself_eff[1]}</span></li>
+							<li className="mt5 mb5 color-orange03"><span className="color-orange03">{data&&data.echart_data===undefined?"":data&&data.echart_data.myself_eff[0]}</span></li>
 						</div>
 					</div>
 					<div className="pr mt20 with100">
@@ -393,7 +393,7 @@ class Shixunechart extends Component {
 							<div className="fl with65" style={{paddingLeft: "5%"}}>
 								<li className="mt5 mb5">{data&&data.username}</li>
 								<li className="mt5 mb5">{data&&data.user_id}</li>
-								<li className="mt5 mb5 color-orange03"><span className="color-orange03">{data&&data.echart_data.myself_object[1]}</span></li>
+								<li className="mt5 mb5 color-orange03"><span className="color-orange03">{data&&data.echart_data===undefined?"":data&&data.echart_data.myself_object[1]}</span></li>
 							</div>
 						</div>
 						<div className="popup_tip_box fontGrey2 with100 disc mt20"

From 8fc86ecf9bbb6da1ba037aaae7c23710d2cdba78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 1 Jul 2019 09:12:54 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../javascripts/educoder/edu_application.js   | 2576 ++++++++---------
 public/react/config/webpack.config.dev.js     |   30 +-
 public/react/src/modules/home/shixunsHome.js  |    8 +-
 public/react/src/modules/tpm/NewFooter.js     |   98 +-
 public/react/src/modules/tpm/SiderBar.js      |    2 +-
 public/react/src/modules/tpm/TPMIndexHOC.js   |   45 +-
 6 files changed, 1385 insertions(+), 1374 deletions(-)

diff --git a/public/javascripts/educoder/edu_application.js b/public/javascripts/educoder/edu_application.js
index 91e04ce80..feacff0dd 100644
--- a/public/javascripts/educoder/edu_application.js
+++ b/public/javascripts/educoder/edu_application.js
@@ -1,1288 +1,1288 @@
-document.write("<link href='//at.alicdn.com/t/font_653600_qa9lwwv74z.css' rel='stylesheet' type='text/css'/>");
-
-/*!
- * JavaScript Cookie v2.2.0
- * https://github.com/js-cookie/js-cookie
- *
- * Copyright 2006, 2015 Klaus Hartl & Fagner Brack
- * Released under the MIT license
- */
-!function(e) {
-    var n;
-    if ("function" == typeof define && define.amd && (define(e),
-    n = !0),
-    "object" == typeof exports && (module.exports = e(),
-    n = !0),
-    !n) {
-        var t = window.Cookies
-          , o = window.Cookies = e();
-        o.noConflict = function() {
-            return window.Cookies = t,
-            o
-        }
-    }
-}(function() {
-    function e() {
-        for (var e = 0, n = {}; e < arguments.length; e++) {
-            var t = arguments[e];
-            for (var o in t)
-                n[o] = t[o]
-        }
-        return n
-    }
-    function n(e) {
-        return e.replace(/(%[0-9A-Z]{2})+/g, decodeURIComponent)
-    }
-    return function t(o) {
-        function r() {}
-        function i(n, t, i) {
-            if ("undefined" != typeof document) {
-                "number" == typeof (i = e({
-                    path: "/"
-                }, r.defaults, i)).expires && (i.expires = new Date(1 * new Date + 864e5 * i.expires)),
-                i.expires = i.expires ? i.expires.toUTCString() : "";
-                try {
-                    var c = JSON.stringify(t);
-                    /^[\{\[]/.test(c) && (t = c)
-                } catch (e) {}
-                t = o.write ? o.write(t, n) : encodeURIComponent(String(t)).replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g, decodeURIComponent),
-                n = encodeURIComponent(String(n)).replace(/%(23|24|26|2B|5E|60|7C)/g, decodeURIComponent).replace(/[\(\)]/g, escape);
-                var f = "";
-                for (var u in i)
-                    i[u] && (f += "; " + u,
-                    !0 !== i[u] && (f += "=" + i[u].split(";")[0]));
-                return document.cookie = n + "=" + t + f
-            }
-        }
-        function c(e, t) {
-            if ("undefined" != typeof document) {
-                for (var r = {}, i = document.cookie ? document.cookie.split("; ") : [], c = 0; c < i.length; c++) {
-                    var f = i[c].split("=")
-                      , u = f.slice(1).join("=");
-                    t || '"' !== u.charAt(0) || (u = u.slice(1, -1));
-                    try {
-                        var a = n(f[0]);
-                        if (u = (o.read || o)(u, a) || n(u),
-                        t)
-                            try {
-                                u = JSON.parse(u)
-                            } catch (e) {}
-                        if (r[a] = u,
-                        e === a)
-                            break
-                    } catch (e) {}
-                }
-                return e ? r[e] : r
-            }
-        }
-        return r.set = i,
-        r.get = function(e) {
-            return c(e, !1)
-        }
-        ,
-        r.getJSON = function(e) {
-            return c(e, !0)
-        }
-        ,
-        r.remove = function(n, t) {
-            i(n, "", e(t, {
-                expires: -1
-            }))
-        }
-        ,
-        r.defaults = {},
-        r.withConverter = t,
-        r
-    }(function() {})
-});
-
-$(function() {
-    var result = location.search.match(/\?search=(\w*)&?/i)
-    if (result && result[1]) {
-        var searchText = result[1]
-        $('#search-input').val(searchText)
-    }
-    // 未报名用户登录时弹框
-    // console.log(Cookies.get('enroll_status'));
-    // if(Cookies.get('enroll_status') == 0){
-    //     Cookies.remove('enroll_status');
-    //     var html='<div class="CompetitionEnrollBox">'+
-    //         '<div class="pr with40">'+
-    //         '<img src="/images/educoder/competition/boxEnroll.png" width="100%"/>'+
-    //         '<a href="javascript:void(0)" class="CloseBox" onclick="CloseBox();"><i class="iconfont icon-roundclose color-grey-c"></i></a>'+
-    //         '<a href="https://www.educoder.net/competitions/gcc-dev-2018/enroll" class="ImmediatelyEnroll">立即报名</a>'+
-    //         '</div></div>';
-    //     $(".newContainer").append(html);
-    // }
-});
-
-function CloseBox() {
-    $(".CompetitionEnrollBox").remove();
-}
-
-//根据页面大小决定侧边栏的位置
-$(window).resize(function() {
-    rightSlider();
-});
-function rightSlider() {
-    var poi = parseInt((parseInt($(window).width()) - 1200) / 2) - 60;
-    // console.log(parseInt($(window).width())+"  "+poi);
-    if (poi > 0) {
-        $(".-task-sidebar").css("right", poi);
-    } else {
-        $(".-task-sidebar").css("right", "0px");
-    }
-    $(".-task-sidebar").show();
-}
-function open_course(id, allowVisit) {
-    if (allowVisit) {
-        window.open("/courses/" + id);
-    }
-}
-function open_project(id, allowVisit) {
-    if (allowVisit) {
-        window.open("/projects/" + id);
-    }
-}
-
-function conver_size(limit) {
-    var size = "";
-    if (limit < 1024) {
-        //如果小于1KB转化成B
-        size = limit.toFixed(2) + "B";
-    } else if (limit < 1024 * 1024) {
-        //如果小于1MB转化成KB
-        size = (limit / 1024).toFixed(2) + "KB";
-    } else if (limit < 1024 * 1024 * 1024) {
-        //如果小于1GB转化成MB
-        size = (limit / (1024 * 1024)).toFixed(2) + "MB";
-    } else {
-        //其他转化成GB
-        size = (limit / (1024 * 1024 * 1024)).toFixed(2) + "GB";
-    }
-
-    var sizestr = size + "";
-    var len = sizestr.indexOf("\.");
-    var dec = sizestr.substr(len + 1, 2);
-    if (dec == "00") {
-        //当小数点后为00时 去掉小数部分
-        return sizestr.substring(0, len) + sizestr.substr(len + 3, 2);
-    }
-    return sizestr;
-}
-
-function _initSider() {
-    var $descSide = $("<div class='-task-desc'></div>").appendTo("body");
-    $(".-task-sidebar>div").hover(function() {
-        //移入显示二维码
-        if ($(this).hasClass("scan")) {
-            $(".scan_ewm").show().css({
-                right: "75px",
-                opacity: 0
-            }).stop().animate({
-                right: "45px",
-                opacity: 1
-            })
-            return;
-        }
-        var $tool = $(this).attr("tooltips");
-        $descSide.html($tool + "<div><img src='/images/edu_user/jt.png'></div>");
-        $descSide.data('_dom', this)
-        $descSide.show().css({
-            left: $(this).offset().left - $descSide.width() - 30,
-            opacity: 0,
-            top: $(this).offset().top
-        }).stop().animate({
-            left: $(this).offset().left - $descSide.width() - 5,
-            opacity: 1
-        }, 400);
-    }, function() {
-        if ($(this).hasClass("scan")) {
-            $(".scan_ewm").stop().animate({
-                right: "75px",
-                opacity: 0
-            }, 200).hide();
-        }
-        $descSide.stop().animate({
-            left: $(this).offset().left - $descSide.width() - 30,
-            opacity: 0
-        }, 200).hide();
-    });
-    rightSlider();
-
-    $(window).scroll(function() {
-        if ($descSide.height()) {
-            var hoverIcon = $descSide.data('_dom')
-            $descSide.css('top', $(hoverIcon).offset().top)
-        }
-    })
-}
-$(function() {
-    loadHeader();
-    _initSider();
-
-    $(window).scroll(function() {
-        if ($(".gotop").length > 0) {
-            if ($(document).scrollTop() > 0) {
-                $(".-task-sidebar .gotop").show();
-                $(".gotop").click(function() {
-                    $("html,body").scrollTop(0);
-                });
-            }
-            if ($(document).scrollTop() == 0) {
-                $(".-task-sidebar .gotop").hide();
-            }
-        }
-    });
-
-    // 翻页的GO
-    $(".page_GO").live("keydown", function(event) {
-        var code;
-        if (!event) {
-            event = window.event;
-            //针对ie浏览器
-            code = event.keyCode;
-        } else {
-            code = event.keyCode;
-        }
-        if (code == 13) {
-            var prev = $(this).prev().find("a").html().trim();
-            var page = $(this).val().trim();
-            if (parseInt(prev) >= parseInt(page)) {
-                if (typeof ($(this).prev().children("a").attr("href")) == "undefined") {
-                    var href = $(this).parent().find("li:first-child").children("a").attr("href");
-                } else {
-                    var href = $(this).prev().children("a").attr("href");
-                }
-                var new_href = href.replace(/page=(\d*)/, 'page=' + page);
-                console.log(new_href);
-                $.get(new_href);
-                return false;
-            }
-        }
-    });
-
-    // 试用申请弹框
-    $("#apply_trail_submit_btn").live('click', function() {
-        if ($("#apply_reason").val().trim() == "") {
-            $("#hint_message").show();
-        } else {
-            $("#hint_message").hide();
-            $("#apply_trail_form").submit();
-            hideModal();
-        }
-    });
-
-});
-
-// editor 存在了jquery对象上，应用不需要自己写md_rec_data方法了
-function md_rec_data(k, mdu, id) {
-    if (window.sessionStorage.getItem(k + mdu) !== null) {
-        editor = $("#e_tips_" + id).data('editor');
-        editor.setValue(window.sessionStorage.getItem(k + mdu));
-
-        md_clear_data(k, mdu, id);
-    }
-}
-// markdown的自动保存
-function md_elocalStorage(editor, mdu, id) {
-    if (window.sessionStorage) {
-        var oc = window.sessionStorage.getItem('content' + mdu);
-        if (oc !== null) {
-            $("#e_tips_" + id).data('editor', editor);
-            var h = '您上次有已保存的数据，是否<a style="cursor: pointer;" class="link-color-blue" onclick="md_rec_data(\'content\',\'' + mdu + '\',\'' + id + '\')">恢复</a> ? / <a style="cursor: pointer;" class="link-color-blue" onclick="md_clear_data(\'content\',\'' + mdu + '\',\'' + id + '\')">不恢复</a>';
-            $("#e_tips_" + id).html(h);
-        }
-        setInterval(function() {
-            d = new Date();
-            var h = d.getHours();
-            var m = d.getMinutes();
-            var s = d.getSeconds();
-            h = h < 10 ? '0' + h : h;
-            m = m < 10 ? '0' + m : m;
-            s = s < 10 ? '0' + s : s;
-            if (editor.getValue().trim() != "") {
-                md_add_data("content", mdu, editor.getValue());
-                var id1 = "#e_tip_" + id;
-                var id2 = "#e_tips_" + id;
-                $(id1).html(" 数据已于 " + h + ':' + m + ':' + s + " 保存   ");
-                $(id2).html("");
-            }
-        }, 10000);
-
-    } else {
-        $("#e_tip_" + id).after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器！');
-    }
-}
-// 保存数据
-function md_add_data(k, mdu, d) {
-    window.sessionStorage.setItem(k + mdu, d);
-}
-// 恢复数据
-//function md_rec_data(k,mdu,id, editor){
-//    if(window.sessionStorage.getItem(k+mdu) !== null){
-//        editor.setValue(window.sessionStorage.getItem(k+mdu));
-//        md_clear_data(k,mdu,id);
-//    }
-//}
-// 清空保存的数据
-function md_clear_data(k, mdu, id) {
-    window.sessionStorage.removeItem(k + mdu);
-    var id1 = "#e_tip_" + id;
-    var id2 = "#e_tips_" + id;
-    if (k == 'content') {
-        $(id2).html("");
-    } else {
-        $(id1).html("");
-    }
-}
-
-// editorMD to create
-/**
- *
- * @param id  渲染DOM的id
- * @param width 宽度
- * @param high  高度
- * @param placeholder
- * @param imageUrl 上传图片的url
- * @returns {*} 返回一个editorMD实例
- */
-function create_editorMD(id, width, high, placeholder, imageUrl, readonly) {
-    var readonly = readonly == undefined ? false : readonly;
-    var editorName = editormd(id, {
-        width: width,
-        height: high,
-        syncScrolling: "single",
-        //你的lib目录的路径，我这边用JSP做测试的
-        path: "/editormd/lib/",
-        tex: true,
-        tocm: true,
-        emoji: true,
-        taskList: true,
-        codeFold: true,
-        searchReplace: true,
-        htmlDecode: "style,script,iframe",
-        sequenceDiagram: true,
-        autoFocus: false,
-        readonly: readonly,
-        toolbarIcons: function() {
-            // Or return editormd.toolbarModes[name]; // full, simple, mini
-            // Using "||" set icons align right.
-            return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"]
-        },
-        toolbarCustomIcons: {
-            testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
-            testIcon1: "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>"
-        },
-        //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
-        saveHTMLToTextarea: true,
-        // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
-        dialogMaskOpacity: 0.6,
-        placeholder: placeholder,
-        imageUpload: true,
-        imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
-        imageUploadURL: imageUrl,
-        //url
-        onload: function(cMirror) {
-            $("#" + id + " [type=\"latex\"]").bind("click", function() {
-                editorName.cm.replaceSelection("```latex");
-                editorName.cm.replaceSelection("\n");
-                editorName.cm.replaceSelection("\n");
-                editorName.cm.replaceSelection("```");
-                var __Cursor = editorName.cm.getDoc().getCursor();
-                editorName.cm.setCursor(__Cursor.line - 1, 0);
-            });
-
-            $("#" + id + " [type=\"inline\"]").bind("click", function() {
-                editorName.cm.replaceSelection("$$$$");
-                var __Cursor = editorName.cm.getDoc().getCursor();
-                editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
-                editorName.cm.focus();
-            });
-            $("[type=\"inline\"]").attr("title", "行内公式");
-            $("[type=\"latex\"]").attr("title", "多行公式");
-            setTimeout(function() {
-                editorName.resize();
-                editorName.cm.refresh();
-                window.new_md = editorName;
-            }, 300);
-        }
-    });
-    return editorName;
-}
-
-// editormd to html
-/**
- *
- * @param id 渲染的id
- * @param callback onload回調 暫時未用
- */
-function editormd_to_html(id, callback) {
-    editormd.loadKaTeX(function() {
-        editormd.markdownToHTML(id, {
-            htmlDecode: "style,script,iframe",
-            // you can filter tags decode
-            onload: function() {
-                callback && callback()
-            },
-            taskList: true,
-            tex: true,
-            // 默认不解析
-            flowChart: true,
-            // 默认不解析
-            sequenceDiagram: true// 默认不解析
-        });
-    });
-}
-
-function loadHeader() {
-    //头部导航条的----------显示搜索框
-    $("#search-open").on("click", function(e) {
-        $(this).hide();
-        //        $("#header-nav").animate({opacity:"0"},1000);
-        $(".posi-search").show()
-        // .animate({opacity:"1"},1000);
-        $("#header-nav").css("z-index", "2");
-        $(".posi-search").css("z-index", "3");
-        // $(".search-input").val("");  //  不清空
-        $(".search-input").focus();
-        $(".search-all .search-content").hide();
-        e.stopPropagation();
-        //阻止冒泡
-    });
-    $(".search-input").on("click", function(e) {
-        e.stopPropagation();
-        //阻止冒泡
-    });
-    //搜索框输入内容
-    $(".search-input").on("input", function(e) {
-        if ($(".search-input").val() == "") {
-            $(".search-all .search-content").hide();
-        } else {
-            $(".search-all .search-content").show();
-        }
-        e.stopPropagation();
-        //阻止冒泡
-    });
-    //搜索
-    $("#header_keyword_search").on("click", header_search);
-    $("input[name='search_keyword']").on("keydown", function(event) {
-        var code;
-        if (!event) {
-            event = window.event;
-            //针对ie浏览器
-            code = event.keyCode;
-        } else {
-            code = event.keyCode;
-        }
-        if (code == 13) {
-            header_search();
-            return false;
-        }
-    });
-    $(".search-clear").click(function(e) {
-        e.stopPropagation();
-    });
-    //切换搜索条件
-    $("#searchkey li").click(function(e) {
-        var key = $($(this).children("a")[0]).html();
-        switch (key) {
-        case '实训':
-            $("#search_type").val('1');
-            break;
-        case '课堂':
-            $("#search_type").val('2');
-            break;
-        case '用户':
-            $("#search_type").val('3');
-            break;
-        }
-        $("#searchkey").siblings(".searchkey").html(key);
-        //        $("#searchkey").hide();
-        e.stopPropagation();
-        //阻止冒泡
-    });
-    //切换选择导航条
-    $("#header-nav li").click(function() {
-        $("#header-nav li").removeClass("active");
-        $(this).addClass("active");
-    });
-    //点击页面其它（与搜索框无关的地方）都会将搜索框隐藏，所以与搜索框有关的地方需要阻止冒泡
-    $("body").on("click", function() {
-        closeSearch();
-    });
-
-    $(".search_history").on("click", function() {
-        $("input[name='search_keyword']").val($(this).html());
-        header_search();
-    });
-}
-
-function header_search() {
-    var keyword = $("input[name='search_keyword']").val();
-    // 搜索关键字
-    var index = $("#search_type").val();
-    // 搜索课程/项目
-    keyword = encodeURIComponent(keyword);
-    // $.get('/users/search_shixuns_or_course',
-    //     { search: keyword,
-    //         index: index});
-    window.location.href = "/users/search_shixuns_or_courses" + "?search=" + keyword + "&index=" + index;
-    //e.stopPropagation();//阻止冒泡
-}
-
-//头部导航条的隐藏
-function closeSearch() {
-    $('#posi-search').hide();
-    $("#search-open").show();
-    //    $(".posi-search").animate({opacity:"0"},800);
-    $("#header-nav").animate({
-        opacity: "1"
-    }, 1000);
-    $(".posi-search").css("z-index", "2");
-    $("#header-nav").css("z-index", "3");
-}
-(function($) {
-    $.fn.drag = function(options) {
-        var x, drag = this, isMove = false, defaults = {};
-        var options = $.extend(defaults, options);
-        //添加背景，文字，滑块
-        var html = '<div class="drag_bg"></div>' + '<div class="drag_text" onselectstart="return false;" unselectable="on">请拖住滑块，拖动到最右边</div>' + '<div class="handler handler_bg"></div>';
-        this.append(html);
-
-        var handler = drag.find('.handler');
-        var drag_bg = drag.find('.drag_bg');
-        var text = drag.find('.drag_text');
-        var maxWidth = text.width() - handler.width();
-        //能滑动的最大间距
-        //鼠标按下时候的x轴的位置
-        handler.mousedown(function(e) {
-            isMove = true;
-            x = e.pageX - parseInt(handler.css('left'), 10);
-        });
-
-        //鼠标指针在上下文移动时，移动距离大于0小于最大间距，滑块x轴位置等于鼠标移动距离
-        $(document).mousemove(function(e) {
-            var _x = e.pageX - x;
-            var handler_offset = handler.offset();
-            var lastX = e.clientX - x;
-            lastX = Math.max(0, Math.min(maxWidth, lastX));
-            if (isMove) {
-                if (_x > 0 && _x <= maxWidth) {
-                    handler.css({
-                        'left': lastX
-                    });
-                    drag_bg.css({
-                        'width': lastX
-                    });
-                } else if (lastX > maxWidth - 5 && lastX < maxWidth + 5) {
-                    //鼠标指针移动距离达到最大时清空事件
-                    dragOk();
-                }
-            }
-        });
-        handler.mouseup(function(e) {
-            isMove = false;
-            var _x = e.pageX - x;
-            if (_x < maxWidth) {
-                //鼠标松开时，如果没有达到最大距离位置，滑块就返回初始位置
-                handler.css({
-                    'left': 0
-                });
-                drag_bg.css({
-                    'width': 0
-                });
-            }
-        });
-
-        //清空事件
-        function dragOk() {
-            var kuaiwidth = drag.width() - handler.width();
-            handler.removeClass('handler_bg').addClass('handler_ok_bg');
-            handler.css({
-                'left': kuaiwidth + 'px'
-            })
-            text.css({
-                'width': kuaiwidth + 'px'
-            });
-            text.text('验证通过');
-            drag.css({
-                'color': '#fff'
-            });
-            drag_bg.css({
-                'width': kuaiwidth + 'px'
-            })
-            handler.unbind('mousedown');
-            $(document).unbind('mousemove');
-            $(document).unbind('mouseup');
-            handler.parent().next().find("p").html("").hide();
-        }
-    }
-    ;
-}
-)(jQuery);
-
-//判断是手机端还是电脑端
-function IsPC() {
-    var userAgentInfo = navigator.userAgent;
-    var Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
-    var flag = true;
-    for (var v = 0; v < Agents.length; v++) {
-        if (userAgentInfo.indexOf(Agents[v]) > 0) {
-            flag = false;
-            break;
-        }
-    }
-    return flag;
-}
-
-//Dom：绑定事件的节点对象，ChangeDOM：操作的相关节点，
-function LeaveTitle(Dom, ChangeDom) {
-    ChangeDom.html("").hide();
-    ChangeDom.parent().css({
-        opacity: 0,
-        left: 0,
-        top: 0
-    }).hide();
-}
-
-$(function() {
-    //平台tip的样式优化js
-    var $desc = $("<div class=\"-task-title\">" + "<div class=\"data-tip-down\"></div>" + "<div class=\"data-tip-left\"></div>" + "<div class=\"data-tip-right\"></div>" + "<div class=\"data-tip-top\"></div>" + "</div>").appendTo("body");
-    //Dom：绑定事件的节点对象，ChangeDOM：操作的相关节点，
-    function LeaveTitle(Dom, ChangeDom) {
-        Dom.live("mouseleave", function() {
-            ChangeDom.html("").hide();
-            $desc.css({
-                opacity: 0,
-                left: 0,
-                top: 0
-            }).hide();
-        })
-    }
-    LeaveTitle($("[data-tip-top]"), $(".data-tip-top"));
-    LeaveTitle($("[data-tip-down]"), $(".data-tip-down"));
-    LeaveTitle($("[data-tip-right]"), $(".data-tip-left"));
-    LeaveTitle($("[data-tip-left]"), $(".data-tip-right"));
-    $("[data-tip-top]").live("mouseenter", function() {
-        var $tool = $(this).attr("data-tip-top");
-        if ($tool != "") {
-            $(".data-tip-top").show().html($tool);
-            $desc.show().css({
-                left: $(this).offset().left - ($desc.width() - $(this).outerWidth()) / 2,
-                opacity: 1,
-                top: $(this).offset().top - 30
-            });
-        }
-    });
-    $("[data-tip-down]").live("mouseenter", function() {
-        var $tool = $(this).attr("data-tip-down");
-        if ($tool != "") {
-            $(".data-tip-down").show().html($tool);
-            $desc.show().css({
-                left: $(this).offset().left - ($desc.width() - $(this).outerWidth()) / 2,
-                opacity: 1,
-                top: $(this).offset().top + $(this).height() + 6
-            });
-        }
-    });
-    $("[data-tip-right]").live("mouseenter", function() {
-        var $tool = $(this).attr("data-tip-right");
-        if ($tool != "") {
-            console.log($(this).offset().left + "  " + $(this).width());
-            $(".data-tip-left").show().html($tool);
-            $desc.show().css({
-                left: $(this).offset().left + $(this).outerWidth() + 6,
-                opacity: 1,
-                top: $(this).offset().top - ($desc.height() - $(this).height()) / 2
-            });
-        }
-    });
-    $("[data-tip-left]").live("mouseenter", function() {
-        var $tool = $(this).attr("data-tip-left");
-        if ($tool != "") {
-            $(".data-tip-right").show().html($tool);
-            $desc.show().css({
-                left: $(this).offset().left - $desc.width() - 6,
-                opacity: 1,
-                top: $(this).offset().top - ($desc.height() - $(this).height()) / 2
-            });
-        }
-    });
-    unitDownOption();
-});
-
-function unitDownOption() {
-    //下拉框
-    $("[select-for]").append("<i class='fa fa-sort-desc lesson_img color-grey-8'></i>");
-    $("[select-for]").hover(function() {
-        $(this).find(".down-select").show();
-    }, function() {
-        $(this).find(".down-select").hide();
-    })
-    $("[select-for] .down-select p").bind("click", function() {
-        //alert($(this).attr("data-shixun-value"));
-        if ($(this).attr("id") == "diy_script") {
-            return;
-            // 实训新建-选择自定义脚本diy
-        }
-        $(this).parents(".down-select").siblings("input[type=hidden]").attr("value", $(this).attr("data-shixun-value"));
-
-        $(this).parents(".down-select").siblings("input[type=text]").val($(this).html().trim());
-        $(this).parents(".down-select").hide();
-    })
-}
-
-//初始化省份
-function showprovince(id) {
-    var arrary = ["北京", "上海", "广东", "江苏", "浙江", "重庆", "安徽", "福建", "甘肃", "广西", "贵州", "海南", "河北", "黑龙江", "河南", "湖北", "湖南", "江西", "吉林", "辽宁", "内蒙古", "宁夏", "青海", "山东", "山西", "陕西", "四川", "天津", "新疆", "西藏", "云南", "香港特别行政区", "澳门特别行政区", "台湾", "海外"];
-    var html = "<option value=\"0\">请选择所在省份</option>"
-    for (var i = 0; i < arrary.length; i++) {
-        var item = arrary[i];
-        html += "<option value=\"" + item + "\">" + item + "</option>";
-    }
-    $("#" + id).html(html);
-}
-
-//省市下拉框
-function showcity(province, cityField) {
-    switch (province) {
-    case "北京":
-        var cityOptions = new Array("东城","西城","朝阳","丰台","石景山","海淀","门头沟","房山","通州","顺义","昌平","大兴","平谷","怀柔","密云","延庆");
-        break;
-    case "上海":
-        var cityOptions = new Array("崇明","黄浦","卢湾","徐汇","长宁","静安","普陀","闸北","虹口","杨浦","闵行","宝山","嘉定","浦东","金山","松江","青浦","南汇","奉贤");
-        break;
-    case "广东":
-        var cityOptions = new Array("广州","深圳","珠海","东莞","中山","佛山","惠州","河源","潮州","江门","揭阳","茂名","梅州","清远","汕头","汕尾","韶关","顺德","阳江","云浮","湛江","肇庆");
-        break;
-    case "江苏":
-        var cityOptions = new Array("南京","常熟","常州","海门","淮安","江都","江阴","昆山","连云港","南通","启东","沭阳","宿迁","苏州","太仓","泰州","同里","无锡","徐州","盐城","扬州","宜兴","仪征","张家港","镇江","周庄");
-        break;
-    case "重庆":
-        var cityOptions = new Array("万州","涪陵","渝中","大渡口","江北","沙坪坝","九龙坡","南岸","北碚","万盛","双挢","渝北","巴南","黔江","长寿","綦江","潼南","铜梁","大足","荣昌","壁山","梁平","城口","丰都","垫江","武隆","忠县","开县","云阳","奉节","巫山","巫溪","石柱","秀山","酉阳","彭水","江津","合川","永川","南川");
-        break;
-    case "安徽":
-        var cityOptions = new Array("合肥","安庆","蚌埠","亳州","巢湖","滁州","阜阳","贵池","淮北","淮化","淮南","黄山","九华山","六安","马鞍山","宿州","铜陵","屯溪","芜湖","宣城");
-        break;
-    case "福建":
-        var cityOptions = new Array("福州","厦门","泉州","漳州","龙岩","南平","宁德","莆田","三明");
-        break;
-    case "甘肃":
-        var cityOptions = new Array("兰州","白银","定西","敦煌","甘南","金昌","酒泉","临夏","平凉","天水","武都","武威","西峰","张掖");
-        break;
-    case "广西":
-        var cityOptions = new Array("南宁","百色","北海","桂林","防城港","贵港","河池","贺州","柳州","钦州","梧州","玉林");
-        break;
-    case "贵州":
-        var cityOptions = new Array("贵阳","安顺","毕节","都匀","凯里","六盘水","铜仁","兴义","玉屏","遵义");
-        break;
-    case "海南":
-        var cityOptions = new Array("海口","儋县","陵水","琼海","三亚","通什","万宁");
-        break;
-    case "河北":
-        var cityOptions = new Array("石家庄","保定","北戴河","沧州","承德","丰润","邯郸","衡水","廊坊","南戴河","秦皇岛","唐山","新城","邢台","张家口");
-        break;
-    case "黑龙江":
-        var cityOptions = new Array("哈尔滨","北安","大庆","大兴安岭","鹤岗","黑河","佳木斯","鸡西","牡丹江","齐齐哈尔","七台河","双鸭山","绥化","伊春");
-        break;
-    case "河南":
-        var cityOptions = new Array("郑州","安阳","鹤壁","潢川","焦作","济源","开封","漯河","洛阳","南阳","平顶山","濮阳","三门峡","商丘","新乡","信阳","许昌","周口","驻马店");
-        break;
-    case "香港":
-        var cityOptions = new Array("香港","九龙","新界");
-        break;
-    case "湖北":
-        var cityOptions = new Array("武汉","恩施","鄂州","黄冈","黄石","荆门","荆州","潜江","十堰","随州","武穴","仙桃","咸宁","襄阳","襄樊","孝感","宜昌");
-        break;
-    case "湖南":
-        var cityOptions = new Array("长沙","常德","郴州","衡阳","怀化","吉首","娄底","邵阳","湘潭","益阳","岳阳","永州","张家界","株洲");
-        break;
-    case "江西":
-        var cityOptions = new Array("南昌","抚州","赣州","吉安","景德镇","井冈山","九江","庐山","萍乡","上饶","新余","宜春","鹰潭");
-        break;
-    case "吉林":
-        var cityOptions = new Array("长春","吉林","白城","白山","珲春","辽源","梅河","四平","松原","通化","延吉");
-        break;
-    case "辽宁":
-        var cityOptions = new Array("沈阳","鞍山","本溪","朝阳","大连","丹东","抚顺","阜新","葫芦岛","锦州","辽阳","盘锦","铁岭","营口");
-        break;
-    case "澳门":
-        var cityOptions = new Array("澳门");
-        break;
-    case "内蒙古":
-        var cityOptions = new Array("呼和浩特","阿拉善盟","包头","赤峰","东胜","海拉尔","集宁","临河","通辽","乌海","乌兰浩特","锡林浩特");
-        break;
-    case "宁夏":
-        var cityOptions = new Array("银川","固源","石嘴山","吴忠");
-        break;
-    case "青海":
-        var cityOptions = new Array("西宁","德令哈","格尔木","共和","海东","海晏","玛沁","同仁","玉树");
-        break;
-    case "山东":
-        var cityOptions = new Array("济南","滨州","兖州","德州","东营","菏泽","济宁","莱芜","聊城","临沂","蓬莱","青岛","曲阜","日照","泰安","潍坊","威海","烟台","枣庄","淄博");
-        break;
-    case "山西":
-        var cityOptions = new Array("太原","长治","大同","候马","晋城","离石","临汾","宁武","朔州","忻州","阳泉","榆次","运城");
-        break;
-    case "陕西":
-        var cityOptions = new Array("西安","安康","宝鸡","汉中","渭南","商州","绥德","铜川","咸阳","延安","榆林");
-        break;
-    case "四川":
-        var cityOptions = new Array("成都","巴中","达川","德阳","都江堰","峨眉山","涪陵","广安","广元","九寨沟","康定","乐山","泸州","马尔康","绵阳","眉山","南充","内江","攀枝花","遂宁","汶川","西昌","雅安","宜宾","自贡","资阳");
-        break;
-    case "台湾":
-        var cityOptions = new Array("台北","基隆","台南","台中","高雄","屏东","南投","云林","新竹","彰化","苗栗","嘉义","花莲","桃园","宜兰","台东","金门","马祖","澎湖");
-        break;
-    case "天津":
-        var cityOptions = new Array("天津","和平","东丽","河东","西青","河西","津南","南开","北辰","河北","武清","红挢","塘沽","汉沽","大港","宁河","静海","宝坻","蓟县");
-        break;
-    case "新疆":
-        var cityOptions = new Array("乌鲁木齐","阿克苏","阿勒泰","阿图什","博乐","昌吉","东山","哈密","和田","喀什","克拉玛依","库车","库尔勒","奎屯","石河子","塔城","吐鲁番","伊宁");
-        break;
-    case "西藏":
-        var cityOptions = new Array("拉萨","阿里","昌都","林芝","那曲","日喀则","山南");
-        break;
-    case "云南":
-        var cityOptions = new Array("昆明","大理","保山","楚雄","大理","东川","个旧","景洪","开远","临沧","丽江","六库","潞西","曲靖","思茅","文山","西双版纳","玉溪","中甸","昭通");
-        break;
-    case "浙江":
-        var cityOptions = new Array("杭州","安吉","慈溪","定海","奉化","海盐","黄岩","湖州","嘉兴","金华","临安","临海","丽水","宁波","瓯海","平湖","千岛湖","衢州","江山","瑞安","绍兴","嵊州","台州","温岭","温州","余姚","舟山");
-        break;
-    case "海外":
-        var cityOptions = new Array("美国","日本","英国","法国","德国","其他");
-        break;
-    default:
-        var cityOptions = new Array("请选择所在城市");
-        break;
-    }
-
-    cityField.options.length = 0;
-    for (var i = 0; i < cityOptions.length; i++) {
-        cityField.options[i] = new Option(cityOptions[i],cityOptions[i]);
-        /*
-         if (cityField.options[i].value==city)
-         {
-         //alert("here put City ok!");
-         document.oblogform["city"].selectedIndex = i;
-         }*/
-    }
-}
-
-/*弹框*/
-// 公共弹框样式
-// 建议左右栏的：Width：460，Height：190
-// 建议宽屏对应值：Width：760，Height：500
-function pop_box_new(value, Width, Height, close) {
-
-    if ($("#popupAll").length > 0) {
-        $("#popupAll").remove();
-    }
-    w = ($(window).width() - Width) / 2;
-    h = ($(window).height() - Height) / 2;
-    var html = "<div class=\"popupAll none\" id='popupAll'><div class=\"pr\"><div id=\"popupWrap\"></div></div></div>";
-    if (close) {
-        value = "<a href='javascript:void(0)' id='closeIcon'><i class='iconfont icon-shanchudiao'></i></a>" + value;
-    }
-    $(document.body).append(html);
-    $("#popupWrap").html(value);
-    $('#popupWrap').css({
-        "top": h + "px",
-        "left": w + "px",
-        "padding": "0",
-        "border": "none",
-        "position": "fixed",
-        "z-index": "99999",
-        "background-color": "#fff",
-        "border-radius": "10px"
-    });
-    if (close) {
-        $('#closeIcon').css({
-            "top": "-26px",
-            "left": Width + "px",
-            "z-index": "100000"
-        });
-    }
-
-    $("#popupWrap").parent().parent().show();
-    $('#popupAll').find("#closeIcon").click(function() {
-        $("#popupAll").hide();
-    });
-    $('#popupAll').find("a[class*='pop_close']").click(function() {
-        $("#popupAll").hide();
-    });
-    //    w = ($(window).width() - Width)/2;
-    //    h = ($(window).height() - Height)/2;
-    //    $("#ajax-modal").html(value);
-    //    showModal('ajax-modal', Width + 'px');
-    //    $('#ajax-modal').siblings().remove();
-    //    $('#ajax-modal').parent().css({"top": h+"px","left": w+"px","padding":"0","border":"none","position":"fixed"});
-    //    $('#ajax-modal').parent().removeClass("resourceUploadPopup popbox_polls popbox");
-    //    $('#ajax-modal').css({"padding":"0","overflow":"hidden"});
-    //    $('#ajax-modal').parent().attr("id","popupWrap");
-
-    //拖拽
-    function Drag(id) {
-        this.div = document.getElementById(id);
-        if (this.div) {
-            this.div.style.cursor = "move";
-            this.div.style.position = "fixed";
-        }
-        this.disX = 0;
-        this.disY = 0;
-        var _this = this;
-        this.div.onmousedown = function(evt) {
-            _this.getDistance(evt);
-            document.onmousemove = function(evt) {
-                _this.setPosition(evt);
-            }
-            ;
-            _this.div.onmouseup = function() {
-                _this.clearEvent();
-            }
-        }
-    }
-    Drag.prototype.getDistance = function(evt) {
-        var oEvent = evt || event;
-        this.disX = oEvent.clientX - this.div.offsetLeft;
-        this.disY = oEvent.clientY - this.div.offsetTop;
-    }
-    ;
-    Drag.prototype.setPosition = function(evt) {
-        var oEvent = evt || event;
-        var l = oEvent.clientX - this.disX;
-        var t = oEvent.clientY - this.disY;
-        if (l <= 0) {
-            l = 0;
-        } else if (l >= document.documentElement.clientWidth - this.div.offsetWidth) {
-            l = document.documentElement.clientWidth - this.div.offsetWidth;
-        }
-        if (t <= 0) {
-            t = 0;
-        } else if (t >= document.documentElement.clientHeight - this.div.offsetHeight) {
-            t = document.documentElement.clientHeight - this.div.offsetHeight;
-        }
-        this.div.style.left = l + "px";
-        this.div.style.top = t + "px";
-    }
-    ;
-    Drag.prototype.clearEvent = function() {
-        this.div.onmouseup = null;
-        document.onmousemove = null;
-    }
-    ;
-
-    new Drag("popupWrap");
-
-    $("#popupAll input, #popupAll textarea, #popupAll select, #popupAll ul, #popupAll a,#shixun_search_form_div").mousedown(function(event) {
-        event.stopPropagation();
-        new Drag("popupWrap");
-    });
-
-}
-
-function hideModal(el) {
-    if ($("#popupAll").length > 0) {
-        $("#popupAll").remove();
-    } else {
-        var modal;
-        if (el) {
-            modal = $(el).parents('.ui-dialog-content');
-        } else {
-            modal = $('#ajax-modal');
-        }
-        modal.dialog("close");
-    }
-}
-
-//提示框：只有一个确定按钮，点击跳转
-//<a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
-function notice_box_redirect(url, str) {
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix font-20">提示</div>' + '<div class="task-popup-content"><p class="task-popup-text-center font-16 mt15 mb15">' + str + '</p></div><div class="task-popup-sure clearfix">' + '<a href="' + url + '" class="task-btn task-btn-orange" onclick="hideModal();">确定</a></div></div>';
-    pop_box_new(htmlvalue, 480, 160);
-}
-//按钮内容自定义（自定义按钮需要remote=true,且有取消按钮）
-function notice_operation_box(url, str, btnstr) {
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix">提示</div>' + '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-OK clearfix">' + '<a href="javascript:void(0);" onclick="hideModal();" class="task-btn mr20">取消</a><a href="' + url + '" class="task-btn task-btn-orange" onclick="hideModal();" target="_blank" remote="true">' + btnstr + '</a></div></div>';
-    pop_box_new(htmlvalue, 480, 160);
-}
-//点击删除时的确认弹框: 不走destroy方法
-function delete_confirm_box(url, str) {
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix">提示</div>' + '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>' + '<a href="' + url + '" class="task-btn task-btn-orange fr" onclick="hideModal();" data-remote="true" id="task_popup_confirm">确定</a></div></div>';
-    pop_box_new(htmlvalue, 480, 160);
-}
-//点击删除时的确认弹框: 走destroy方法,remote为true
-function delete_confirm_box_2(url, str) {
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix">提示</div>' + '<div class="task-popup-content"><div class="task-popup-text-center font-14">' + str + '</div></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>' + '<a href="' + url + '" class="task-btn task-btn-orange fr" onclick="hideModal();" data-method="delete" data-remote="true">确定</a></div></div>';
-    pop_box_new(htmlvalue, 480, 160);
-}
-
-// 点击确定的时候ajax请求，两个按钮 点击确认跳转, 提示信息可以多行
-function op_confirm_box_remote(url, str) {
-    var htmlvalue = '<div class="task-popup" style="width:578px;"><div class="task-popup-title clearfix">提示</div>' + '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>' + '<a href="' + url + '" class="task-btn task-btn-orange fr" onclick="hideModal();" data-remote="true">确定</a></div></div>';
-    pop_box_new(htmlvalue, 578, 205);
-}
-
-//点击删除时的确认弹框: post,remote为true
-function post_confirm_box(url, str) {
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>' + '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>' + '<a href="' + url + '" class="task-btn task-btn-orange fr pop_close" data-method="POST" data-remote="true">确定</a></div></div>';
-    pop_box_new(htmlvalue, 480, 160);
-}
-
-//提示框：只有一个确定按钮，点击关闭弹框
-//<a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
-function notice_box(str) {
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix">提示</div>' + '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-sure clearfix">' + '<a href="javascript:void(0);" class="task-btn task-btn-orange" onclick="hideModal();">确定</a></div></div>';
-    pop_box_new(htmlvalue, 480, 160);
-}
-
-//点击删除时的确认弹框: 走destroy方法
-function delete_confirm_box_3(url, str) {
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix">提示</div>' + '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>' + '<a href="' + url + '" class="task-btn task-btn-orange fr" data-method="delete" onclick="hideModal();">确定</a></div></div>';
-    pop_box_new(htmlvalue, 480, 160);
-}
-
-//取消和确定，确定会调用自定义方法
-function op_confirm_tip(str, func) {
-    var htmlvalue = '<div class="task-popup" style="width:500px;"><div class="task-popup-title clearfix">提示</div>' + '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>' + '<a href="javascript:void(0)" class="task-btn task-btn-orange fr" onclick="' + func + '();">确定</a></div></div>';
-    pop_box_new(htmlvalue, 500, 205);
-}
-
-//取消和确定，确定会调用自定义方法（带参数）
-function op_confirm_tip_1(str, func) {
-    var htmlvalue = '<div class="task-popup" style="width:500px;"><div class="task-popup-title clearfix">提示</div>' + '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>' + '<a href="javascript:void(0)" class="task-btn task-btn-orange fr" onclick="' + func + '">确定</a></div></div>';
-    pop_box_new(htmlvalue, 500, 205);
-}
-
-function op_confirm_box_loading(url, str) {
-    var htmlvalue = '<div class="task-popup" style="width:578px;"><div class="task-popup-title clearfix">提示</div>' + '<div class="task-popup-content"><p class="task-popup-text-center font-16 pt15">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>' + '<a href="' + url + '" class="task-btn task-btn-orange fr" onclick="hideModal();$(\'.loading_all\').show();">确定</a></div></div>';
-    pop_box_new(htmlvalue, 578, 205);
-}
-
-// 两个按钮 点击确认跳转, 提示信息有两行
-function s_op_confirm_box(url, str) {
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix">提示</div>' + '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>' + '<a href="' + url + '" class="task-btn task-btn-orange fr" onclick="hideModal();">确定</a></div></div>';
-    pop_box_new(htmlvalue, 480, 205);
-}
-
-function suofang() {
-    var html = '<div><p class="mb20 font-16 edu-txt-center">可能会影响某些功能的正常使用</p><ul class="mb20 color-grey-6" style="width: 372px;margin:0px auto;">' + '<li>1.请尝试调整浏览器缩放比例为<span class="color-orange mr5">100%</span>（快捷键ctrl+0）</li>' + '<li>2.请尝试调整系统显示比例为<span class="color-orange mr5">100%</span>（控制面板/显示 设置）</li>' + '</ul></div>';
-    sure_confirm_box("页面缩放比例不正确", 600, 310, html);
-}
-
-//一个“知道了”按钮，title和宽度都作为参数
-function sure_confirm_box(title, width, height, str) {
-    var htmlvalue = '<div class="task-popup" style="width:' + width + 'px;"><div class="task-popup-title clearfix">' + title + '</div>' + '<div class="task-popup-content edu-txt-center">' + str + '</div><div class="mb30 edu-txt-center clearfix">' + '<a href="javascript:void(0)" class="task-btn task-btn-orange" onclick="hideModal();">知道了</a></div></div>';
-    pop_box_new(htmlvalue, width, height);
-}
-
-function throttle(method, context, e) {
-    clearTimeout(method.tId);
-    method.tId = setTimeout(function() {
-        method.call(context, e);
-    }, 500);
-}
-
-function apply_publish_shixun(url) {
-    if ($("#apply_publish_shixun").attr("data-option") == '1') {
-        $("#apply_publish_shixun").attr("data-option", 0);
-        $("#apply_publish_shixun").addClass("disabled-grey-bg");
-        $.ajax({
-            url: url,
-            type: 'get'
-        });
-    }
-}
-
-var autoTextarea = function(elem, extra, maxHeight) {
-    extra = extra || 0;
-    var isFirefox = !!document.getBoxObjectFor || 'mozInnerScreenX'in window
-      , isOpera = !!window.opera && !!window.opera.toString().indexOf('Opera')
-      , addEvent = function(type, callback) {
-        elem.addEventListener ? elem.addEventListener(type, callback, false) : elem.attachEvent('on' + type, callback);
-    }
-      , getStyle = elem.currentStyle ? function(name) {
-        var val = elem.currentStyle[name];
-
-        if (name === 'height' && val.search(/px/i) !== 1) {
-            var rect = elem.getBoundingClientRect();
-            return rect.bottom - rect.top - parseFloat(getStyle('paddingTop')) - parseFloat(getStyle('paddingBottom')) + 'px';
-        }
-        ;
-        return val;
-    }
-    : function(name) {
-        return getComputedStyle(elem, null)[name];
-    }
-      , minHeight = parseFloat(getStyle('height'));
-
-    elem.style.resize = 'none';
-
-    var change = function() {
-        var scrollTop, height, padding = 0, style = elem.style;
-
-        if (elem._length === elem.value.length)
-            return;
-        elem._length = elem.value.length;
-
-        if (!isFirefox && !isOpera) {
-            padding = parseInt(getStyle('paddingTop')) + parseInt(getStyle('paddingBottom'));
-        }
-        ;scrollTop = document.body.scrollTop || document.documentElement.scrollTop;
-
-        elem.style.height = minHeight + 'px';
-        if (elem.scrollHeight > minHeight) {
-            if (maxHeight && elem.scrollHeight > maxHeight) {
-                height = maxHeight - padding;
-                style.overflowY = 'auto';
-            } else {
-                height = elem.scrollHeight - padding + 10;
-                style.overflowY = 'hidden';
-            }
-            ;style.height = height + extra + 'px';
-            scrollTop += parseInt(style.height) - elem.currHeight;
-            //document.body.scrollTop = scrollTop;
-            //document.documentElement.scrollTop = scrollTop;
-            elem.currHeight = parseInt(style.height);
-        }
-        ;
-    };
-
-    addEvent('propertychange', change);
-    addEvent('input', change);
-    addEvent('focus', change);
-    change();
-};
-
-// 点击按钮复制功能
-function jsCopy() {
-    var e = document.getElementById("copy_rep_content");
-    e.select();
-    document.execCommand("Copy");
-}
-
-// 使用resize事件监听窗口的zoom，如果zoom变化了，弹框提示；初始化时也检查zoom是否是100%。
-function _initZoomCheck() {
-    if (!IsPC()) {
-        // 手机端不需要提示
-        return;
-    }
-    var isNormalZoom = Math.round(window.devicePixelRatio * 100) === 100
-    if (!isNormalZoom) {
-        suofang();
-    }
-
-    $(window).resize(function() {
-        var isNormalZoom = Math.round(window.devicePixelRatio * 100) === 100
-        if (!isNormalZoom) {
-            suofang();
-        } else {
-            $('.task-btn.task-btn-orange:visible').click()
-        }
-    })
-
-}
-
-var win_resize = function() {
-    var _w = $(window).width() - 1200;
-    if (_w < 0) {
-        $('.newHeader>.educontent').width('auto')
-    } else {
-        $('.newHeader>.educontent').width('1200px')
-    }
-};
-
-function initWindowResize() {
-    if (location.pathname === '/login') {
-        // 登录页不需要
-        return;
-    }
-
-    $(function() {
-        setTimeout(function() {
-            win_resize();
-        }, 1000)
-    })
-
-    $(window).resize(function() {
-        win_resize()
-    })
-}
-initWindowResize();
-
-// 登录刷新 https://stackoverflow.com/questions/28230845/communication-between-tabs-or-windows
-if (window['BroadcastChannel']) {
-    var bc = new BroadcastChannel('ec_reload');
-    bc.onmessage = function(ev) {
-        if (window['ec_reload_msg_send_window']) {
-            window['ec_reload_msg_send_window'] = false;
-        } else {
-            location.reload();
-        }
-    }
-}
-function _sendReloadMsg() {
-    var bc = new BroadcastChannel('ec_reload');
-    window['ec_reload_msg_send_window'] = true;
-    // 消息发出的窗口，不需要处理该消息
-    bc.postMessage('ec_reload');
-    /* send */
-}
-// IE11 没有 startsWith
-if (!String.prototype.startsWith) {
-    String.prototype.startsWith = function(searchString, position) {
-        position = position || 0;
-        return this.substr(position, searchString.length) === searchString;
-    }
-    ;
-    String.prototype.endsWith = function(search, this_len) {
-        if (this_len === undefined || this_len > this.length) {
-            this_len = this.length;
-        }
-        return this.substring(this_len - search.length, this_len) === search;
-    }
-    ;
-}
-
-function clickNewsubscript() {
-    $(".newsubscript").hide();
-    $(".newedbox").addClass("newminheight");
-    $(".newedbox").removeClass("newedboxheight");
-}
-
-/** tpm实训开启按钮，不允许多次点击  START                  */
-//点击模拟实战或者开启实战等，按钮变灰内容变成“开启中”
-var operationItem = null;
-var operationButtonOldValue = null;
-function opClickString(item) {
-    var value = $(item).html();
-    $(item).css({
-        'background': 'gray',
-        'border': '1px solid grey',
-        'pointer-events': 'none'
-    });
-    $(item).html('开启中');
-
-    operationButtonOldValue = value
-    operationItem = item
-    // setTimeout(function(){ $(item).css('background', '#4CACFF');$(item).html(value); }, 4000)
-}
-// 
-// var isOperationSending = false;
-$(document).bind('ajaxStop', function(event, xhr, settings) {
-    if (settings && settings.url && (settings.url.match(/operation\?/))) {
-        if (operationItem) {
-            $(operationItem).css('background', '#4CACFF').css('pointer-events', 'inherit');
-            $(operationItem).html(operationButtonOldValue);
-        }
-    }
-});
-$(document).bind('ajaxError', function(event, xhr, settings) {
-    if (settings && settings.url && (settings.url.match(/operation\?/))) {
-        if (operationItem) {
-            $(operationItem).css('background', '#4CACFF').css('pointer-events', 'inherit');
-            $(operationItem).html(operationButtonOldValue);
-        }
-    }
-});
-/** tpm实训开启按钮，不允许多次点击  END                  */
+document.write("<link href='//at.alicdn.com/t/font_653600_qa9lwwv74z.css' rel='stylesheet' type='text/css'/>");
+
+/*!
+ * JavaScript Cookie v2.2.0
+ * https://github.com/js-cookie/js-cookie
+ *
+ * Copyright 2006, 2015 Klaus Hartl & Fagner Brack
+ * Released under the MIT license
+ */
+!function(e) {
+    var n;
+    if ("function" == typeof define && define.amd && (define(e),
+    n = !0),
+    "object" == typeof exports && (module.exports = e(),
+    n = !0),
+    !n) {
+        var t = window.Cookies
+          , o = window.Cookies = e();
+        o.noConflict = function() {
+            return window.Cookies = t,
+            o
+        }
+    }
+}(function() {
+    function e() {
+        for (var e = 0, n = {}; e < arguments.length; e++) {
+            var t = arguments[e];
+            for (var o in t)
+                n[o] = t[o]
+        }
+        return n
+    }
+    function n(e) {
+        return e.replace(/(%[0-9A-Z]{2})+/g, decodeURIComponent)
+    }
+    return function t(o) {
+        function r() {}
+        function i(n, t, i) {
+            if ("undefined" != typeof document) {
+                "number" == typeof (i = e({
+                    path: "/"
+                }, r.defaults, i)).expires && (i.expires = new Date(1 * new Date + 864e5 * i.expires)),
+                i.expires = i.expires ? i.expires.toUTCString() : "";
+                try {
+                    var c = JSON.stringify(t);
+                    /^[\{\[]/.test(c) && (t = c)
+                } catch (e) {}
+                t = o.write ? o.write(t, n) : encodeURIComponent(String(t)).replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g, decodeURIComponent),
+                n = encodeURIComponent(String(n)).replace(/%(23|24|26|2B|5E|60|7C)/g, decodeURIComponent).replace(/[\(\)]/g, escape);
+                var f = "";
+                for (var u in i)
+                    i[u] && (f += "; " + u,
+                    !0 !== i[u] && (f += "=" + i[u].split(";")[0]));
+                return document.cookie = n + "=" + t + f
+            }
+        }
+        function c(e, t) {
+            if ("undefined" != typeof document) {
+                for (var r = {}, i = document.cookie ? document.cookie.split("; ") : [], c = 0; c < i.length; c++) {
+                    var f = i[c].split("=")
+                      , u = f.slice(1).join("=");
+                    t || '"' !== u.charAt(0) || (u = u.slice(1, -1));
+                    try {
+                        var a = n(f[0]);
+                        if (u = (o.read || o)(u, a) || n(u),
+                        t)
+                            try {
+                                u = JSON.parse(u)
+                            } catch (e) {}
+                        if (r[a] = u,
+                        e === a)
+                            break
+                    } catch (e) {}
+                }
+                return e ? r[e] : r
+            }
+        }
+        return r.set = i,
+        r.get = function(e) {
+            return c(e, !1)
+        }
+        ,
+        r.getJSON = function(e) {
+            return c(e, !0)
+        }
+        ,
+        r.remove = function(n, t) {
+            i(n, "", e(t, {
+                expires: -1
+            }))
+        }
+        ,
+        r.defaults = {},
+        r.withConverter = t,
+        r
+    }(function() {})
+});
+
+$(function() {
+    var result = location.search.match(/\?search=(\w*)&?/i)
+    if (result && result[1]) {
+        var searchText = result[1]
+        $('#search-input').val(searchText)
+    }
+    // 未报名用户登录时弹框
+    // console.log(Cookies.get('enroll_status'));
+    // if(Cookies.get('enroll_status') == 0){
+    //     Cookies.remove('enroll_status');
+    //     var html='<div class="CompetitionEnrollBox">'+
+    //         '<div class="pr with40">'+
+    //         '<img src="/images/educoder/competition/boxEnroll.png" width="100%"/>'+
+    //         '<a href="javascript:void(0)" class="CloseBox" onclick="CloseBox();"><i class="iconfont icon-roundclose color-grey-c"></i></a>'+
+    //         '<a href="https://www.educoder.net/competitions/gcc-dev-2018/enroll" class="ImmediatelyEnroll">立即报名</a>'+
+    //         '</div></div>';
+    //     $(".newContainer").append(html);
+    // }
+});
+
+function CloseBox() {
+    $(".CompetitionEnrollBox").remove();
+}
+
+//根据页面大小决定侧边栏的位置
+$(window).resize(function() {
+    rightSlider();
+});
+function rightSlider() {
+    var poi = parseInt((parseInt($(window).width()) - 1200) / 2) - 34;
+    // console.log(parseInt($(window).width())+"  "+poi);
+    if (poi > 0) {
+        $(".-task-sidebar").css("right", poi);
+    } else {
+        $(".-task-sidebar").css("right", "0px");
+    }
+    $(".-task-sidebar").show();
+}
+function open_course(id, allowVisit) {
+    if (allowVisit) {
+        window.open("/courses/" + id);
+    }
+}
+function open_project(id, allowVisit) {
+    if (allowVisit) {
+        window.open("/projects/" + id);
+    }
+}
+
+function conver_size(limit) {
+    var size = "";
+    if (limit < 1024) {
+        //如果小于1KB转化成B
+        size = limit.toFixed(2) + "B";
+    } else if (limit < 1024 * 1024) {
+        //如果小于1MB转化成KB
+        size = (limit / 1024).toFixed(2) + "KB";
+    } else if (limit < 1024 * 1024 * 1024) {
+        //如果小于1GB转化成MB
+        size = (limit / (1024 * 1024)).toFixed(2) + "MB";
+    } else {
+        //其他转化成GB
+        size = (limit / (1024 * 1024 * 1024)).toFixed(2) + "GB";
+    }
+
+    var sizestr = size + "";
+    var len = sizestr.indexOf("\.");
+    var dec = sizestr.substr(len + 1, 2);
+    if (dec == "00") {
+        //当小数点后为00时 去掉小数部分
+        return sizestr.substring(0, len) + sizestr.substr(len + 3, 2);
+    }
+    return sizestr;
+}
+
+function _initSider() {
+    var $descSide = $("<div class='-task-desc'></div>").appendTo("body");
+    $(".-task-sidebar>div").hover(function() {
+        //移入显示二维码
+        if ($(this).hasClass("scan")) {
+            $(".scan_ewm").show().css({
+                right: "75px",
+                opacity: 0
+            }).stop().animate({
+                right: "45px",
+                opacity: 1
+            })
+            return;
+        }
+        var $tool = $(this).attr("tooltips");
+        $descSide.html($tool + "<div><img src='/images/edu_user/jt.png'></div>");
+        $descSide.data('_dom', this)
+        $descSide.show().css({
+            left: $(this).offset().left - $descSide.width() - 30,
+            opacity: 0,
+            top: $(this).offset().top
+        }).stop().animate({
+            left: $(this).offset().left - $descSide.width() - 5,
+            opacity: 1
+        }, 400);
+    }, function() {
+        if ($(this).hasClass("scan")) {
+            $(".scan_ewm").stop().animate({
+                right: "75px",
+                opacity: 0
+            }, 200).hide();
+        }
+        $descSide.stop().animate({
+            left: $(this).offset().left - $descSide.width() - 30,
+            opacity: 0
+        }, 200).hide();
+    });
+    rightSlider();
+
+    $(window).scroll(function() {
+        if ($descSide.height()) {
+            var hoverIcon = $descSide.data('_dom')
+            $descSide.css('top', $(hoverIcon).offset().top)
+        }
+    })
+}
+$(function() {
+    loadHeader();
+    _initSider();
+
+    $(window).scroll(function() {
+        if ($(".gotop").length > 0) {
+            if ($(document).scrollTop() > 0) {
+                $(".-task-sidebar .gotop").show();
+                $(".gotop").click(function() {
+                    $("html,body").scrollTop(0);
+                });
+            }
+            if ($(document).scrollTop() == 0) {
+                $(".-task-sidebar .gotop").hide();
+            }
+        }
+    });
+
+    // 翻页的GO
+    $(".page_GO").live("keydown", function(event) {
+        var code;
+        if (!event) {
+            event = window.event;
+            //针对ie浏览器
+            code = event.keyCode;
+        } else {
+            code = event.keyCode;
+        }
+        if (code == 13) {
+            var prev = $(this).prev().find("a").html().trim();
+            var page = $(this).val().trim();
+            if (parseInt(prev) >= parseInt(page)) {
+                if (typeof ($(this).prev().children("a").attr("href")) == "undefined") {
+                    var href = $(this).parent().find("li:first-child").children("a").attr("href");
+                } else {
+                    var href = $(this).prev().children("a").attr("href");
+                }
+                var new_href = href.replace(/page=(\d*)/, 'page=' + page);
+                console.log(new_href);
+                $.get(new_href);
+                return false;
+            }
+        }
+    });
+
+    // 试用申请弹框
+    $("#apply_trail_submit_btn").live('click', function() {
+        if ($("#apply_reason").val().trim() == "") {
+            $("#hint_message").show();
+        } else {
+            $("#hint_message").hide();
+            $("#apply_trail_form").submit();
+            hideModal();
+        }
+    });
+
+});
+
+// editor 存在了jquery对象上，应用不需要自己写md_rec_data方法了
+function md_rec_data(k, mdu, id) {
+    if (window.sessionStorage.getItem(k + mdu) !== null) {
+        editor = $("#e_tips_" + id).data('editor');
+        editor.setValue(window.sessionStorage.getItem(k + mdu));
+
+        md_clear_data(k, mdu, id);
+    }
+}
+// markdown的自动保存
+function md_elocalStorage(editor, mdu, id) {
+    if (window.sessionStorage) {
+        var oc = window.sessionStorage.getItem('content' + mdu);
+        if (oc !== null) {
+            $("#e_tips_" + id).data('editor', editor);
+            var h = '您上次有已保存的数据，是否<a style="cursor: pointer;" class="link-color-blue" onclick="md_rec_data(\'content\',\'' + mdu + '\',\'' + id + '\')">恢复</a> ? / <a style="cursor: pointer;" class="link-color-blue" onclick="md_clear_data(\'content\',\'' + mdu + '\',\'' + id + '\')">不恢复</a>';
+            $("#e_tips_" + id).html(h);
+        }
+        setInterval(function() {
+            d = new Date();
+            var h = d.getHours();
+            var m = d.getMinutes();
+            var s = d.getSeconds();
+            h = h < 10 ? '0' + h : h;
+            m = m < 10 ? '0' + m : m;
+            s = s < 10 ? '0' + s : s;
+            if (editor.getValue().trim() != "") {
+                md_add_data("content", mdu, editor.getValue());
+                var id1 = "#e_tip_" + id;
+                var id2 = "#e_tips_" + id;
+                $(id1).html(" 数据已于 " + h + ':' + m + ':' + s + " 保存   ");
+                $(id2).html("");
+            }
+        }, 10000);
+
+    } else {
+        $("#e_tip_" + id).after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器！');
+    }
+}
+// 保存数据
+function md_add_data(k, mdu, d) {
+    window.sessionStorage.setItem(k + mdu, d);
+}
+// 恢复数据
+//function md_rec_data(k,mdu,id, editor){
+//    if(window.sessionStorage.getItem(k+mdu) !== null){
+//        editor.setValue(window.sessionStorage.getItem(k+mdu));
+//        md_clear_data(k,mdu,id);
+//    }
+//}
+// 清空保存的数据
+function md_clear_data(k, mdu, id) {
+    window.sessionStorage.removeItem(k + mdu);
+    var id1 = "#e_tip_" + id;
+    var id2 = "#e_tips_" + id;
+    if (k == 'content') {
+        $(id2).html("");
+    } else {
+        $(id1).html("");
+    }
+}
+
+// editorMD to create
+/**
+ *
+ * @param id  渲染DOM的id
+ * @param width 宽度
+ * @param high  高度
+ * @param placeholder
+ * @param imageUrl 上传图片的url
+ * @returns {*} 返回一个editorMD实例
+ */
+function create_editorMD(id, width, high, placeholder, imageUrl, readonly) {
+    var readonly = readonly == undefined ? false : readonly;
+    var editorName = editormd(id, {
+        width: width,
+        height: high,
+        syncScrolling: "single",
+        //你的lib目录的路径，我这边用JSP做测试的
+        path: "/editormd/lib/",
+        tex: true,
+        tocm: true,
+        emoji: true,
+        taskList: true,
+        codeFold: true,
+        searchReplace: true,
+        htmlDecode: "style,script,iframe",
+        sequenceDiagram: true,
+        autoFocus: false,
+        readonly: readonly,
+        toolbarIcons: function() {
+            // Or return editormd.toolbarModes[name]; // full, simple, mini
+            // Using "||" set icons align right.
+            return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"]
+        },
+        toolbarCustomIcons: {
+            testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
+            testIcon1: "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>"
+        },
+        //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
+        saveHTMLToTextarea: true,
+        // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
+        dialogMaskOpacity: 0.6,
+        placeholder: placeholder,
+        imageUpload: true,
+        imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
+        imageUploadURL: imageUrl,
+        //url
+        onload: function(cMirror) {
+            $("#" + id + " [type=\"latex\"]").bind("click", function() {
+                editorName.cm.replaceSelection("```latex");
+                editorName.cm.replaceSelection("\n");
+                editorName.cm.replaceSelection("\n");
+                editorName.cm.replaceSelection("```");
+                var __Cursor = editorName.cm.getDoc().getCursor();
+                editorName.cm.setCursor(__Cursor.line - 1, 0);
+            });
+
+            $("#" + id + " [type=\"inline\"]").bind("click", function() {
+                editorName.cm.replaceSelection("$$$$");
+                var __Cursor = editorName.cm.getDoc().getCursor();
+                editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
+                editorName.cm.focus();
+            });
+            $("[type=\"inline\"]").attr("title", "行内公式");
+            $("[type=\"latex\"]").attr("title", "多行公式");
+            setTimeout(function() {
+                editorName.resize();
+                editorName.cm.refresh();
+                window.new_md = editorName;
+            }, 300);
+        }
+    });
+    return editorName;
+}
+
+// editormd to html
+/**
+ *
+ * @param id 渲染的id
+ * @param callback onload回調 暫時未用
+ */
+function editormd_to_html(id, callback) {
+    editormd.loadKaTeX(function() {
+        editormd.markdownToHTML(id, {
+            htmlDecode: "style,script,iframe",
+            // you can filter tags decode
+            onload: function() {
+                callback && callback()
+            },
+            taskList: true,
+            tex: true,
+            // 默认不解析
+            flowChart: true,
+            // 默认不解析
+            sequenceDiagram: true// 默认不解析
+        });
+    });
+}
+
+function loadHeader() {
+    //头部导航条的----------显示搜索框
+    $("#search-open").on("click", function(e) {
+        $(this).hide();
+        //        $("#header-nav").animate({opacity:"0"},1000);
+        $(".posi-search").show()
+        // .animate({opacity:"1"},1000);
+        $("#header-nav").css("z-index", "2");
+        $(".posi-search").css("z-index", "3");
+        // $(".search-input").val("");  //  不清空
+        $(".search-input").focus();
+        $(".search-all .search-content").hide();
+        e.stopPropagation();
+        //阻止冒泡
+    });
+    $(".search-input").on("click", function(e) {
+        e.stopPropagation();
+        //阻止冒泡
+    });
+    //搜索框输入内容
+    $(".search-input").on("input", function(e) {
+        if ($(".search-input").val() == "") {
+            $(".search-all .search-content").hide();
+        } else {
+            $(".search-all .search-content").show();
+        }
+        e.stopPropagation();
+        //阻止冒泡
+    });
+    //搜索
+    $("#header_keyword_search").on("click", header_search);
+    $("input[name='search_keyword']").on("keydown", function(event) {
+        var code;
+        if (!event) {
+            event = window.event;
+            //针对ie浏览器
+            code = event.keyCode;
+        } else {
+            code = event.keyCode;
+        }
+        if (code == 13) {
+            header_search();
+            return false;
+        }
+    });
+    $(".search-clear").click(function(e) {
+        e.stopPropagation();
+    });
+    //切换搜索条件
+    $("#searchkey li").click(function(e) {
+        var key = $($(this).children("a")[0]).html();
+        switch (key) {
+        case '实训':
+            $("#search_type").val('1');
+            break;
+        case '课堂':
+            $("#search_type").val('2');
+            break;
+        case '用户':
+            $("#search_type").val('3');
+            break;
+        }
+        $("#searchkey").siblings(".searchkey").html(key);
+        //        $("#searchkey").hide();
+        e.stopPropagation();
+        //阻止冒泡
+    });
+    //切换选择导航条
+    $("#header-nav li").click(function() {
+        $("#header-nav li").removeClass("active");
+        $(this).addClass("active");
+    });
+    //点击页面其它（与搜索框无关的地方）都会将搜索框隐藏，所以与搜索框有关的地方需要阻止冒泡
+    $("body").on("click", function() {
+        closeSearch();
+    });
+
+    $(".search_history").on("click", function() {
+        $("input[name='search_keyword']").val($(this).html());
+        header_search();
+    });
+}
+
+function header_search() {
+    var keyword = $("input[name='search_keyword']").val();
+    // 搜索关键字
+    var index = $("#search_type").val();
+    // 搜索课程/项目
+    keyword = encodeURIComponent(keyword);
+    // $.get('/users/search_shixuns_or_course',
+    //     { search: keyword,
+    //         index: index});
+    window.location.href = "/users/search_shixuns_or_courses" + "?search=" + keyword + "&index=" + index;
+    //e.stopPropagation();//阻止冒泡
+}
+
+//头部导航条的隐藏
+function closeSearch() {
+    $('#posi-search').hide();
+    $("#search-open").show();
+    //    $(".posi-search").animate({opacity:"0"},800);
+    $("#header-nav").animate({
+        opacity: "1"
+    }, 1000);
+    $(".posi-search").css("z-index", "2");
+    $("#header-nav").css("z-index", "3");
+}
+(function($) {
+    $.fn.drag = function(options) {
+        var x, drag = this, isMove = false, defaults = {};
+        var options = $.extend(defaults, options);
+        //添加背景，文字，滑块
+        var html = '<div class="drag_bg"></div>' + '<div class="drag_text" onselectstart="return false;" unselectable="on">请拖住滑块，拖动到最右边</div>' + '<div class="handler handler_bg"></div>';
+        this.append(html);
+
+        var handler = drag.find('.handler');
+        var drag_bg = drag.find('.drag_bg');
+        var text = drag.find('.drag_text');
+        var maxWidth = text.width() - handler.width();
+        //能滑动的最大间距
+        //鼠标按下时候的x轴的位置
+        handler.mousedown(function(e) {
+            isMove = true;
+            x = e.pageX - parseInt(handler.css('left'), 10);
+        });
+
+        //鼠标指针在上下文移动时，移动距离大于0小于最大间距，滑块x轴位置等于鼠标移动距离
+        $(document).mousemove(function(e) {
+            var _x = e.pageX - x;
+            var handler_offset = handler.offset();
+            var lastX = e.clientX - x;
+            lastX = Math.max(0, Math.min(maxWidth, lastX));
+            if (isMove) {
+                if (_x > 0 && _x <= maxWidth) {
+                    handler.css({
+                        'left': lastX
+                    });
+                    drag_bg.css({
+                        'width': lastX
+                    });
+                } else if (lastX > maxWidth - 5 && lastX < maxWidth + 5) {
+                    //鼠标指针移动距离达到最大时清空事件
+                    dragOk();
+                }
+            }
+        });
+        handler.mouseup(function(e) {
+            isMove = false;
+            var _x = e.pageX - x;
+            if (_x < maxWidth) {
+                //鼠标松开时，如果没有达到最大距离位置，滑块就返回初始位置
+                handler.css({
+                    'left': 0
+                });
+                drag_bg.css({
+                    'width': 0
+                });
+            }
+        });
+
+        //清空事件
+        function dragOk() {
+            var kuaiwidth = drag.width() - handler.width();
+            handler.removeClass('handler_bg').addClass('handler_ok_bg');
+            handler.css({
+                'left': kuaiwidth + 'px'
+            })
+            text.css({
+                'width': kuaiwidth + 'px'
+            });
+            text.text('验证通过');
+            drag.css({
+                'color': '#fff'
+            });
+            drag_bg.css({
+                'width': kuaiwidth + 'px'
+            })
+            handler.unbind('mousedown');
+            $(document).unbind('mousemove');
+            $(document).unbind('mouseup');
+            handler.parent().next().find("p").html("").hide();
+        }
+    }
+    ;
+}
+)(jQuery);
+
+//判断是手机端还是电脑端
+function IsPC() {
+    var userAgentInfo = navigator.userAgent;
+    var Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
+    var flag = true;
+    for (var v = 0; v < Agents.length; v++) {
+        if (userAgentInfo.indexOf(Agents[v]) > 0) {
+            flag = false;
+            break;
+        }
+    }
+    return flag;
+}
+
+//Dom：绑定事件的节点对象，ChangeDOM：操作的相关节点，
+function LeaveTitle(Dom, ChangeDom) {
+    ChangeDom.html("").hide();
+    ChangeDom.parent().css({
+        opacity: 0,
+        left: 0,
+        top: 0
+    }).hide();
+}
+
+$(function() {
+    //平台tip的样式优化js
+    var $desc = $("<div class=\"-task-title\">" + "<div class=\"data-tip-down\"></div>" + "<div class=\"data-tip-left\"></div>" + "<div class=\"data-tip-right\"></div>" + "<div class=\"data-tip-top\"></div>" + "</div>").appendTo("body");
+    //Dom：绑定事件的节点对象，ChangeDOM：操作的相关节点，
+    function LeaveTitle(Dom, ChangeDom) {
+        Dom.live("mouseleave", function() {
+            ChangeDom.html("").hide();
+            $desc.css({
+                opacity: 0,
+                left: 0,
+                top: 0
+            }).hide();
+        })
+    }
+    LeaveTitle($("[data-tip-top]"), $(".data-tip-top"));
+    LeaveTitle($("[data-tip-down]"), $(".data-tip-down"));
+    LeaveTitle($("[data-tip-right]"), $(".data-tip-left"));
+    LeaveTitle($("[data-tip-left]"), $(".data-tip-right"));
+    $("[data-tip-top]").live("mouseenter", function() {
+        var $tool = $(this).attr("data-tip-top");
+        if ($tool != "") {
+            $(".data-tip-top").show().html($tool);
+            $desc.show().css({
+                left: $(this).offset().left - ($desc.width() - $(this).outerWidth()) / 2,
+                opacity: 1,
+                top: $(this).offset().top - 30
+            });
+        }
+    });
+    $("[data-tip-down]").live("mouseenter", function() {
+        var $tool = $(this).attr("data-tip-down");
+        if ($tool != "") {
+            $(".data-tip-down").show().html($tool);
+            $desc.show().css({
+                left: $(this).offset().left - ($desc.width() - $(this).outerWidth()) / 2,
+                opacity: 1,
+                top: $(this).offset().top + $(this).height() + 6
+            });
+        }
+    });
+    $("[data-tip-right]").live("mouseenter", function() {
+        var $tool = $(this).attr("data-tip-right");
+        if ($tool != "") {
+            console.log($(this).offset().left + "  " + $(this).width());
+            $(".data-tip-left").show().html($tool);
+            $desc.show().css({
+                left: $(this).offset().left + $(this).outerWidth() + 6,
+                opacity: 1,
+                top: $(this).offset().top - ($desc.height() - $(this).height()) / 2
+            });
+        }
+    });
+    $("[data-tip-left]").live("mouseenter", function() {
+        var $tool = $(this).attr("data-tip-left");
+        if ($tool != "") {
+            $(".data-tip-right").show().html($tool);
+            $desc.show().css({
+                left: $(this).offset().left - $desc.width() - 6,
+                opacity: 1,
+                top: $(this).offset().top - ($desc.height() - $(this).height()) / 2
+            });
+        }
+    });
+    unitDownOption();
+});
+
+function unitDownOption() {
+    //下拉框
+    $("[select-for]").append("<i class='fa fa-sort-desc lesson_img color-grey-8'></i>");
+    $("[select-for]").hover(function() {
+        $(this).find(".down-select").show();
+    }, function() {
+        $(this).find(".down-select").hide();
+    })
+    $("[select-for] .down-select p").bind("click", function() {
+        //alert($(this).attr("data-shixun-value"));
+        if ($(this).attr("id") == "diy_script") {
+            return;
+            // 实训新建-选择自定义脚本diy
+        }
+        $(this).parents(".down-select").siblings("input[type=hidden]").attr("value", $(this).attr("data-shixun-value"));
+
+        $(this).parents(".down-select").siblings("input[type=text]").val($(this).html().trim());
+        $(this).parents(".down-select").hide();
+    })
+}
+
+//初始化省份
+function showprovince(id) {
+    var arrary = ["北京", "上海", "广东", "江苏", "浙江", "重庆", "安徽", "福建", "甘肃", "广西", "贵州", "海南", "河北", "黑龙江", "河南", "湖北", "湖南", "江西", "吉林", "辽宁", "内蒙古", "宁夏", "青海", "山东", "山西", "陕西", "四川", "天津", "新疆", "西藏", "云南", "香港特别行政区", "澳门特别行政区", "台湾", "海外"];
+    var html = "<option value=\"0\">请选择所在省份</option>"
+    for (var i = 0; i < arrary.length; i++) {
+        var item = arrary[i];
+        html += "<option value=\"" + item + "\">" + item + "</option>";
+    }
+    $("#" + id).html(html);
+}
+
+//省市下拉框
+function showcity(province, cityField) {
+    switch (province) {
+    case "北京":
+        var cityOptions = new Array("东城","西城","朝阳","丰台","石景山","海淀","门头沟","房山","通州","顺义","昌平","大兴","平谷","怀柔","密云","延庆");
+        break;
+    case "上海":
+        var cityOptions = new Array("崇明","黄浦","卢湾","徐汇","长宁","静安","普陀","闸北","虹口","杨浦","闵行","宝山","嘉定","浦东","金山","松江","青浦","南汇","奉贤");
+        break;
+    case "广东":
+        var cityOptions = new Array("广州","深圳","珠海","东莞","中山","佛山","惠州","河源","潮州","江门","揭阳","茂名","梅州","清远","汕头","汕尾","韶关","顺德","阳江","云浮","湛江","肇庆");
+        break;
+    case "江苏":
+        var cityOptions = new Array("南京","常熟","常州","海门","淮安","江都","江阴","昆山","连云港","南通","启东","沭阳","宿迁","苏州","太仓","泰州","同里","无锡","徐州","盐城","扬州","宜兴","仪征","张家港","镇江","周庄");
+        break;
+    case "重庆":
+        var cityOptions = new Array("万州","涪陵","渝中","大渡口","江北","沙坪坝","九龙坡","南岸","北碚","万盛","双挢","渝北","巴南","黔江","长寿","綦江","潼南","铜梁","大足","荣昌","壁山","梁平","城口","丰都","垫江","武隆","忠县","开县","云阳","奉节","巫山","巫溪","石柱","秀山","酉阳","彭水","江津","合川","永川","南川");
+        break;
+    case "安徽":
+        var cityOptions = new Array("合肥","安庆","蚌埠","亳州","巢湖","滁州","阜阳","贵池","淮北","淮化","淮南","黄山","九华山","六安","马鞍山","宿州","铜陵","屯溪","芜湖","宣城");
+        break;
+    case "福建":
+        var cityOptions = new Array("福州","厦门","泉州","漳州","龙岩","南平","宁德","莆田","三明");
+        break;
+    case "甘肃":
+        var cityOptions = new Array("兰州","白银","定西","敦煌","甘南","金昌","酒泉","临夏","平凉","天水","武都","武威","西峰","张掖");
+        break;
+    case "广西":
+        var cityOptions = new Array("南宁","百色","北海","桂林","防城港","贵港","河池","贺州","柳州","钦州","梧州","玉林");
+        break;
+    case "贵州":
+        var cityOptions = new Array("贵阳","安顺","毕节","都匀","凯里","六盘水","铜仁","兴义","玉屏","遵义");
+        break;
+    case "海南":
+        var cityOptions = new Array("海口","儋县","陵水","琼海","三亚","通什","万宁");
+        break;
+    case "河北":
+        var cityOptions = new Array("石家庄","保定","北戴河","沧州","承德","丰润","邯郸","衡水","廊坊","南戴河","秦皇岛","唐山","新城","邢台","张家口");
+        break;
+    case "黑龙江":
+        var cityOptions = new Array("哈尔滨","北安","大庆","大兴安岭","鹤岗","黑河","佳木斯","鸡西","牡丹江","齐齐哈尔","七台河","双鸭山","绥化","伊春");
+        break;
+    case "河南":
+        var cityOptions = new Array("郑州","安阳","鹤壁","潢川","焦作","济源","开封","漯河","洛阳","南阳","平顶山","濮阳","三门峡","商丘","新乡","信阳","许昌","周口","驻马店");
+        break;
+    case "香港":
+        var cityOptions = new Array("香港","九龙","新界");
+        break;
+    case "湖北":
+        var cityOptions = new Array("武汉","恩施","鄂州","黄冈","黄石","荆门","荆州","潜江","十堰","随州","武穴","仙桃","咸宁","襄阳","襄樊","孝感","宜昌");
+        break;
+    case "湖南":
+        var cityOptions = new Array("长沙","常德","郴州","衡阳","怀化","吉首","娄底","邵阳","湘潭","益阳","岳阳","永州","张家界","株洲");
+        break;
+    case "江西":
+        var cityOptions = new Array("南昌","抚州","赣州","吉安","景德镇","井冈山","九江","庐山","萍乡","上饶","新余","宜春","鹰潭");
+        break;
+    case "吉林":
+        var cityOptions = new Array("长春","吉林","白城","白山","珲春","辽源","梅河","四平","松原","通化","延吉");
+        break;
+    case "辽宁":
+        var cityOptions = new Array("沈阳","鞍山","本溪","朝阳","大连","丹东","抚顺","阜新","葫芦岛","锦州","辽阳","盘锦","铁岭","营口");
+        break;
+    case "澳门":
+        var cityOptions = new Array("澳门");
+        break;
+    case "内蒙古":
+        var cityOptions = new Array("呼和浩特","阿拉善盟","包头","赤峰","东胜","海拉尔","集宁","临河","通辽","乌海","乌兰浩特","锡林浩特");
+        break;
+    case "宁夏":
+        var cityOptions = new Array("银川","固源","石嘴山","吴忠");
+        break;
+    case "青海":
+        var cityOptions = new Array("西宁","德令哈","格尔木","共和","海东","海晏","玛沁","同仁","玉树");
+        break;
+    case "山东":
+        var cityOptions = new Array("济南","滨州","兖州","德州","东营","菏泽","济宁","莱芜","聊城","临沂","蓬莱","青岛","曲阜","日照","泰安","潍坊","威海","烟台","枣庄","淄博");
+        break;
+    case "山西":
+        var cityOptions = new Array("太原","长治","大同","候马","晋城","离石","临汾","宁武","朔州","忻州","阳泉","榆次","运城");
+        break;
+    case "陕西":
+        var cityOptions = new Array("西安","安康","宝鸡","汉中","渭南","商州","绥德","铜川","咸阳","延安","榆林");
+        break;
+    case "四川":
+        var cityOptions = new Array("成都","巴中","达川","德阳","都江堰","峨眉山","涪陵","广安","广元","九寨沟","康定","乐山","泸州","马尔康","绵阳","眉山","南充","内江","攀枝花","遂宁","汶川","西昌","雅安","宜宾","自贡","资阳");
+        break;
+    case "台湾":
+        var cityOptions = new Array("台北","基隆","台南","台中","高雄","屏东","南投","云林","新竹","彰化","苗栗","嘉义","花莲","桃园","宜兰","台东","金门","马祖","澎湖");
+        break;
+    case "天津":
+        var cityOptions = new Array("天津","和平","东丽","河东","西青","河西","津南","南开","北辰","河北","武清","红挢","塘沽","汉沽","大港","宁河","静海","宝坻","蓟县");
+        break;
+    case "新疆":
+        var cityOptions = new Array("乌鲁木齐","阿克苏","阿勒泰","阿图什","博乐","昌吉","东山","哈密","和田","喀什","克拉玛依","库车","库尔勒","奎屯","石河子","塔城","吐鲁番","伊宁");
+        break;
+    case "西藏":
+        var cityOptions = new Array("拉萨","阿里","昌都","林芝","那曲","日喀则","山南");
+        break;
+    case "云南":
+        var cityOptions = new Array("昆明","大理","保山","楚雄","大理","东川","个旧","景洪","开远","临沧","丽江","六库","潞西","曲靖","思茅","文山","西双版纳","玉溪","中甸","昭通");
+        break;
+    case "浙江":
+        var cityOptions = new Array("杭州","安吉","慈溪","定海","奉化","海盐","黄岩","湖州","嘉兴","金华","临安","临海","丽水","宁波","瓯海","平湖","千岛湖","衢州","江山","瑞安","绍兴","嵊州","台州","温岭","温州","余姚","舟山");
+        break;
+    case "海外":
+        var cityOptions = new Array("美国","日本","英国","法国","德国","其他");
+        break;
+    default:
+        var cityOptions = new Array("请选择所在城市");
+        break;
+    }
+
+    cityField.options.length = 0;
+    for (var i = 0; i < cityOptions.length; i++) {
+        cityField.options[i] = new Option(cityOptions[i],cityOptions[i]);
+        /*
+         if (cityField.options[i].value==city)
+         {
+         //alert("here put City ok!");
+         document.oblogform["city"].selectedIndex = i;
+         }*/
+    }
+}
+
+/*弹框*/
+// 公共弹框样式
+// 建议左右栏的：Width：460，Height：190
+// 建议宽屏对应值：Width：760，Height：500
+function pop_box_new(value, Width, Height, close) {
+
+    if ($("#popupAll").length > 0) {
+        $("#popupAll").remove();
+    }
+    w = ($(window).width() - Width) / 2;
+    h = ($(window).height() - Height) / 2;
+    var html = "<div class=\"popupAll none\" id='popupAll'><div class=\"pr\"><div id=\"popupWrap\"></div></div></div>";
+    if (close) {
+        value = "<a href='javascript:void(0)' id='closeIcon'><i class='iconfont icon-shanchudiao'></i></a>" + value;
+    }
+    $(document.body).append(html);
+    $("#popupWrap").html(value);
+    $('#popupWrap').css({
+        "top": h + "px",
+        "left": w + "px",
+        "padding": "0",
+        "border": "none",
+        "position": "fixed",
+        "z-index": "99999",
+        "background-color": "#fff",
+        "border-radius": "10px"
+    });
+    if (close) {
+        $('#closeIcon').css({
+            "top": "-26px",
+            "left": Width + "px",
+            "z-index": "100000"
+        });
+    }
+
+    $("#popupWrap").parent().parent().show();
+    $('#popupAll').find("#closeIcon").click(function() {
+        $("#popupAll").hide();
+    });
+    $('#popupAll').find("a[class*='pop_close']").click(function() {
+        $("#popupAll").hide();
+    });
+    //    w = ($(window).width() - Width)/2;
+    //    h = ($(window).height() - Height)/2;
+    //    $("#ajax-modal").html(value);
+    //    showModal('ajax-modal', Width + 'px');
+    //    $('#ajax-modal').siblings().remove();
+    //    $('#ajax-modal').parent().css({"top": h+"px","left": w+"px","padding":"0","border":"none","position":"fixed"});
+    //    $('#ajax-modal').parent().removeClass("resourceUploadPopup popbox_polls popbox");
+    //    $('#ajax-modal').css({"padding":"0","overflow":"hidden"});
+    //    $('#ajax-modal').parent().attr("id","popupWrap");
+
+    //拖拽
+    function Drag(id) {
+        this.div = document.getElementById(id);
+        if (this.div) {
+            this.div.style.cursor = "move";
+            this.div.style.position = "fixed";
+        }
+        this.disX = 0;
+        this.disY = 0;
+        var _this = this;
+        this.div.onmousedown = function(evt) {
+            _this.getDistance(evt);
+            document.onmousemove = function(evt) {
+                _this.setPosition(evt);
+            }
+            ;
+            _this.div.onmouseup = function() {
+                _this.clearEvent();
+            }
+        }
+    }
+    Drag.prototype.getDistance = function(evt) {
+        var oEvent = evt || event;
+        this.disX = oEvent.clientX - this.div.offsetLeft;
+        this.disY = oEvent.clientY - this.div.offsetTop;
+    }
+    ;
+    Drag.prototype.setPosition = function(evt) {
+        var oEvent = evt || event;
+        var l = oEvent.clientX - this.disX;
+        var t = oEvent.clientY - this.disY;
+        if (l <= 0) {
+            l = 0;
+        } else if (l >= document.documentElement.clientWidth - this.div.offsetWidth) {
+            l = document.documentElement.clientWidth - this.div.offsetWidth;
+        }
+        if (t <= 0) {
+            t = 0;
+        } else if (t >= document.documentElement.clientHeight - this.div.offsetHeight) {
+            t = document.documentElement.clientHeight - this.div.offsetHeight;
+        }
+        this.div.style.left = l + "px";
+        this.div.style.top = t + "px";
+    }
+    ;
+    Drag.prototype.clearEvent = function() {
+        this.div.onmouseup = null;
+        document.onmousemove = null;
+    }
+    ;
+
+    new Drag("popupWrap");
+
+    $("#popupAll input, #popupAll textarea, #popupAll select, #popupAll ul, #popupAll a,#shixun_search_form_div").mousedown(function(event) {
+        event.stopPropagation();
+        new Drag("popupWrap");
+    });
+
+}
+
+function hideModal(el) {
+    if ($("#popupAll").length > 0) {
+        $("#popupAll").remove();
+    } else {
+        var modal;
+        if (el) {
+            modal = $(el).parents('.ui-dialog-content');
+        } else {
+            modal = $('#ajax-modal');
+        }
+        modal.dialog("close");
+    }
+}
+
+//提示框：只有一个确定按钮，点击跳转
+//<a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
+function notice_box_redirect(url, str) {
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix font-20">提示</div>' + '<div class="task-popup-content"><p class="task-popup-text-center font-16 mt15 mb15">' + str + '</p></div><div class="task-popup-sure clearfix">' + '<a href="' + url + '" class="task-btn task-btn-orange" onclick="hideModal();">确定</a></div></div>';
+    pop_box_new(htmlvalue, 480, 160);
+}
+//按钮内容自定义（自定义按钮需要remote=true,且有取消按钮）
+function notice_operation_box(url, str, btnstr) {
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix">提示</div>' + '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-OK clearfix">' + '<a href="javascript:void(0);" onclick="hideModal();" class="task-btn mr20">取消</a><a href="' + url + '" class="task-btn task-btn-orange" onclick="hideModal();" target="_blank" remote="true">' + btnstr + '</a></div></div>';
+    pop_box_new(htmlvalue, 480, 160);
+}
+//点击删除时的确认弹框: 不走destroy方法
+function delete_confirm_box(url, str) {
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix">提示</div>' + '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>' + '<a href="' + url + '" class="task-btn task-btn-orange fr" onclick="hideModal();" data-remote="true" id="task_popup_confirm">确定</a></div></div>';
+    pop_box_new(htmlvalue, 480, 160);
+}
+//点击删除时的确认弹框: 走destroy方法,remote为true
+function delete_confirm_box_2(url, str) {
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix">提示</div>' + '<div class="task-popup-content"><div class="task-popup-text-center font-14">' + str + '</div></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>' + '<a href="' + url + '" class="task-btn task-btn-orange fr" onclick="hideModal();" data-method="delete" data-remote="true">确定</a></div></div>';
+    pop_box_new(htmlvalue, 480, 160);
+}
+
+// 点击确定的时候ajax请求，两个按钮 点击确认跳转, 提示信息可以多行
+function op_confirm_box_remote(url, str) {
+    var htmlvalue = '<div class="task-popup" style="width:578px;"><div class="task-popup-title clearfix">提示</div>' + '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>' + '<a href="' + url + '" class="task-btn task-btn-orange fr" onclick="hideModal();" data-remote="true">确定</a></div></div>';
+    pop_box_new(htmlvalue, 578, 205);
+}
+
+//点击删除时的确认弹框: post,remote为true
+function post_confirm_box(url, str) {
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>' + '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>' + '<a href="' + url + '" class="task-btn task-btn-orange fr pop_close" data-method="POST" data-remote="true">确定</a></div></div>';
+    pop_box_new(htmlvalue, 480, 160);
+}
+
+//提示框：只有一个确定按钮，点击关闭弹框
+//<a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
+function notice_box(str) {
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix">提示</div>' + '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-sure clearfix">' + '<a href="javascript:void(0);" class="task-btn task-btn-orange" onclick="hideModal();">确定</a></div></div>';
+    pop_box_new(htmlvalue, 480, 160);
+}
+
+//点击删除时的确认弹框: 走destroy方法
+function delete_confirm_box_3(url, str) {
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix">提示</div>' + '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>' + '<a href="' + url + '" class="task-btn task-btn-orange fr" data-method="delete" onclick="hideModal();">确定</a></div></div>';
+    pop_box_new(htmlvalue, 480, 160);
+}
+
+//取消和确定，确定会调用自定义方法
+function op_confirm_tip(str, func) {
+    var htmlvalue = '<div class="task-popup" style="width:500px;"><div class="task-popup-title clearfix">提示</div>' + '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>' + '<a href="javascript:void(0)" class="task-btn task-btn-orange fr" onclick="' + func + '();">确定</a></div></div>';
+    pop_box_new(htmlvalue, 500, 205);
+}
+
+//取消和确定，确定会调用自定义方法（带参数）
+function op_confirm_tip_1(str, func) {
+    var htmlvalue = '<div class="task-popup" style="width:500px;"><div class="task-popup-title clearfix">提示</div>' + '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>' + '<a href="javascript:void(0)" class="task-btn task-btn-orange fr" onclick="' + func + '">确定</a></div></div>';
+    pop_box_new(htmlvalue, 500, 205);
+}
+
+function op_confirm_box_loading(url, str) {
+    var htmlvalue = '<div class="task-popup" style="width:578px;"><div class="task-popup-title clearfix">提示</div>' + '<div class="task-popup-content"><p class="task-popup-text-center font-16 pt15">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>' + '<a href="' + url + '" class="task-btn task-btn-orange fr" onclick="hideModal();$(\'.loading_all\').show();">确定</a></div></div>';
+    pop_box_new(htmlvalue, 578, 205);
+}
+
+// 两个按钮 点击确认跳转, 提示信息有两行
+function s_op_confirm_box(url, str) {
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix">提示</div>' + '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>' + '<a href="' + url + '" class="task-btn task-btn-orange fr" onclick="hideModal();">确定</a></div></div>';
+    pop_box_new(htmlvalue, 480, 205);
+}
+
+function suofang() {
+    var html = '<div><p class="mb20 font-16 edu-txt-center">可能会影响某些功能的正常使用</p><ul class="mb20 color-grey-6" style="width: 372px;margin:0px auto;">' + '<li>1.请尝试调整浏览器缩放比例为<span class="color-orange mr5">100%</span>（快捷键ctrl+0）</li>' + '<li>2.请尝试调整系统显示比例为<span class="color-orange mr5">100%</span>（控制面板/显示 设置）</li>' + '</ul></div>';
+    sure_confirm_box("页面缩放比例不正确", 600, 310, html);
+}
+
+//一个“知道了”按钮，title和宽度都作为参数
+function sure_confirm_box(title, width, height, str) {
+    var htmlvalue = '<div class="task-popup" style="width:' + width + 'px;"><div class="task-popup-title clearfix">' + title + '</div>' + '<div class="task-popup-content edu-txt-center">' + str + '</div><div class="mb30 edu-txt-center clearfix">' + '<a href="javascript:void(0)" class="task-btn task-btn-orange" onclick="hideModal();">知道了</a></div></div>';
+    pop_box_new(htmlvalue, width, height);
+}
+
+function throttle(method, context, e) {
+    clearTimeout(method.tId);
+    method.tId = setTimeout(function() {
+        method.call(context, e);
+    }, 500);
+}
+
+function apply_publish_shixun(url) {
+    if ($("#apply_publish_shixun").attr("data-option") == '1') {
+        $("#apply_publish_shixun").attr("data-option", 0);
+        $("#apply_publish_shixun").addClass("disabled-grey-bg");
+        $.ajax({
+            url: url,
+            type: 'get'
+        });
+    }
+}
+
+var autoTextarea = function(elem, extra, maxHeight) {
+    extra = extra || 0;
+    var isFirefox = !!document.getBoxObjectFor || 'mozInnerScreenX'in window
+      , isOpera = !!window.opera && !!window.opera.toString().indexOf('Opera')
+      , addEvent = function(type, callback) {
+        elem.addEventListener ? elem.addEventListener(type, callback, false) : elem.attachEvent('on' + type, callback);
+    }
+      , getStyle = elem.currentStyle ? function(name) {
+        var val = elem.currentStyle[name];
+
+        if (name === 'height' && val.search(/px/i) !== 1) {
+            var rect = elem.getBoundingClientRect();
+            return rect.bottom - rect.top - parseFloat(getStyle('paddingTop')) - parseFloat(getStyle('paddingBottom')) + 'px';
+        }
+        ;
+        return val;
+    }
+    : function(name) {
+        return getComputedStyle(elem, null)[name];
+    }
+      , minHeight = parseFloat(getStyle('height'));
+
+    elem.style.resize = 'none';
+
+    var change = function() {
+        var scrollTop, height, padding = 0, style = elem.style;
+
+        if (elem._length === elem.value.length)
+            return;
+        elem._length = elem.value.length;
+
+        if (!isFirefox && !isOpera) {
+            padding = parseInt(getStyle('paddingTop')) + parseInt(getStyle('paddingBottom'));
+        }
+        ;scrollTop = document.body.scrollTop || document.documentElement.scrollTop;
+
+        elem.style.height = minHeight + 'px';
+        if (elem.scrollHeight > minHeight) {
+            if (maxHeight && elem.scrollHeight > maxHeight) {
+                height = maxHeight - padding;
+                style.overflowY = 'auto';
+            } else {
+                height = elem.scrollHeight - padding + 10;
+                style.overflowY = 'hidden';
+            }
+            ;style.height = height + extra + 'px';
+            scrollTop += parseInt(style.height) - elem.currHeight;
+            //document.body.scrollTop = scrollTop;
+            //document.documentElement.scrollTop = scrollTop;
+            elem.currHeight = parseInt(style.height);
+        }
+        ;
+    };
+
+    addEvent('propertychange', change);
+    addEvent('input', change);
+    addEvent('focus', change);
+    change();
+};
+
+// 点击按钮复制功能
+function jsCopy() {
+    var e = document.getElementById("copy_rep_content");
+    e.select();
+    document.execCommand("Copy");
+}
+
+// 使用resize事件监听窗口的zoom，如果zoom变化了，弹框提示；初始化时也检查zoom是否是100%。
+function _initZoomCheck() {
+    if (!IsPC()) {
+        // 手机端不需要提示
+        return;
+    }
+    var isNormalZoom = Math.round(window.devicePixelRatio * 100) === 100
+    if (!isNormalZoom) {
+        suofang();
+    }
+
+    $(window).resize(function() {
+        var isNormalZoom = Math.round(window.devicePixelRatio * 100) === 100
+        if (!isNormalZoom) {
+            suofang();
+        } else {
+            $('.task-btn.task-btn-orange:visible').click()
+        }
+    })
+
+}
+
+var win_resize = function() {
+    var _w = $(window).width() - 1200;
+    if (_w < 0) {
+        $('.newHeader>.educontent').width('auto')
+    } else {
+        $('.newHeader>.educontent').width('1200px')
+    }
+};
+
+function initWindowResize() {
+    if (location.pathname === '/login') {
+        // 登录页不需要
+        return;
+    }
+
+    $(function() {
+        setTimeout(function() {
+            win_resize();
+        }, 1000)
+    })
+
+    $(window).resize(function() {
+        win_resize()
+    })
+}
+initWindowResize();
+
+// 登录刷新 https://stackoverflow.com/questions/28230845/communication-between-tabs-or-windows
+if (window['BroadcastChannel']) {
+    var bc = new BroadcastChannel('ec_reload');
+    bc.onmessage = function(ev) {
+        if (window['ec_reload_msg_send_window']) {
+            window['ec_reload_msg_send_window'] = false;
+        } else {
+            location.reload();
+        }
+    }
+}
+function _sendReloadMsg() {
+    var bc = new BroadcastChannel('ec_reload');
+    window['ec_reload_msg_send_window'] = true;
+    // 消息发出的窗口，不需要处理该消息
+    bc.postMessage('ec_reload');
+    /* send */
+}
+// IE11 没有 startsWith
+if (!String.prototype.startsWith) {
+    String.prototype.startsWith = function(searchString, position) {
+        position = position || 0;
+        return this.substr(position, searchString.length) === searchString;
+    }
+    ;
+    String.prototype.endsWith = function(search, this_len) {
+        if (this_len === undefined || this_len > this.length) {
+            this_len = this.length;
+        }
+        return this.substring(this_len - search.length, this_len) === search;
+    }
+    ;
+}
+
+function clickNewsubscript() {
+    $(".newsubscript").hide();
+    $(".newedbox").addClass("newminheight");
+    $(".newedbox").removeClass("newedboxheight");
+}
+
+/** tpm实训开启按钮，不允许多次点击  START                  */
+//点击模拟实战或者开启实战等，按钮变灰内容变成“开启中”
+var operationItem = null;
+var operationButtonOldValue = null;
+function opClickString(item) {
+    var value = $(item).html();
+    $(item).css({
+        'background': 'gray',
+        'border': '1px solid grey',
+        'pointer-events': 'none'
+    });
+    $(item).html('开启中');
+
+    operationButtonOldValue = value
+    operationItem = item
+    // setTimeout(function(){ $(item).css('background', '#4CACFF');$(item).html(value); }, 4000)
+}
+// 
+// var isOperationSending = false;
+$(document).bind('ajaxStop', function(event, xhr, settings) {
+    if (settings && settings.url && (settings.url.match(/operation\?/))) {
+        if (operationItem) {
+            $(operationItem).css('background', '#4CACFF').css('pointer-events', 'inherit');
+            $(operationItem).html(operationButtonOldValue);
+        }
+    }
+});
+$(document).bind('ajaxError', function(event, xhr, settings) {
+    if (settings && settings.url && (settings.url.match(/operation\?/))) {
+        if (operationItem) {
+            $(operationItem).css('background', '#4CACFF').css('pointer-events', 'inherit');
+            $(operationItem).html(operationButtonOldValue);
+        }
+    }
+});
+/** tpm实训开启按钮，不允许多次点击  END                  */
diff --git a/public/react/config/webpack.config.dev.js b/public/react/config/webpack.config.dev.js
index dfd54f38b..ceddbd81b 100644
--- a/public/react/config/webpack.config.dev.js
+++ b/public/react/config/webpack.config.dev.js
@@ -114,21 +114,21 @@ module.exports = {
       // First, run the linter.
       // It's important to do this before Babel processes the JS.
         // 上线然后要注释回来
-      {
-        test: /\.(js|jsx|mjs)$/,
-        enforce: 'pre',
-        use: [
-          {
-            options: {
-              formatter: eslintFormatter,
-              eslintPath: require.resolve('eslint'),
-
-            },
-            loader: require.resolve('eslint-loader'),
-          },
-        ],
-        include: paths.appSrc,
-      },
+      // {
+      //   test: /\.(js|jsx|mjs)$/,
+      //   enforce: 'pre',
+      //   use: [
+      //     {
+      //       options: {
+      //         formatter: eslintFormatter,
+      //         eslintPath: require.resolve('eslint'),
+			//
+      //       },
+      //       loader: require.resolve('eslint-loader'),
+      //     },
+      //   ],
+      //   include: paths.appSrc,
+      // },
       {
         // "oneOf" will traverse all following loaders until one will
         // match the requirements. When no loader matches it will fall
diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js
index 0c204a823..07920e2d9 100644
--- a/public/react/src/modules/home/shixunsHome.js
+++ b/public/react/src/modules/home/shixunsHome.js
@@ -198,13 +198,13 @@ class ShixunsHome extends Component {
                                 </div>
                                 <Link to={"/paths"} className="moreitem">更多<i className="fa fa-angle-right ml5"></i></Link>
 
-                                <div className="square-list clearfix">
+                                <div className="square-list clearfix" style={{width:'102%'}}>
 
 
                                     {homedatalist===undefined?"":homedatalist.subjects.map((item,key)=>{
                                         if(key<8)
                                         return(
-                                            <div className="square-Item" key={key} id={item.id}>
+                                            <div className="square-Item" key={key} id={item.id} style={{width:'286px'}}>
 
                                                 <div className="tag-green">
                                                     <span className="tag-name"> {item.name}</span>
@@ -272,10 +272,10 @@ class ShixunsHome extends Component {
                                 </div>
                                 <Link to={"/shixuns"} className="moreitem">更多<i className="fa fa-angle-right ml5"></i></Link>
 
-                                <div className="square-list clearfix">
+                                <div className="square-list clearfix" style={{width:'102%'}}>
                                     {homedatalist===undefined?"":homedatalist.shixuns.map((item,key)=>{
                                         return(
-                                            <div className="square-Item" key={key} id={item.id}>
+                                            <div className="square-Item" key={key} id={item.id} style={{width:'286px'}}>
 
                                                 <div className="tag-green">
                                                     <span className="tag-name"> {item.tag_name}</span>
diff --git a/public/react/src/modules/tpm/NewFooter.js b/public/react/src/modules/tpm/NewFooter.js
index 9be48597b..9c984b8cd 100644
--- a/public/react/src/modules/tpm/NewFooter.js
+++ b/public/react/src/modules/tpm/NewFooter.js
@@ -1,49 +1,49 @@
-import React, { Component } from 'react';
-import { Redirect } from 'react-router';
-import { getImageUrl, toPath } from 'educoder'
-import PropTypes from 'prop-types';
-
-class NewFooter extends Component {
-  constructor(props) {
-    super(props)
-
-  }
-
-  componentWillReceiveProps(newProps, newContext) {
-
-  }
-
-
-  render() {
-    return (
-      <div className="newFooter edu-txt-center">
-        <div className="inner-footer_con">
-          <div className="footercon">
-            <div className="inline mt40 mb5">
-              <a href="/" className="fl" style={{height:'70px'}}>
-                <img alt="高校智能化教学与实训平台" src={getImageUrl(`images/educoder/headNavLogo.png?1526520218`)} width="70px">
-                </img>
-              </a>
-              <span className="fl color-grey-c cdefault font-28 ml22" style={{lineHeight:'74px'}}>EduCoder.net</span>
-            </div>
-            <ul className="clearfix inner-footernav">
-              <li><a href="/" className="fl" target="_blank">网站首页</a></li>
-              <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.about_us} className="fl" target="_blank">关于我们</a></li>
-              <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.connect_us} className="fl" target="_blank">联系我们</a></li>
-              <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.cooperation_partner} className="fl" target="_blank">合作伙伴</a></li>
-              <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.service_agreement} className="fl" target="_blank">服务协议</a></li>
-              <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.help_center} className="fl" target="_blank">帮助中心</a></li>
-              <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.feedback} className="fl" target="_blank">意见反馈</a></li>
-            </ul>
-          </div>
-          <div>
-            <p className="footer_con-p inline lineh-30 font-14"><span className="font-18 fl">©</span>&nbsp;2019&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</p>
-          </div>
-          <div className="cl"></div>
-        </div>
-      </div>
-    );
-  }
-}
-
-export default NewFooter;
+import React, { Component } from 'react';
+import { Redirect } from 'react-router';
+import { getImageUrl, toPath } from 'educoder'
+import PropTypes from 'prop-types';
+
+class NewFooter extends Component {
+  constructor(props) {
+    super(props)
+
+  }
+
+  componentWillReceiveProps(newProps, newContext) {
+
+  }
+
+
+  render() {
+    return (
+      <div className="newFooter edu-txt-center newContainers">
+        <div className="inner-footer_con">
+          <div className="footercon">
+            <div className="inline mt40 mb5">
+              <a href="/" className="fl" style={{height:'70px'}}>
+                <img alt="高校智能化教学与实训平台" src={getImageUrl(`images/educoder/headNavLogo.png?1526520218`)} width="70px">
+                </img>
+              </a>
+              <span className="fl color-grey-c cdefault font-28 ml22" style={{lineHeight:'74px'}}>EduCoder.net</span>
+            </div>
+            <ul className="clearfix inner-footernav">
+              <li><a href="/" className="fl" target="_blank">网站首页</a></li>
+              <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.about_us} className="fl" target="_blank">关于我们</a></li>
+              <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.connect_us} className="fl" target="_blank">联系我们</a></li>
+              <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.cooperation_partner} className="fl" target="_blank">合作伙伴</a></li>
+              <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.service_agreement} className="fl" target="_blank">服务协议</a></li>
+              <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.help_center} className="fl" target="_blank">帮助中心</a></li>
+              <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.feedback} className="fl" target="_blank">意见反馈</a></li>
+            </ul>
+          </div>
+          <div>
+            <p className="footer_con-p inline lineh-30 font-14"><span className="font-18 fl">©</span>&nbsp;2019&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</p>
+          </div>
+          <div className="cl"></div>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default NewFooter;
diff --git a/public/react/src/modules/tpm/SiderBar.js b/public/react/src/modules/tpm/SiderBar.js
index f8af121e1..bc1a80ed4 100644
--- a/public/react/src/modules/tpm/SiderBar.js
+++ b/public/react/src/modules/tpm/SiderBar.js
@@ -23,7 +23,7 @@ $(window).scroll(function(){
 });
 
 function rightSlider(){
-  var poi=parseInt((parseInt($(window).width())- 1200 )/2)-60;
+  var poi=parseInt((parseInt($(window).width())- 1200 )/2)-34;
   // console.log(parseInt($(window).width())+"  "+poi);
   if(poi>0){
     $(".-task-sidebar").css("right",poi);
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 5501ef499..68f3c2e56 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -294,23 +294,34 @@ export function TPMIndexHOC(WrappedComponent) {
 		    return (
 		    	<div>
 
-
-            <SiderBar
-                        Headertop={Headertop}
-                    />
-                    <NewHeader {...this.state} {...this.props}></NewHeader>
-                    <div className="newContainer">
-                        <WrappedComponent initCommonState={(user)=>this.initCommonState(user)}
-                          {...this.props} {...this.state}
-                          showShixun={this.showShixun} aboutFocus={this.aboutFocus}
-                          {...common}
-                        >
-                      </WrappedComponent>
-
-                    </div>
-                    <NewFooter
-                        Footerdown={Footerdown}
-                    />
+            <SiderBar Headertop={Headertop}/>
+						<style>{
+							`
+							.newContainers{
+								width: 100%;
+								min-width: 1440px;
+							  max-width: unset;
+							}
+							// .-task-sidebar{
+						  //   right: 270px !important;
+							// }
+							`
+						}</style>
+						<NewHeader {...this.state} {...this.props}></NewHeader>
+						<div className="newContainer newContainers">
+								<WrappedComponent initCommonState={(user)=>this.initCommonState(user)}
+									{...this.props} {...this.state}
+									showShixun={this.showShixun} aboutFocus={this.aboutFocus}
+									{...common}
+								>
+							</WrappedComponent>
+
+						</div>
+
+
+						<NewFooter
+								Footerdown={Footerdown}
+						/>
 		        </div>
 		    );
 	  	}