From 3d80f6b6ff1e2905673d90b407c69907f5c43b17 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Sat, 20 Jul 2019 21:05:36 +0800 Subject: [PATCH 1/4] au --- public/react/src/common/educoder.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/react/src/common/educoder.js b/public/react/src/common/educoder.js index 128963c25..f090d2c39 100644 --- a/public/react/src/common/educoder.js +++ b/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'; From 0f4147892ab19f2977873c0f5d913fb5687854b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 20 Jul 2019 21:48:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/shixunHomework/ShixunHomeworkPage.js | 5 ++++- .../courses/shixunHomework/ShixunStudentWork.js | 10 ++++++++-- .../modules/courses/shixunHomework/ShixunWorkReport.js | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js index a1f670d03..48bb26ad3 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js @@ -111,6 +111,9 @@ class ShixunHomeworkPage extends Component { let {tab, teacherdata, jobsettingsdata} = this.state; const isAdmin = this.props.isAdmin(); + + console.log(this.props) + console.log(this.state) return (
@@ -222,7 +225,7 @@ class ShixunHomeworkPage extends Component { this.workshowmodels(this.child)}>代码查重 : "" : ""} {this.state.view_report === true ? + to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${teacherdata&&teacherdata.work_id}/shixun_work_report`}> 查看实训报告 : ""} { diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js index ed399af98..2da778707 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js @@ -759,7 +759,13 @@ class ShixunStudentWork extends Component { top: 72%;} } `} - {datalist === undefined ? "" : +
+ +

暂无数据哦~

+
+ :
{ - datalist === undefined ? "":datalist.length<11? + datalist === undefined ? "":datalist.length===0?"":datalist.length<11?
; From ff40ae2b7740badfbea7d7a9a8d0d4e75f1692b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 20 Jul 2019 21:49:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/shixunHomework/ShixunHomeworkPage.js | 2 -- .../src/modules/courses/shixunHomework/ShixunStudentWork.js | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js index 112193d2e..60f84b0da 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js @@ -115,8 +115,6 @@ class ShixunHomeworkPage extends Component { const isAdmin = this.props.isAdmin(); - console.log(this.props) - console.log(this.state) return (
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js index 08cc0c1c3..d4e1855ed 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js @@ -815,7 +815,7 @@ class ShixunStudentWork extends Component { top: 72%;} } `} - + {datalist === undefined ? "" : datalist.length===0?
From 3b43f494eadeaf4abcb3944928aca333dcbfb7ef Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Sat, 20 Jul 2019 21:51:34 +0800 Subject: [PATCH 4/4] - --- public/react/src/modules/paths/ShixunPathSearch.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/paths/ShixunPathSearch.js b/public/react/src/modules/paths/ShixunPathSearch.js index 4ff7c6d97..c37754d62 100644 --- a/public/react/src/modules/paths/ShixunPathSearch.js +++ b/public/react/src/modules/paths/ShixunPathSearch.js @@ -117,14 +117,14 @@ class ShixunPathSearch extends Component{ this.changeStatus("updated_at")}>最新 this.changeStatus("myshixun_count")}>最热
- + > */}