From 80c554bf2f3d7e61b60229e11f8d49066f648787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 4 Sep 2019 16:49:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E5=A0=82=E7=BB=93=E6=9D=9F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/coursesDetail/CoursesLeftNav.js   |  5 ++---
 .../shixunHomework/Listofworksstudentone.js   | 20 +++++++++----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
index 1a7c19824..24235d723 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
@@ -749,9 +749,9 @@ class Coursesleftnav extends Component{
       {/*毕业设计*/}
       {/*{item.type==="graduation"?<div onClick={()=>this.Navmodalnames(1,"attachment",item.id)}>添加目录</div>:""}*/}
       {/*讨论区*/}
-      {item.type==="board"?<div onClick={e=>this.Navmodalnames(e,6,"board",item.main_id)}>添加目录</div>:""}
+      {item.type==="board"?this.props.current_user&&this.props.current_user.course_is_end===true?"":<div onClick={e=>this.Navmodalnames(e,6,"board",item.main_id)}>添加目录</div>:""}
       {/*分班*/}
-      {item.type==="course_group"?<div onClick={e=>this.Navmodalnames(e,2,"course_group",item.id)}>添加分班</div>:""}
+      {item.type==="course_group"?this.props.current_user&&this.props.current_user.course_is_end===true?"":<div onClick={e=>this.Navmodalnames(e,2,"course_group",item.id)}>添加分班</div>:""}
       {/*分班*/}
       {/*{item.type==="course_group"? :""}*/}
       <div onClick={e=>this.Navmodalnames(e,3,"editname",item.id,item.name)}>重命名</div>
@@ -798,7 +798,6 @@ class Coursesleftnav extends Component{
 
     // console.log("778");
     // console.log("CoursesLeftNav");
-    // console.log(this.props);
     // console.log(course_modules);
 
     return(
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 73ea4a221..bba76386a 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -3157,16 +3157,16 @@ class Listofworksstudentone extends Component {
 
 															<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
 															{	course_is_end===true?"":teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
-													{computeTimetype===true?
-														(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
-															计算成绩
-														</div>:""):
-														teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
-															(this.props.isNotMember()===false?<div className={"computeTimes font-13"}>
-																计算成绩
-															</div>:"")
-													}
-												 </span>}
+																{computeTimetype===true?
+																	(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
+																		计算成绩
+																	</div>:""):
+																	teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
+																		(this.props.isNotMember()===false?<div className={"computeTimes font-13"}>
+																			计算成绩
+																		</div>:"")
+																}
+												 			</span>}
 
 														</div>
 														{/*因为计算按钮占了和这个位置，和设计沟通学生视角取消这个按钮*/}