Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

public/react/src/modules/courses/busyWork/CommonWorkAppraise.js

@@ -190,7 +190,7 @@ class CommonWorkAppraise extends Component{
             <div className={"color-grey-6 h20 mb20 font-16"}>
               内容
             </div>
-            <div className={"ml20"} className="markdown-body" dangerouslySetInnerHTML={{__html: markdownToHTML(description)}}>
+            <div className="markdown-body ml20" dangerouslySetInnerHTML={{__html: markdownToHTML(description)}}>
             </div>
 
             {attachments.map((item,key)=>{

public/react/src/modules/courses/busyWork/CommonWorkList.js

@@ -80,7 +80,7 @@ function buildColumns(that, student_works) {
 					overflow: 'hidden',
 					textOverflow: 'ellipsis',
 					whiteSpace: 'nowrap',
-          maxWidth: '98px'
+          width: '98px'
 					 }} title={text}>
 				{/* <Tooltip placement="bottom" title={text}>
 				</Tooltip> */}
@@ -99,7 +99,7 @@ function buildColumns(that, student_works) {
         <span>
           <a href="javascript:;"  
             title={record.student_id}
-            style={{color:'#9A9A9A', 'text-overflow': 'ellipsis', 'white-space': 'nowrap', 'max-width': '100px', display: 'block', overflow: 'hidden'}}
+            style={{color:'#9A9A9A', 'text-overflow': 'ellipsis', 'white-space': 'nowrap', 'width': '100px', display: 'block', overflow: 'hidden'}}
           >{record.student_id}</a>
       </span>
       ),
@@ -234,7 +234,7 @@ function buildColumns(that, student_works) {
         <span>
           <Tooltip title={
             getScoreTip(student_score,
-            <div>
+            isNiPing ? `你的评阅分数：${record.student_score}分` : <div>
               {record.student_comment_count && <div>{`${record.student_comment_count}名学生进行了匿评`}</div>}
               <div>有效平均分：{record.student_score}分</div>
             </div>