From 6787d59ec17161fb8b3cdff304265f6c162b26e5 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 20 Jun 2019 17:17:04 +0800
Subject: [PATCH 01/15] font-16

---
 .../modules/courses/common/titleSearch/TitleSearchSection.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/common/titleSearch/TitleSearchSection.js b/public/react/src/modules/courses/common/titleSearch/TitleSearchSection.js
index c6530e855..4cb69a8d7 100644
--- a/public/react/src/modules/courses/common/titleSearch/TitleSearchSection.js
+++ b/public/react/src/modules/courses/common/titleSearch/TitleSearchSection.js
@@ -62,7 +62,7 @@ class Titlesearchsection extends Component{
           <p className="clearfix padding30 bor-bottom-greyE">
             <p style={{height: '20px'}}>
               <span className="font-18 fl color-dark-21">{title}</span>
-              <li className="fr">
+              <li className="fr font-16">
                 { firstRowRight }
               </li>
             </p>

From 01fd748038d54aa709630d9e48b0445dad287fcf Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 20 Jun 2019 17:19:48 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E5=85=88=E6=B3=A8=E9=87=8A=E4=BA=86?=
 =?UTF-8?q?=EF=BC=8C=E5=BD=B1=E5=93=8D=E5=88=B0=E4=BA=86md=E7=9A=84?=
 =?UTF-8?q?=E6=8B=96=E6=8B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/forums/MemoDetailMDEditor.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/forums/MemoDetailMDEditor.js b/public/react/src/modules/forums/MemoDetailMDEditor.js
index 17bc11212..caf8e5743 100644
--- a/public/react/src/modules/forums/MemoDetailMDEditor.js
+++ b/public/react/src/modules/forums/MemoDetailMDEditor.js
@@ -158,13 +158,15 @@ class MemoDetailMDEditor extends Component {
 						</a>
 					</div>
 					<style>
+						{/* 
+						先注释了，影响到了md的拖拽
 						{
 							`
 							.commentInputs{
    							 height: 250px;
 							}
 							`
-						}
+						} */}
 					</style>
 					<div nhname={`new_message_${memo.id}`} className="commentInput  commentInputs"
 							style={{ padding: '30px',boxSizing:"border-box", display: isInited ? '' : 'none' }} >

From 268baa136d26846078621846f06f97498c732b67 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 20 Jun 2019 19:03:00 +0800
Subject: [PATCH 03/15] canNotLink

---
 .../src/modules/courses/busyWork/CommonWorkItem.js     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkItem.js b/public/react/src/modules/courses/busyWork/CommonWorkItem.js
index 41b873bac..258a06332 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkItem.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkItem.js
@@ -104,6 +104,7 @@ class CommonWorkItem extends Component{
     let coursesId = this.props.match.params.coursesId;
 
     const isStudent = this.props.isStudent()
+    const isAdmin = this.props.isAdmin()
     const isAdminOrStudent = this.props.isAdminOrStudent()
     return(
       <div className="workList">
@@ -128,19 +129,20 @@ class CommonWorkItem extends Component{
         </style>
       {
         mainList && mainList.homeworks.length>0 && mainList.homeworks.map((item,index)=>{
+          let canNotLink = !isAdminOrStudent && item.private_icon == true
           return(
         <div className="mt20 edu-back-white padding02010" key={index} >
           <div className="clearfix">
             <div className="workList_Item">
               {
-                mainList && mainList.course_identity < 5 &&
+                mainList && isAdmin &&
                 <span className="fl mr12"><Checkbox value={item.homework_id}></Checkbox></span>
               }
               <div className="flex1" onClick={() => this.props.onItemClick(Object.assign({}, item, {id: item.homework_id})) }>
                 <p className="clearfix mb20">
                   <a  title={item.name}
-                      className="fl font-16 font-bd mt2 comnonwidth580"
-                      onClick={() => this.onItemClick(item)}
+                      className="fl font-16 font-bd mt2 comnonwidth580" style={{cursor: canNotLink ? 'normal' : 'poninter'}}
+                      onClick={canNotLink ? () => {} : () => this.onItemClick(item)}
                   >{item.name}</a>
                   
               {/* 只有非课堂成员且作业是私有的情况下才会为true */}
@@ -155,7 +157,7 @@ class CommonWorkItem extends Component{
                     <CoursesListType typelist={item.status} />
                   </span>
                   {
-                    mainList && mainList.course_identity < 5 &&
+                    mainList && isAdmin &&
                     <li className="fr drop_down">
                       <i className="iconfont icon-caidan font-16 color-grey-c"></i>
                       <ul className="drop_down_normal" style={{ textAlign: 'center'}}>

From 07e5760e2b0b067e8cb8457836619a95488b45e2 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 20 Jun 2019 19:06:46 +0800
Subject: [PATCH 04/15] this.props.addSuccess

---
 .../graduation/tasks/GraduationTasksappraiseReplyChild.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js
index 094f8d96f..1279b4907 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js
@@ -83,7 +83,7 @@ class GraduationTasksappraiseReplyChild extends Component{
             </div> */}
 
 							{this.props.ultimate===true?"": isAdmin && <GraduationTasksappraiseMainEditor {...this.props}
-																																														addSuccess={this.props.addSuccess()}
+								addSuccess={() => this.props.addSuccess()}																																								
 							></GraduationTasksappraiseMainEditor> }
 							<style>{`
 

From 8a3519e7b1aea9598b6c9ecb86fc74959be3d43d Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 20 Jun 2019 19:23:03 +0800
Subject: [PATCH 05/15] canNotLink

---
 public/react/src/modules/courses/boards/BoardsListItem.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/courses/boards/BoardsListItem.js b/public/react/src/modules/courses/boards/BoardsListItem.js
index fe14d7a7c..089d060a4 100644
--- a/public/react/src/modules/courses/boards/BoardsListItem.js
+++ b/public/react/src/modules/courses/boards/BoardsListItem.js
@@ -26,6 +26,8 @@ class BoardsListItem extends Component{
     if (!discussMessage || !discussMessage.author) {
       return '';
     }
+    let canNotLink = !isAdminOrStudent && discussMessage.is_public == false
+
     return(
         <div className="panel-inner-fourm boardsList">
           <style>{`
@@ -44,8 +46,9 @@ class BoardsListItem extends Component{
           </a>
           <div className="clearfix ds pr pt5 contentSection" onClick={() => onItemClick(discussMessage)}>
             <h6>
-              <a href="javascript:void(0)" className="panel-list-title hide fl mt5 color-dark font-bd" style={{ fontWeight: 'bold' }}
-                onClick={() => this.onTitleClick(discussMessage)}
+              <a href="javascript:void(0)" className="panel-list-title hide fl mt5 color-dark font-bd" 
+                style={{ fontWeight: 'bold', cursor: (canNotLink ? 'default' : 'poninter') }}
+                onClick={canNotLink ? () => {} : () => this.onTitleClick(discussMessage)}
               >{discussMessage.subject}</a>
               { !!discussMessage.sticky && <span className="btn-cir btn-cir-red fl mt5 ml5">置顶</span> }
               {

From 1e99acc02c1c5302d5cd647fdd86754fad318779 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, 20 Jun 2019 19:28:22 +0800
Subject: [PATCH 06/15] =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/Resource/Fileslistitem.js | 83 ++++++++++++++++++-
 .../src/modules/courses/Resource/index.js     | 19 +++--
 .../courses/coursesPublic/SelectResource.js   |  1 +
 .../courses/coursesPublic/SelectSetting.js    |  9 +-
 .../courses/coursesPublic/sendResource.js     |  2 +-
 .../courses/exercise/ExerciseListItem.js      | 50 ++++++-----
 .../graduation/tasks/GraduateTaskItem.js      | 12 ++-
 7 files changed, 142 insertions(+), 34 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index bc79bdada..cc6304481 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -8,6 +8,7 @@ import {getUrl} from 'educoder';
 import moment from 'moment';
 import CoursesListType from '../coursesPublic/CoursesListType';
 import Showoldfiles from "../coursesPublic/Showoldfiles";
+import Modals from '../../modals/Modals';
 
 class Fileslistitem extends Component{
     constructor(props){
@@ -74,7 +75,68 @@ class Fileslistitem extends Component{
             Showoldfiles:false,
         })
     }
-    render(){
+
+		onDelete = (id) => {
+
+			this.setState({
+				Modalstype:true,
+				Modalstopval:"是否确认删除?",
+				ModalCancel:this.cancelmodel,
+				ModalSave:()=>this.savedelete(id),
+			})
+
+		}
+
+	cancelmodel=()=>{
+
+		this.setState({
+			Modalstype:false,
+			Loadtype:false,
+			Modalstopval:"",
+			ModalCancel:"",
+			ModalSave:"",
+			checkBoxValues:[],
+		})
+
+	}
+
+	savedelete=(id)=>{
+
+		this.setState({
+			Modalstype:false,
+		})
+
+
+		const cid = this.props.match.params.coursesId
+		const url = `/files/bulk_delete.json`;
+		axios.delete(url, { data: {
+					course_id:cid,
+					ids: [id],
+				}})
+			.then((response) => {
+				if (response.data.status == 0) {
+					//Modalstopval:response.data.message,
+
+					this.props.updatafiledfun()
+					this.setState({
+						// Modalstype:true,
+						// Modalstopval:"删除成功",
+						ModalsBottomval:"",
+						// ModalSave:this.cancelmodel,
+						// Loadtype:true,
+						checkBoxValues:[],
+						checkAllValue:false
+					})
+
+					this.props.showNotification("删除成功");
+				}
+			})
+			.catch(function (error) {
+				console.log(error);
+			});
+	}
+
+	render(){
 
         const { checkBox,
             discussMessage,
@@ -84,6 +146,16 @@ class Fileslistitem extends Component{
 
         return(
             <div className="graduateTopicList boardsList">
+
+							{/*提示*/}
+							{this.state.Modalstype&&this.state.Modalstype===true?<Modals
+								modalsType={this.state.Modalstype}
+								modalsTopval={this.state.Modalstopval}
+								modalCancel={this.state.ModalCancel}
+								modalSave={this.state.ModalSave}
+								modalsBottomval={this.state.ModalsBottomval}
+								loadtype={this.state.Loadtype}
+							/>:""}
                 <Showoldfiles
                     visible={this.state.Showoldfiles}
                     allfiles={this.state.allfiles}
@@ -178,12 +250,19 @@ class Fileslistitem extends Component{
 
                   {this.props.isAdmin ||this.props.current_user.username===discussMessage.author.name?
                     <span className={"sttingbox"}>
+
                       <WordsBtn style="blue" className="colorblue font-16 mr20 fr">
                         <a className="btn colorblue"
                            onClick={()=>this.settingList()}>设置</a>
                       </WordsBtn>
+
+										  <WordsBtn style="blue" className="colorblue font-16 mr20 fr">
+                        <a className="btn colorblue"
+													 onClick={()=>this.onDelete(discussMessage.id)}>删除</a>
+                      </WordsBtn>
+
                       </span>:""}
-                    <div className="cl"></div>
+
                   <style>
                     {
                       `
diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index ac168d880..5ad4b81d3 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -106,6 +106,14 @@ class Fileslists extends Component{
 
     })
   }
+  updatafiled=()=>{
+  	debugger
+		if(this.props.match.params.main_id){
+			this.seactall();
+		}else if(this.props.match.params.Id){
+			this.seactall(parseInt(this.props.match.params.Id),1)
+		}
+	}
   seactall=(coursesecondcategoryid,type)=>{
 
     this.setState({
@@ -243,8 +251,7 @@ class Fileslists extends Component{
         .then((response) => {
           if (response.data.status == 0) {
             //Modalstopval:response.data.message,
-
-            this.seactall();
+						this.updatafiled()
             this.setState({
               // Modalstype:true,
               // Modalstopval:"删除成功",
@@ -254,7 +261,6 @@ class Fileslists extends Component{
               checkBoxValues:[],
               checkAllValue:false
             })
-						this.props.updataleftNavfun()
             this.props.showNotification("删除成功");
           }
         })
@@ -519,7 +525,7 @@ class Fileslists extends Component{
               checkBoxValues:[],
               // checkAllValue:false
             })
-						this.props.updataleftNavfun()
+						this.updatafiled()
             this.props.showNotification('资源移动成功')
           }
         })
@@ -658,7 +664,7 @@ class Fileslists extends Component{
                 showSearchInput={true}
             ></Titlesearchsection>
 
-            <div className="mt20 edu-back-white padding20-30" style={{display:this.props.isAdmin()||this.props.isStudent()?"":"none"}}>
+						{this.props.isAdmin()? <div className="mt20 edu-back-white padding20-30" style={{display:this.props.isAdmin()||this.props.isStudent()?"":"none"}}>
               <div className="clearfix">
                 {this.props.isAdmin()? <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue}>已选 {checkBoxValues.length} 个</Checkbox>:""}
                 <div className="studentList_operation_ul">
@@ -736,7 +742,7 @@ class Fileslists extends Component{
                   </li>:""}
                 </div>
               </div>
-            </div>
+            </div> :""}
 
             <style>{`
           .padding02010{
@@ -771,6 +777,7 @@ class Fileslists extends Component{
                                 checkBox={<Checkbox value={item.id}></Checkbox>}
                                 Settingtypes={(id)=>this.Settingtypes(id)}
                                 coursesId={this.props.match.params.coursesId}
+																updatafiledfun={()=>this.updatafiled()}
                             ></Fileslistitem>
                           </div>
                         </div>
diff --git a/public/react/src/modules/courses/coursesPublic/SelectResource.js b/public/react/src/modules/courses/coursesPublic/SelectResource.js
index 5c2ab5780..1b400b800 100644
--- a/public/react/src/modules/courses/coursesPublic/SelectResource.js
+++ b/public/react/src/modules/courses/coursesPublic/SelectResource.js
@@ -196,6 +196,7 @@ class Selectresource extends Component{
 	}
 
 	savecouseShixunModal=()=>{
+
 		let {patheditarry}=this.state;
 		let {coursesId,attachmentId}=this.props;
 	   let url="/files/import.json";
diff --git a/public/react/src/modules/courses/coursesPublic/SelectSetting.js b/public/react/src/modules/courses/coursesPublic/SelectSetting.js
index a12099f79..541145fbf 100644
--- a/public/react/src/modules/courses/coursesPublic/SelectSetting.js
+++ b/public/react/src/modules/courses/coursesPublic/SelectSetting.js
@@ -181,6 +181,7 @@ class Selectsetting extends Component{
 	}
 
 	savecouseShixunModal=()=>{
+		debugger
 		let {fileList,is_public,unified_setting,description,datatime,course_groups}=this.state;
 
 		let newfileList=[];
@@ -188,7 +189,7 @@ class Selectsetting extends Component{
 			newfileList.push(list.response.id)
 		}
 
-		if(description===undefined){
+		if(description===undefined||description===null){
 
 		}else if(description.length>100){
 			this.setState({
@@ -512,7 +513,7 @@ class Selectsetting extends Component{
                    .popups{
 												padding-left: 20px;
 												padding-right: 20px;
-										    padding-top: 30px;
+										    padding-top: 20px;
                    }
                 `}</style>
 						<div className="popups">
@@ -696,7 +697,7 @@ class Selectsetting extends Component{
 														id={"startimes"}
 														className={"Selectleft20"}
 														width={"200px"}
-														value={item.publish_time===undefined||item.publish_time===""?"":moment(item.publish_time, dateFormat)}
+														value={item.publish_time===undefined||item.publish_time===""?"":item.publish_time===null?"":moment(item.publish_time, dateFormat)}
 														onChange={(e,index)=>this.onChangeTimepublishs(e,index,key)}
 														// onChange={ this.onChangeTimepublish }
 														disabledTime={disabledDateTime}
@@ -739,7 +740,7 @@ class Selectsetting extends Component{
 							{/*{this.state.course_group_idtypes===true?<p className={"color-red"}>请选择分班</p>:""}*/}
 
 							{/*{course_group_publish_timestype===true?<p className={"color-red mt10"}>请填写完整</p>:""}*/}
-							<textarea  placeholder="请在此输入补交附件的原因，最大限制100个字符" className={"mt10"} value={description} onInput={this.settextarea} style={{
+							<textarea  placeholder="请输入资源描述，最大限制100个字符" className={"mt10"} value={description} onInput={this.settextarea} style={{
 								width: '100%',
 								height:'120px',
 								border:'1px solid rgba(234,234,234,1)',
diff --git a/public/react/src/modules/courses/coursesPublic/sendResource.js b/public/react/src/modules/courses/coursesPublic/sendResource.js
index b56e1f916..544c44286 100644
--- a/public/react/src/modules/courses/coursesPublic/sendResource.js
+++ b/public/react/src/modules/courses/coursesPublic/sendResource.js
@@ -566,7 +566,7 @@ class Sendresource extends Component{
               border:'1px solid rgba(234,234,234,1)',
               padding: '10px'
             }}></textarea>
-            {descriptiontype===true?<p className={"color-red"}>描述不能超过最大限制：100个字符</p>:""}
+            {descriptiontype===true?<p className={"color-red"}>请输入资源描述，最大限制100个字符</p>:""}
             <div className="clearfix mt30 edu-txt-center mb10">
               <a  className="task-btn color-white mr70" onClick={this.props.Cancel}>{this.props.Cancelname}</a>
               <a className="task-btn task-btn-orange" onClick={()=>this.Saves()}>{this.props.Savesname}</a>
diff --git a/public/react/src/modules/courses/exercise/ExerciseListItem.js b/public/react/src/modules/courses/exercise/ExerciseListItem.js
index 43210315d..eb0377022 100644
--- a/public/react/src/modules/courses/exercise/ExerciseListItem.js
+++ b/public/react/src/modules/courses/exercise/ExerciseListItem.js
@@ -85,11 +85,14 @@ class ExerciseListItem extends Component{
               text-overflow: ellipsis;
               white-space: nowrap;
              }
+              .homepagePostSetting {
+								position: absolute;
+							}
             `
 								}
 							</style>
                 <div className="flex1 pr">
-                    <p className="clearfix mb30">
+                    <p className="clearfix mb20">
 
                         {/*<Link to={`/courses/${coursesId}/exercises/${item.id}/exercises/student_exercise_list?tab=0`} className="fl font-16 font-bd mt2 color-grey-3 task-hide" style={{"maxWidth":"600px"}}>{item.exercise_name}</Link>*/}
                         {
@@ -132,7 +135,7 @@ class ExerciseListItem extends Component{
                         {/*</ul>*/}
                         {/*</li>*/}
                     </p>
-              <p className="color-grey-9 clearfix">
+                  <p className="color-grey-9 clearfix">
                       {item.exercise_status===1?"":<span className="mr20 fl">{item.exercise_answer} 已答</span>}
                       {item.exercise_status===1?"":<span className="mr20 fl">{item.exercise_unanswer} 未答</span>}
                         {item.unreview_count===null||item.exercise_status===1?"":<span className="mr20 fl">{item.unreview_count} 未评数</span> }
@@ -161,23 +164,32 @@ class ExerciseListItem extends Component{
                           {/*item.exercise_status ==2?"":*/}
                           {/*<span className="mr20 fl"> 发布于{moment(item.exercise_left_time).fromNow()} </span>*/}
                         {/*}*/}
-                    </p>
-                    {
-                        IsAdmin &&
-                        <div className="homepagePostSetting" style={{"right":"0px","top":"-5px","position":"absolute","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">
-                                        <li> <Link  className="" to={`/courses/${coursesId}/exercises/${item.id}/edit`}>编辑</Link></li>
-                                        <li> <a  className="" href={`
-                                        /courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=3`
-                                        }>设置</a></li>
-                                    </ul>
-                                </li>
-                            </ul>
-                        </div>
-                    }
+
+
+										{ IsAdmin &&<div className="homepagePostSetting" style={{"right":"-17px","top":"51px","display":"block","width":"100px"}}>
+											<a className="btn colorblue font-16" href={`/courses/${coursesId}/exercises/${item.id}/edit`} target={"_blank"}>编辑</a>
+											<a  className="btn colorblue ml20 font-16" href={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=3`}>设置</a>
+										</div> }
+
+									</p>
+                    {/*{*/}
+                        {/*IsAdmin &&*/}
+                        {/*<div className="homepagePostSetting" style={{"right":"0px","top":"-5px","position":"absolute","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">*/}
+                                        {/*<li> <Link  className="" to={`/courses/${coursesId}/exercises/${item.id}/edit`}>编辑</Link></li>*/}
+                                        {/*<li> <a  className="" href={`*/}
+                                        {/*/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=3`*/}
+                                        {/*}>设置</a></li>*/}
+                                    {/*</ul>*/}
+                                {/*</li>*/}
+                            {/*</ul>*/}
+                        {/*</div>*/}
+                    {/*}*/}
+
+
                     {
                         IsStudent &&
                         <div className="homepagePostSetting" style={{"right":"0px","top":"62px","position":"absolute","display":"block"}}>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
index 3e3259a72..ef23674fe 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
@@ -234,12 +234,20 @@ class GraduateTaskItem extends Component{
               </span>
             </p>
 
-
+						<style>
+							{
+								`
+								.mrf4{
+								    margin-right: -4px;
+								}
+								`
+							}
+						</style>
 
             {this.props.isAdmin?
 
               <div className="mt13">
-                  <WordsBtn  style="blue" to={"/courses/"+coursesId+"/graduation_tasks/"+taskid+"/edit"} className="colorblue font-16 mr20 fr">
+                  <WordsBtn  style="blue" to={"/courses/"+coursesId+"/graduation_tasks/"+taskid+"/edit"} className="colorblue font-16  mrf4 fr">
                      <a className="btn colorblue">编辑</a>
                   </WordsBtn>
                   <WordsBtn  style="blue" to={"/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/"+taskid+"/setting"} className="colorblue font-16 mr20 fr">

From 2141b068f97e5f6830be88fe19fa4766ba544ca5 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, 20 Jun 2019 19:33:55 +0800
Subject: [PATCH 07/15] =?UTF-8?q?=E6=AF=95=E8=AE=BE=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tasks/GraduationTaskssetting.js           | 46 ++++++++++---------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
index a002911ec..9ef3d7091 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
@@ -480,7 +480,7 @@ class GraduationTaskssettingapp extends Component{
   saveTaskssetting=()=>{
 
 
-    let {latepenalty,hascommit,minnums,max_nums,publish_time,end_time,crosscomment,latetime}=this.state;
+    let {latepenalty,hascommit,minnums,max_nums,publish_time,end_time,crosscomment,latetime,starttimetype}=this.state;
     if(latepenalty===undefined){
       this.setState({
         latepenaltytype:true,
@@ -500,19 +500,19 @@ class GraduationTaskssettingapp extends Component{
     }
 
 
-
-    if(moment(publish_time) <= moment()){
-      this.setState({
-        publishTimetypes:true,
-        publishTimetypesval:"发布时间不能早于当前时间",
-      })
-      return
-    }else{
-      this.setState({
-        publishTimetypes:false
-      })
-    }
-
+		if(starttimetype===false) {
+			if (moment(publish_time) <= moment()) {
+				this.setState({
+					publishTimetypes: true,
+					publishTimetypesval: "发布时间不能早于当前时间",
+				})
+				return
+			} else {
+				this.setState({
+					publishTimetypes: false
+				})
+			}
+		}
 
 
     if(moment(end_time)<moment(publish_time)){
@@ -583,15 +583,17 @@ class GraduationTaskssettingapp extends Component{
 
     }
 
+		if(starttimetype===false){
+			if(publish_time===null||publish_time=== ""){
+				this.setState({
+					publishTimetypes:true,
+					publishTimetypesval:"发布时间不能为空",
+				})
+				this.scrollToAnchor("publishtimestart");
+				return
+			}
+		}
 
-     if(publish_time===null||publish_time=== ""){
-			 this.setState({
-				 publishTimetypes:true,
-				 publishTimetypesval:"发布时间不能为空",
-			 })
-			 this.scrollToAnchor("publishtimestart");
-       return
-     }
 
 
 

From e96f90c444b178328ffe437bce213607b526e18c Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 20 Jun 2019 20:05:37 +0800
Subject: [PATCH 08/15] =?UTF-8?q?=E5=AD=90=E5=9B=9E=E5=A4=8D=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/boards/BoardsListItem.js | 7 ++++---
 public/react/src/modules/courses/common/courseMessage.css | 2 +-
 public/react/src/modules/forums/MemoDetailMDEditor.js     | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/public/react/src/modules/courses/boards/BoardsListItem.js b/public/react/src/modules/courses/boards/BoardsListItem.js
index 089d060a4..c25c541e8 100644
--- a/public/react/src/modules/courses/boards/BoardsListItem.js
+++ b/public/react/src/modules/courses/boards/BoardsListItem.js
@@ -1,6 +1,7 @@
 import React,{ Component } from "react";
 import {Tooltip} from 'antd'
 import moment from 'moment'
+import { getUrl } from 'educoder'
 class BoardsListItem extends Component{
   constructor(props){
     super(props);
@@ -37,11 +38,11 @@ class BoardsListItem extends Component{
             }
           `}</style>
           { checkBox }
-          <a href="/users/innov" alt="用户" style={{"width":"50px","height":"50px","display":"block", margin: "0 10px"}}>
+          <a href={`/users/${discussMessage.author.login}`} alt="用户" style={{"width":"50px","height":"50px","display":"block", margin: "0 10px"}}>
             {/* /images/avatars/User/1?1529221779 */}
             <img 
               alt="1?1529221779" className="panel-list-img mr15" height="50"
-              src={`/images/${discussMessage.author.image_url}`} width="50"
+              src={`${getUrl()}/images/${discussMessage.author.image_url}`} width="50"
             ></img>
           </a>
           <div className="clearfix ds pr pt5 contentSection" onClick={() => onItemClick(discussMessage)}>
@@ -62,7 +63,7 @@ class BoardsListItem extends Component{
             <div className="cl"></div>
             <p className="color-grey panel-lightgrey mt10 fl">
               <span className="mr50">
-                <a href="/users/innov" className="panel-name-small hide fl mr15 mr30 color-grey3">{discussMessage.author.name}</a>
+                <a href={`/users/${discussMessage.author.login}`} className="panel-name-small hide fl mr15 mr30 color-grey3">{discussMessage.author.name}</a>
 
                 { discussMessage.total_replies_count != 0 && <span className="mr15 color-grey9">{discussMessage.total_replies_count} 回复</span> }
                 { discussMessage.total_praises_count != 0 && <span className="mr15 color-grey9">{discussMessage.total_praises_count} 点赞</span> }
diff --git a/public/react/src/modules/courses/common/courseMessage.css b/public/react/src/modules/courses/common/courseMessage.css
index c928162f4..db2381d37 100644
--- a/public/react/src/modules/courses/common/courseMessage.css
+++ b/public/react/src/modules/courses/common/courseMessage.css
@@ -17,7 +17,7 @@
 }
 /* 子回复按钮 */
 .course-message .reply_to_message a.commentsbtn.task-btn-blue {
-  margin-right: 50px;
+  /* margin-right: 50px; */
 }
 /* 改边距 */
 /* .course-message .commentsDelegateParent {
diff --git a/public/react/src/modules/forums/MemoDetailMDEditor.js b/public/react/src/modules/forums/MemoDetailMDEditor.js
index caf8e5743..ebb61b1b7 100644
--- a/public/react/src/modules/forums/MemoDetailMDEditor.js
+++ b/public/react/src/modules/forums/MemoDetailMDEditor.js
@@ -169,7 +169,7 @@ class MemoDetailMDEditor extends Component {
 						} */}
 					</style>
 					<div nhname={`new_message_${memo.id}`} className="commentInput  commentInputs"
-							style={{ padding: '30px',boxSizing:"border-box", display: isInited ? '' : 'none' }} >
+							style={{ padding: '30px',boxSizing:"border-box", display: isInited ? '' : 'none', paddingBottom: '40px' }} >
 						<div id="memo_comment_editorMd" className="editorMD" style={{ marginBottom: '0px'
 								, border: errorMsg ? '1px solid red' : '1px solid #ddd'}}>
 								<textarea style={{'display': 'none'}}>
@@ -180,7 +180,7 @@ class MemoDetailMDEditor extends Component {
     							marginLeft: '4px'}}>{errorMsg}</span> }
 						<a id={`new_message_submit_btn_${memo.id}`} href="javascript:void(0)" 
 								onClick={this.onCommit} className="commentsbtn task-btn task-btn-blue fr">
-								发送
+								{this.props.buttonText || '发送'}
 						</a>
 					</div>
 				</React.Fragment>

From 0248bc7e6c0bf01f32b315faf4445e688375e7e6 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 20 Jun 2019 20:09:37 +0800
Subject: [PATCH 09/15] markdown css

---
 public/react/src/modules/comment/Comments.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/comment/Comments.js b/public/react/src/modules/comment/Comments.js
index 50368d60a..db59ddee8 100644
--- a/public/react/src/modules/comment/Comments.js
+++ b/public/react/src/modules/comment/Comments.js
@@ -225,7 +225,7 @@ class Comments extends Component {
 
 					<div className="comment_content  clearfix" id={`reply_content_${item.id}`}>
 						<div className="color-grey-3" id={`reply_content_${item.id}`}>
-							<div className={"break_word_comments"} dangerouslySetInnerHTML={{__html: _content}}></div>
+							<div className={"break_word_comments markdown-body"} dangerouslySetInnerHTML={{__html: _content}}></div>
 							<div className="cl"></div>
 						</div>
 					</div>
@@ -326,7 +326,7 @@ class Comments extends Component {
 										{ item.hidden && ((this.props.onlySuperAdminCouldHide && !item.isSuperAdmin) 
 												|| !this.props.onlySuperAdminCouldHide && item.admin === false && (item.manager === false || item.manager == undefined))
 											? <p className="color-orange font-16">违规评论已被屏蔽！</p>
-											: <div  className={"break_word_comments"} dangerouslySetInnerHTML={{__html: _content}}></div>
+											: <div  className={"break_word_comments  markdown-body"} dangerouslySetInnerHTML={{__html: _content}}></div>
 										}
 										<div className="cl"></div>
 									</div>

From b36c238545a9f241c476215e8b521445e9c6a0f6 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 20 Jun 2019 20:17:41 +0800
Subject: [PATCH 10/15] mr

---
 public/react/src/modules/comment/Comment.css                    | 1 +
 public/react/src/modules/comment/Comments.js                    | 2 +-
 .../src/modules/tpm/shixunchild/ShixunDiscuss/ShixunDiscuss.js  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/comment/Comment.css b/public/react/src/modules/comment/Comment.css
index 61e8b2f8b..f7b52366d 100644
--- a/public/react/src/modules/comment/Comment.css
+++ b/public/react/src/modules/comment/Comment.css
@@ -236,6 +236,7 @@
     /* line-height: 14px; */
     width: 100%;
     word-wrap: break-word;
+    margin-bottom: 4px;
 }
 .childComment .break_word_comments{
     line-height: 22px;
diff --git a/public/react/src/modules/comment/Comments.js b/public/react/src/modules/comment/Comments.js
index db59ddee8..42fea091c 100644
--- a/public/react/src/modules/comment/Comments.js
+++ b/public/react/src/modules/comment/Comments.js
@@ -168,7 +168,7 @@ class Comments extends Component {
 						}
 					</div>
 
-					<p className="fr mr10 orig_reply lineh-20">
+					<p className="fr  orig_reply lineh-20">
 							<span id="hidden_discuss_btn_952">
 							</span>
 
diff --git a/public/react/src/modules/tpm/shixunchild/ShixunDiscuss/ShixunDiscuss.js b/public/react/src/modules/tpm/shixunchild/ShixunDiscuss/ShixunDiscuss.js
index 31594aa96..4e9470f89 100644
--- a/public/react/src/modules/tpm/shixunchild/ShixunDiscuss/ShixunDiscuss.js
+++ b/public/react/src/modules/tpm/shixunchild/ShixunDiscuss/ShixunDiscuss.js
@@ -88,7 +88,7 @@ class ShixunDiscuss extends Component {
                                                                   <a href={i.user.user_url} className="content-username hide fl">{i.user.name}</a>
                                                                   <span className="t_area fl">{i.time}</span>
                                                               </div>
-                                                              <p className="fr mr10 orig_reply lineh-20">
+                                                              <p className="fr  orig_reply lineh-20">
                                                                   <span id="hidden_discuss_btn_952"></span>
                                                                   <a className="color-grey-8">
                                                                       <i className="iconfont icon-jiangli fl mt2"></i>

From e0668cea7c6785184b54723d274fc00c417a412e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 21 Jun 2019 01:03:26 +0800
Subject: [PATCH 11/15] =?UTF-8?q?=E6=AF=95=E8=AE=BE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/Resource/Fileslistitem.js |  46 +--
 .../src/modules/courses/Resource/index.js     |   4 +-
 .../courses/coursesHome/coursesHomeCard.js    | 272 +++++++++---------
 .../graduation/tasks/GraduateTaskItem.js      |   5 +-
 .../tasks/GraduationTasksSubmitedit.js        |   2 +-
 .../tasks/GraduationTasksSubmitnew.js         |   2 +-
 .../tasks/GraduationTasksappraise.js          |  10 +-
 .../tasks/GraduationTasksappraiseReply.js     |   4 +-
 .../graduation/tasks/GraduationTasksedit.js   |  13 +-
 .../tasks/GraduationTaskssetting.js           |  52 ++--
 .../tasks/GraduationTaskssettinglist.js       |  64 +++--
 .../tasks/GraduationTaskssettingquestions.js  |   4 +-
 public/react/src/modules/forums/PostItem.js   | 208 +++++++-------
 13 files changed, 360 insertions(+), 326 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index cc6304481..dd37c441c 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -248,20 +248,7 @@ class Fileslistitem extends Component{
                     }
                   </style>
 
-                  {this.props.isAdmin ||this.props.current_user.username===discussMessage.author.name?
-                    <span className={"sttingbox"}>
 
-                      <WordsBtn style="blue" className="colorblue font-16 mr20 fr">
-                        <a className="btn colorblue"
-                           onClick={()=>this.settingList()}>设置</a>
-                      </WordsBtn>
-
-										  <WordsBtn style="blue" className="colorblue font-16 mr20 fr">
-                        <a className="btn colorblue"
-													 onClick={()=>this.onDelete(discussMessage.id)}>删除</a>
-                      </WordsBtn>
-
-                      </span>:""}
 
                   <style>
                     {
@@ -269,25 +256,28 @@ class Fileslistitem extends Component{
                        .lightgreybox{
                           min-width: 260px;
                        }
+                       .mrf2{
+                       margin-top: -2px;
+                       }
                       `
                     }
                   </style>
                   {discussMessage.course_groups.length===0?"":
-                  <p className="color-grey panel-lightgrey mt8 fl lightgreybox">
+                  <p className="color-grey panel-lightgrey mt8 fl lightgreybox" style={{width:'100%'}}>
                     {discussMessage.course_groups.map((item,key)=>{
                     return(
                       <div className="mr50">
                         <span className="mr15 color-dark">{item.course_group_name}</span>
-                        <span className="mr15 color-grey9 fr">发布于 { moment(item.course_group_publish_time).format('YYYY-MM-DD hh:mm')}</span>
+                        <span className="mr15 color-grey9 ">将发布于 { moment(item.course_group_publish_time).format('YYYY-MM-DD hh:mm')}</span>
                       </div>
                     )
                     })}
 
                   </p>}
 
-                    <p className="color-grey panel-lightgrey mt8 fl" style={{width:'70%'}}>
+                    <p className="color-grey panel-lightgrey mt8 fl" style={{width:'100%'}}>
                       <span className="mr50">
-                        <span className="mr15 color-dark">{discussMessage.author.name}</span>
+                        <span className="mr15 color-dark">{discussMessage.author.login}</span>
                         <span className="mr15 color-grey9">大小 {discussMessage.filesize}</span>
                         <span className="mr15 color-grey9">下载 {discussMessage.downloads_count}</span>
                         <span className="mr15 color-grey9">引用 {discussMessage.quotes}</span>
@@ -299,15 +289,31 @@ class Fileslistitem extends Component{
                            { discussMessage.publish_time===null?"":discussMessage.is_publish===true?moment(discussMessage.publish_time).fromNow():moment(discussMessage.publish_time).format('YYYY-MM-DD hh:mm')}
                         </span>
                       </span>
+											{this.props.isAdmin ||this.props.current_user.login===discussMessage.author.login?
+												<span className={"fr mrf2"}>
+
+                      <WordsBtn style="blue" className="colorblue font-16 mr20 fr">
+                        <a className="btn colorblue"
+													 onClick={()=>this.settingList()}>设置</a>
+                      </WordsBtn>
+
+										  <WordsBtn style="blue" className="colorblue font-16 mr20 fr">
+                        <a className="btn colorblue"
+													 onClick={()=>this.onDelete(discussMessage.id)}>删除</a>
+                      </WordsBtn>
+
+                      </span>:""}
                     </p>
 
 
 
                     <p className="color-grey panel-lightgrey mt8 fl" style={{width:'100%'}}>
                       <span className="mr50">
-                          <span className="mr15 color-dark">资源描述 :</span>
-                          <span className="mr15 color-dark">{discussMessage.description}</span>
-                          {this.props.isAdmin ?<span><i className="iconfont icon-bianjidaibeijing font-22 color-green"  onClick={()=>this.settingList()}></i></span>:""}
+                          {/*<span className="mr15 color-dark"></span>*/}
+                          <span  className="mr15 color-dark">
+														<pre>资源描述 :{discussMessage.description===null?"暂无描述":discussMessage.description}</pre>
+                          </span>
+                          {/*{this.props.isAdmin ?<span><i className="iconfont icon-bianjidaibeijing font-22 color-green"  onClick={()=>this.settingList()}></i></span>:""}*/}
                       </span>
                     </p>
 
diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index 5ad4b81d3..2cc5dbafb 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -655,8 +655,8 @@ class Fileslists extends Component{
                 secondRowLeft={
                   <div style={{"display":"inline-block", "marginTop": "22px"}}>
                     <span>共 {total_count} 个资源</span>
-                    <span style={{"marginLeft":"16px"}}>公共资源：{public_count}个</span>
-                    {this.props.isAdmin()||this.props.isStudent()?<span style={{"marginLeft":"16px"}}>私有资源：{private_count}个</span>:""}
+                    <span style={{"marginLeft":"16px"}}>已发布：{public_count}个</span>
+                    {this.props.isAdmin()||this.props.isStudent()?<span style={{"marginLeft":"16px"}}>未发布：{private_count}个</span>:""}
                   </div>
                 }
                 onPressEnter={this.onPressEnter}
diff --git a/public/react/src/modules/courses/coursesHome/coursesHomeCard.js b/public/react/src/modules/courses/coursesHome/coursesHomeCard.js
index 3f6d565cf..c5f6aeca7 100644
--- a/public/react/src/modules/courses/coursesHome/coursesHomeCard.js
+++ b/public/react/src/modules/courses/coursesHome/coursesHomeCard.js
@@ -1,136 +1,136 @@
-import React, { Component } from 'react';
-import {getImageUrl} from 'educoder';
-import { BrowserRouter as Router, Route, Link } from "react-router-dom";
-import {Tooltip,Spin,Alert} from 'antd';
-import ShowSpin from '../../../common/ShowSpin';
-
-class coursesHomeCard extends Component{
-  constructor(props) {
-    super(props)
-  }
-  render(){
-    let {coursesHomelist}=this.props;
-
-   return(
-      <div className="educontent mb20" id="subjects_list_content">
-        <style>
-          {`
-              .square-Item .square-img img {
-                  width: 60px;
-                  border-radius: 6px 6px 0px 0px;
-                  vertical-align: bottom;
-                  height: 60px;
-                  border-radius: 50%;
-                 }`
-          }
-        </style>
-          <div className="square-list clearfix">
-
-          {/*<ShowSpin/>*/}
-
-            {
-            coursesHomelist===undefined?"":coursesHomelist.courses.map((item,key)=>{
-
-
-                  return(
-                      <div className = "square-Item" style={{cursor:'pointer'}} key={key}>
-
-                          <div className={item.is_public===0&&item.is_accessible === false ? "closeSquare" : "none"}>
-                              <img src={getImageUrl("images/educoder/icon/lockclose.svg")}
-                              className="mt80 mb25"/>
-                              <p className="font-14 color-white">非成员不能访问</p>
-                          </div>
-                           <Link to={item.first_category_url} className="square-img" target="_blank">
-                             {
-                               item.is_public===1&&item.id===1309?
-                                 <div>
-                                   <div className = "publicpart orangeBlack"></div>
-                                   <span className="smalltrangle"></span>
-                                   <span className={"publicword"}> 公开 </span>
-                                 </div>
-                               :""
-                             }
-                             {
-                               item.is_public===1&&item.id!=1309?
-                                 <div>
-                                   <div className = "publicpart"></div>
-                                   <span className="smalltrangle"></span>
-                                   <span className={"publicword"}> 公开 </span>
-                                 </div>
-                                 :""
-                             }
-                             {item.is_end===true?<p  className="fr squareIconSpan mt10 biaoqiancours">
-                                 <i className="iconfont icon-biaoqian fl memberscount"></i>
-                                 <div className={"coursesover"}>已结束</div>
-                             </p>:""}
-                          <div className="substance">
-
-                              <p className="subName font-16">
-                                {/*{item.name.length>32?*/}
-                                  {/*<Tooltip placement="bottom" >*/}
-                                    {/**/}
-                                  {/*</Tooltip>: <span>{item.name}</span>}*/}
-                                <span title={item.name.length>23?item.name:""}>{item.name}</span>
-                              </p>
-
-                              <span className={"color-dark"}>
-                                 <img alt="用户" className="radius mt15" height="60" src={getImageUrl(`${"images/"+item.avatar_url}`)}  width="60"/>
-                              </span>
-
-                              <p className="font-14 mt10"><span className={"color-dark"}>{item.creator} {item.technical_title}</span></p>
-                              <p className="font-16 mb15 task-hide mt10">
-
-                              <Tooltip placement="bottom" title={item.school}>
-                                 <span className="color-grey-98">{item.school}</span>
-                              </Tooltip>
-
-                              </p>
-                          </div>
-
-                          <div className="edu-txt-center course-bottom">
-                              <div className="inline color-grey-B4">
-                                {item.visits===0?"":<span  className="fl ml10 mr10 squareIconSpan">
-                                  <Tooltip placement="bottom" title="访问量">
-                                        <i className="iconfont icon-liulanyan fl mr3"></i>{item.visits}
-                                  </Tooltip>
-
-                                </span>}
-
-                                {item.course_members_count===0?"":<span className="fl ml10 mr10 squareIconSpan">
-                                  <Tooltip placement="bottom" title="成员">
-                                      <i className="iconfont icon-chengyuan fl mr3"></i>{item.course_members_count}
-                                  </Tooltip>
-                               </span>}
-
-                                {item.tasks_count===0?"":<span className="fl ml10 mr10 squareIconSpan">
-                                  <Tooltip placement="bottom" title="作业">
-                                      <i className="iconfont icon-zuoye fl mr3"></i>{item.tasks_count}
-                                  </Tooltip>
-                                  </span>}
-
-                              {/*<span className="fl ml10 mr10 squareIconSpan">*/}
-
-                              {/*<Tooltip placement="bottom" title="资源">*/}
-                                  {/*<i className="iconfont icon-ziyuan fl mr3"></i>{item.attachment_count}*/}
-                              {/*</Tooltip>*/}
-
-                              {/*</span>*/}
-
-                              </div>
-                          </div>
-                        </Link>
-                      </div>
-                  )
-              })
-          }
-
-
-
-
-      </div>
-      </div>
-          )
-        }
-      }
-export default coursesHomeCard;
-
+import React, { Component } from 'react';
+import {getImageUrl} from 'educoder';
+import { BrowserRouter as Router, Route, Link } from "react-router-dom";
+import {Tooltip,Spin,Alert} from 'antd';
+import ShowSpin from '../../../common/ShowSpin';
+
+class coursesHomeCard extends Component{
+  constructor(props) {
+    super(props)
+  }
+  render(){
+    let {coursesHomelist}=this.props;
+
+   return(
+      <div className="educontent mb20" id="subjects_list_content">
+        <style>
+          {`
+              .square-Item .square-img img {
+                  width: 60px;
+                  border-radius: 6px 6px 0px 0px;
+                  vertical-align: bottom;
+                  height: 60px;
+                  border-radius: 50%;
+                 }`
+          }
+        </style>
+          <div className="square-list clearfix">
+
+          {/*<ShowSpin/>*/}
+
+            {
+            coursesHomelist===undefined?"":coursesHomelist.courses.map((item,key)=>{
+
+
+                  return(
+                      <div className = "square-Item" style={{cursor:'pointer'}} key={key}>
+
+                          <div className={item.is_public===0&&item.is_accessible === false ? "closeSquare" : "none"}>
+                              <img src={getImageUrl("images/educoder/icon/lockclose.svg")}
+                              className="mt80 mb25"/>
+                              <p className="font-14 color-white">非成员不能访问</p>
+                          </div>
+                           <a href={item.first_category_url} className="square-img" target="_blank">
+                             {
+                               item.is_public===1&&item.id===1309?
+                                 <div>
+                                   <div className = "publicpart orangeBlack"></div>
+                                   <span className="smalltrangle"></span>
+                                   <span className={"publicword"}> 公开 </span>
+                                 </div>
+                               :""
+                             }
+                             {
+                               item.is_public===1&&item.id!=1309?
+                                 <div>
+                                   <div className = "publicpart"></div>
+                                   <span className="smalltrangle"></span>
+                                   <span className={"publicword"}> 公开 </span>
+                                 </div>
+                                 :""
+                             }
+                             {item.is_end===true?<p  className="fr squareIconSpan mt10 biaoqiancours">
+                                 <i className="iconfont icon-biaoqian fl memberscount"></i>
+                                 <div className={"coursesover"}>已结束</div>
+                             </p>:""}
+                          <div className="substance">
+
+                              <p className="subName font-16">
+                                {/*{item.name.length>32?*/}
+                                  {/*<Tooltip placement="bottom" >*/}
+                                    {/**/}
+                                  {/*</Tooltip>: <span>{item.name}</span>}*/}
+                                <span title={item.name.length>23?item.name:""}>{item.name}</span>
+                              </p>
+
+                              <span className={"color-dark"}>
+                                 <img alt="用户" className="radius mt15" height="60" src={getImageUrl(`${"images/"+item.avatar_url}`)}  width="60"/>
+                              </span>
+
+                              <p className="font-14 mt10"><span className={"color-dark"}>{item.creator} {item.technical_title}</span></p>
+                              <p className="font-16 mb15 task-hide mt10">
+
+                              <Tooltip placement="bottom" title={item.school}>
+                                 <span className="color-grey-98">{item.school}</span>
+                              </Tooltip>
+
+                              </p>
+                          </div>
+
+                          <div className="edu-txt-center course-bottom">
+                              <div className="inline color-grey-B4">
+                                {item.visits===0?"":<span  className="fl ml10 mr10 squareIconSpan">
+                                  <Tooltip placement="bottom" title="访问量">
+                                        <i className="iconfont icon-liulanyan fl mr3"></i>{item.visits}
+                                  </Tooltip>
+
+                                </span>}
+
+                                {item.course_members_count===0?"":<span className="fl ml10 mr10 squareIconSpan">
+                                  <Tooltip placement="bottom" title="成员">
+                                      <i className="iconfont icon-chengyuan fl mr3"></i>{item.course_members_count}
+                                  </Tooltip>
+                               </span>}
+
+                                {item.tasks_count===0?"":<span className="fl ml10 mr10 squareIconSpan">
+                                  <Tooltip placement="bottom" title="作业">
+                                      <i className="iconfont icon-zuoye fl mr3"></i>{item.tasks_count}
+                                  </Tooltip>
+                                  </span>}
+
+                              {/*<span className="fl ml10 mr10 squareIconSpan">*/}
+
+                              {/*<Tooltip placement="bottom" title="资源">*/}
+                                  {/*<i className="iconfont icon-ziyuan fl mr3"></i>{item.attachment_count}*/}
+                              {/*</Tooltip>*/}
+
+                              {/*</span>*/}
+
+                              </div>
+                          </div>
+                        </a>
+                      </div>
+                  )
+              })
+          }
+
+
+
+
+      </div>
+      </div>
+          )
+        }
+      }
+export default coursesHomeCard;
+
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
index ef23674fe..942fa96ca 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
@@ -185,18 +185,21 @@ class GraduateTaskItem extends Component{
 
               {
                 this.props.isAdmin?<a href={"/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/"+taskid+"/list"}
+																			title={discussMessage.name}
                                       className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
               }
               {
                 this.props.isStudent? <a href={"/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/"+taskid+"/list"}
+																				 title={discussMessage.name}
                                            className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
               }
 
               {
             this.props.isNotMember?this.props.discussMessage.private_icon===true?
-                  <span className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</span>
+                  <span className="fl mt3 font-16 font-bd color-dark maxwidth580" title={discussMessage.name}>{discussMessage.name}</span>
                   :
                   <a href={"/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/"+taskid+"/list"}
+										 title={discussMessage.name}
                      className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
               }
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
index a708939ba..ec1cf4e48 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
@@ -473,7 +473,7 @@ class GraduationTasksSubmitedit extends Component{
                 {/*<Link to={"/courses/"+courseId+"/graduation/graduation_tasks/"+category_id} className="color-grey-6">{workslist&&workslist.task_name}</Link>*/}
                 {/*<span className="color-grey-9 ml3 mr3">&gt;</span>*/}
                 {/*</WordsBtn>*/}
-                <span>{this.props.user.username} 提交作品</span>
+                <span>{this.props.user&&this.props.user.username} 提交作品</span>
               </p>
 
               <div style={{ width:'100%',height:'75px'}} >
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index 2a0ffa8fb..e1284832c 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
@@ -459,7 +459,7 @@ render(){
           {/*<Link to={"/courses/"+courseId+"/graduation/graduation_tasks/"+category_id} className="color-grey-6">{workslist&&workslist.task_name}</Link>*/}
           {/*<span className="color-grey-9 ml3 mr3">&gt;</span>*/}
         {/*</WordsBtn>*/}
-        <span>{this.props.user.username} 提交作品</span>
+        <span>{this.props.user&&this.props.user.username} 提交作品</span>
       </p>
 
       <div style={{ width:'100%',height:'75px'}} >
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
index a76354481..374318af1 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
@@ -234,11 +234,11 @@ class GraduationTasksappraise extends Component{
 
                   <div className={"color-grey-6 h20 ml20"}>
 
-                      <span className={"color9B9B fr"}>更新</span>
-                      <span className={"fr font-13 mr10 ml10"}>{datalist&&datalist.update_user_name}</span>
-                      <span className={"color9B9B fr"}>
-                        {moment(datalist&&datalist.update_time).format('YYYY-MM-DD HH:mm:ss')==="Invalid date"?"":moment(datalist&&datalist.update_time).format('YYYY-MM-DD HH:mm:ss')}
-                      </span>
+                      {/*<span className={"color9B9B fr"}>更新</span>*/}
+                      {/*<span className={"fr font-13 mr10 ml10"}>{datalist&&datalist.update_user_name}</span>*/}
+                      {/*<span className={"color9B9B fr"}>*/}
+                        {/*{moment(datalist&&datalist.update_time).format('YYYY-MM-DD HH:mm:ss')==="Invalid date"?"":moment(datalist&&datalist.update_time).format('YYYY-MM-DD HH:mm:ss')}*/}
+                      {/*</span>*/}
                       <span className={"color9B9B fr mr30"}>提交</span>
                       <span className={"fr font-13 mr10 ml10"}>{datalist&&datalist.author_name}</span>
                       <span className={" color9B9B fr"}>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js
index 69ab8ba79..1c733868e 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js
@@ -124,8 +124,9 @@ class GraduationTasksappraiseReply extends Component{
   saveModulationModal=(value,num)=>{
     console.log(value,num)
     let {operationId}=this.state;
+		let category_id= this.props.match.params.category_id;
     // console.log(value,num)
-    let url ="/graduation_works/"+operationId+"/adjust_score.json";
+    let url ="/graduation_works/"+category_id+"/adjust_score.json";
     axios.post(url,{
       score:num,
       comment:value
@@ -138,6 +139,7 @@ class GraduationTasksappraiseReply extends Component{
           Modalstopval:result.data.message,
           ModalSave:this.cancelmodel,
         })
+				this.fetchAllComments()
       }
 
     }).catch((error)=>{
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index 8bd55dea9..36c2f9d3f 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -18,7 +18,7 @@ class GraduationTasksedit extends Component{
     this.state={
       coursename:"",
       coursesearch:"",
-      title_num:20,
+      title_num:60,
       title_value:"",
       fileList: [],
       contents: [{val:"",id:1}],
@@ -138,8 +138,11 @@ class GraduationTasksedit extends Component{
   }
 
   goback=()=>{
-    let courseId=this.props.match.params.coursesId;
-    window.location.href="/courses/"+courseId+"/graduation_tasks/"+this.state.data.graduation_id;
+    // let courseId=this.props.match.params.coursesId;
+    // window.location.href="/courses/"+courseId+"/graduation_tasks/"+this.state.data.graduation_id;
+		// goback = () => {
+			window.history.go(-1)
+
   }
 
 
@@ -147,7 +150,7 @@ class GraduationTasksedit extends Component{
   changeTitle=(e)=>{
 
     this.setState({
-      title_num:20-parseInt(e.target.value.length),
+      title_num:60-parseInt(e.target.value.length),
       title_value:e.target.value
     })
 
@@ -315,7 +318,7 @@ class GraduationTasksedit extends Component{
                   <Form.Item label="任务标题"  >
                     {getFieldDecorator('name', {
                       rules: [{ required: true, message: "请输入标题" }],
-                    })(<Input placeholder="请输入任务名称，最大限制20个字符" value={name} onInput={this.changeTitle}  className="searchView searchViewAfter" style={{"width":"100%"}} maxLength="20" addonAfter={String(title_num)}/>)}
+                    })(<Input placeholder="请输入任务名称，最大限制20个字符" value={name} onInput={this.changeTitle}  className="searchView searchViewAfter" style={{"width":"100%"}} maxLength="60" addonAfter={String(title_num)}/>)}
                   </Form.Item>
                   <input type="hidden"  id='nametypes' />
                 </div>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
index 9ef3d7091..9d0b33e80 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
@@ -111,11 +111,11 @@ class GraduationTaskssettingapp extends Component{
          max_nums: result.data.max_num,
          task_type: result.data.task_type,
          baseonproject: result.data.base_on_project,
-         publish_time: result.data.publish_time,
-         end_time: result.data.end_time,
+         publish_time:moment(moment(handleDateString(result.data.publish_time))).format("YYYY-MM-DD HH:mm"),
+         end_time:moment(moment(handleDateString(result.data.end_time))).format("YYYY-MM-DD HH:mm"),
          allowlate: result.data.allow_late,
          latepenalty: result.data.late_penalty,
-         latetime: result.data.late_time,
+         latetime:moment(moment(handleDateString(result.data.late_time))).format("YYYY-MM-DD HH:mm"),
          crosscomment: result.data.cross_comment,
          taskid: result.data.id,
          taskname: result.data.task_name,
@@ -128,7 +128,7 @@ class GraduationTaskssettingapp extends Component{
          hasproject: result.data.has_project,
          hascommit: result.data.has_commit,
          assigngroups: assigngroups,
-         commenttime: result.data.comment_time,
+         commenttime:moment(moment(handleDateString(result.data.comment_time))).format("YYYY-MM-DD HH:mm"),
          task_status: result.data.task_status
        })
      }
@@ -142,7 +142,9 @@ class GraduationTaskssettingapp extends Component{
   componentDidMount(){
 
     this.getsettings();
-
+		if(this.props.isAdmin()===true){
+			this.editSetting()
+		}
   }
 
 
@@ -210,17 +212,18 @@ class GraduationTaskssettingapp extends Component{
          latetime:null
        })
      }else{
-       endtime=moment(handleDateString(dateString)).add(1, 'months')
+
+       endtime=	moment(moment(handleDateString(dateString))).add(1, 'months').format("YYYY-MM-DD HH:mm")
        let {allowlate}=this.state;
        if(allowlate===true||allowlate===1){
          this.setState({
-           publish_time:handleDateString(dateString),
+           publish_time:moment(moment(handleDateString(dateString))).format("YYYY-MM-DD HH:mm"),
            end_time:endtime,
-           latetime:moment(endtime).add(1, 'months'),
+           latetime:moment(moment(handleDateString(endtime))).add(1, 'months').format("YYYY-MM-DD HH:mm"),
          })
        }else{
          this.setState({
-           publish_time:handleDateString(dateString),
+           publish_time:moment(moment(handleDateString(dateString))).format("YYYY-MM-DD HH:mm"),
            end_time:endtime
          })
        }
@@ -240,12 +243,12 @@ class GraduationTaskssettingapp extends Component{
       let {allowlate}=this.state;
       if(allowlate===true||allowlate===1){
         this.setState({
-          end_time:handleDateString(dateString),
-          latetime:moment(handleDateString(dateString)).add(1, 'months'),
+          end_time:moment(moment(handleDateString(dateString))).format("YYYY-MM-DD HH:mm"),
+          latetime:moment(moment(handleDateString(dateString))).add(1, 'months').format("YYYY-MM-DD HH:mm"),
         })
       }else{
         this.setState({
-          end_time:handleDateString(dateString)
+          end_time:moment(moment(handleDateString(dateString))).format("YYYY-MM-DD HH:mm"),
         })
       }
 
@@ -288,7 +291,7 @@ class GraduationTaskssettingapp extends Component{
       this.setState({
         latepenalty:5,
         allowlate:e.target.value,
-        latetime:end_time===null?"":moment(end_time).add(1, 'months'),
+        latetime:end_time===null?"":moment(moment(handleDateString(end_time))).add(1, 'months').format("YYYY-MM-DD HH:mm"),
       })
    }else{
      this.setState({
@@ -326,7 +329,7 @@ class GraduationTaskssettingapp extends Component{
 
         this.setState({
           crosscomment:e.target.checked,
-          commenttime:newtime
+          commenttime:moment(moment(newtime)).format("YYYY-MM-DD HH:mm"),
         })
 
       }else{
@@ -410,7 +413,7 @@ class GraduationTaskssettingapp extends Component{
       Topval:"发布设置均可修改",
       Botvalleft:"点击修改",
       Botval:"此设置将对所有分班生效",
-      starttime:moment(moment(handleDateString(this.props.getNowFormatDates(1))).add(1, 'months')).format("YYYY-MM-DD HH:mm"),
+      starttime:moment(moment(handleDateString(this.props.getNowFormatDates(1)))).format("YYYY-MM-DD HH:mm") ,
 			starttimes:this.props.getNowFormatDates(1),
 			typs:"start",
       endtime:endtime,
@@ -558,6 +561,7 @@ class GraduationTaskssettingapp extends Component{
           commenttimetype:false
         })
       }
+			debugger
       if(moment(this.state.commenttime)<moment(publish_time)){
         this.setState({
           commenttimetype:true,
@@ -569,6 +573,7 @@ class GraduationTaskssettingapp extends Component{
           commenttimetype:false
         })
       }
+
       if(moment(this.state.commenttime)<moment(end_time)){
         this.setState({
           commenttimetype:true,
@@ -716,6 +721,7 @@ class GraduationTaskssettingapp extends Component{
          if(resulet.data.status===0){
 					 this.getsettings();
            this.cancelmodel();
+					 this.isgoback()
            this.setState({
              // Modalstype:true,
              // Modalstopval:resulet.data.message,
@@ -871,8 +877,8 @@ class GraduationTaskssettingapp extends Component{
 
   //编辑
   editSetting = () => {
-    try {
-      if (this.state.settingdata.is_end === true) {
+
+      if (this.state.settingdata&&this.state.settingdata.is_end === true) {
         // this.setState({
         //   modalsType: true,
         //   modalsTopval: "课堂已结束不能再修改!",
@@ -886,9 +892,7 @@ class GraduationTaskssettingapp extends Component{
           flagPageEdit: true,
         })
       }
-    } catch (e) {
 
-    }
 
   }
 
@@ -1025,8 +1029,8 @@ class GraduationTaskssettingapp extends Component{
               </div>
 
 
-              <div className="stud-class-set bor-bottom-greyE">
-                <div className="mt10 clearfix edu-back-white poll_list pl20">
+              <div className="stud-class-set bor-bottom-greyE" id={"publishtimestart"}>
+                <div className="mt10 clearfix edu-back-white poll_list pl20" id={"publishtimeend"}>
 
                   <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/list"}>任务列表</Link>
                   <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/questions"}>任务问答</Link>
@@ -1113,7 +1117,7 @@ class GraduationTaskssettingapp extends Component{
 
 
 
-                  <div className={"h20 mb30 ml30"} id={"publishtimestart"}>
+                  <div className={"h20 mb30 ml30"} >
                     <span>发布时间：</span>
                     <Tooltip placement="bottom" title={this.props.isAdmin()===true?starttimetype===true?"时间已过，不能再修改":"":""}>
                     <span>
@@ -1150,7 +1154,7 @@ class GraduationTaskssettingapp extends Component{
                     {this.state.publishTimetypesval}
                   </div>:""}
 
-                  <div className={"h20 mb30 ml30"} id={"publishtimeend"}>
+                  <div className={"h20 mb30 ml30"} >
                     <span>截止时间：</span>
                     <Tooltip placement="bottom" title={this.props.isAdmin()===true?endtimetype===true?"时间已过，不能再修改":"":""}>
                     <span>
@@ -1166,7 +1170,7 @@ class GraduationTaskssettingapp extends Component{
                       value={end_time===null||end_time===""?"":moment(end_time, dateFormat)}
                       onChange={this.onChangeTimeend}
                       disabledTime={disabledDateTime}
-                      disabled={this.props.isAdmin()===true?endtimetype===true?true:flagPageEdit===true?false:true:true}
+                      disabled={this.props.isSuperAdmin()===true?flagPageEdit===true?false:true:this.props.isAdmin()===true?endtimetype===true?true:flagPageEdit===true?false:true:true}
                       className={this.state.endTimetypes===true||end_timetype===true?"noticeTip":""}
                     />
                     </span>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 4c5496ad5..d0b30db93 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -105,10 +105,12 @@ class GraduationTaskssettinglist extends Component{
 							teacherrating: worklists[i].teacher_comment_score,
 							crossrating: worklists[i].cross_comment_score,
 							finalscore: worklists[i].final_score.work_score === null ? "--" : worklists[i].final_score.work_score,
-							operation: this.props.isAdmin()?[{name: worklists[i].assign === true ? "分配" : "", id: worklists[i].id}, {
+							operation: this.props.isAdmin()?[{name: worklists[i].assign === true ? "分配" : "", id: worklists[i].id,status:worklists[i].status}, {
 								name: "调分",
-								id: worklists[i].id
-							}, {name:"评阅", id: worklists[i].id}]:[{name:"", id: worklists[i].id}],
+								id: worklists[i].id,
+								status:worklists[i].status
+							}, {name:"评阅", id: worklists[i].id,	status:worklists[i].status}]:[{name:"", id: worklists[i].id,
+								status:worklists[i].status}],
 						})
 					}
 				}
@@ -723,8 +725,8 @@ class GraduationTaskssettinglist extends Component{
                         <div>
                             {this.props.isAdmin()?operation.map((tag,key) => {
                                 return(
-                                    <div key={key}>
-                                        <Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
+																<div key={key}>
+																	{tag.status===0?"--":<Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
 																					其它历史评分将全部失效</pre>:""}>
 
                                             {tag.name==="评阅"?<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >{tag.name}</a>
@@ -734,7 +736,7 @@ class GraduationTaskssettinglist extends Component{
                                                 >{tag.name}</a>
                                             }
 
-                                        </Tooltip>
+                                        </Tooltip>}
                                     </div>
                                 )
                             }):""}
@@ -742,8 +744,10 @@ class GraduationTaskssettinglist extends Component{
                                 this.props.isStudent()?
                                     operation.map((tag,key) => {
                                         return(
-                                            <div key={key}>
+																			     <div key={key}>
+																						 {tag.status===0?"--":
                                                 <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >查看</a>
+																						 }
                                             </div>
                                         )}
                                     ):""
@@ -853,8 +857,9 @@ class GraduationTaskssettinglist extends Component{
                         <div>
                             {this.props.isAdmin()?operation.map((tag,key) => {
                                 return(
-                                    <div key={key}>
-                                        <Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
+														        <div key={key}>
+																			{tag.status===0?"--":
+																			<Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
 																					其它历史评分将全部失效</pre>:""}>
 
                                             {tag.name==="评阅"?<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >{tag.name}</a>
@@ -865,6 +870,7 @@ class GraduationTaskssettinglist extends Component{
                                             }
 
                                         </Tooltip>
+																			}
                                     </div>
                                 )
                             }):""}
@@ -872,8 +878,10 @@ class GraduationTaskssettinglist extends Component{
                                 this.props.isStudent()?
                                     operation.map((tag,key) => {
                                         return(
-                                            <div key={key}>
+																					 <div key={key}>
+																						 {tag.status===0?"--":
                                                 <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >查看</a>
+																						 }
                                             </div>
                                         )}
                                     ):""
@@ -997,16 +1005,18 @@ class GraduationTaskssettinglist extends Component{
                         <div>
                             {this.props.isAdmin()?operation.map((tag,key) => {
                                 return(
-                                    <div key={key}>
-                                        <Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
-																					其它历史评分将全部失效</pre>:""}>
-                                            {tag.name==="评阅"?<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >{tag.name}</a>
-                                                :
-                                                <a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
-                                                   onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""}
-                                                >{tag.name}</a>
-                                            }
-                                        </Tooltip>
+													  			<div key={key}>
+																		{tag.status===0?"--":
+																						<Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
+																							其它历史评分将全部失效</pre>:""}>
+																								{tag.name==="评阅"?<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >{tag.name}</a>
+																										:
+																										<a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
+																											 onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""}
+																										>{tag.name}</a>
+																								}
+																						</Tooltip>
+																				}
                                     </div>
                                 )
                             }):""}
@@ -1015,8 +1025,10 @@ class GraduationTaskssettinglist extends Component{
                                 this.props.isStudent()?
                                     operation.map((tag,key) => {
                                         return(
-                                            <div key={key}>
+																				   <div key={key}>
+																						 {tag.status===0?"--":
                                                 <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >查看</a>
+																						 }
                                             </div>
                                         )}
                                     ):""
@@ -1125,7 +1137,8 @@ class GraduationTaskssettinglist extends Component{
                         <div>
                             {this.props.isAdmin()?operation.map((tag,key) => {
                                 return(
-                                    <div key={key}>
+																     <div key={key}>
+																			 {tag.status===0?"--":
                                         <Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
 																					其它历史评分将全部失效</pre>:""}>
                                             {tag.name==="评阅"?<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >{tag.name}</a>
@@ -1135,6 +1148,7 @@ class GraduationTaskssettinglist extends Component{
                                                 >{tag.name}</a>
                                             }
                                         </Tooltip>
+																			 }
                                     </div>
                                 )
                             }):""}
@@ -1143,8 +1157,10 @@ class GraduationTaskssettinglist extends Component{
                                 this.props.isStudent()?
                                     operation.map((tag,key) => {
                                         return(
-                                            <div key={key}>
-                                                <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >查看</a>
+																				   <div key={key}>
+																						 {tag.status===0?"--":
+																						 <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >查看</a>
+																						 }
                                             </div>
                                         )}
                                     ):""
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
index acf160c1f..f373af827 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
@@ -1,7 +1,7 @@
 import React,{Component} from "React";
 import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag} from "antd";
 import {Link} from 'react-router-dom';
-import { WordsBtn } from 'educoder';
+import { WordsBtn,markdownToHTML} from 'educoder';
 import axios from 'axios';
 import Modals from '../../../modals/Modals';
 import HomeworkModal from "../../coursesPublic/HomeworkModal";
@@ -332,7 +332,7 @@ class GraduationTasksquestions extends Component{
                         width: '100%',
                         border: '1px solid transparent'
                       }}>
-                    {questionslist.description}
+												<div dangerouslySetInnerHTML={{__html: markdownToHTML(questionslist.description).replace(/▁/g,"▁▁▁")}}></div>
                      </div>:""
                     }
 
diff --git a/public/react/src/modules/forums/PostItem.js b/public/react/src/modules/forums/PostItem.js
index 2f79e6dc5..aa610184f 100644
--- a/public/react/src/modules/forums/PostItem.js
+++ b/public/react/src/modules/forums/PostItem.js
@@ -1,104 +1,104 @@
-import React, { Component } from 'react';
-import { Redirect } from 'react-router';
-
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
-import PropTypes from 'prop-types';
-
-import classNames from 'classnames';
-
-import { getImageUrl, toPath } from 'educoder';
-
-import moment from 'moment';
-
-
-class PostItem extends Component {
-    _toTenThousand(num) {
-      if (num > 10000) {
-        return ( (num - 500)/ 10000 ).toFixed(1) + '万'
-      }
-      return num
-    }
-
-  	render() {
-  		const { match, history, currentPage, memo, user, setTop, setDown } = this.props
-	    return (
-            <div className="forum_table_line pl20">
-                <div className="forum_table_item" id={`memo_detail_${memo.id}`}>
-                    <a href={`/users/${memo.login}`} className="fr mr15">
-                        <img alt="用户头像" className="bor-radius-all mt3" height="50" src={getImageUrl(`images/`+memo.image_url)} width="50" />
-                    </a>
-                    <div className="fl pr" style={{flex: 1}}>
-                        <p className="font-16 clearfix" >
-                        {/* target="_blank" */}
-                            <Link to={`/forums/${memo.id}`} target="_blank" title={memo.subject}
-                                className="clearfix task-hide item_name fl" style={{maxWidth: '750px'}} >
-                                {memo.subject}
-                            </Link>
-
-                          { memo.sticky && <span className="btn-top btn-cir-orange mt6 ml5 fl">置顶</span> }
-
-                          { memo.reward &&
-                          <span className=" ml10 fl color-orange03 fl" data-tip-down={`获得平台奖励金币：${memo.reward}`}>
-                            <i className="iconfont icon-gift font-16 mr5 fl"></i><span className="fl mt3 font-14">{memo.reward}</span>
-                          </span>
-                          }
-                        </p>
-
-                        <div className="clearfix mt5 color-grey-9">
-                            <span className="fl">{memo.username}</span>
-                          {/*最后回复：todo{memo.username}
-                      memo.language && memo.language != 'other' && <span className="fl language-cir-orange mr10 mt3 ml6">{memo.language}</span>
-                          */}
-                          <span className="fl ml50">{moment(memo.updated_at).fromNow()}</span>
-                          {memo.tag && memo.tag.length ? <span className="fl ml50">来自 {memo.tag.join('/')}</span> : ''}
-
-                          {/*<span className="fl language-cir-orange mr10 mt3">C++</span>*/}
-
-                            <p className="font-12 fr mr8 color-grey-6">
-                              {/* data-tip-down="回复数" <i className="fa fa-comments-o mr5"></i>{memo.replies_count}
-                                  <i className="fa fa-thumbs-o-up mr5"></i>{memo.praise_count}*/}
-                              {memo.replies_count ?
-                                <span className="mr10 ml10 fl edu-txt-right" style={{cursor: 'default'}} >
-                                  {memo.replies_count} 回复
-                              </span> :''}
-
-                              {memo.praise_count ?
-                              <span className="mr10 ml10 fl edu-txt-right" style={{cursor: 'default'}} >
-                                {memo.praise_count} 赞
-                              </span> :''}
-
-                              {memo.viewed_count ?
-                              <span className="mr10 ml10 fl edu-txt-right" style={{cursor: 'default',minWidth:'55px'}}>
-                                {this._toTenThousand(memo.viewed_count)} 浏览
-                              </span> :''}
-
-                            </p>
-                        </div>
-                      { user && (user.admin === true || user.user_id === memo.author_id) &&
-                      <div className="edu-position-hidebox" style={{position: 'absolute', right: '18px',top:'0px'}}>
-                        <a href="javascript:void(0);"><i className="fa fa-bars font-16"></i></a>
-                        <ul className="edu-position-hide undis">
-                          { user.admin === true &&
-                            ( memo.sticky === true ?
-                            <li><a href="javascript:void(0);" onClick={() => setDown(memo)}>取消置顶</a></li>
-                            :
-                            <li><a href="javascript:void(0);" onClick={() => setTop(memo)}>置&nbsp;&nbsp;顶</a></li> )
-                          }
-                          <li><Link to={`/forums/${memo.id}/edit`}>编&nbsp;&nbsp;辑</Link></li>
-                          <li>
-                            <a href="javascript:void(0)" onClick={() =>
-                                window.delete_confirm_box_2_react(`onMemoDelete`, '您确定要删除吗？' , memo)}>
-
-                              删&nbsp;&nbsp;除</a>
-                          </li>
-                        </ul>
-                      </div>
-                      }
-                    </div>
-                </div>
-            </div>
-	    );
-  	}
-}
-export default PostItem
+import React, { Component } from 'react';
+import { Redirect } from 'react-router';
+
+import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
+
+import PropTypes from 'prop-types';
+
+import classNames from 'classnames';
+
+import { getImageUrl, toPath } from 'educoder';
+
+import moment from 'moment';
+
+
+class PostItem extends Component {
+    _toTenThousand(num) {
+      if (num > 10000) {
+        return ( (num - 500)/ 10000 ).toFixed(1) + '万'
+      }
+      return num
+    }
+
+  	render() {
+  		const { match, history, currentPage, memo, user, setTop, setDown } = this.props
+	    return (
+            <div className="forum_table_line pl20">
+                <div className="forum_table_item" id={`memo_detail_${memo.id}`}>
+                    <a href={`/users/${memo.login}`} className="fr mr15">
+                        <img alt="用户头像" className="bor-radius-all mt3" height="50" src={getImageUrl(`images/`+memo.image_url)} width="50" />
+                    </a>
+                    <div className="fl pr" style={{flex: 1}}>
+                        <p className="font-16 clearfix" >
+                        {/* target="_blank" */}
+                            <a href={`/forums/${memo.id}`} target="_blank" title={memo.subject}
+                                className="clearfix task-hide item_name fl" style={{maxWidth: '750px'}} >
+                                {memo.subject}
+                            </a>
+
+                          { memo.sticky && <span className="btn-top btn-cir-orange mt6 ml5 fl">置顶</span> }
+
+                          { memo.reward &&
+                          <span className=" ml10 fl color-orange03 fl" data-tip-down={`获得平台奖励金币：${memo.reward}`}>
+                            <i className="iconfont icon-gift font-16 mr5 fl"></i><span className="fl mt3 font-14">{memo.reward}</span>
+                          </span>
+                          }
+                        </p>
+
+                        <div className="clearfix mt5 color-grey-9">
+                            <span className="fl">{memo.username}</span>
+                          {/*最后回复：todo{memo.username}
+                      memo.language && memo.language != 'other' && <span className="fl language-cir-orange mr10 mt3 ml6">{memo.language}</span>
+                          */}
+                          <span className="fl ml50">{moment(memo.updated_at).fromNow()}</span>
+                          {memo.tag && memo.tag.length ? <span className="fl ml50">来自 {memo.tag.join('/')}</span> : ''}
+
+                          {/*<span className="fl language-cir-orange mr10 mt3">C++</span>*/}
+
+                            <p className="font-12 fr mr8 color-grey-6">
+                              {/* data-tip-down="回复数" <i className="fa fa-comments-o mr5"></i>{memo.replies_count}
+                                  <i className="fa fa-thumbs-o-up mr5"></i>{memo.praise_count}*/}
+                              {memo.replies_count ?
+                                <span className="mr10 ml10 fl edu-txt-right" style={{cursor: 'default'}} >
+                                  {memo.replies_count} 回复
+                              </span> :''}
+
+                              {memo.praise_count ?
+                              <span className="mr10 ml10 fl edu-txt-right" style={{cursor: 'default'}} >
+                                {memo.praise_count} 赞
+                              </span> :''}
+
+                              {memo.viewed_count ?
+                              <span className="mr10 ml10 fl edu-txt-right" style={{cursor: 'default',minWidth:'55px'}}>
+                                {this._toTenThousand(memo.viewed_count)} 浏览
+                              </span> :''}
+
+                            </p>
+                        </div>
+                      { user && (user.admin === true || user.user_id === memo.author_id) &&
+                      <div className="edu-position-hidebox" style={{position: 'absolute', right: '18px',top:'0px'}}>
+                        <a href="javascript:void(0);"><i className="fa fa-bars font-16"></i></a>
+                        <ul className="edu-position-hide undis">
+                          { user.admin === true &&
+                            ( memo.sticky === true ?
+                            <li><a href="javascript:void(0);" onClick={() => setDown(memo)}>取消置顶</a></li>
+                            :
+                            <li><a href="javascript:void(0);" onClick={() => setTop(memo)}>置&nbsp;&nbsp;顶</a></li> )
+                          }
+                          <li><Link to={`/forums/${memo.id}/edit`}>编&nbsp;&nbsp;辑</Link></li>
+                          <li>
+                            <a href="javascript:void(0)" onClick={() =>
+                                window.delete_confirm_box_2_react(`onMemoDelete`, '您确定要删除吗？' , memo)}>
+
+                              删&nbsp;&nbsp;除</a>
+                          </li>
+                        </ul>
+                      </div>
+                      }
+                    </div>
+                </div>
+            </div>
+	    );
+  	}
+}
+export default PostItem

From 06367bf257790a1401be98a2e554822741d3d37e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 21 Jun 2019 09:05:22 +0800
Subject: [PATCH 12/15] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/graduation/tasks/GraduationTasksappraise.js   | 4 ++--
 .../courses/graduation/tasks/GraduationTaskssetting.js    | 8 ++++----
 .../src/modules/tpm/shixunchild/Challenges/Challenges.js  | 6 ++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
index 374318af1..a45a105fd 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
@@ -1,7 +1,7 @@
 import React,{Component} from "React";
 import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag} from "antd";
 import {Link} from 'react-router-dom';
-import { WordsBtn } from 'educoder';
+import { WordsBtn,markdownToHTML } from 'educoder';
 import axios from 'axios';
 import moment from 'moment';
 import Modals from '../../../modals/Modals';
@@ -205,7 +205,7 @@ class GraduationTasksappraise extends Component{
                     </div>
 
                     <div className={"ml20"}>
-                      {datalist&&datalist.description}
+											<div dangerouslySetInnerHTML={{__html: markdownToHTML(datalist&&datalist.description).replace(/▁/g,"▁▁▁")}}></div>
                     </div>
 
                     {/*<div className={"color-grey-6 h20 ml20"}>*/}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
index 9d0b33e80..762fe1406 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
@@ -111,11 +111,11 @@ class GraduationTaskssettingapp extends Component{
          max_nums: result.data.max_num,
          task_type: result.data.task_type,
          baseonproject: result.data.base_on_project,
-         publish_time:moment(moment(handleDateString(result.data.publish_time))).format("YYYY-MM-DD HH:mm"),
-         end_time:moment(moment(handleDateString(result.data.end_time))).format("YYYY-MM-DD HH:mm"),
+         publish_time:result.data.publish_time===null?"":moment(moment(handleDateString(result.data.publish_time))).format("YYYY-MM-DD HH:mm"),
+         end_time:result.data.end_time===null?"":moment(moment(handleDateString(result.data.end_time))).format("YYYY-MM-DD HH:mm"),
          allowlate: result.data.allow_late,
          latepenalty: result.data.late_penalty,
-         latetime:moment(moment(handleDateString(result.data.late_time))).format("YYYY-MM-DD HH:mm"),
+         latetime:result.data.late_time===null?"":moment(moment(handleDateString(result.data.late_time))).format("YYYY-MM-DD HH:mm"),
          crosscomment: result.data.cross_comment,
          taskid: result.data.id,
          taskname: result.data.task_name,
@@ -128,7 +128,7 @@ class GraduationTaskssettingapp extends Component{
          hasproject: result.data.has_project,
          hascommit: result.data.has_commit,
          assigngroups: assigngroups,
-         commenttime:moment(moment(handleDateString(result.data.comment_time))).format("YYYY-MM-DD HH:mm"),
+         commenttime:result.data.comment_time===null?"":moment(moment(handleDateString(result.data.comment_time))).format("YYYY-MM-DD HH:mm"),
          task_status: result.data.task_status
        })
      }
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
index c6870c2e9..38584c793 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
 
 import classNames from 'classnames';
 
-import { getImageUrl } from 'educoder'
+import { getImageUrl ,markdownToHTML} from 'educoder'
 
 import { CircularProgress } from 'material-ui/Progress';
 
@@ -250,9 +250,7 @@ class Challenges extends Component {
                  id="challenge_editorMd_description">
               <p id="ReactMarkdown" style={{overflow:'hidden'}}>
                 {ChallengesDataList === undefined ? "" :ChallengesDataList.description===null?"":
-                  <textarea>
-                                    {ChallengesDataList.description}
-                                  </textarea>
+									<div dangerouslySetInnerHTML={{__html: markdownToHTML(ChallengesDataList.description).replace(/▁/g,"▁▁▁")}}></div>
                 }
               </p>
 

From 7afce937962a6efcd5b0993c2168c126652c2195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 21 Jun 2019 09:33:52 +0800
Subject: [PATCH 13/15] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tasks/GraduationTasksappraise.js          |  2 +-
 .../tasks/GraduationTaskssettinglist.js       | 59 ++++++++++---------
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
index a45a105fd..7807e7265 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
@@ -205,7 +205,7 @@ class GraduationTasksappraise extends Component{
                     </div>
 
                     <div className={"ml20"}>
-											<div dangerouslySetInnerHTML={{__html: markdownToHTML(datalist&&datalist.description).replace(/▁/g,"▁▁▁")}}></div>
+											<div dangerouslySetInnerHTML={{__html: markdownToHTML(datalist&&datalist.description===null?"--":datalist&&datalist.description).replace(/▁/g,"▁▁▁")}}></div>
                     </div>
 
                     {/*<div className={"color-grey-6 h20 ml20"}>*/}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index d0b30db93..39068e1e3 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -726,17 +726,19 @@ class GraduationTaskssettinglist extends Component{
                             {this.props.isAdmin()?operation.map((tag,key) => {
                                 return(
 																<div key={key}>
-																	{tag.status===0?"--":<Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
+																      <Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
 																					其它历史评分将全部失效</pre>:""}>
 
-                                            {tag.name==="评阅"?<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >{tag.name}</a>
+                                            {tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
+																								{tag.name}
+                                            </a>
                                                 :
-                                                <a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
+																							<a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
                                                    onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""}
-                                                >{tag.name}</a>
+                                                >{tag.status===0?"":tag.name}</a>
                                             }
 
-                                        </Tooltip>}
+                                       </Tooltip>
                                     </div>
                                 )
                             }):""}
@@ -745,9 +747,7 @@ class GraduationTaskssettinglist extends Component{
                                     operation.map((tag,key) => {
                                         return(
 																			     <div key={key}>
-																						 {tag.status===0?"--":
-                                                <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >查看</a>
-																						 }
+                                                <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >{tag.status===0?"":"查看"}</a>
                                             </div>
                                         )}
                                     ):""
@@ -858,19 +858,21 @@ class GraduationTaskssettinglist extends Component{
                             {this.props.isAdmin()?operation.map((tag,key) => {
                                 return(
 														        <div key={key}>
-																			{tag.status===0?"--":
+
 																			<Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
 																					其它历史评分将全部失效</pre>:""}>
 
-                                            {tag.name==="评阅"?<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >{tag.name}</a>
+                                            {tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
+																								{tag.name}
+                                            </a>
                                                 :
                                                 <a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
                                                    onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""}
-                                                >{tag.name}</a>
+                                                >{tag.status===0?"":tag.name}</a>
                                             }
 
                                         </Tooltip>
-																			}
+
                                     </div>
                                 )
                             }):""}
@@ -879,9 +881,10 @@ class GraduationTaskssettinglist extends Component{
                                     operation.map((tag,key) => {
                                         return(
 																					 <div key={key}>
-																						 {tag.status===0?"--":
-                                                <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >查看</a>
-																						 }
+                                                <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
+																									{tag.status===0?"":"查看"}
+                                                </a>
+
                                             </div>
                                         )}
                                     ):""
@@ -1006,14 +1009,15 @@ class GraduationTaskssettinglist extends Component{
                             {this.props.isAdmin()?operation.map((tag,key) => {
                                 return(
 													  			<div key={key}>
-																		{tag.status===0?"--":
+
 																						<Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
 																							其它历史评分将全部失效</pre>:""}>
-																								{tag.name==="评阅"?<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >{tag.name}</a>
+																								{tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
+																										{tag.name}</a>
 																										:
 																										<a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
 																											 onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""}
-																										>{tag.name}</a>
+																										>{tag.status===0?"":tag.name}</a>
 																								}
 																						</Tooltip>
 																				}
@@ -1026,9 +1030,9 @@ class GraduationTaskssettinglist extends Component{
                                     operation.map((tag,key) => {
                                         return(
 																				   <div key={key}>
-																						 {tag.status===0?"--":
-                                                <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >查看</a>
-																						 }
+                                                <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
+																									{tag.status===0?"":"查看"}
+                                                </a>
                                             </div>
                                         )}
                                     ):""
@@ -1138,14 +1142,16 @@ class GraduationTaskssettinglist extends Component{
                             {this.props.isAdmin()?operation.map((tag,key) => {
                                 return(
 																     <div key={key}>
-																			 {tag.status===0?"--":
+
                                         <Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
 																					其它历史评分将全部失效</pre>:""}>
-                                            {tag.name==="评阅"?<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >{tag.name}</a>
+                                            {tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
+																								{tag.name}
+                                            </a>
                                                 :
                                                 <a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
                                                    onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""}
-                                                >{tag.name}</a>
+                                                >{tag.status===0?"":tag.name}</a>
                                             }
                                         </Tooltip>
 																			 }
@@ -1158,9 +1164,8 @@ class GraduationTaskssettinglist extends Component{
                                     operation.map((tag,key) => {
                                         return(
 																				   <div key={key}>
-																						 {tag.status===0?"--":
-																						 <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >查看</a>
-																						 }
+																						 <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
+																							 {tag.status===0?"":"查看"}</a>
                                             </div>
                                         )}
                                     ):""

From f3c99d878012f7ff124957c249fa0fc9feaa2c1a Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 21 Jun 2019 09:50:16 +0800
Subject: [PATCH 14/15] MarkdownToHtml

---
 public/react/src/common/TextUtil.js           |  5 ++-
 .../components/markdown/MarkdownToHtml.js     | 45 ++++++-------------
 .../src/modules/courses/boards/TopicDetail.js | 32 ++++---------
 3 files changed, 27 insertions(+), 55 deletions(-)

diff --git a/public/react/src/common/TextUtil.js b/public/react/src/common/TextUtil.js
index 4a3145c19..d39ebb32a 100644
--- a/public/react/src/common/TextUtil.js
+++ b/public/react/src/common/TextUtil.js
@@ -1,5 +1,5 @@
 import { bytesToSize } from 'educoder';
-export function markdownToHTML(oldContent) {
+export function markdownToHTML(oldContent, selector) {
     window.$('#md_div').html('')
     // markdown to html
     var markdwonParser = window.editormd.markdownToHTML("md_div", {
@@ -12,6 +12,9 @@ export function markdownToHTML(oldContent) {
         sequenceDiagram: true // 默认不解析
     });
     const content = window.$('#md_div').html()
+    if (selector) {
+        window.$(selector).html(content)
+    }
     return content
 }
 
diff --git a/public/react/src/common/components/markdown/MarkdownToHtml.js b/public/react/src/common/components/markdown/MarkdownToHtml.js
index 86e94c62e..266f831ee 100644
--- a/public/react/src/common/components/markdown/MarkdownToHtml.js
+++ b/public/react/src/common/components/markdown/MarkdownToHtml.js
@@ -6,40 +6,23 @@ class MarkdownToHtml extends Component{
     this.state={
     }
   }
-  // componentDidUpdate = (prevProps) => {
-  //   if (this.props.content) {
-  //     if ( prevProps.content != this.props.content ) {
-  //       if (!this.shixunDescr) {
-  //           this.shixunDescr = window.editormd.markdownToHTML("memo_content_editorMd", {
-  //             markdown: this.props.content,
-  //             htmlDecode: "style,script,iframe",  // you can filter tags decode
-  //             taskList: true,
-  //             tex: true,  // 默认不解析
-  //             flowChart: true,  // 默认不解析
-  //             sequenceDiagram: true // 默认不解析
-  //         });
-  //       } else {
-  //         this.shixunDescr.html(this.props.content)
-  //       }
-  //     }
-  //   }
-  // }
-  // componentDidMount () {
-  //   if (!this.shixunDescr) {
-  //       this.shixunDescr = window.editormd.markdownToHTML("memo_content_editorMd", {
-  //         markdown: this.props.content,
-  //         htmlDecode: "style,script,iframe",  // you can filter tags decode
-  //         taskList: true,
-  //         tex: true,  // 默认不解析
-  //         flowChart: true,  // 默认不解析
-  //         sequenceDiagram: true // 默认不解析
-  //     });
-  //   }
-  // }
+  componentDidUpdate = (prevProps) => {
+    if (this.props.content) {
+      if ( prevProps.content != this.props.content ) {
+        markdownToHTML(this.props.content, `.markdown_to_html_${this.props.selector || ''}`)
+      }
+    }
+  }
+  componentDidMount () {
+    this.props.content && markdownToHTML(this.props.content, `.markdown_to_html_${this.props.selector || ''}`)
+    
+  }
   render(){
     
     return(
-      <div id="memo_content_editorMd" className="new_li markdown-body" dangerouslySetInnerHTML={{__html: markdownToHTML(this.props.content)}}>
+      <div id="memo_content_editorMd" className={`new_li markdown-body ${this.props.className} markdown_to_html_${this.props.selector || ''}`}
+        // dangerouslySetInnerHTML={{__html: markdownToHTML(this.props.content)}}
+      >
       </div>
     )
   }
diff --git a/public/react/src/modules/courses/boards/TopicDetail.js b/public/react/src/modules/courses/boards/TopicDetail.js
index f0bc978ef..1ef880c9f 100644
--- a/public/react/src/modules/courses/boards/TopicDetail.js
+++ b/public/react/src/modules/courses/boards/TopicDetail.js
@@ -24,7 +24,7 @@ import '../../forums/RightSection.css'
 import './TopicDetail.css'
 import '../common/courseMessage.css'
 import { Pagination, Tooltip } from 'antd'
-import { bytesToSize, ConditionToolTip } from 'educoder'
+import { bytesToSize, ConditionToolTip, markdownToHTML, MarkdownToHtml } from 'educoder'
 import SendToCourseModal from '../coursesPublic/modal/SendToCourseModal'
 import CBreadcrumb from '../common/CBreadcrumb'
 import { generateComments, generateChildComments, _findById, handleContentBeforeCreateNew, addNewComment
@@ -87,15 +87,6 @@ class TopicDetail extends Component {
                   replies_count: response.data.data.total_replies_count
                 }, {...this.state.memo})
               }, () => {
-                setTimeout(()=>{
-                  var shixunDescr = window.editormd.markdownToHTML("memo_content_editorMd", {
-                      htmlDecode: "style,script,iframe",  // you can filter tags decode
-                      taskList: true,
-                      tex: true,  // 默认不解析
-                      flowChart: true,  // 默认不解析
-                      sequenceDiagram: true // 默认不解析
-                  });
-                }, 200)
               })
 
               // const { memo_replies, memo } = response.data;
@@ -181,13 +172,13 @@ class TopicDetail extends Component {
         // md渲染content，等xhr执行完（即memoLoading变化），memo.content更新后初始化md
         
           setTimeout(()=>{
-            var shixunDescr = window.editormd.markdownToHTML("memo_content_editorMd", {
-                htmlDecode: "style,script,iframe",  // you can filter tags decode
-                taskList: true,
-                tex: true,  // 默认不解析
-                flowChart: true,  // 默认不解析
-                sequenceDiagram: true // 默认不解析
-            });
+            // var shixunDescr = window.editormd.markdownToHTML("memo_content_editorMd", {
+            //     htmlDecode: "style,script,iframe",  // you can filter tags decode
+            //     taskList: true,
+            //     tex: true,  // 默认不解析
+            //     flowChart: true,  // 默认不解析
+            //     sequenceDiagram: true // 默认不解析
+            // });
           }, 200)
       }
       
@@ -629,13 +620,8 @@ class TopicDetail extends Component {
 
                     
                     <div className="padding40 memoContent new_li">
-                      <div id="memo_content_editorMd" className="new_li">
-                        <textarea style={{'display': 'none'}}>
-                          {memo.content}
-                        </textarea>
-                      </div>
+                      <MarkdownToHtml content={memo.content}></MarkdownToHtml>
                     </div>
-{/* style={{ paddingTop: '0px'}} */}
                     <div className="padding40 bor-bottom-greyE" >
                         <div className="mt10 mb20">
                           {/* ${memo.user_praise ? '' : ''}  */}

From 3c40720339f36cbc77e05db8018aba3d8338b391 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 21 Jun 2019 10:09:33 +0800
Subject: [PATCH 15/15] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../graduation/tasks/GraduationTasksedit.js   |  2 +-
 .../tasks/GraduationTaskssettinglist.js       | 27 +++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index 36c2f9d3f..9874b26fa 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -125,7 +125,7 @@ class GraduationTasksedit extends Component{
               GraduationTasksedittype=false;
               // window.location.href="/courses/"+course_id+"/graduation/"+graduationId+"/graduation_tasks/"+category_id+"/questions";
               // this.goback()
-              this.props.history.push("/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+graduation_id+"/"+this.props.match.params.category_id +"/setting");
+							window.location.href="/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+graduation_id+"/"+this.props.match.params.category_id +"/setting";
             }
           }).catch((error) => {
             console.log(error)
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 39068e1e3..ecfd21257 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -730,7 +730,7 @@ class GraduationTaskssettinglist extends Component{
 																					其它历史评分将全部失效</pre>:""}>
 
                                             {tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
-																								{tag.name}
+																								tag.name
                                             </a>
                                                 :
 																							<a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
@@ -747,7 +747,7 @@ class GraduationTaskssettinglist extends Component{
                                     operation.map((tag,key) => {
                                         return(
 																			     <div key={key}>
-                                                <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >{tag.status===0?"":"查看"}</a>
+																						 {tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >查看</a>}
                                             </div>
                                         )}
                                     ):""
@@ -863,7 +863,7 @@ class GraduationTaskssettinglist extends Component{
 																					其它历史评分将全部失效</pre>:""}>
 
                                             {tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
-																								{tag.name}
+																								tag.name
                                             </a>
                                                 :
                                                 <a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
@@ -881,10 +881,9 @@ class GraduationTaskssettinglist extends Component{
                                     operation.map((tag,key) => {
                                         return(
 																					 <div key={key}>
-                                                <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
-																									{tag.status===0?"":"查看"}
-                                                </a>
-
+																						 {tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
+																									查看
+                                                </a>}
                                             </div>
                                         )}
                                     ):""
@@ -1013,7 +1012,7 @@ class GraduationTaskssettinglist extends Component{
 																						<Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
 																							其它历史评分将全部失效</pre>:""}>
 																								{tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
-																										{tag.name}</a>
+																										tag.name</a>
 																										:
 																										<a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
 																											 onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""}
@@ -1030,9 +1029,9 @@ class GraduationTaskssettinglist extends Component{
                                     operation.map((tag,key) => {
                                         return(
 																				   <div key={key}>
-                                                <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
-																									{tag.status===0?"":"查看"}
-                                                </a>
+																						 {tag.status===0?"--": <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
+																									 查看
+                                                </a>}
                                             </div>
                                         )}
                                     ):""
@@ -1146,7 +1145,7 @@ class GraduationTaskssettinglist extends Component{
                                         <Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
 																					其它历史评分将全部失效</pre>:""}>
                                             {tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
-																								{tag.name}
+																								tag.name
                                             </a>
                                                 :
                                                 <a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
@@ -1164,8 +1163,8 @@ class GraduationTaskssettinglist extends Component{
                                     operation.map((tag,key) => {
                                         return(
 																				   <div key={key}>
-																						 <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
-																							 {tag.status===0?"":"查看"}</a>
+																						 {tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
+																							 查看</a>}
                                             </div>
                                         )}
                                     ):""