From 67e9fa5e23bd3195aa622cff6a19852f20359c7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Mon, 9 Sep 2019 11:12:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=AE=9E=E7=8E=B0=E4=BD=9C?=
 =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shixunHomework/Listofworksstudentone.js   | 159 ++++++++++++------
 1 file changed, 112 insertions(+), 47 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 534078e74..36ec72276 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -458,84 +458,64 @@ class Listofworksstudentone extends Component {
 				},
 			],
 			columnsstu2: [
-				// {
-				// 	title: '序号',
-				// 	dataIndex: 'number',
-				// 	key: 'number',
-				// 	align: "center",
-				// 	className:'font-14',
-				// 	width:'100px',
-				// 	render: (text, record) => (
-				// 		<span style={{width:'100px'}}>
-				// 		{record.number === undefined ?
-				// 			<span style={{
-				// 				color: '#9A9A9A',
-				// 				textAlign: "center",
-				// 				width:'100px'
-				// 			}}> --</span>
-				// 			: record.number === "" ?
-				// 				<span style={{
-				// 					color: '#9A9A9A',
-				// 					textAlign: "center",
-				// 					width:'100px'
-				// 				}}>--</span>
-				// 				: record.number === "--" ?
-				// 					<span style={{
-				// 						color: '#9A9A9A',
-				// 						textAlign: "center",
-				// 						width:'100px'
-				// 					}}>--</span>
-				// 					:
-				// 					<span style={{
-				// 						color: '#07111B',
-				// 						textAlign: "center",
-				// 						width:'100px'
-				// 					}}>  {record.number}</span>
-				// 		}
-        // </span>
-				// 	),
-				// },
+				{
+					title: '序号',
+					dataIndex: 'number',
+					key: 'number',
+					align: "center",
+					className:'font-14',
+					width:'100px',
+					render: (text, record) => (
+						<span style={{width:'100px'}}>
+									<span style={{
+										color: '#07111B',
+										textAlign: "center",
+										width:'100px'
+									}}> 我</span>
+            </span>
+					),
+				},
 				{
 					title: '姓名',
 					dataIndex: 'name',
 					key: 'name',
 					align: "center",
-					className:'font-14 maxnamewidth200',
-					width:'200px',
+					className:'font-14 maxnamewidth110',
+					width:'100px',
 					render: (text, record) => (
-						<span className="maxnamewidth200">
+						<span className="maxnamewidth110">
 						{record.name === undefined ?
 							<span style={{
 								color: '#9A9A9A',
 								textAlign: "center",
-								width:'200px'
+								width:'100px'
 							}}>--</span>
 							:
 							record.name === "" ?
 								<span style={{
 									color: '#9A9A9A',
 									textAlign: "center",
-									width:'200px'
+									width:'100px'
 								}}>--</span>
 								:
 								record.name === null ?
 									<span style={{
 										color: '#9A9A9A',
 										textAlign: "center",
-										width:'200px'
+										width:'100px'
 									}}>--</span>
 									:
 									record.name === "--" ?
 										<span style={{
 											color: '#9A9A9A',
 											textAlign: "center",
-											width:'200px'
+											width:'100px'
 										}}>--</span>
 										:
-										<a className="maxnamewidth200" title={record.name} style={{
+										<a className="maxnamewidth110" title={record.name} style={{
 											color: '#07111B',
 											textAlign: "center",
-											width:'200px'
+											width:'100px'
 										}}>{record.name}</a>
 						}
 
@@ -1673,6 +1653,7 @@ class Listofworksstudentone extends Component {
 		let datalists = [];
 		var styletable = {"display": "none"}
 		var arr =[];
+		var arr2=[];
 		for(var i=0;i<this.state.columnsstu.length;i++){
 			var item = this.state.columnsstu[i];
 			if(this.props.isNotMember()===true){
@@ -1709,7 +1690,48 @@ class Listofworksstudentone extends Component {
 
 			}
 		}
+		try {
+			for(var i=0;i<this.state.columnsstu2.length;i++){
+				var item = this.state.columnsstu2[i];
+				if(this.props.isNotMember()===true){
+					if(item.title==="关卡得分") {
+						continue
+					}
+					if(item.title==="效率分") {
+						continue
+					}
+					if(item.title==="最终成绩") {
+						continue
+					}
+					if(item.title==="学号") {
+						continue
+					}
+					else{
+						arr2.push(item);
+					}
+				}
+				else{
+					if (work_efficiency === false) {
+						if(item.title==="关卡得分"){
+							continue
+						}
+						else if(item.title==="效率分"){
+							continue
+
+						}else{
+							arr2.push(item);
+						}
+					}else{
+						arr2.push(item);
+					}
+
+				}
+			}
+		}catch (e) {
+			arr2=this.state.columnsstu2;
+		}
 		let columns2=	arr;
+		let columns3= arr2;
 		var teacherlists = undefined;
 		if (teacherdata !== undefined) {
 			// console.log("seacthdata设置数据")
@@ -1803,6 +1825,8 @@ class Listofworksstudentone extends Component {
 			loadingstate: false,
 			styletable: styletable,
 			columnsstu:columns2,
+			columnsstu2:columns3,
+
 		})
 	}
 	// 设置数据
@@ -1813,6 +1837,7 @@ class Listofworksstudentone extends Component {
 
 
 		var arr =[];
+		var arr2 =[];
 		for(var i=0;i<this.state.columnsstu.length;i++){
 			var item = this.state.columnsstu[i];
 
@@ -1847,8 +1872,47 @@ class Listofworksstudentone extends Component {
 
 			}
 		}
-		let columns2=	arr;
+		try {
+			for(var i=0;i<this.state.columnsstu2.length;i++){
+				var item = this.state.columnsstu2[i];
 
+				if(this.props.isNotMember()===true){
+					if(item.title==="关卡得分") {
+						continue
+					}
+					if(item.title==="效率分") {
+						continue
+					}
+					if(item.title==="最终成绩") {
+						continue
+					}
+					if(item.title==="学号") {
+						continue
+					}else{
+						arr.push(item);
+					}
+				}else{
+					if (this.state.work_efficiency === false) {
+						if (item.title === "关卡得分") {
+							continue
+						} else if (item.title === "效率分") {
+							continue
+						}else{
+							arr.push(item);
+
+						}
+					}else{
+						arr.push(item);
+					}
+
+				}
+			}
+
+		}catch (e) {
+			arr2=this.state.columnsstu2;
+		}
+		let columns2=	arr;
+		let columns3=	arr2;
 		if (teacherdata !== undefined) {
 			// console.log("seacthdata设置数据")
 			// console.log(this.state.teacherdata.id )
@@ -1912,6 +1976,7 @@ class Listofworksstudentone extends Component {
 			teacherlist: teacherlist,
 			loadingstate: false,
 			columnsstu:columns2,
+			columnsstu2:columns3,
 		})
 	}
 	// 查看学员实训信息