Merge remote-tracking branch 'origin/master'

public/react/src/AppConfig.js

@@ -102,6 +102,7 @@ export function initAxiosInterceptors(props) {
         if(response===undefined){
            return
        }
+       const config = response.config
         if (response.data.status === -1) {
         //     console.error('error:', response.data.message)
         //     throw new Error()

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

@@ -243,6 +243,12 @@ class CommonWorkDetailIndex extends Component{
                         {work_statuses && work_statuses.indexOf('提交作品') != -1 && <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
                             onClick={() => { this.props.toWorkPostPage(this.props.match.params)}}
                         >提交作品</a>}
+
+                        { work_statuses && work_statuses.indexOf('补交作品') != -1 &&
+                        <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
+                            onClick={() => { this.props.toWorkPostPage(this.props.match.params, null, true, work_id)}}>
+                        补交作品</a> }
+
                         {work_statuses && work_statuses.indexOf('修改作品') != -1 && <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
                             onClick={() => { this.props.toWorkPostPage(this.props.match.params, null, true, work_id)}}
                         >修改作品</a>}

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/busyWork/commonWork.js

@@ -88,10 +88,14 @@ class commonWork extends Component{
     let {page,search,order}=this.state;
     this.getList(page,search,order);
   }
-  useBankSuccess = () => {
+  useBankSuccess = (checkBoxValues, newWorkIdArray) => {
     this.setState({
-      page:1
+      page:1,
+      checkBoxValues: newWorkIdArray
+    }, () => {
+      this.refs['publishModalRef'].open()
     })
+    
     let {search, order}=this.state;
     this.getList(1, search, order);
   }
@@ -418,7 +422,7 @@ class commonWork extends Component{
                       onClick={this.onWorkDelete}>删除</a>
                 </li>
                 <li className="li_line">
-                  <PublishRightnow showActionButton={true} {...this.props} checkBoxValues={checkBoxValues} 
+                  <PublishRightnow ref="publishModalRef" showActionButton={true} {...this.props} checkBoxValues={checkBoxValues} 
                       isPublish={true} doWhenSuccess={this.doWhenSuccess} fromListPage={true}></PublishRightnow>
                 </li>
                 <li className="li_line">

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

@@ -160,7 +160,6 @@ class GraduationTasksappraiseReply extends Component{
       <React.Fragment>
 				{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}
               {...this.state}
@@ -170,8 +169,7 @@ class GraduationTasksappraiseReply extends Component{
               addSuccess={this.addSuccess}
               onDelete={this.onDelete}
             />
-          :
+          : <GraduationTasksappraiseReplyChild {...this.state} {...this.props}
-              <GraduationTasksappraiseReplyChild {...this.state} {...this.props}
                  cancelmodel={this.cancelmodel}
                  showModulationtype={(id)=>this.showModulationtype(id)}
                  saveModulationModal={(value,num)=>this.saveModulationModal(value,num)}

public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js

@@ -80,10 +80,11 @@ class GraduateTopicDetailTable extends Component{
   }
   sureAgreeTopic=(count)=>{
     if(count > 0){
+      debugger
       let{tableData}=this.props;
       let{operationId,classesId}=this.state
       let courseId=this.props.match.params.course_id;
-      let name=tableData.group_list.filter(item=>item.course_group_id==classesId)[0].group_name;
+      let name=tableData.group_list.filter(item=>item.group_id==classesId)[0].group_name;
       this.agreeChoose(courseId,operationId,classesId,name);
     }else{
       this.setState({

public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js

@@ -1747,7 +1747,7 @@ class Trainingjobsetting extends Component {
                                         <div>
                                             <div className="clearfix mb5 ml15">
                                                 <span className="font-16 mr15 fl mt6" style={{"color":"#999999"}}>发布时间：</span>
-                                                <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : starttimetype === true ? "发布时间已过，则不能修改" : ""}></Tooltip>
+                                                <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditstwo === true ? "发布时间已过，则不能修改" : ""}>
                                                 <div className="fl">
                                                     <DatePicker
                                                         showToday={false}
@@ -1775,11 +1775,12 @@ class Trainingjobsetting extends Component {
                                                         }
                                                     </p>
                                                 </div>
+                                                </Tooltip>
                                                 <span className="ml20 fl mt10" style={{"color":"#999999","text-align":"left","font-size":"14px"}}>(学生收到作业的时间)</span>
                                             </div>
                                             <div className="clearfix ml15">
                                                 <span className="mr15 fl mt10 font-16" style={{"color":"#999999"}}>截止时间：</span>
-                                                <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : starttimetype === true ? "截止时间已过，则不能修改" : ""}> </Tooltip>
+                                                <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditsthrees === true ? "截止时间已过，则不能修改" : ""}>
                                                 <div className="fl">
                                                     <DatePicker
                                                         showToday={false}
@@ -1807,6 +1808,7 @@ class Trainingjobsetting extends Component {
                                                         }
                                                     </p>
                                                 </div>
+                                                </Tooltip>
                                                 <span className=" ml20 fl mt10 color-grey-9" style={{"text-align":"left","font-size":"14px"}}>(学生“按时”提交作品的时间截点)</span>
                                             </div>
                                         </div>
@@ -1924,7 +1926,7 @@ class Trainingjobsetting extends Component {
                                           checked={this.state.completionefficiencyscore} style={{"color":"#666666"}}>效率分<span
                                     className={"font-14 color-grey-9 font-14 ml15"} style={{"text-align":"left"}}>(选中，则学生最终成绩包含效率分)</span></Checkbox>
                             </div>
-                            <div className="ml80 mt30">
+                            <div className="ml85 mt30">
                                 <span className="c_grey mr10" style={{"color":"#999999"}}>分值</span>
                                 <InputNumber min={0} disabled={!flagPageEdit} max={100} className="ml10 h40 mr10  color-grey-9"
                                              style={{width: "100px","color":"#999999"}}

public/react/src/modules/login/LoginDialog.css

@@ -1,5 +1,5 @@
 .dialogBox{
-    height: 370px;
+    height: 338px;
 }
 .dialogBox2{
     height: 420px;

public/react/src/modules/login/Trialapplication.js

@@ -268,25 +268,23 @@ class Trialapplication extends Component {
 			reason: this.state.reason,
 		}).then((result) => {
 			// console.log(result);
-			try {
 				// this.onTabChange("1");
-				thiss.props.showNotification(`试用申请已提交，我们将尽快完成审核`);
+			if(result !== undefined){
-				if (thiss.state.showTrial === false) {
+				this.props.showNotification(`试用申请已提交，我们将尽快完成审核`);
+				if (this.state.showTrial === false) {
 					window.location.href = "/";
-					thiss.setState({
+					this.setState({
 						isRenders: false
 					})
-					thiss.Cancel();
+					this.Cancel();
 
 				} else {
-					thiss.setState({
+					this.setState({
 						isRenders: false
 					})
-					thiss.Cancel();
+					this.Cancel();
 
 				}
-			} catch (e) {
-
 			}
 		}).catch((error) => {
 

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