diff --git a/public/react/src/modules/courses/boards/BoardsListItem.js b/public/react/src/modules/courses/boards/BoardsListItem.js
index c25c541e8..2a6aaae2f 100644
--- a/public/react/src/modules/courses/boards/BoardsListItem.js
+++ b/public/react/src/modules/courses/boards/BoardsListItem.js
@@ -1,7 +1,7 @@
 import React,{ Component } from "react";
 import {Tooltip} from 'antd'
 import moment from 'moment'
-import { getUrl } from 'educoder'
+import { getUrl, WordsBtn } from 'educoder'
 class BoardsListItem extends Component{
   constructor(props){
     super(props);
@@ -61,34 +61,37 @@ class BoardsListItem extends Component{
             </h6>
               
             <div className="cl"></div>
-            <p className="color-grey panel-lightgrey mt10 fl">
+            <p className="color-grey panel-lightgrey mt18 fl">
               <span className="mr50">
-                <a href={`/users/${discussMessage.author.login}`} 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 font-14">{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> }
-                { discussMessage.visits != 0 && <span className="mr15 color-grey9">{discussMessage.visits} 浏览</span> }
+                { discussMessage.total_replies_count != 0 && <span className="mr15 color-grey9 font-14">{discussMessage.total_replies_count} 回复</span> }
+                { discussMessage.total_praises_count != 0 && <span className="mr15 color-grey9 font-14">{discussMessage.total_praises_count} 点赞</span> }
+                { discussMessage.visits != 0 && <span className="mr15 color-grey9 font-14">{discussMessage.visits} 浏览</span> }
 
-                <span className="mr15 color-light-grey-C">{moment(discussMessage.created_on).fromNow()} </span>
+                <span className="mr15 color-light-grey-C font-14">{moment(discussMessage.created_on).fromNow()} </span>
               </span>
-              {/* <span className="mr10">最后回复<span className="ml10 mr10">社区导师</span>10个月前</span> */}
             </p>
+            <div className="fr mt15">
+              {(isAdmin || discussMessage.author.login == current_user.login) &&  
+                <WordsBtn style="blue" className="fl font-16 ml28" 
+                    onClick={(e) => { this.props.toEditPage(this.props.match.params.coursesId, this.props.match.params.boardId, discussMessage.id )} }>编辑</WordsBtn> }
+
+                { isAdmin && <WordsBtn style="blue" className="fl font-16 ml28" 
+                    onClick={(e) => { debugger; onSticky(discussMessage); e.cancelBubble = true; e.stopPropagation();}}>
+                    { discussMessage.sticky ? '取消置顶' : '置顶' }</WordsBtn> }
+            </div>
+
+
 
-            {/* <span className="mr10"><i className="fa fa-eye color-grey  mr5 "></i>473</span> */}
-            {/* <p className="fr panel-lightgrey mt10">
-              <span className="mr10"><i className="fa fa-eye color-grey mr5" data-tip-down="浏览数"></i>82</span>
-              <span className="mr10"><i className="fa fa-thumbs-up color-grey mr5" data-tip-down="点赞数"></i>1</span>
-              <span className="mr10"><i className="fa fa-comments-o color-grey mr5" data-tip-down="回复数"></i>4</span>
-            </p> */}
 
 
-            { (isAdmin || discussMessage.author.login == current_user.login) && 
+            {/* { (isAdmin || discussMessage.author.login == current_user.login) && 
             <div className="homepagePostSetting" style={{"right":"4px","top":"5px","display":"block"}}>
               <ul>
                 <li className="edu-position edu-position-hidebox">
                   <i className="fa fa-bars color-grey-b"></i>
                   <ul className="edu-position-hide undis">
-                    {/* <li><a href="javascript:void(0)" onclick="show_send(34255, 1, 'message');">发送</a></li> */}
                     {(isAdmin || discussMessage.author.login == current_user.login) && <li><a href="javascript:void(0)" onClick={(e) => { 
                         this.props.toEditPage(this.props.match.params.coursesId, this.props.match.params.boardId, discussMessage.id )} } >编辑</a></li>
                     }
@@ -96,14 +99,13 @@ class BoardsListItem extends Component{
                       { discussMessage.sticky ? '取消置顶' : '置顶' }
                     </a></li>
                     }
-                    {/* <li>
-                      <a href="javascript:void(0);" onclick="delete_confirm_box_3('/boards/5464/topics/34255/destroy', '确定要删除该帖子吗？')">删除</a>
-                    </li> */}
                   </ul>
                 </li>
               </ul>
             </div>
-            }
+            } */}
+
+
           </div>
         </div>
       )
diff --git a/public/react/src/modules/courses/boards/BoardsNew.js b/public/react/src/modules/courses/boards/BoardsNew.js
index bd134c922..cf530aba5 100644
--- a/public/react/src/modules/courses/boards/BoardsNew.js
+++ b/public/react/src/modules/courses/boards/BoardsNew.js
@@ -280,7 +280,7 @@ class BoardsNew extends Component{
               { name: this.isEdit ? '帖子编辑' : '帖子新建'}
             ]}></CBreadcrumb>
 
-            <p className="clearfix mt30 mb30">
+            <p className="clearfix mt20 mb20">
               <span className="fl font-24 color-grey-3">{this.isEdit ? "编辑" : "新建"}帖子</span>
               <a href="javascript:void(0)" className="color-grey-6 fr font-16 mr2" 
                   onClick={() => this.props.history.goBack()}>
diff --git a/public/react/src/modules/courses/boards/TopicDetail.js b/public/react/src/modules/courses/boards/TopicDetail.js
index 1ef880c9f..5d4a434a5 100644
--- a/public/react/src/modules/courses/boards/TopicDetail.js
+++ b/public/react/src/modules/courses/boards/TopicDetail.js
@@ -227,15 +227,30 @@ class TopicDetail extends Component {
           // filesize = bytesToSize(item.filesize)
         }
         attachments.push(
-          <p className="clearfix" key={index} >
-            <a href={item.url} className="color-green clearfix notefileDownload">
-              <i className="iconfont icon-xiazai color-green ml5 fl"></i>
-              {fileName && <ConditionToolTip title={fileName} condition={fileName.length > 30 }>
-                <span className="fl task-hide upload_item" style={{ color: '#333'}}>{fileName}</span>
-              </ConditionToolTip>}
-              <span className="fl" style={{ color: '#999', marginLeft: '6px'}}>{filesize? ` ${filesize.replace(' ', '')}` : ''}</span>
+          // <p className="clearfix" key={index} >
+          //   <a href={item.url} className="color-green clearfix notefileDownload">
+          //     <i className="iconfont icon-fujian color-green ml5 fl"></i>
+          //     {fileName && <ConditionToolTip title={fileName} condition={fileName.length > 30 }>
+          //       <span className="fl task-hide upload_item" style={{ color: '#333'}}>{fileName}</span>
+          //     </ConditionToolTip>}
+          //     <span className="fl" style={{ color: '#999', marginLeft: '6px'}}>{filesize? ` ${filesize.replace(' ', '')}` : ''}</span>
+          //   </a>
+          // </p>
+
+          <div className="color-grey" key={index}>
+            <a className="color-grey ml20">
+              <i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
             </a>
-          </p>
+            {fileName && <ConditionToolTip title={fileName} condition={fileName.length > 30 }>
+              <a href={item.url}
+                  className="mr12 color9B9B" length="58">
+                {fileName}
+              </a>
+            </ConditionToolTip>}
+
+            <span className="color656565 mt2 color-grey-6 font-12 mr8">{item.filesize}</span>
+            
+          </div>
           )
       })
       return attachments;
@@ -542,7 +557,7 @@ class TopicDetail extends Component {
                             </span> }
                             {/* || current_user.user_id === author_info.user_id */}
                             { current_user && (isAdmin || isCurrentUserTheAuthor)  &&
-                                <div className="edu-position-hidebox" style={{position: 'absolute', right: '18px',top:'4px'}}>
+                                <div className="edu-position-hidebox" style={{position: 'absolute', right: '2px',top:'4px'}}>
                                     <a href="javascript:void(0);"><i className="fa fa-bars font-16"></i></a>
                                     <ul className="edu-position-hide undis">
                                         
@@ -619,10 +634,10 @@ class TopicDetail extends Component {
                     </div>
 
                     
-                    <div className="padding40 memoContent new_li">
+                    <div className="padding30 memoContent new_li" style={{ paddingBottom: '10px'}}>
                       <MarkdownToHtml content={memo.content}></MarkdownToHtml>
                     </div>
-                    <div className="padding40 bor-bottom-greyE" >
+                    <div className="padding40 bor-bottom-greyE" style={{paddingTop: '2px'}}>
                         <div className="mt10 mb20">
                           {/* ${memo.user_praise ? '' : ''}  */}
                           <Tooltip title={`${memo.liked ? '取消点赞' : '点赞'}`}>
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkItem.js b/public/react/src/modules/courses/busyWork/CommonWorkItem.js
index 258a06332..295f55fe1 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkItem.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkItem.js
@@ -156,7 +156,7 @@ class CommonWorkItem extends Component{
                   <span className="fl">
                     <CoursesListType typelist={item.status} />
                   </span>
-                  {
+                  {/* {
                     mainList && isAdmin &&
                     <li className="fr drop_down">
                       <i className="iconfont icon-caidan font-16 color-grey-c"></i>
@@ -170,7 +170,7 @@ class CommonWorkItem extends Component{
                         </li>
                       </ul>
                     </li>
-                    }
+                    } */}
                 </p>
                 <p className="color-grey-9 clearfix">
 									{item.commit_count===undefined?"":<span className="mr20 fl">{item.commit_count} 已交</span>}
@@ -184,6 +184,12 @@ class CommonWorkItem extends Component{
                       <span className="mr20 fl">{item.status_time}</span>
                     </Tooltip>
                   }
+
+                  {this.props.isAdmin && <div className="fr">
+                      <WordsBtn style="blue" className="fl font-16 ml28" onClick={ () => { this.props.toEditPage(this.props.match.params, item.homework_id) }}>编辑</WordsBtn> 
+                      <WordsBtn style="blue" className="fl font-16 ml28" onClick={ () => { this.props.toWorkSettingPage(this.props.match.params, item.homework_id) }}>设置</WordsBtn> 
+                    </div>}
+
                   {
                     //  
                     isStudent &&
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 58a448a35..11d26ebf1 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -70,10 +70,10 @@ function buildColumns(that, student_works) {
 					overflow: 'hidden',
 					textOverflow: 'ellipsis',
 					whiteSpace: 'nowrap'
-					 }}>
-				<Tooltip placement="bottom" title={text}>
+					 }} title={text}>
+				{/* <Tooltip placement="bottom" title={text}>
+				</Tooltip> */}
 					{text}
-				</Tooltip>
       </div>
     ),
   }, {
diff --git a/public/react/src/modules/courses/busyWork/IndexGroup.js b/public/react/src/modules/courses/busyWork/IndexGroup.js
index 5271d7deb..0a4415f2f 100644
--- a/public/react/src/modules/courses/busyWork/IndexGroup.js
+++ b/public/react/src/modules/courses/busyWork/IndexGroup.js
@@ -36,6 +36,10 @@ const CommonWorkAnswer = Loadable({
   loader: () => import('./CommonWorkAnswer'),
   loading:Loading,
 })
+const CommonWorkAppraise = Loadable({
+  loader: () => import('./CommonWorkAppraise'),
+  loading:Loading,
+})
 
 
 const CommonWork = Loadable({
@@ -87,6 +91,12 @@ class CoursesWorkIndex extends Component{
                 (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
               }
             ></Route>
+            {/* 评阅 */}
+            <Route exact path="/courses/:coursesId/group_homeworks/:workId/:studentWorkId/appraise"
+              render={
+                (props) => (<CommonWorkAppraise {...this.props} {...props} {...this.state} />)
+              }
+            ></Route>
 
 
             <Route exact path="/courses/:coursesId/group_homeworks/:workId/post"
diff --git a/public/react/src/modules/courses/busyWork/NewWork.js b/public/react/src/modules/courses/busyWork/NewWork.js
index 607a2dc82..eefbc1f0b 100644
--- a/public/react/src/modules/courses/busyWork/NewWork.js
+++ b/public/react/src/modules/courses/busyWork/NewWork.js
@@ -373,7 +373,7 @@ class NewWork extends Component{
             { name: `${ this.isEdit ? '编辑' : '新建'}` }
           ]}></CBreadcrumb>
           
-          <p className="clearfix mt30 mb30">
+          <p className="clearfix mt20 mb20">
             <span className="fl font-24 color-grey-3">{this.isEdit ?"编辑":"新建"}{ moduleName }</span>
             {/* history.goBack() 
                 this.props.toListPage(this.props.match.params, category.category_id)}
diff --git a/public/react/src/modules/courses/common/courseMessage.css b/public/react/src/modules/courses/common/courseMessage.css
index db2381d37..e521b24f5 100644
--- a/public/react/src/modules/courses/common/courseMessage.css
+++ b/public/react/src/modules/courses/common/courseMessage.css
@@ -25,7 +25,7 @@
 } */
 
 #forum_list .return_btn.no_mr {
-  margin-right: 15px
+  /* margin-right: 15px */
 }
 
 /* md编辑器拖拽调整 */
diff --git a/public/react/src/modules/courses/exercise/ExerciseNew.js b/public/react/src/modules/courses/exercise/ExerciseNew.js
index 88e1859f9..8bc7ed6ae 100644
--- a/public/react/src/modules/courses/exercise/ExerciseNew.js
+++ b/public/react/src/modules/courses/exercise/ExerciseNew.js
@@ -405,10 +405,10 @@ class ExerciceNew extends Component{
               { name: this.isEdit ? '编辑试卷' : '新建试卷'}
             ]}></CBreadcrumb>
 
-            <p className="clearfix mt30 mb30">
+            <p className="clearfix mt20 mb20">
               <span className="fl font-24 color-grey-3">{this.isEdit ? "编辑" : "新建"}试卷</span>
               <a href="javascript:void(0)" className="color-grey-6 fr font-16 mr2" 
-                  onClick={() => this.props.history.goBack()}>
+                  onClick={() => this.props.history.length == 1 ? this.props.history.push(`/courses/${courseId}/exercises/${left_banner_id}`): this.props.history.goBack()}>
                 返回
               </a>
             </p>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index 9874b26fa..39116c5de 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -79,7 +79,12 @@ class GraduationTasksedit extends Component{
     let listid=[]
     let graduation_id=this.state.data.graduation_id;
     for(var list of fileList){
-      listid.push(list.response.id)
+    	if(list.response!=undefined){
+				listid.push(list.response.id)
+			}else{
+				listid.push(list.uid)
+			}
+
     }
 
     // console.log(listid)
@@ -125,7 +130,7 @@ class GraduationTasksedit extends Component{
               GraduationTasksedittype=false;
               // window.location.href="/courses/"+course_id+"/graduation/"+graduationId+"/graduation_tasks/"+category_id+"/questions";
               // this.goback()
-							window.location.href="/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+graduation_id+"/"+this.props.match.params.category_id +"/setting";
+              this.props.history.push("/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/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js
index d8fb83974..6c0158f21 100644
--- a/public/react/src/modules/courses/new/CoursesNew.js
+++ b/public/react/src/modules/courses/new/CoursesNew.js
@@ -314,7 +314,7 @@ class CoursesNew extends Component {
             }
         }).then((result)=>{
             this.setState({
-                searchlistscholl:result.data.shools_name,
+                searchlistscholl:result.data.school_names,
                 scholl:value
             })
             this.props.form.setFieldsValue({