From 1a7d9a7f60faa8b3e81d4161248dc6f8f4c73925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 4 Jul 2019 15:12:05 +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

---
 .../shixunHomework/ShixunStudentWork.js       |  7 ++-
 .../shixunHomework/ShixunhomeWorkItem.js      |  2 +-
 .../Shixunworkdetails/ShixunWorkModal.js      | 57 ++++++++++---------
 3 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
index 7188c65bd..30d5830d2 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
@@ -659,7 +659,7 @@ class ShixunStudentWork extends Component {
 
 						{data&&data?
 						<div>
-						<ul className="clearfix" style={{padding: '20px 40px 10px 40px'}}>
+						<ul className="clearfix" style={{padding: '20px 16px 10px'}}>
 							<li className="clearfix ">
 
 								<span   className="fl  mr10 color-grey-8 ">查重时间：{data&&data.last_review_time}</span>
@@ -715,7 +715,7 @@ class ShixunStudentWork extends Component {
 						</ul>
 
 
-						<div id="graduation_work_list" style={{padding: '0px 40px 10px 40px'}}>
+						<div id="graduation_work_list" style={{padding: '0px 16px 10px'}}>
 
 							<div className="clearfix">
                   <span className="fl color-grey-6 font-12">
@@ -755,11 +755,12 @@ class ShixunStudentWork extends Component {
 							{datalist === undefined ? "" : <Table
 								dataSource={datalist}
 								columns={columns}
-								pagination={{  //分页
+								pagination={ datalist.length<11?false:{  //分页
 									total: datalist.length===0?0:data&&data.all_reviews_count, //数据总数量
 									pageSize: 10,  //显示几条一页
 									current:page,
 								}}
+
 								onChange={this.TablePagination}
 							/>}
 						</div>
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index 5731c3b73..d6c96182b 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -358,7 +358,7 @@ class ShixunhomeWorkItem extends Component{
 								`
 							}
 						</style>
-            {this.props.isAdmin?<div className={this.props.isClassManagement?"homepagePostSetting homepagePostSettingname":"homepagePostSetting homepagePostSettingbox"} style={{"right":"-2px","top":"44px","display":"block"}}>
+            {this.props.isAdmin?<div className={this.props.isAdminOrTeacher()?"homepagePostSetting homepagePostSettingname":"homepagePostSetting homepagePostSettingbox"} style={{"right":"-2px","top":"44px","display":"block"}}>
               <a className="btn colorblue font-16" href={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>实训详情</a>
 								{this.props.isAdminOrTeacher()?<a  onClick={()=>this.editname(discussMessage.name,discussMessage.homework_id)} className={"btn colorblue ml20 font-16"}>重命名</a>:""}
               <WordsBtn className="btn colorblue ml20 font-16"  to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings`}  > 设置</WordsBtn>
diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
index 5a4ad673c..173346c81 100644
--- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
+++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
@@ -31,7 +31,9 @@ class ShixunWorkModal extends Component{
 				response.data.group_list.map((item,key)=>{
 					newgroup_list.push(item)
 				})
-				if( response.data.ungroup_list!== undefined ||  response.data.ungroup_list !== null){
+				if(response.data.ungroup_list===undefined){
+
+				}else{
 					newgroup_list.push(response.data.ungroup_list)
 				}
 				this.setState({
@@ -255,31 +257,10 @@ class ShixunWorkModal extends Component{
 
 								<Checkbox.Group style={{ width: '100%' }}  onChange={this.shixunhomeworkedit} value={group_ids}>
 									{
-										group_list===undefined?course_groups.ungroup_list.work_count===0?"":
-
-											<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE">
-												<li className="fl task-hide" style={{width: '240px'}}>
-													<Checkbox
-														className="fl task-hide edu-txt-left"
-														name="shixun_homework[]"
-														value={course_groups.ungroup_list.id}
-													>
-														<label style={{"textAlign": "left", "color": "#05101A"}}
-																	 className="task-hide color-grey-name" title="frerere">{course_groups.ungroup_list.name}</label>
-													</Checkbox>
-												</li>
-												<li className="fl" style={{width: '100px'}}>
-													{course_groups.ungroup_list.work_count}
-												</li>
-												<li className="fl" style={{width: '160px'}}>
-													{course_groups.ungroup_list.last_review_time}
-												</li>
-											</div>
-
-											:
-											group_list&&group_list.length===0?"":group_list[0]===undefined?"":group_list.map((item,key)=>{
+										group_list===undefined?"":
+											group_list&&group_list.length===0?"":group_list.map((item,key)=>{
 												return(
-													item.work_count===0?"":<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
+													 <div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
 														<li className="fl task-hide" style={{width: '240px'}}>
 															<Checkbox
 																className="fl task-hide edu-txt-left"
@@ -318,4 +299,28 @@ class ShixunWorkModal extends Component{
 		)
 	}
 }
-export default ShixunWorkModal;
\ No newline at end of file
+export default ShixunWorkModal;
+
+
+// course_groups.ungroup_list.work_count===0?"":
+//
+// 	<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE">
+// 		<li className="fl task-hide" style={{width: '240px'}}>
+// 			<Checkbox
+// 				className="fl task-hide edu-txt-left"
+// 				name="shixun_homework[]"
+// 				value={course_groups.ungroup_list.id}
+// 			>
+// 				<label style={{"textAlign": "left", "color": "#05101A"}}
+// 							 className="task-hide color-grey-name" title="frerere">{course_groups.ungroup_list.name}</label>
+// 			</Checkbox>
+// 		</li>
+// 		<li className="fl" style={{width: '100px'}}>
+// 			{course_groups.ungroup_list.work_count}
+// 		</li>
+// 		<li className="fl" style={{width: '160px'}}>
+// 			{course_groups.ungroup_list.last_review_time}
+// 		</li>
+// 	</div>
+//
+// :
\ No newline at end of file