From 3bf8e6d80175ad6402d8a4ed374ef45e7ac93074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 11 Mar 2020 21:05:58 +0800
Subject: [PATCH] =?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  | 271 +-----------------
 1 file changed, 7 insertions(+), 264 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index 5944e9c6f..1d391bb2c 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -1207,262 +1207,7 @@ class Studentshavecompletedthelist extends Component {
 					)
 				},
 			],
-			columnsystwo: [
-				{
-					title: '序号',
-					dataIndex: 'number',
-					key: 'number',
-					align: 'center',
-					className: "edu-txt-center font-14",
-					render: (text, record) => (
-						<span>
-							 {record.number === "--" ?
-								 <span style={{color: '#999999', textAlign: "center"}}>--</span>
-								 :
-								 <span style={{color: '#07111B', textAlign: "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', textAlign: "center"}}>{record.name}</span>
-								:
-								<span style={{color: '#07111B', textAlign: "center"}}>{record.name}</span>
-							}
-        </span>
-					)
-				},
-				{
-					title: '学号',
-					dataIndex: 'stduynumber',
-					key: 'stduynumber',
-					align: 'center',
-					className: "edu-txt-center font-14",
-					sorter: true,
-					sortDirections: sortDirections,
-					render: (text, record) => (
-						<span>
-						{record.stduynumber === "--" ?
-							<span style={{color: '#999999', textAlign: "center"}}>{record.stduynumber}</span>
-							:
-							<span style={{color: '#9A9A9A', textAlign: "center"}}>{record.stduynumber}</span>
-						}
-        </span>
-					),
-				},
-				{
-					title: '分班',
-					key: 'classroom',
-					dataIndex: 'classroom',
-					align: 'center',
-					className: "edu-txt-center font-14 maxnamewidth260 ",
-					width:'260px',
-					render: (text, record) => (
-						<span>
-							{record.classroom==="--"?
-								<span style={{color: '#999999', textAlign: "center"}} className="maxnamewidth260">{record.classroom}</span>
-								:
-								<a style={{color: '#07111B', textAlign: "center"}} className="maxnamewidth260" title={record.classroom}>{record.classroom}</a>
-							}
-        </span>
-					)
-				},
-				{
-					title: '提交状态',
-					dataIndex: 'submitstate',
-					key: 'submitstate',
-					align: 'center',
-					className: "edu-txt-center font-14",
-					render: (text, record) => (
-						<span>
-								<span style={record.submitstate === "未提交" ? {
-									color: '#999999',
-									textAlign: "center"
-								} : record.submitstate === "已提交" ? {color: '#29BD8B', textAlign: "center"} : {
-									color: '#29BD8B',
-									textAlign: "center"
-								}}>{record.submitstate}</span>
-
-        </span>
-					)
-
-				},
-				{
-					title: '提交时间',
-					dataIndex: 'updatetime',
-					key: 'updatetime',
-					align: 'center',
-					className: "edu-txt-center font-14",
-					sorter: true,
-					defaultSortOrder: 'descend',
-					sortDirections: sortDirections,
-					render: (text, record) => (
-						<span>
-							{record.updatetime==="--"?
-								<span style={{color: '#999999', textAlign: "center"}}>--</span>
-								:
-								<span style={{color: '#9A9A9A', textAlign: "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', textAlign: "center"}}>--</span>
-								:
-								<span style={{color: '#07111B', textAlign: "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', textAlign: "center"}}>--</span>
-								:
-								<span style={{color: '#FF6800', textAlign: "center"}}>{record.levelscore}</span>
-							}
-        </span>
-					)
-				},
-				{
-					title: '最终成绩',
-					dataIndex: 'efficiencyscore',
-					key: 'efficiencyscore',
-					align: 'center',
-					className: "edu-txt-center font-14",
-					sorter: true,
-					sortDirections: sortDirections,
-					render: (text, record) => (
-						<span>
-															{record.efficiencyscore === "--" ?
-																<Tooltip  placement="bottom" title={<div>
-																	<div>未评分</div>
-																</div>}>
-																	<a style={{color: '#999999',
-																		textAlign: "center",}}>--</a>
-																</Tooltip>
-																:
-																record.commit_method===5?
-																	<Tooltip  placement="bottom" title={
-																		<div>
-																			<div>最终调整成绩：{record.efficiencyscore}分</div>
-																		</div>}>
-																	<span style={parseInt(record.efficiencyscore) > 90 ? {
-																		color: '#DD1717',
-																		textAlign: "center",
-																	} : parseInt(record.efficiencyscore) <= 90 ? {
-																		color: '#FF6800',
-																		textAlign: "center",
-																	} : parseInt(record.efficiencyscore) <= 60 ? {
-																		color: '#747A7F',
-																		textAlign: "center",
-																	} : {
-																		color: '#747A7F',
-																		textAlign: "center",
-																	}}>{record.efficiencyscore}</span>
-																	</Tooltip>
-																	:
-																<span style={parseInt(record.efficiencyscore) > 90 ? {
-																	color: '#DD1717',
-																	textAlign: "center",
-																} : parseInt(record.efficiencyscore) <= 90 ? {
-																	color: '#FF6800',
-																	textAlign: "center",
-																} : parseInt(record.efficiencyscore) <= 60 ? {
-																	color: '#747A7F',
-																	textAlign: "center",
-																} : {
-																	color: '#747A7F',
-																	textAlign: "center",
-																}}>{record.efficiencyscore}</span>
-															}
-        </span>
-					)
-				},
-				{
-					title: '操作',
-					dataIndex: 'finalscore',
-					key: 'finalscore',
-					align: 'center',
-					className: "edu-txt-center font-14",
-					render: (text, record) => (
-						<span>
-							{
-								record.submitstate === "未提交"||record.commit_method===5?
-									(//是否助教
-										this.props.isAssistant()&&this.props.isAssistant()===true?
-											(//助教是否有权限
-												this.props.assistant_auth&&this.props.assistant_auth===true?
-													<a style={{textAlign: "center"}} className="color-blue"
-														 target="_blank" onClick={() => this.Adjustment(record.user_id)}>评阅</a>
-													:
-													(//是否截止
-														this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status===3?
-															<a style={{textAlign: "center"}} className="color-blue"
-																 target="_blank" onClick={() => this.Adjustment(record.user_id)}>评阅</a>
-															:
-															<span style={{textAlign: "center", color: '#999999'}}>--</span>
-													)
-											)
-											:
-											<a style={{textAlign: "center"}} className="color-blue"
-												 target="_blank" onClick={() => this.Adjustment(record.user_id)}>评阅</a>
-									)
-									:record.submitstate === "已提交"?
-									(//是否助教
-										this.props.isAssistant()&&this.props.isAssistant()===true?
-											(//助教是否有权限
-												this.props.assistant_auth&&this.props.assistant_auth===true?
-													<a style={{textAlign: "center"}} className="color-blue"
-														 target="_blank"
-														 href={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
-													:
-													(//是否截止
-														this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status===3?
-															//是助教就是评阅
-															<a style={{textAlign: "center"}} className="color-blue"
-																 target="_blank"
-																 href={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
-															:
-															<span style={{textAlign: "center", color: '#999999'}}>--</span>
-													)
-											)
-											:
-											//是老师就是评阅
-											<a style={{textAlign: "center"}} className="color-blue"
-												 target="_blank"
-												 href={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
-									)
-									:
-									<span style={{textAlign: "center", color: '#999999'}}>--</span>
-							}
-						</span>
-					)
-				},
-			],//columnsystwo 也会被columnsys当作参数接收
+			columnsystwo: [],// 也会被columnsys当作参数接收
 			exercise_status:0,
 			order_type: "desc",
 			exeuserid: 0,
@@ -1523,20 +1268,18 @@ class Studentshavecompletedthelist extends Component {
 	}
 
 	componentDidMount() {
-		// if(this.props.isAdmin() === true){
-		//     this.Teacherliststudentlistsy();
-		//     //console.log("1111111111111111");
-		//     //console.log(this.props.isAdmin());
-		// }else {
+		//被columnsys当作参数接收
+		this.setState({
+			columnsystwo:this.state.columnsys,
+		})
 		this.Teacherliststudentlist();
-		// //console.log("2222222222222");
-		// //console.log(this.props.isAdmin());
-		// }
+
 		try {
 			this.props.triggerRef(this);
 		}catch (e) {
 
 		}
+
 	}
 
 	componentWillReceiveProps = (nextProps) => {