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

public/react/src/common/educoder.js

@@ -2,7 +2,8 @@ import { from } from '_array-flatten@2.1.2@array-flatten';
 
 // export { default as OrderStateUtil } from          '../routes/Order/components/OrderStateUtil';
 
-export { getImageUrl as getImageUrl, getUrl as getUrl, getUrl2 as getUrl2, setImagesUrl as setImagesUrl, getUploadActionUrl as getUploadActionUrl } from                './UrlTool';
+export { getImageUrl as getImageUrl, getUrl as getUrl, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
+        , getUploadActionUrl as getUploadActionUrl, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth } from                './UrlTool';
 export { default as queryString } from                './UrlTool2';
  
 export { SnackbarHOC as SnackbarHOC } from                './SnackbarHOC';

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/paths/ShixunPathSearch.js

@@ -117,14 +117,14 @@ class ShixunPathSearch extends Component{
             <a href="javascript:void(0)" className={ order == "updated_at" ? "fl mr20 font-16 bestChoose active" : "fl mr20 font-16 bestChoose"} onClick={ () => this.changeStatus("updated_at")}>最新</a>
             <a href="javascript:void(0)" className={ order == "myshixun_count" ? "fl mr20 font-16 bestChoose active" : "fl mr20 font-16 bestChoose"} onClick={ () => this.changeStatus("myshixun_count")}>最热</a>
             <div className="fr mr5 search-new">
-              <Search
+              {/* <Search
               placeholder="请输入路径名称进行搜索"
               id="subject_search_input"
               value={search}
               onInput={this.inputSearchValue}
               onSearch={this.searchValue}
               autoComplete="off"
-              ></Search>
+              ></Search> */}
             </div>
           </div>
           <PathCard {...this.props} {...this.state}></PathCard>