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

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

@@ -114,6 +114,7 @@ class ShixunHomeworkPage extends Component {
 		let {tab, teacherdata,  jobsettingsdata} = this.state;
 
 		const isAdmin = this.props.isAdmin();
+
 		return (
 			<div className="newMain clearfix ">
 				<div className={"educontent mb20"} style={{width: "1200px"}}>
@@ -225,7 +226,7 @@ class ShixunHomeworkPage extends Component {
 										<a className="fr color-blue font-16" onClick={(child)=>this.workshowmodels(this.child)}>代码查重</a>
 										: "" : ""}
 								{this.state.view_report === true ? <Link className="fr color-blue font-16" target={"_blank"}
-																												 to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${this.props.match.params.homeworkid}/shixun_work_report`}>
+																												 to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${teacherdata&&teacherdata.work_id}/shixun_work_report`}>
 									查看实训报告
 								</Link> : ""}
 								{

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

@@ -815,7 +815,13 @@ class ShixunStudentWork extends Component {
 													top: 72%;}
 								}
 							`}</style>
-							{datalist === undefined ? "" : <Table
+
+							{datalist === undefined ? "" : datalist.length===0? <div className="alltask">
+								<div className="edu-tab-con-box clearfix edu-txt-center">
+									<img className="edu-nodata-img mb20" src="/images/educoder/nodata.png" />
+									<p className="edu-nodata-p mb20">暂无数据哦~</p>
+								</div>
+							</div>:<Table
 								dataSource={datalist}
 								columns={columns}
 								pagination={false}
@@ -826,7 +832,7 @@ class ShixunStudentWork extends Component {
 				</div>
 
 						{
-							datalist === undefined ? "":datalist.length<11?
+							datalist === undefined ? "":datalist.length===0?"":datalist.length<11?
 								<div className="edu-txt-center mt30 mb20">
 									<Pagination showQuickJumper current={page}
 															onChange={this.TablePagination} pageSize={10}

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

@@ -103,7 +103,7 @@ class ShixunWorkReport extends Component {
 	}
 	render() {
 		let{data} =this.state;
-		let category_id=data===undefined?"":data.category.category_id;
+		let category_id=data===undefined?"":data.category===null?"":data.category.category_id;
 		let homework_common_id=data===undefined?"":data.homework_common_id;
 		let homeworkid=this.props.match.params.homeworkid;
 		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;

public/react/src/modules/user/modal/RealNameCertificationModal.js

@@ -30,7 +30,7 @@ class RealNameCertificationModal extends Component{
   constructor(props){
     super(props);
     this.state={
-      
+      fileList:[]
     }
   }
 
@@ -38,6 +38,7 @@ class RealNameCertificationModal extends Component{
     
   }
   setVisible = (visible) => {
+    this.setState({ fileList:[] });
     this.refs.modalWrapper.setVisible(visible)
   }
 
@@ -119,30 +120,26 @@ class RealNameCertificationModal extends Component{
         loading: false,
       }));
     }
+    let fileList = [...info.fileList];
+    this.setState({ fileList });
   }
 
   render(){
     const { course_lists, checkBoxValues, searchValue, loading, imageUrl, imageUrl2 } = this.state
     const { moduleName } = this.props
     const { getFieldDecorator } = this.props.form;
-    const uploadProps = {
-      name: 'file',
-      multiple: true,
-      showUploadList: false,
-      action: getUploadActionUrl(),
-      className: 'idPic-uploader first_uploader',
-      onChange: this.handleChange,
-    };
-
+    let {certification}=this.props;
+    
     const uploadProps2 = {
-      name: 'file',
+      name: 'image',
+      data:{type:certification == 1 ? "real_name" : "professional"},      
       multiple: true,
       showUploadList: false,
-      action: getUploadActionUrl(),
+      // https://newweb.educoder.net
+      action: `/api/users/accounts/${this.props.current_user.login}/auth_attachment.json`,
       className: 'idPic-uploader',
       onChange: this.handleChange2,
     };
-    let {certification}=this.props;
     return(
       <ModalWrapper
         ref="modalWrapper"
@@ -297,7 +294,7 @@ class RealNameCertificationModal extends Component{
               <span className="idPic-uploader demoImg">
                 <img src={`${certification == 1 ? authImg : jobImg}`} alt="avatar" style={{ maxHeight: '110px'}}/>
               </span>
-              <Dragger {...uploadProps2}>
+              <Dragger {...uploadProps2} fileList = {this.state.fileList}>
                 {imageUrl2 ? 
                   // <a href={imageUrl2} target="_blank" title="点击重新上传图片"></a>
                     <img src={imageUrl2} alt="avatar" style={{ maxHeight: '110px'}}/>