From 8f97c7f9576241b34686dfba130287b7d30002a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 8 Oct 2019 15:30:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/courses/exercise/Exercise.js | 3 ++-
.../graduation/tasks/GraduationTaskDetail.js | 2 +-
.../modules/courses/graduation/tasks/index.js | 3 ++-
public/react/src/modules/courses/poll/Poll.js | 3 ++-
.../courses/shixunHomework/shixunHomework.js | 23 +++++++++++++------
5 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/public/react/src/modules/courses/exercise/Exercise.js b/public/react/src/modules/courses/exercise/Exercise.js
index 65377bb19..8fd31cd5c 100644
--- a/public/react/src/modules/courses/exercise/Exercise.js
+++ b/public/react/src/modules/courses/exercise/Exercise.js
@@ -120,11 +120,12 @@ class Exercise extends Component{
changeType=(e)=>{
this.setState({
type:e.key,
+ page:1,
checkAllValue:false,
checkBoxValues:[]
})
let{StudentList_value,page,limit}=this.state;
- this.InitList(e.key==="0"?undefined:e.key,StudentList_value,page,limit)
+ this.InitList(e.key==="0"?undefined:e.key,StudentList_value,1,limit)
}
//切换分页
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js
index 6e809b874..a219fe409 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js
@@ -455,7 +455,7 @@ class GraduationTaskDetail extends Component{
{item==="提交作品"?提交作品:""}
{item==="补交作品"?补交作品:""}
{item==="修改作品"?修改作品:""}
- {item==="查看作品"?查看作品 :""}
+ {item==="查看作品"?查看作品 :""}
{item==="创建项目"?创建项目:""}
{item==="关联项目"?关联项目:""}
{item==="取消关联"?取消关联:""}
diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js
index f33614e76..0fbc3bc2f 100644
--- a/public/react/src/modules/courses/graduation/tasks/index.js
+++ b/public/react/src/modules/courses/graduation/tasks/index.js
@@ -385,6 +385,7 @@ class GraduationTasks extends Component{
this.setState({
order: e.key,
+ page:1,
isSpin:true,
checkBoxValues:[],
checkAllValue:false
@@ -395,7 +396,7 @@ class GraduationTasks extends Component{
newkey="all"
}
- this.fetchAll(search,page,newkey);
+ this.fetchAll(search,1,newkey);
}
onPressEnter = (value) => {
diff --git a/public/react/src/modules/courses/poll/Poll.js b/public/react/src/modules/courses/poll/Poll.js
index e7846e3fa..2831611c5 100644
--- a/public/react/src/modules/courses/poll/Poll.js
+++ b/public/react/src/modules/courses/poll/Poll.js
@@ -96,11 +96,12 @@ class Poll extends Component{
changeType=(e)=>{
this.setState({
type:e.key,
+ page:1,
checkBoxValues:[],
checkAllValue:false
})
let{StudentList_value,page}=this.state;
- this.InitList(e.key,StudentList_value,page);
+ this.InitList(e.key,StudentList_value,1);
}
// 获取列表数据
InitList=(type,search,page,bank_checkValue)=>{
diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
index 221a8e377..8e68a7398 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
@@ -43,7 +43,7 @@ class ShixunHomework extends Component{
datas:undefined,
page:1,
Coursename:"",
- order:"",
+ order:undefined,
orders:"8",
shixunmodal:false,
shixunmodallist:undefined,
@@ -92,7 +92,9 @@ class ShixunHomework extends Component{
this.setState({
isSpin:true,
checkedtype:false,
- orders:"8"
+ order:undefined,
+ orders:"8",
+ page:1,
})
this.seactall();
if(this.props.isAdmin()===true){
@@ -103,7 +105,9 @@ class ShixunHomework extends Component{
this.setState({
isSpin:true,
checkedtype:false,
- orders:"8"
+ order:undefined,
+ orders:"8",
+ page:1
})
this.seactall(parseInt(this.props.match.params.category_id))
if(this.props.isAdmin()===true){
@@ -143,7 +147,9 @@ class ShixunHomework extends Component{
if(this.props.match.params.main_id!=undefined){
this.setState({
checkedtype:false,
- orders:"8"
+ orders:"8",
+ order:undefined,
+ page:1
})
this.seactall();
}
@@ -152,7 +158,9 @@ class ShixunHomework extends Component{
if(this.props.match.params.category_id!=undefined){
this.setState({
checkedtype:false,
- orders:"8"
+ orders:"8",
+ order:undefined,
+ page:1
})
this.seactall(parseInt(this.props.match.params.category_id))
}
@@ -608,14 +616,15 @@ class ShixunHomework extends Component{
orders:e.key,
checkBoxValues:[],
checkedtype:false,
- isSpin:true
+ isSpin:true,
+ page:1,
});
let newkey=e.key;
if(newkey==="8"){
newkey=undefined
}
- this.homeworkupdatalist(Coursename,page,newkey);
+ this.homeworkupdatalist(Coursename,1,newkey);
}
funpatheditarry=(list)=>{