From 27be7606345f2a87f0d3071c7841169f8302c0e5 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, 8 Jan 2020 15:49:12 +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

---
 public/react/src/AppConfig.js                 |  2 +-
 .../modules/courses/boards/BoardsListItem.js  |  7 +++---
 .../courses/exercise/ExerciseListItem.js      | 24 +++++++++++++++----
 .../graduation/tasks/GraduateTaskItem.js      | 14 +++++++++++
 .../graduation/topics/GraduateTopicItem.js    | 14 +++++++++--
 .../src/modules/courses/poll/PollListItem.js  | 11 +++++++--
 .../shixunHomework/ShixunhomeWorkItem.js      | 12 ++++++----
 7 files changed, 66 insertions(+), 18 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 2926d6c0f..5acc8bf04 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -42,7 +42,7 @@ if (isDev) {
 // 老师
 //debugType="teacher";
 // 学生
-//debugType="student";
+ debugType="student";
 
 
  function railsgettimes(proxy) {
diff --git a/public/react/src/modules/courses/boards/BoardsListItem.js b/public/react/src/modules/courses/boards/BoardsListItem.js
index 0df7675a3..db58fb998 100644
--- a/public/react/src/modules/courses/boards/BoardsListItem.js
+++ b/public/react/src/modules/courses/boards/BoardsListItem.js
@@ -75,6 +75,7 @@ class BoardsListItem extends Component{
                   <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
                  </Tooltip>) : ""
               }
+              {canNotLink?"":<WordsBtn style="blue"  className="font-16 fr " 	onClick={canNotLink ? () => {} : () => this.onTitleClick(discussMessage)}>查看详情</WordsBtn>}
             </h6>
 
             <div className="fr">
@@ -112,14 +113,14 @@ class BoardsListItem extends Component{
                 </ConditionToolTip>
               </div>
             }
-            
-            {/* { (isAdmin || discussMessage.author.login == current_user.login) && 
+
+            {/* { (isAdmin || discussMessage.author.login == current_user.login) &&
             <div className="homepagePostSetting" style={{"right":"4px","top":"5px","display":"block"}}>
               <ul>
                 <li className="edu-position edu-position-hidebox">
                   <i className="fa fa-bars color-grey-b"></i>
                   <ul className="edu-position-hide undis">
-                    {(isAdmin || discussMessage.author.login == current_user.login) && <li><a href="javascript:void(0)" onClick={(e) => { 
+                    {(isAdmin || discussMessage.author.login == current_user.login) && <li><a href="javascript:void(0)" onClick={(e) => {
                         this.props.toEditPage(this.props.match.params.coursesId, this.props.match.params.boardId, discussMessage.id )} } >编辑</a></li>
                     }
                     {isAdmin && <li><a href="javascript:void(0)" onClick={(e) => { debugger; onSticky(discussMessage); e.cancelBubble = true; e.stopPropagation();} }>
diff --git a/public/react/src/modules/courses/exercise/ExerciseListItem.js b/public/react/src/modules/courses/exercise/ExerciseListItem.js
index ef500ba0b..72b5e579f 100644
--- a/public/react/src/modules/courses/exercise/ExerciseListItem.js
+++ b/public/react/src/modules/courses/exercise/ExerciseListItem.js
@@ -185,8 +185,12 @@ class ExerciseListItem extends Component{
                         {/*}*/}
 
 
-										{ IsAdmin &&<div className="homepagePostSetting" style={{"right":"-17px","top":"51px","display":"block","width":"100px"}}>
-											<Link className="btn colorblue font-16" to={`/courses/${coursesId}/exercises/${item.id}/edit`}>编辑</Link>
+
+
+
+										{ IsAdmin &&<div className="homepagePostSetting" style={{"right":"-17px","top":"51px","display":"block","width":"200px"}}>
+											<a className="btn colorblue font-16 ml20" onClick={()=>this.toDetailPage(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>查看详情</a>
+											<Link className="btn colorblue font-16 ml20" to={`/courses/${coursesId}/exercises/${item.id}/edit`}>编辑</Link>
 											<Link  className="btn colorblue ml20 font-16" to={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=3`}>设置</Link>
 										</div> }
 
@@ -212,11 +216,21 @@ class ExerciseListItem extends Component{
                     {
                         IsStudent &&
                         <div className="homepagePostSetting" style={{"right":"0px","top":"62px","position":"absolute","display":"block"}}>
-                        {item.current_status ===0&&item.exercise_status>1? <li> <Link  className="btn colorblue  font-16" to={`/courses/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`}>继续答题</Link></li>:
-                          item.current_status ===1&&item.exercise_status>1? <li> <a className="btn colorblue  font-16" target="_blank" href={`/courses/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`}>查看答题</a></li>:
-                            item.current_status ===2&&item.exercise_status>1? <li> <a className="btn colorblue ml20  font-16" onClick={()=>this.setgameexercise(`/courses/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`)}>开始答题</a></li>:""}
+													<li className={"fl"}> <a  className="btn colorblue  font-16" onClick={()=>this.toDetailPage(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>查看详情</a></li>
+                            {item.current_status ===0&&item.exercise_status>1? <li className={"fl ml20"}> <Link  className="btn colorblue  font-16" to={`/courses/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`}>继续答题</Link></li>:
+                            item.current_status ===1&&item.exercise_status>1? <li className={"fl ml20"}> <a className="btn colorblue  font-16" target="_blank" href={`/courses/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`}>查看答题</a></li>:
+                            item.current_status ===2&&item.exercise_status>1? <li className={"fl ml20"}s> <a className="btn colorblue ml20  font-16" onClick={()=>this.setgameexercise(`/courses/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`)}>开始答题</a></li>:""}
                         </div>
                     }
+
+									{
+										this.props.isNotMember()? item.lock_status === 0 ?
+											""
+											: <div className="homepagePostSetting" style={{"right":"0px","top":"62px","position":"absolute","display":"block"}}>
+												<li> <a  className="btn colorblue  font-16" onClick={()=>this.toDetailPage(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>查看详情</a></li>
+											</div>:""
+									}
+
                 </div>
             </div>
         )
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
index 39a2f0876..6a3e4aea5 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
@@ -300,12 +300,19 @@ class GraduateTaskItem extends Component{
             {this.props.isAdmin?
 
               <div className="mt13">
+
                   <WordsBtn  style="blue" to={"/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/setting"}   className="colorblue font-16  mrf4 fr">
                      <a className="btn colorblue">设置</a>
                   </WordsBtn>
+
                   <WordsBtn  style="blue"  to={"/courses/"+coursesId+"/graduation_tasks/"+taskid+"/edit"} className="colorblue font-16 mr20 fr">
                   <a className="btn colorblue" >编辑</a>
                   </WordsBtn>
+
+                  <WordsBtn  style="blue" onClick={()=>this.toDetailPage("/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/list")}
+                             className="btn colorblue colorblue font-16 mr20 fr">
+                    查看详情
+                  </WordsBtn>
               </div>
 
               :""}
@@ -319,6 +326,8 @@ class GraduateTaskItem extends Component{
                     return(
                       <span key={key}>
 
+
+
                       {item==="提交作品"?
 
                         <WordsBtn  style="blue" className="colorblue font-16 ml20 fr mt12">
@@ -384,6 +393,11 @@ class GraduateTaskItem extends Component{
                     )
                   }):""}
 
+                {this.props.isStudent?
+                  <WordsBtn  style="blue" onClick={()=>this.toDetailPage("/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/list")}
+                             className="colorblue font-16 ml20 fr mt12">
+                    查看详情
+                  </WordsBtn>:""}
 
           </div>
         </div>
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
index a2c19ecbd..b75598636 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
@@ -120,9 +120,17 @@ class GraduateTopicItem extends Component{
               </span>              
               <span className="fl mr20 color-grey-9 mt1">{discussMessage.selected_count} 已选</span>
               <span className="fl color-grey-9 mt1">{discussMessage.confirmation_count} 已确认</span>
-              <span className="fr">               
+              <span className="fr">
                 {
-                  isAdmin && <WordsBtn onClick={()=>this.editTopic(`${discussMessage.id}`)} style="blue" className="font-16">编辑</WordsBtn>
+                  isStudent?<WordsBtn style="blue" onClick={() => this.toDetailPage(`${discussMessage.id}`)}
+                                      className="font-16 mr20" >查看详情</WordsBtn>:""
+                }
+                {
+                  isAdmin?<WordsBtn style="blue" onClick={() => this.toDetailPage(`${discussMessage.id}`)} className="font-16 mr20"  >查看详情</WordsBtn>:""
+                }
+
+                {
+                  isAdmin && <WordsBtn onClick={()=>this.editTopic(`${discussMessage.id}`)} style="blue" className="font-16  ">编辑</WordsBtn>
                 }
                 {
                   isStudent && data.user_selected == true && discussMessage.user_topic_status==0 &&
@@ -136,6 +144,8 @@ class GraduateTopicItem extends Component{
                     选题
                   </WordsBtn>                   
                 }
+
+
               </span>
             </p>
           </div>
diff --git a/public/react/src/modules/courses/poll/PollListItem.js b/public/react/src/modules/courses/poll/PollListItem.js
index ec1eb2fa3..be5e7f88d 100644
--- a/public/react/src/modules/courses/poll/PollListItem.js
+++ b/public/react/src/modules/courses/poll/PollListItem.js
@@ -97,8 +97,12 @@ class PollListItem extends Component{
                 <span className="mr20 fl mt3">{"提交剩余时间："+formatDuring(t)}</span>
               </Tooltip>
             }
+
+
             {
-              isStudent ? <WordsBtn style="blue" targets={item.current_status == 2||item.current_status == 0?undefined:'_blank'} className="fr font-16" to={`/courses/${coursesId}/polls/${item.id}/users/${this.props.current_user.login}`}>
+              isStudent ? <WordsBtn style="blue" targets={item.current_status == 2||item.current_status == 0?undefined:'_blank'} className="fr font-16 ml20" to={`/courses/${coursesId}/polls/${item.id}/users/${this.props.current_user.login}`}>
+
+
                 {
                   item.current_status == 0 && "继续答题"
                 }
@@ -110,10 +114,13 @@ class PollListItem extends Component{
                 }
               </WordsBtn>:""
             }
+            { isStudent ?canNotLink ?"": <WordsBtn style="blue"  className="font-16 fr "  onClick={()=>this.toDetailPage(`/courses/${coursesId}/polls/${item.id}/detail`)} >查看详情</WordsBtn>:""}
+
             {
               IsAdmin && 
               <ul className="fr">
-                <WordsBtn style="blue"  className="font-16" to={`/courses/${coursesId}/polls/${item.id}/${"edit"}`}>编辑</WordsBtn>
+                { canNotLink ?"": <WordsBtn style="blue"  className="font-16" onClick={()=>this.toDetailPage(`/courses/${coursesId}/polls/${item.id}/detail`)} >查看详情</WordsBtn>}
+                <WordsBtn style="blue"  className="font-16 ml20" to={`/courses/${coursesId}/polls/${item.id}/${"edit"}`}>编辑</WordsBtn>
                 <WordsBtn style="blue" className="ml20 font-16" to={`/courses/${coursesId}/polls/${item.id}/detail?tab=3`}>设置</WordsBtn>
               </ul>
             }
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index 7f56e47ba..88e60a98f 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -377,11 +377,6 @@ class ShixunhomeWorkItem extends Component{
 								<WordsBtn className="btn colorblue  font-16 ml15 fontweight400"  to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>
 							</span>:""}
 
-              {this.props.isStudent===true?this.props.course_identity===5?
-                <a onClick={()=>this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")}
-                   className="btn colorblue colorblue font-16 mr20 fr  mt2">查看详情</a>
-                :"":""
-              }
 
 							{this.props.isStudent===true?this.props.course_identity===5?discussMessage&&discussMessage.shixun_status>1?
                 discussMessage.time_status<5?
@@ -398,6 +393,13 @@ class ShixunhomeWorkItem extends Component{
 								</WordsBtn>:"":"":"":""
 							}
 
+
+              {this.props.isStudent===true?this.props.course_identity===5?
+                <a onClick={()=>this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")}
+                   className="btn colorblue colorblue font-16 mr20 fr  mt2">查看详情</a>
+                :"":""
+              }
+
             </h6>
 
             <div className="cl"></div>