From e2c80258a26f875d91580179268f946c111e0224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 9 Aug 2019 18:13:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=9D=9E=E8=AF=BE=E5=A0=82=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/shixunHomework/Listofworksstudentone.js | 2 +- public/react/src/modules/courses/shixunHomework/style.css | 3 +++ public/react/src/search/SearchPage.js | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index ac4664b82..2c0b7d9a1 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -3203,7 +3203,7 @@ class Listofworksstudentone extends Component { { teacherdata && teacherdata.work_count && teacherdata.work_count > limit ? -
+
diff --git a/public/react/src/modules/courses/shixunHomework/style.css b/public/react/src/modules/courses/shixunHomework/style.css index a07c1152e..f2b0c39ed 100644 --- a/public/react/src/modules/courses/shixunHomework/style.css +++ b/public/react/src/modules/courses/shixunHomework/style.css @@ -50,4 +50,7 @@ text-overflow:ellipsis; white-space:nowrap; cursor: default; +} +.ysyslxh{ + background: #fafafa; } \ No newline at end of file diff --git a/public/react/src/search/SearchPage.js b/public/react/src/search/SearchPage.js index 5b3d51d22..33a1a7852 100644 --- a/public/react/src/search/SearchPage.js +++ b/public/react/src/search/SearchPage.js @@ -252,7 +252,7 @@ class SearchPage extends Component{ {item.content.member_user_names === undefined || item.content.member_user_names===0?"": item.content.member_user_names.map((item7, key7) => { return (
- 合作单位： + 合作团队： 1?" tzbq ":" tzbqx"} dangerouslySetInnerHTML={{__html:item7}} />
From a0b5fd69fb019c0dcc19e6729a85ff46c5b6fcdd 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, 10 Aug 2019 09:31:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=20=E8=B0=83=E6=95=B4=E7=81=AB=E7=8B=90?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=8A=A0=E8=BD=BD=E5=88=B7=E6=96=B0=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/coursesPublic/PathModal.js | 18 ++++++++------ .../courses/coursesPublic/ShixunModal.js | 24 +++++++++++-------- .../react/src/modules/courses/css/Courses.css | 4 ++-- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/public/react/src/modules/courses/coursesPublic/PathModal.js b/public/react/src/modules/courses/coursesPublic/PathModal.js index 3fbbd4af4..07ce55024 100644 --- a/public/react/src/modules/courses/coursesPublic/PathModal.js +++ b/public/react/src/modules/courses/coursesPublic/PathModal.js @@ -122,16 +122,20 @@ class PathModal extends Component{ contentViewScrolledit=(e)=>{ //滑动到底判断 + const {shixunmodallist} = this.state; if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){ - let {Searchvalue,type,page,shixunpathlist}=this.state; - let newpage=page+1 - this.funshixunpathlist(Searchvalue,type,true,newpage) - this.setState({ - page:newpage - }) - + if(shixunmodallist.subject_list.length===0){ + return; + }else{ + let {Searchvalue,type,page,shixunpathlist}=this.state; + let newpage=page+1 + this.funshixunpathlist(Searchvalue,type,true,newpage) + this.setState({ + page:newpage + }) + } } } diff --git a/public/react/src/modules/courses/coursesPublic/ShixunModal.js b/public/react/src/modules/courses/coursesPublic/ShixunModal.js index 1ae63da90..2a53cf104 100644 --- a/public/react/src/modules/courses/coursesPublic/ShixunModal.js +++ b/public/react/src/modules/courses/coursesPublic/ShixunModal.js @@ -100,17 +100,21 @@ class ShixunModal extends Component{ } contentViewScrolledit=(e)=>{ - + const {shixunmodallist}=this.state; //滑动到底判断 - if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){ - let {Searchvalue,type,page}=this.state; - let newpage=page+1 - this.setupdatalist(Searchvalue,type,true,newpage) - this.setState({ - page:newpage - }) - } - + if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight) { + + if (shixunmodallist.shixun_list.length === 0) { + return; + } else { + let {Searchvalue, type, page} = this.state; + let newpage = page + 1 + this.setupdatalist(Searchvalue, type, true, newpage) + this.setState({ + page: newpage + }) + } + } } //搜索 diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css index 47db2f595..b6388b1e7 100644 --- a/public/react/src/modules/courses/css/Courses.css +++ b/public/react/src/modules/courses/css/Courses.css @@ -477,9 +477,9 @@ a.white-btn.use_scope-btn:hover{ } .pathInfobox li{ margin-right: 20px; - height: 15px; + height: 20px; /*overflow: hidden;*/ - line-height: 15px; + line-height: 20px; } .width70f{ width: 70px; From 230b603b005921937a3bb12e7360a7742e8d9055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Sat, 10 Aug 2019 09:46:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shixunHomework/Listofworksstudentone.js | 39 ++++++++++++++----- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 2c0b7d9a1..fef1bec75 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -1608,7 +1608,7 @@ class Listofworksstudentone extends Component { } - paginationonChanges = (pageNumber) => { + paginationonChangestwo = (pageNumber) => { this.setState({ page: pageNumber, loadingstate: true, @@ -2495,7 +2495,10 @@ class Listofworksstudentone extends Component { // console.log(datajs); // console.log("2202"); // console.log(this.props.isAdmin()); - + // console.log("2498"); + // console.log(data); + // console.log(datas); + // console.log(this.props.isAdmin()); return ( this.props.isAdmin() === true ? ( @@ -2927,8 +2930,8 @@ class Listofworksstudentone extends Component { {teacherdata === undefined ? "" : teacherdata.commit_count === undefined ? "" : teacherdata.commit_count}已交{teacherdata === undefined ? "" : teacherdata.uncommit_count}未交 + className="color-orange-tip">{teacherdata === undefined ? "0" : teacherdata.commit_count === undefined ? "0" : teacherdata.commit_count}已交{teacherdata === undefined ? "0" : teacherdata.uncommit_count}未交 {teacherdata === undefined ? "" : teacherdata.left_time === undefined ? "" : teacherdata.left_time === null ? "" : {teacherdata.left_time.status} } @@ -2969,6 +2972,12 @@ class Listofworksstudentone extends Component { .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot { top: 72%;} } + .edu-table .ant-table-tbody > tr > td { + height: 85px; + } + .edu-table .ant-table-thead > tr > th{ + height: 85px; + } .ysltableow .ant-table-thead > tr > th{ height: 85px; } @@ -3033,7 +3042,7 @@ class Listofworksstudentone extends Component { }
-
+