From 071692035fc7be5a5265f87e19841a34fd5fa32f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 11 Nov 2019 09:38:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=BE=E5=A0=82=E6=A8=A1?=
=?UTF-8?q?=E5=9D=97=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../courses/common/button/CheckAllGroup.js | 4 +-
.../exercise/Studentshavecompletedthelist.js | 124 ++++++++++--------
.../tasks/GraduationTaskssettinglist.js | 56 ++++----
.../shixunHomework/Listofworksstudentone.js | 47 ++++---
.../shixunHomework/ShixunStudentWork.js | 2 +-
5 files changed, 125 insertions(+), 108 deletions(-)
diff --git a/public/react/src/modules/courses/common/button/CheckAllGroup.js b/public/react/src/modules/courses/common/button/CheckAllGroup.js
index b19b684f7..21f7e6683 100644
--- a/public/react/src/modules/courses/common/button/CheckAllGroup.js
+++ b/public/react/src/modules/courses/common/button/CheckAllGroup.js
@@ -20,7 +20,7 @@ class CheckAllGroup extends Component{
this.props.onChange && this.props.onChange([], true);
}
onChange = (checkedValues) => {
- if (checkedValues.length > 0 && checkedValues.length != this.props.options.length) {
+ if (checkedValues.length > 0) {
this.setState({
'checkAll': false,
checkedValues
@@ -48,7 +48,7 @@ class CheckAllGroup extends Component{
`}
{label}
-
+
{
diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index be7871d7b..96b0790e4 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -2155,24 +2155,28 @@ class Studentshavecompletedthelist extends Component {
}
this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
- } else if (checkedValues.length === data.length) {
- if (this.state.loadingstate === false) {
- this.setState({
- loadingstate: true,
- course_groupyslstwo: undefined,
- unlimiteds: 0,
- page:1
- })
- } else {
- this.setState({
- course_groupyslstwo: undefined,
- unlimiteds: 0,
- page:1,
- })
- }
-
- this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
- } else {
+ }
+ // else if (checkedValues.length === data.length) {
+ // if (this.state.loadingstate === false) {
+ // this.setState({
+ // loadingstate: true,
+ // course_groupyslstwo: undefined,
+ // unlimiteds: 0,
+ // page:1
+ // })
+ // }
+ //
+ // else {
+ // this.setState({
+ // course_groupyslstwo: undefined,
+ // unlimiteds: 0,
+ // page:1,
+ // })
+ // }
+ //
+ // this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
+ // }
+ else {
// //console.log(checkedValues);
this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
if (this.state.loadingstate === false) {
@@ -2234,24 +2238,26 @@ class Studentshavecompletedthelist extends Component {
}
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
- } else if (checkedValues.length === data.length) {
- if (this.state.loadingstate === false) {
- this.setState({
- unlimited: 0,
- course_groupyslsthree: undefined,
- loadingstate: true,
- page:1
- })
- } else {
- this.setState({
- unlimited: 0,
- course_groupyslsthree: undefined,
- page:1
- })
- }
-
- this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
- } else {
+ }
+ // else if (checkedValues.length === data.length) {
+ // if (this.state.loadingstate === false) {
+ // this.setState({
+ // unlimited: 0,
+ // course_groupyslsthree: undefined,
+ // loadingstate: true,
+ // page:1
+ // })
+ // } else {
+ // this.setState({
+ // unlimited: 0,
+ // course_groupyslsthree: undefined,
+ // page:1
+ // })
+ // }
+ //
+ // this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
+ // }
+ else {
// //console.log(checkedValues);
if (this.state.loadingstate === false) {
this.setState({
@@ -2314,24 +2320,26 @@ class Studentshavecompletedthelist extends Component {
}
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit, this.state.order_type)
- } else if (checkedValues.length === data.length) {
- if (this.state.loadingstate === false) {
- this.setState({
- course_groupysls: undefined,
- unlimitedtwo: 0,
- loadingstate: true,
- page:1,
- })
- } else {
- this.setState({
- course_groupysls: undefined,
- unlimitedtwo: 0,
- page:1,
- })
- }
-
- this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit, this.state.order_type)
- } else {
+ }
+ // else if (checkedValues.length === data.length) {
+ // if (this.state.loadingstate === false) {
+ // this.setState({
+ // course_groupysls: undefined,
+ // unlimitedtwo: 0,
+ // loadingstate: true,
+ // page:1,
+ // })
+ // } else {
+ // this.setState({
+ // course_groupysls: undefined,
+ // unlimitedtwo: 0,
+ // page:1,
+ // })
+ // }
+ //
+ // this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit, this.state.order_type)
+ // }
+ else {
// //console.log(checkedValues);
if (this.state.loadingstate === false) {
this.setState({
@@ -2690,7 +2698,7 @@ class Studentshavecompletedthelist extends Component {
作品状态:
+ onClick={() => this.notlimiteds()}>全部
this.checkeboxstwo(e, course_groupyslstwodata && course_groupyslstwodata)}>
{
@@ -2721,7 +2729,7 @@ class Studentshavecompletedthelist extends Component {
你的评阅:
+ onClick={() => this.notlimited()}>全部
this.checkeboxs(e, course_groupyslstwodata && course_groupyslstwodata)}>
@@ -2752,7 +2760,7 @@ class Studentshavecompletedthelist extends Component {
作品状态:
+ onClick={() => this.notlimiteds()}>全部
this.checkeboxstwo(e, course_groupyslstwodata && course_groupyslstwodata)}>
{
@@ -2778,7 +2786,7 @@ class Studentshavecompletedthelist extends Component {
+ onClick={() => this.funtaskstatustwos()}>全部
|
教师评阅:
-
+
this.funteachercomment(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.teacher_comment.length)} style={{ paddingTop: '4px'}}>
{taskslistdata.search_assistants && taskslistdata.search_assistants.teacher_comment && taskslistdata.search_assistants.teacher_comment.map((item,key)=>{
@@ -1172,7 +1176,7 @@ class GraduationTaskssettinglist extends Component{
作品状态:
-
+
this.funtaskstatus(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.task_status.length)} style={{ paddingTop: '4px'}}>
@@ -1194,7 +1198,7 @@ class GraduationTaskssettinglist extends Component{
{taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.length!=0?
分班情况:
-
+
this.groupgroup(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.length)} style={{width: '1000px', paddingTop: '4px'}}>
@@ -1220,7 +1224,7 @@ class GraduationTaskssettinglist extends Component{
交叉评阅:
-
+
{taskslistdata.search_assistants&&taskslistdata.search_assistants.cross_comment.map((item,key)=>{
@@ -1331,7 +1335,7 @@ class GraduationTaskssettinglist extends Component{
教师评阅:
-
+
this.funteachercomment(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.teacher_comment.length)} style={{ paddingTop: '4px'}}>
@@ -1364,7 +1368,7 @@ class GraduationTaskssettinglist extends Component{
作品状态:
-
+
this.funtaskstatus(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.task_status.length)} style={{ paddingTop: '4px'}}>
@@ -1387,7 +1391,7 @@ class GraduationTaskssettinglist extends Component{
分班情况:
-
+
this.groupgroup(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.length)} style={{ paddingTop: '4px'}}>
@@ -1409,7 +1413,7 @@ class GraduationTaskssettinglist extends Component{
交叉评阅:
-
+
{taskslistdata.search_assistants&&taskslistdata.search_assistants.cross_comment.map((item,key)=>{
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index a0d641aa5..c2d78f83e 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -2793,15 +2793,7 @@ class Listofworksstudentone extends Component {
page: 1,
})
this.Startsortingt(this.state.orders, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.myorders);
- } else if (checkedValues.length === data.length) {
- this.setState({
- unlimited: 0,
- course_groupyslstwo: [],
- loadingstate: true,
- page: 1,
- })
- this.Startsortingt(this.state.orders, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.myorders);
- } else {
+ }else {
// console.log(checkedValues);
this.setState({
course_groupyslstwo: checkedValues,
@@ -2812,6 +2804,16 @@ class Listofworksstudentone extends Component {
this.Startsortingt(this.state.orders, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.myorders);
}
+ // else if (checkedValues.length === data.length) {
+ // // this.setState({
+ // // unlimited: 0,
+ // // course_groupyslstwo: [],
+ // // loadingstate: true,
+ // // page: 1,
+ // // })
+ // // this.Startsortingt(this.state.orders, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.myorders);
+ // }
+
}
//作品状态2
funtaskstatustwot = (checkedValues, data) => {
@@ -2827,16 +2829,7 @@ class Listofworksstudentone extends Component {
page: 1,
})
this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, checkedValues, this.state.searchtext, 1, this.state.limit, this.state.myorders);
- } else if (checkedValues.length === data.length) {
- this.setState({
- unlimitedtwo: 1,
- course_groupysls: undefined,
- checkedValuesineinfo: [],
- loadingstate: true,
- page: 1,
- })
- this.Startsortingt(this.state.orders, this.state.checcourse_groupyslstwokedValuesine, checkedValues, this.state.searchtext, 1, this.state.limit, this.state.myorders);
- } else {
+ }else {
this.setState({
checkedValuesineinfo: checkedValues,
course_groupysls: checkedValues,
@@ -2849,6 +2842,18 @@ class Listofworksstudentone extends Component {
}
+ // else if (checkedValues.length === data.length) {
+ // this.setState({
+ // unlimitedtwo: 1,
+ // course_groupysls: undefined,
+ // checkedValuesineinfo: [],
+ // loadingstate: true,
+ // page: 1,
+ // })
+ // this.Startsortingt(this.state.orders, this.state.checcourse_groupyslstwokedValuesine, checkedValues, this.state.searchtext, 1, this.state.limit, this.state.myorders);
+ // }
+
+
}
//搜索学生 文字输入
inputSearchValuest = (e) => {
@@ -3559,7 +3564,7 @@ class Listofworksstudentone extends Component {
作品状态:
+ onClick={() => this.notlimiteds()}>全部
this.funtaskstatust(e, task_status && task_status)}
style={{paddingTop: '4px'}}>
@@ -3591,7 +3596,7 @@ class Listofworksstudentone extends Component {
分班情况:
+ onClick={() => this.notlimitedst()}>全部
this.funtaskstatustwot(e, course_group_info && course_group_info)}
style={{paddingTop: '4px', width: '1017px'}}>
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
index a89022ee6..01f7055ce 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
@@ -919,7 +919,7 @@ class ShixunStudentWork extends Component {
|