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

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

@@ -234,7 +234,7 @@ function buildColumns(that, student_works) {
         <span>
           <Tooltip title={
             getScoreTip(student_score,
-            isNiPing ? `你的评阅分数：${record.student_score}分` : <div>
+            that.state.is_evaluation ? `你的评阅分数：${record.student_score}分` : <div>
               {record.student_comment_count && <div>{`${record.student_comment_count}名学生进行了匿评`}</div>}
               <div>有效平均分：{record.student_score}分</div>
             </div>
@@ -334,7 +334,7 @@ const orderMap = {
   work_score: 'asc',
   student_id: 'asc',
 }
-const PAGE_SIZE = 50
+const PAGE_SIZE = 20
 // 类似页面 http://localhost:3007/courses/1309/graduation/graduation_tasks/48/76/setting
 class CommonWorkList extends Component{
 
@@ -564,6 +564,19 @@ class CommonWorkList extends Component{
 			 }
 		})
 
+    // time_status	int	时间对应的状态: 0：未发布，1:提交中，2:补交中，3:匿评中，4:申诉中，5:评阅中，6:已结束
+
+    let timeMsg = '提交剩余时间'
+    if (time_status === 1) {
+
+    } else if (time_status === 2) {
+      timeMsg = '补交剩余时间'
+    } else if (time_status === 3) {
+      timeMsg = '匿评剩余时间'
+    } else if (time_status === 4) {
+      timeMsg = '申诉剩余时间'
+    }
+    
     // console.log(StudentData)
 		// console.log(student_works)
     return(
@@ -638,7 +651,7 @@ class CommonWorkList extends Component{
                     (!!commit_count || !!uncommit_count) &&
                     <React.Fragment>
                       <span className="color-orange-tip">{commit_count}</span>已交　{uncommit_count}未交　
-											{time_status===5?"":"剩余提交时间"}
+											{timeMsg || ''}
                       <span className="color-orange-tip">{left_time.time}</span>
                     </React.Fragment>
                   }

public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js

@@ -153,11 +153,12 @@ class GraduationTasksappraiseReply extends Component{
     const { current_user, memo } = this.props
     const isAdmin = this.props.isAdmin();
     const isStudent=this.props.isStudent();
+    const isNotMember=this.props.isNotMember();
 
 
     return(
       <React.Fragment>
-				{comment_scores.length===0? "": <div className="edu-back-white padding20-30" style={{marginTop: '16px'}}>
+				{comment_scores.length===0&&isStudent===true||comment_scores.length===0&&isNotMember===true? "": <div className="edu-back-white padding20-30" style={{marginTop: '16px'}}>
         {isStudent===true?
           <GraduationTasksappraiseReplyChild
               {...this.props}

public/react/src/modules/page/component/UpdateDrawer.js

@@ -198,7 +198,7 @@ class UpdateDrawer extends Component {
 		            	}
 		            </div>
 	          	</DialogContent>
-	          	<DialogActions id="dialog-actions">
+	          	<DialogActions id="dialog-actions" style={{ 'margin-bottom': '16px'}}>
 	          		{ needUpdateScript ? 
 	          		<React.Fragment>
 			            <Button