From 51a534823756c31e1c26b08d034a18bd793beeb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 9 Sep 2019 22:27:44 +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/ShowAppraiseList.js        | 87 +++++++++----------
 .../modules/courses/shixunHomework/style.css  | 13 +++
 2 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/ShowAppraiseList.js b/public/react/src/modules/courses/shixunHomework/ShowAppraiseList.js
index 34e978bef..1a5b4a136 100644
--- a/public/react/src/modules/courses/shixunHomework/ShowAppraiseList.js
+++ b/public/react/src/modules/courses/shixunHomework/ShowAppraiseList.js
@@ -2,6 +2,7 @@ import React,{ Component } from "react";
 import { Modal,Checkbox,Upload,Button,Icon,message,Input,Radio} from "antd";
 import { WordNumberTextarea,markdownToHTML } from 'educoder';
 import axios from 'axios';
+import './style.css';
 
 class ShowAppraiseList extends Component{
 	constructor(props){
@@ -15,8 +16,8 @@ class ShowAppraiseList extends Component{
 
 	render(){
 		let {data, work_comment,work_comment_hidden}=this.props;
-		let work_commenttype=work_comment===undefined||work_comment===null||work_comment==="";
-		let work_comment_hiddentype=work_comment===undefined||work_comment===null||work_comment==="";
+		let work_commenttype=this.props&&this.props.isAdmin()===true?false:work_comment===undefined||work_comment===null||work_comment==="";
+		let work_comment_hiddentype=this.props&&this.props.isAdmin()===true?false:work_comment===undefined||work_comment===null||work_comment==="";
 		return(
 			<div>
 				<style>
@@ -34,22 +35,15 @@ class ShowAppraiseList extends Component{
 									text-align: center;
 									line-height: 22px;
 							}
-							.666{
-							    color: #666;
-							    font-size:14px;
-							}
-							.000{
-							    color: #000;
-							    font-size:16px;
-							}
 
+							.markdown-body{
+    							padding-bottom: 10px;
+							}
 							.borderbom{
-							    margin-bottom: 20px;
+							    margin-bottom: 15px;
        						border-bottom: 2px solid #fafafa;
 							}
-							pd30bt{
-							    padding: 30px 30px 0px 30px;
-							}
+
 						`
 					}
 				</style>
@@ -60,39 +54,41 @@ class ShowAppraiseList extends Component{
 							<div className="font-16 color-dark-21 shixunreporttitleboxtop pd20 color333">
 								<span className={"appraisebox"}>总体评阅</span>评阅内容
 
-								{this.props&&this.props.isAdminOrTeacher()===true?<a className="color-blue font-14 fr ml20"
+								{this.props&&this.props.isAdmin()===true?<a className="color-blue font-14 fr ml20"
 																																		 onClick={()=>this.props.isdeleteModal(data.comment_id,true,"main")}
 								>删除</a>:""}
 
-								{this.props&&this.props.isAdminOrTeacher()===true?<a className="color-blue font-14 fr"
+								{this.props&&this.props.isAdmin()===true?<a className="color-blue font-14 fr"
 																																		 onClick={()=>this.props.showAppraiseModal("main",undefined,work_comment,work_comment_hidden)}
 								>编辑</a>:""}
 
 							</div>
 
-							{this.props&&this.props.isAdminOrTeacher()===true?
-								<div className="font-16 color-dark-21 shixunreporttitleboxbom pd30">
+							{this.props&&this.props.isAdmin()===true?
+								<div className="font-16 color-dark-21 shixunreporttitleboxbom pd30bt">
+									<div>
+										<span className={"z000"}>学生可见<span className={"z666"}>（学生可查看老师的评阅内容）</span></span>
+									</div>
+									<div className={"borderbom"} style={{minHeight:'40px'}}>
+										{work_comment===true?"":<div className={"personalsummary"}>
+											<div className={"markdown-body"}
+													 dangerouslySetInnerHTML={{__html: markdownToHTML(work_comment).replace(/▁/g, "▁▁▁")}}></div>
+										</div>}
+									</div>
+
 								<div>
-									<span className={"000"}>学生不可见<span className={"666"}>（仅对课堂老师可见）</span></span>
+									<span className={"z000"}>学生不可见<span className={"z666"}>（仅对课堂老师可见）</span></span>
 								</div>
-									<div className={"borderbom"} style={{minHeight:'50px'}}>
+									<div  style={{minHeight:'40px'}}>
 										{work_comment_hidden===true?"":<div className={"personalsummary"}>
 										<div className={"markdown-body"}
 												 dangerouslySetInnerHTML={{__html: markdownToHTML(work_comment_hidden).replace(/▁/g, "▁▁▁")}}></div>
 									</div>}
 								</div>
-								<div>
-									<span className={"000"}>学生可见<span className={"666"}>（学生可查看老师的评阅内容）</span></span>
-								</div>
-								<div style={{minHeight:'50px'}}>
-									{work_comment===true?"":<div className={"personalsummary"}>
-										<div className={"markdown-body"}
-												 dangerouslySetInnerHTML={{__html: markdownToHTML(work_comment).replace(/▁/g, "▁▁▁")}}></div>
-									</div>}
-								</div>
+
 
 							</div>:<div className="font-16 color-dark-21 shixunreporttitleboxbom pd30">
-								<div style={{minHeight:'50px'}}>
+								<div style={{minHeight:'40px'}}>
 									<div className={"personalsummary"}>
 										<div className={"markdown-body"}
 												 dangerouslySetInnerHTML={{__html: markdownToHTML(work_comment).replace(/▁/g, "▁▁▁")}}></div>
@@ -108,8 +104,8 @@ class ShowAppraiseList extends Component{
 
 
 				{data===undefined?"":data.stage_list.map((item,key)=>{
-					let challenge_comment_hidden=item.challenge_comment_hidden===undefined||item.challenge_comment_hidden===null||item.challenge_comment_hidden==="";
-					let challenge_comment=item.challenge_comment===undefined||item.challenge_comment===null||item.challenge_comment==="";
+					let challenge_comment_hidden=this.props&&this.props.isAdmin()===true?false:item.challenge_comment_hidden===undefined||item.challenge_comment_hidden===null||item.challenge_comment_hidden==="";
+					let challenge_comment=this.props&&this.props.isAdmin()===true?false:item.challenge_comment===undefined||item.challenge_comment===null||item.challenge_comment==="";
 
 					return(
 						<div key={key}>
@@ -118,38 +114,39 @@ class ShowAppraiseList extends Component{
 
 								<div className="font-16 color-dark-21 shixunreporttitleboxtop pd20 color333">
 									<span className={"appraisebox"}>第{key+1}关</span>{item.name}
-									{this.props&&this.props.isAdminOrTeacher()===true?<a className="color-blue font-14 fr ml20"
+									{this.props&&this.props.isAdmin()===true?<a className="color-blue font-14 fr ml20"
 																																			 onClick={()=>this.props.isdeleteModal(item.comment_id,true,"child")}
 									>删除</a>:""}
 
-									{this.props&&this.props.isAdminOrTeacher()===true?<a className="color-blue font-14 fr"
+									{this.props&&this.props.isAdmin()===true?<a className="color-blue font-14 fr"
 																																			 onClick={()=>this.props.showAppraiseModal("child",item.challenge_id,item.challenge_comment,item.challenge_comment_hidden)}
 									>编辑</a>:""}
 								</div>
 
-								{this.props&&this.props.isAdminOrTeacher()===true?
-									<div className="font-16 color-dark-21 shixunreporttitleboxbom pd30">
+								{this.props&&this.props.isAdmin()===true?
+									<div className="font-16 color-dark-21 shixunreporttitleboxbom pd30bt">
 										<div>
-											<span className={"000"}>学生不可见<span className={"666"}>（仅对课堂老师可见）</span></span>
+											<span className={"z000"}>学生可见<span className={"z666"}>（学生可查看老师的评阅内容）</span></span>
 										</div>
-										<div  className={"borderbom"}  style={{minHeight:'50px'}}>
-											{challenge_comment_hidden===true?"":<div className={"personalsummary"}>
+										<div className={"borderbom"} style={{minHeight:'40px'}}>
+											{challenge_comment===true?"":<div className={"personalsummary"}>
 												<div className={"markdown-body"}
-														 dangerouslySetInnerHTML={{__html: markdownToHTML(item.challenge_comment_hidden).replace(/▁/g, "▁▁▁")}}></div>
+														 dangerouslySetInnerHTML={{__html: markdownToHTML(item.challenge_comment).replace(/▁/g, "▁▁▁")}}></div>
 											</div>}
 										</div>
+
 										<div>
-											<span className={"000"}>学生可见<span className={"666"}>（学生可查看老师的评阅内容）</span></span>
+											<span className={"z000"}>学生不可见<span className={"z666"}>（仅对课堂老师可见）</span></span>
 										</div>
-										<div style={{minHeight:'50px'}}>
-											{challenge_comment===true?"":<div className={"personalsummary"}>
+										<div style={{minHeight:'40px'}}>
+											{challenge_comment_hidden===true?"":<div className={"personalsummary"}>
 												<div className={"markdown-body"}
-														 dangerouslySetInnerHTML={{__html: markdownToHTML(item.challenge_comment).replace(/▁/g, "▁▁▁")}}></div>
+														 dangerouslySetInnerHTML={{__html: markdownToHTML(item.challenge_comment_hidden).replace(/▁/g, "▁▁▁")}}></div>
 											</div>}
 										</div>
 
 									</div>:	<div className="font-16 color-dark-21 shixunreporttitleboxbom pd30">
-										<div style={{minHeight:'50px'}}>
+										<div style={{minHeight:'40px'}}>
 											<div className={"personalsummary"}>
 												<div className={"markdown-body"}
 														 dangerouslySetInnerHTML={{__html: markdownToHTML(item.challenge_comment).replace(/▁/g, "▁▁▁")}}></div>
diff --git a/public/react/src/modules/courses/shixunHomework/style.css b/public/react/src/modules/courses/shixunHomework/style.css
index c2affa32c..c3976515b 100644
--- a/public/react/src/modules/courses/shixunHomework/style.css
+++ b/public/react/src/modules/courses/shixunHomework/style.css
@@ -53,4 +53,17 @@
 }
 .ysyslxh{
   background: #fafafa;
+}
+
+.z666{
+    color: #666;
+    font-size:14px;
+}
+.z000{
+    color: #000;
+    font-size:16px;
+}
+
+.pd30bt{
+    padding: 10px 30px 0px 30px;
 }
\ No newline at end of file