From 90ce3fa8f3e187246cd0182f5fcc907ed1bb3ec3 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Thu, 2 Jun 2022 17:09:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=AD=A6?=
=?UTF-8?q?=E5=91=98=E6=90=9C=E7=B4=A2=E9=A1=B5=E7=A0=81=E6=94=B9=E4=B8=BA?=
=?UTF-8?q?1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/Index.vue | 2 +-
src/views/article/MyList.vue | 3 ++-
src/views/article/contactMine.vue | 2 ++
src/views/exam/MyExamTask.vue | 2 ++
src/views/qa/MyList.vue | 4 +++-
src/views/qa/MyReplys.vue | 2 ++
src/views/share/MyList.vue | 6 ++++++
src/views/share/ToList.vue | 6 ++++++
src/views/user/MyAssess.vue | 11 ++++++++---
src/views/user/MyFavorites.vue | 8 ++++++++
10 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/src/views/Index.vue b/src/views/Index.vue
index 3edae977..59b5663f 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -368,7 +368,7 @@ export default {
device:1,
orderField: orderType == 1 ? '' : 'studys',
orderAsc: false,
- topOrder:true,
+ // topOrder:true,
pageIndex: pageIndex
};
let isTopList = [];
diff --git a/src/views/article/MyList.vue b/src/views/article/MyList.vue
index 80dbafc9..3d0a15c3 100644
--- a/src/views/article/MyList.vue
+++ b/src/views/article/MyList.vue
@@ -91,6 +91,7 @@ export default {
methods: {
search(){
this.isSearh = true;
+ this.pageData.pageIndex = 1;
this.getArticleList()
},
saveSuccess(data){
@@ -127,7 +128,7 @@ export default {
},
reset(){
-
+ this.pageData.pageIndex = 1;
this.pageData.keyword = '',
this.pageData.status = ''
this.getArticleList();
diff --git a/src/views/article/contactMine.vue b/src/views/article/contactMine.vue
index 18874e52..2f265100 100644
--- a/src/views/article/contactMine.vue
+++ b/src/views/article/contactMine.vue
@@ -141,6 +141,7 @@ export default {
components: {},
methods: {
getList() {
+ this.dataList.pageIndex = 1;
this.isSearh = true;
this.getData();
},
@@ -187,6 +188,7 @@ export default {
})
},
reset(){
+ this.dataList.pageIndex = 1;
this.dataList.send = '',
this.type = 0;
this.getData();
diff --git a/src/views/exam/MyExamTask.vue b/src/views/exam/MyExamTask.vue
index 43fd5a3f..035cc29c 100644
--- a/src/views/exam/MyExamTask.vue
+++ b/src/views/exam/MyExamTask.vue
@@ -113,11 +113,13 @@
},
search(){
this.isSearh = true;
+ this.pageIndex =1;
this.query()
},
reset() {
this.testName = '';
this.status='';
+ this.pageIndex =1;
this.query();
this.isSearh = false;
},
diff --git a/src/views/qa/MyList.vue b/src/views/qa/MyList.vue
index 2e0f4fa5..6671abca 100644
--- a/src/views/qa/MyList.vue
+++ b/src/views/qa/MyList.vue
@@ -94,12 +94,14 @@ export default {
reset(){
this.queryObj.keyWord = '',
- this.queryObj.isResolve = ''
+ this.queryObj.isResolve = '';
+ this.queryObj.pageIndex =1;
this.getData();
this.isSearh = false;
},
getList() {
this.isSearh = true;
+ this.queryObj.pageIndex =1;
this.getData();
},
//获取列表数据
diff --git a/src/views/qa/MyReplys.vue b/src/views/qa/MyReplys.vue
index de8ee878..ae3992b1 100644
--- a/src/views/qa/MyReplys.vue
+++ b/src/views/qa/MyReplys.vue
@@ -85,6 +85,7 @@ export default {
},
methods: {
getList() {
+ this.queryObj.pageIndex = 1;
this.isSearh = true;
this.getData();
},
@@ -104,6 +105,7 @@ export default {
});
},
reset(){
+ this.queryObj.pageIndex = 1;
this.queryObj.keyWord = '';
this.queryObj.isResolve = '';
this.getData();
diff --git a/src/views/share/MyList.vue b/src/views/share/MyList.vue
index 7834cc98..cbd9be3a 100644
--- a/src/views/share/MyList.vue
+++ b/src/views/share/MyList.vue
@@ -149,6 +149,9 @@
},
methods:{
queryData(){
+ this.qaList.pageIndex = 1;
+ this.articleList.pageIndex = 1;
+ this.courseList.pageIndex = 1;
this.isSearh = true;
if (this.tabName == 'qa') {
this.findQa();
@@ -161,6 +164,9 @@
}
},
resData() {
+ this.qaList.pageIndex = 1;
+ this.articleList.pageIndex = 1;
+ this.courseList.pageIndex = 1;
this.keyword = '';
this.isRead = '';
this.queryData();
diff --git a/src/views/share/ToList.vue b/src/views/share/ToList.vue
index 6878033f..c7689e2d 100644
--- a/src/views/share/ToList.vue
+++ b/src/views/share/ToList.vue
@@ -170,6 +170,9 @@ export default {
},
methods: {
queryData() {
+ this.qaList.pageIndex = 1;
+ this.articleList.pageIndex = 1;
+ this.courseList.pageIndex = 1;
this.isSearh= true;
if (this.tabName == 'qa') {
this.findQa();
@@ -185,6 +188,9 @@ export default {
resData() {
this.keyword = '';
this.isRead = '';
+ this.qaList.pageIndex = 1;
+ this.articleList.pageIndex = 1;
+ this.courseList.pageIndex = 1;
this.queryData();
this.isSearh= false;
},
diff --git a/src/views/user/MyAssess.vue b/src/views/user/MyAssess.vue
index 610254f8..8a2a1e7b 100644
--- a/src/views/user/MyAssess.vue
+++ b/src/views/user/MyAssess.vue
@@ -7,7 +7,7 @@
- 搜索
+ 搜索
重置
@@ -82,6 +82,10 @@
jumpRouter(item) {
window.open(`${this.webBaseUrl}/course/boeframe?id=${item.id}&type=quizsummary`)
},
+ getData() {
+ this.page=1;
+ this.findList();
+ },
findList(){
let params={
keyword:this.keyword,
@@ -110,8 +114,9 @@
this.findList()
},
reset(){
- this.keyword = ''
- this.findList();
+ this.keyword = '';
+ this.page=1;
+ this.findList();
},
getItem(item){
if(item.cover[0].url){
diff --git a/src/views/user/MyFavorites.vue b/src/views/user/MyFavorites.vue
index 5ba89ed5..0a0c008b 100644
--- a/src/views/user/MyFavorites.vue
+++ b/src/views/user/MyFavorites.vue
@@ -278,6 +278,10 @@ export default {
},
methods: {
queryData() {
+ this.qaList.pageIndex = 1;
+ this.articleList.pageIndex = 1;
+ this.courseList.pageIndex = 1;
+ this.dataList.pageIndex = 1;
this.isSearh = true;
if (this.tabName == 'qa') {
this.findQa();
@@ -296,6 +300,10 @@ export default {
}
},
resData() {
+ this.qaList.pageIndex = 1;
+ this.articleList.pageIndex = 1;
+ this.courseList.pageIndex = 1;
+ this.dataList.pageIndex = 1;
this.keyword = '';
this.isRead = '';
this.courseList.type = '';
From 71ac7e62cfb75b160c62abd3556f0b76c4d7c5a9 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Thu, 2 Jun 2022 17:23:46 +0800
Subject: [PATCH 2/2] pageIndex
---
src/views/article/ManageList.vue | 8 +++++++-
src/views/course/Courseware.vue | 8 +++++++-
src/views/course/ManageList.vue | 9 ++++++++-
src/views/course/TeacherList.vue | 1 +
src/views/course/WaitAudit.vue | 7 ++++++-
src/views/course/WaitAudited.vue | 5 +++++
src/views/exam/ExamList.vue | 8 +++++++-
src/views/exam/Question.vue | 14 ++++++++++----
src/views/exam/TestPaper.vue | 7 ++++++-
src/views/examine/NotApproved.vue | 7 ++++++-
src/views/examine/Reviewed.vue | 7 ++++++-
src/views/manage/TeacherList.vue | 7 ++++++-
src/views/manage/UserGroupList.vue | 2 ++
src/views/qa/ManageList.vue | 8 ++++++--
src/views/qa/NeedReplys.vue | 2 ++
src/views/qa/TeacherList.vue | 2 ++
16 files changed, 87 insertions(+), 15 deletions(-)
diff --git a/src/views/article/ManageList.vue b/src/views/article/ManageList.vue
index db9ca280..25f85b1f 100644
--- a/src/views/article/ManageList.vue
+++ b/src/views/article/ManageList.vue
@@ -35,7 +35,7 @@
搜索
- 搜索
+ 搜索
重置
@@ -356,6 +356,11 @@ export default {
});
},
methods: {
+ search(){
+ this.params.pageIndex = 1;
+ this.getSearch();
+
+ },
reset() {
this.params.self = null;
this.params.name = '';
@@ -365,6 +370,7 @@ export default {
this.params.resOwner1 = '';
this.params.resOwner2 = '';
this.params.resOwner3 = '';
+ this.params.pageIndex = 1;
this.getSearch();
},
...mapActions({
diff --git a/src/views/course/ManageList.vue b/src/views/course/ManageList.vue
index d1172922..e4cc11c9 100644
--- a/src/views/course/ManageList.vue
+++ b/src/views/course/ManageList.vue
@@ -69,7 +69,7 @@
- 搜索
+ 搜索
重置
@@ -507,6 +507,11 @@ export default {
});
});
},
+ getsearch(){
+ this.params.pageIndex = 1;
+ this.searchData();
+
+ },
reset(){
this.resOwner = ''
this.params.sysType = ''
@@ -519,6 +524,8 @@ export default {
this.params.sysType1 = '';
this.params.sysType2 = '';
this.params.sysType3 = '';
+ this.params.pageIndex = 1;
+
this.searchData();
},
...mapActions({
diff --git a/src/views/course/TeacherList.vue b/src/views/course/TeacherList.vue
index b6c5f937..2c83cff0 100644
--- a/src/views/course/TeacherList.vue
+++ b/src/views/course/TeacherList.vue
@@ -178,6 +178,7 @@ export default {
this.params.keyword = '';
this.params.status = '';
this.params.type = '';
+ this.params.pageIndex = 1;
this.getList();
this.isSearh = false;
},
diff --git a/src/views/course/WaitAudit.vue b/src/views/course/WaitAudit.vue
index bc5d1caa..a0891550 100644
--- a/src/views/course/WaitAudit.vue
+++ b/src/views/course/WaitAudit.vue
@@ -22,7 +22,7 @@
- 搜索
+ 搜索
重置
@@ -289,6 +289,10 @@ export default {
this.loadSysTypes();
},
methods: {
+ getseatch(){
+ this.params.pageIndex= 1;
+ this.searchData();
+ },
reset(){
this.resOwner = ''
this.params.sysType = ''
@@ -300,6 +304,7 @@ export default {
this.params.sysType1 = '';
this.params.sysType2 = '';
this.params.sysType3 = '';
+ this.params.pageIndex= 1;
this.searchData();
},
...mapActions({
diff --git a/src/views/course/WaitAudited.vue b/src/views/course/WaitAudited.vue
index 8eb79b6b..a60abbf7 100644
--- a/src/views/course/WaitAudited.vue
+++ b/src/views/course/WaitAudited.vue
@@ -181,6 +181,10 @@ export default {
},
methods: {
+ getseatch(){
+ this.params.pageIndex= 1;
+ this.searchData();
+ },
reset(){
this.resOwner = ''
this.params.sysType = ''
@@ -192,6 +196,7 @@ export default {
this.params.sysType1 = '';
this.params.sysType2 = '';
this.params.sysType3 = '';
+ this.params.pageIndex= 1;
this.searchData();
},
...mapActions({
diff --git a/src/views/exam/ExamList.vue b/src/views/exam/ExamList.vue
index f304fd90..37b2d16d 100644
--- a/src/views/exam/ExamList.vue
+++ b/src/views/exam/ExamList.vue
@@ -21,7 +21,7 @@
- 搜索
+ 搜索
重置
@@ -836,10 +836,16 @@ export default {
ele.select();
document.execCommand("Copy");
},
+ search(){
+ this.params.pageIndex = 1;
+ this.loadData();
+
+ },
reset(){
this.params.keyWord = ''
this.params.published = ''
this.ownership = ''
+ this.params.pageIndex = 1;
this.loadData();
},
diff --git a/src/views/exam/Question.vue b/src/views/exam/Question.vue
index 0e76348d..b72e567e 100644
--- a/src/views/exam/Question.vue
+++ b/src/views/exam/Question.vue
@@ -29,7 +29,7 @@
clearable>
- 搜索
+ 搜索
重置
添加
@@ -395,10 +395,16 @@ export default {
}
})
},
+ getsearch(){
+ this.params.pageIndex = 1;
+ this.loadData(1)
+
+ },
reset(){
- this.params.ownership = []
- this.params.type = ''
- this.params.title = ''
+ this.params.ownership = [];
+ this.params.type = '';
+ this.params.title = '';
+ this.params.pageIndex = 1;
this.loadData(1)
},
...mapActions({
diff --git a/src/views/exam/TestPaper.vue b/src/views/exam/TestPaper.vue
index 5b6d27bb..9017c834 100644
--- a/src/views/exam/TestPaper.vue
+++ b/src/views/exam/TestPaper.vue
@@ -15,7 +15,7 @@
- 搜索
+ 搜索
重置
新建试卷
@@ -427,10 +427,15 @@ export default {
}
})
},
+ getsearch(){
+ this.params.pageIndex = 1;
+ this.searchData();
+ },
reset(){
this.ownership = []
this.params.paperType = ''
this.params.keyWord = ''
+ this.params.pageIndex = 1;
this.searchData();
},
...mapActions({
diff --git a/src/views/examine/NotApproved.vue b/src/views/examine/NotApproved.vue
index 66d6e2da..3330cca2 100644
--- a/src/views/examine/NotApproved.vue
+++ b/src/views/examine/NotApproved.vue
@@ -22,7 +22,7 @@
- 搜索
+ 搜索
重置
@@ -289,6 +289,10 @@ export default {
this.loadSysTypes();
},
methods: {
+ getsearch(){
+ this.params.pageIndex= 1;
+ this.searchData();
+ },
reset(){
this.resOwner = ''
this.params.sysType = ''
@@ -300,6 +304,7 @@ export default {
this.params.sysType1 = '';
this.params.sysType2 = '';
this.params.sysType3 = '';
+ this.params.pageIndex= 1;
this.searchData();
},
...mapActions({
diff --git a/src/views/examine/Reviewed.vue b/src/views/examine/Reviewed.vue
index 86b26a46..b7e92d28 100644
--- a/src/views/examine/Reviewed.vue
+++ b/src/views/examine/Reviewed.vue
@@ -23,7 +23,7 @@
- 搜索
+ 搜索
重置
@@ -235,6 +235,10 @@ export default {
},
methods: {
+ getsearch(){
+ this.params.pageIndex = 1;
+ this.searchData();
+ },
reset(){
this.resOwner = ''
this.params.sysType = ''
@@ -246,6 +250,7 @@ export default {
this.params.sysType1 = '';
this.params.sysType2 = '';
this.params.sysType3 = '';
+ this.params.pageIndex = 1;
this.searchData();
},
...mapActions({
diff --git a/src/views/manage/TeacherList.vue b/src/views/manage/TeacherList.vue
index 5c4d29ea..e8f89b15 100644
--- a/src/views/manage/TeacherList.vue
+++ b/src/views/manage/TeacherList.vue
@@ -21,7 +21,7 @@
- 搜索
+ 搜索
重置
新建教师
导出
@@ -297,9 +297,14 @@
});
this.levelData=array;
},
+ getsearch(){
+ this.pageIndex = 1;
+ this.loadData(1);
+ },
reset (){
this.queryName = '';
this.$refs.teacherTable.clearFilter();
+ this.pageIndex = 1;
this.loadData(1);
},
openDialog(){
diff --git a/src/views/manage/UserGroupList.vue b/src/views/manage/UserGroupList.vue
index 8b61e030..77451901 100644
--- a/src/views/manage/UserGroupList.vue
+++ b/src/views/manage/UserGroupList.vue
@@ -128,8 +128,10 @@
},
methods: {
reset(){
+ this.page.pageIndex = 1;
this.query.name = ''
this.query.status = ''
+
this.loadData(this.page,this.query);
},
handleSizePushChange(val){
diff --git a/src/views/qa/ManageList.vue b/src/views/qa/ManageList.vue
index 71982cb4..330825f1 100644
--- a/src/views/qa/ManageList.vue
+++ b/src/views/qa/ManageList.vue
@@ -32,7 +32,7 @@
- 搜索
+ 搜索
重置
@@ -163,13 +163,17 @@ export default {
}
},
methods: {
-
+ search(){
+ this.queryObj.pageIndex = 1;
+ this.getQaList();
+ },
reset(){
this.queryObj.orderField = ''
this.queryObj.status = ''
this.queryObj.isResolve = ''
this.queryObj.keyword = ''
this.queryObj.isEssence = ''
+ this.queryObj.pageIndex = 1;
this.getQaList();
},
//查询问答列表数据
diff --git a/src/views/qa/NeedReplys.vue b/src/views/qa/NeedReplys.vue
index 0301f15a..2eaad5c0 100644
--- a/src/views/qa/NeedReplys.vue
+++ b/src/views/qa/NeedReplys.vue
@@ -116,10 +116,12 @@ export default {
methods: {
getlist(){
+ this.dataList.pageIndex = 1;
this.isSearh = true;
this.getData();
},
reset(){
+ this.dataList.pageIndex = 1;
this.dataList.send = ''
this.getData()
this.isSearh = false;
diff --git a/src/views/qa/TeacherList.vue b/src/views/qa/TeacherList.vue
index 0f049a53..0a49562f 100644
--- a/src/views/qa/TeacherList.vue
+++ b/src/views/qa/TeacherList.vue
@@ -108,10 +108,12 @@ export default {
components: {},
methods: {
getList(){
+ this.dataList.pageIndex = 1;
this.isSearh = true;
this.getData();
},
reset(){
+ this.dataList.pageIndex = 1;
this.dataList.send = ''
this.getData();
this.isSearh = false;