From 696e80bb9b34fd8d244fd4bf5c70dfa08636be7a Mon Sep 17 00:00:00 2001 From: daihh Date: Tue, 31 May 2022 11:22:44 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E6=94=BE=E5=BC=80=E6=95=99=E5=B8=88?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9A=84=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/UserCenter/menu.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/UserCenter/menu.vue b/src/components/UserCenter/menu.vue index a9051d1e..d8d73cb5 100644 --- a/src/components/UserCenter/menu.vue +++ b/src/components/UserCenter/menu.vue @@ -73,10 +73,10 @@ 考试管理 - + 教师管理 From 119ad56340e0eec519aff8178ba2ca293a84f56b Mon Sep 17 00:00:00 2001 From: "LAPTOP-S9RBPPM6\\bjxask-2201" <752743406@qq.com> Date: Tue, 31 May 2022 12:24:18 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/collectItem.vue | 2 +- src/views/manage/TeacherList.vue | 4 ++-- src/views/manage/teacherDetails.vue | 3 +-- src/views/portal/article/Index.vue | 12 +++++++++--- src/views/portal/qa/Index.vue | 13 ++++++++++--- 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/src/components/Course/collectItem.vue b/src/components/Course/collectItem.vue index 21a6bf04..1facdb19 100644 --- a/src/components/Course/collectItem.vue +++ b/src/components/Course/collectItem.vue @@ -134,7 +134,7 @@ export default { - + + + + + + diff --git a/src/views/study/PortalIndex.vue b/src/views/study/PortalIndex.vue index b5459e7b..b4b702e4 100644 --- a/src/views/study/PortalIndex.vue +++ b/src/views/study/PortalIndex.vue @@ -1,1440 +1,1451 @@ - - - - - + + + + + From ef55032c44fd1c1b5963e14d67172af721f8bbdb Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Thu, 2 Jun 2022 12:26:48 +0800 Subject: [PATCH 16/25] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=97=A0=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E8=AF=BE=E7=A8=8B=E6=97=B6=EF=BC=8C=E5=8B=BE=E9=80=89?= =?UTF-8?q?=E6=A1=86=E5=BA=94=E8=AF=A5=E5=92=8C=E6=8F=90=E4=BA=A4=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=90=8C=E6=97=B6=E5=87=BA=E7=8E=B0=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 4536ddc3..d0df5854 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -180,7 +180,7 @@
- 我已阅读并遵守平台内容发布要求 + 我已阅读并遵守平台内容发布要求 提交审核 关闭 From 1cb586d793f972639d725306e0632e6a1a368f6f Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Thu, 2 Jun 2022 13:52:08 +0800 Subject: [PATCH 17/25] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=AF=95=E5=8D=B7?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/exam/TestPaper.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/exam/TestPaper.vue b/src/views/exam/TestPaper.vue index 399d537e..c0e3acfa 100644 --- a/src/views/exam/TestPaper.vue +++ b/src/views/exam/TestPaper.vue @@ -451,7 +451,10 @@ export default { this.resOwner = []; this.formTab = 'info'; this.totalScore=0; + this.qlib.type= ''; + this.qlib.title= ''; this.paperLength=0; + this.question.all = false; this.question.list =[]; this.question.checkQuest = []; }, From 5f358418e77c0a65f179a14da36cf022b82f36f6 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Thu, 2 Jun 2022 14:03:21 +0800 Subject: [PATCH 18/25] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/exam/TestPaper.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/exam/TestPaper.vue b/src/views/exam/TestPaper.vue index c0e3acfa..5b6d27bb 100644 --- a/src/views/exam/TestPaper.vue +++ b/src/views/exam/TestPaper.vue @@ -155,7 +155,7 @@ 搜索 - 分页符 + 选项 @@ -454,7 +454,7 @@ export default { this.qlib.type= ''; this.qlib.title= ''; this.paperLength=0; - this.question.all = false; + this.question.all = this.question.list =[]; this.question.checkQuest = []; }, From a1841fe7973cd6963d92201dad970d28f2c0e736 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Thu, 2 Jun 2022 15:01:25 +0800 Subject: [PATCH 19/25] =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=80=85=E8=BF=9B?= =?UTF-8?q?=E9=98=B6=E8=B7=B3=E5=88=B0=E5=AD=A6=E4=B9=A0=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PortalHeader.vue | 2 +- src/views/Index.vue | 1 + src/views/StudyIndex.vue | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue index dbd6a0d2..59fa073e 100644 --- a/src/components/PortalHeader.vue +++ b/src/components/PortalHeader.vue @@ -162,7 +162,7 @@ export default { let obj = { one: urlPre+'/web/teacherLesson', two: urlPre+'/grow180/login', - three: this.webBaseUrl + '/study/index', + three: this.webBaseUrl + '/study/index?study=1', four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130', five: urlPre+'/boe/new-employee/index.html' }; diff --git a/src/views/Index.vue b/src/views/Index.vue index ce9b731e..3edae977 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -373,6 +373,7 @@ export default { }; let isTopList = []; let data = []; + this.courseList.list = []; apiCoursePortal.pageList(course).then(res => { if (res.status == 200 && res.result.list.length > 0) { diff --git a/src/views/StudyIndex.vue b/src/views/StudyIndex.vue index ea70a1fb..3c44cc33 100644 --- a/src/views/StudyIndex.vue +++ b/src/views/StudyIndex.vue @@ -123,7 +123,7 @@ }, beforeCreate() { this.loading = true; - let params={ + let params={ // keyword:this.keyword, page:1, size:10, @@ -138,7 +138,11 @@ if(res.result.count > 0) { this.$router.push('/uc/study/task') } else { - this.$router.push('/uc/study/courses') + if(this.$route.query.study == '1') { + this.$router.push('/uc/study/task') + } else { + this.$router.push('/uc/study/courses') + } } }else{ this.$router.push('/uc/study/courses') From 81826d855baacb9c1c3b7dfc15acca3cadd27e69 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Thu, 2 Jun 2022 15:34:08 +0800 Subject: [PATCH 20/25] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/user/MyFavorites.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/user/MyFavorites.vue b/src/views/user/MyFavorites.vue index 9df95d9d..5ba89ed5 100644 --- a/src/views/user/MyFavorites.vue +++ b/src/views/user/MyFavorites.vue @@ -79,7 +79,7 @@ -
+
-
+
没有查询到相关内容
暂无数据
From 83c7394f6131d343052c909e1201f64fcf58bbca Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Thu, 2 Jun 2022 16:37:13 +0800 Subject: [PATCH 21/25] pdf --- src/components/Course/auditCourse1.vue | 16 ++++++++++------ src/components/Course/auditCourse2.vue | 16 ++++++++++------ src/components/Course/weikeContent.vue | 10 +++++++--- src/views/portal/course/Micro.vue | 17 +++++++++++++---- src/views/study/PortalIndex.vue | 7 +++++-- 5 files changed, 45 insertions(+), 21 deletions(-) diff --git a/src/components/Course/auditCourse1.vue b/src/components/Course/auditCourse1.vue index edf1a8c0..979eb012 100644 --- a/src/components/Course/auditCourse1.vue +++ b/src/components/Course/auditCourse1.vue @@ -594,19 +594,23 @@ export default { } if($this.coursewareInfo.content.contentType == 40) { //console.log(con.content,'con.content'); - if(con.content != '' && con.content.indexOf('.pdf') > -1) { - $this.coursewareInfo.content.content = con.content; - }else { + // if(con.content != '' && con.content.indexOf('.pdf') > -1) { + // $this.coursewareInfo.content.content = con.content; + // }else { apiCourseFile.detail(con.contentRefId).then(cfrs => { if (cfrs.status == 200) { - $this.curCFile=cfrs.result; - $this.converStatus = cfrs.result.converStatus; $this.coursewareInfo.content.content = cfrs.result.previewFilePath; + if(cfrs.result.previewFilePath == '' && cfrs.result.filePath.indexOf('pdf') > -1) { + $this.coursewareInfo.content.content = cfrs.result.filePath; + } else { + $this.curCFile=cfrs.result; + $this.converStatus = cfrs.result.converStatus; + } } else { $this.$message.error('加载pdf课件文件失败'); } }); - } + // } } } else if (con.sortIndex == 2) { $this.homeworkInfo = con; diff --git a/src/components/Course/auditCourse2.vue b/src/components/Course/auditCourse2.vue index 9c79582d..7eb77481 100644 --- a/src/components/Course/auditCourse2.vue +++ b/src/components/Course/auditCourse2.vue @@ -650,21 +650,25 @@ export default { } } else if(r.contentType == 40) { this.contentData.content=""; - if (r.content != '' && r.content.indexOf('.pdf') > -1) { - this.contentData.content = cfrs.result.previewFilePath; - }else{ + // if (r.content != '' && r.content.indexOf('.pdf') > -1) { + // // this.contentData.content = cfrs.result.previewFilePath; + // }else{ apiCourseFile.detail(r.contentRefId).then(cfrs => { if (cfrs.status == 200) { - this.curCFile=cfrs.result; - this.converStatus = cfrs.result.converStatus; this.contentData.content = cfrs.result.previewFilePath; + if(cfrs.result.previewFilePath == '' && cfrs.result.filePath.indexOf('pdf') > -1) { + this.contentData.content = cfrs.result.filePath; + } else { + this.converStatus = cfrs.result.converStatus; + this.curCFile=cfrs.result; + } //console.log(r.content); }else { this.contentData.content=""; this.$message.error('加载pdf课件文件失败'); } }); - } + // } } this.type = 0; }, diff --git a/src/components/Course/weikeContent.vue b/src/components/Course/weikeContent.vue index 06ba2c8c..49cb2704 100644 --- a/src/components/Course/weikeContent.vue +++ b/src/components/Course/weikeContent.vue @@ -738,11 +738,15 @@ }else{ apiCourseFile.detail(this.cware.content.contentRefId).then(rs=>{ if(rs.status==200){ - this.curCFile=rs.result; - this.converStatus = rs.result.converStatus; this.courseFileShow = false; this.cware.content.pdfPath=rs.result.previewFilePath; - this.$forceUpdate(); + if(rs.result.previewFilePath == '' && rs.result.filePath.indexOf('pdf') > -1) { + this.cware.content.pdfPath = rs.result.filePath; + } else { + this.curCFile=rs.result; + this.converStatus = rs.result.converStatus; + } + this.$forceUpdate(); } }); } diff --git a/src/views/portal/course/Micro.vue b/src/views/portal/course/Micro.vue index da23d7ff..50f42ca5 100644 --- a/src/views/portal/course/Micro.vue +++ b/src/views/portal/course/Micro.vue @@ -290,6 +290,7 @@ import courseImage from "@/components/Course/courseImage.vue"; import studyUtil from '@/utils/study.js'; import {encrypt} from '@/utils/jsencrypt.js'; import cookies from 'vue-cookies' +import { log } from 'util'; export default { name: "micro", components: { @@ -311,7 +312,9 @@ export default { }, data() { return { - curCFile:{}, + curCFile:{ + converStatus:4, + }, sex:null, playerBoxShow:false, userAvatarText, @@ -444,16 +447,22 @@ export default { } else if (con.contentType == 40) { //需要读取pdf的路径 - if($this.coursewareInfo.content.content!='' && $this.coursewareInfo.content.content.indexOf('.pdf')==-1){ + // if($this.coursewareInfo.content.content!='' && $this.coursewareInfo.content.content.indexOf('.pdf')==-1){ apiCourseFile.detail($this.coursewareInfo.content.contentRefId).then(cfrs=>{ if(cfrs.status==200){ - this.curCFile = cfrs.result; + // this.curCFile = cfrs.result; $this.coursewareInfo.content.content=cfrs.result.previewFilePath; + if(cfrs.result.previewFilePath == '' && cfrs.result.filePath.indexOf('pdf') > -1) { + $this.coursewareInfo.content.content = cfrs.result.filePath; + } else { + $this.curCFile=rs.result; + // this.converStatus = rs.result.converStatus; + } }else{ $this.$message.error('加载pdf课件文件失败'); } }); - } + // } //let url = this.fileBaseUrl + r.content; }else if(con.contentType ==52){ if(con.content.startsWith('\{')){ diff --git a/src/views/study/PortalIndex.vue b/src/views/study/PortalIndex.vue index b4b702e4..010ed9ec 100644 --- a/src/views/study/PortalIndex.vue +++ b/src/views/study/PortalIndex.vue @@ -263,7 +263,9 @@ export default { components: { courseImage, portalHeader, portalFooter, hyperLink, comments, homework, exam, interactBar, assess, pdfPreview, audioPlayer, videoPlayer }, data() { return { - curCFile:{}, + curCFile:{ + converStatus:4, + }, interactRuning:false, playerBoxShow:false, userAvatarText, @@ -820,9 +822,10 @@ export default { apiCourseFile.detail(r.contentRefId).then(cfrs => { if (cfrs.status == 200) { r.content = cfrs.result.previewFilePath; - this.curCFile = cfrs.result; if(cfrs.result.previewFilePath == '' && cfrs.result.filePath.indexOf('pdf') > -1) { r.content = cfrs.result.filePath; + } else { + this.curCFile = cfrs.result; } } else { $this.$message.error('加载pdf课件文件失败'); From d81ad623e4c372b22bee06be70e16cf8fef55d22 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 2 Jun 2022 16:59:06 +0800 Subject: [PATCH 22/25] =?UTF-8?q?=E5=BE=AE=E8=AF=BE=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E6=92=AD=E6=94=BE=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Micro.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/portal/course/Micro.vue b/src/views/portal/course/Micro.vue index 0175d770..de461c67 100644 --- a/src/views/portal/course/Micro.vue +++ b/src/views/portal/course/Micro.vue @@ -500,8 +500,9 @@ export default { //console.log(urlSign,'urlSign'); cookies.set('PLAYSIGN_TIME', ctime);//写客户端的cookie保存 //this.blobUrl=process.env.VUE_APP_BASE_API+'/xboe/m/course/play/resource?sign='+urlSign; - this.blobUrl='http://localhost:9090/xboe/course/resource?fid='+fid; - + this.blobUrl=process.env.VUE_APP_BASE_API+'/xboe/course/resource?fid='+fid; + //this.blobUrl='http://localhost:9090/xboe/course/resource?fid='+fid; + //this.blobUrl=this.fileBaseUrl+u; }, createVideoBlob(url){ let $this=this; From b0d0c79370702d7c971939b83a200f7f8017e030 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 2 Jun 2022 17:02:15 +0800 Subject: [PATCH 23/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=96=87=E5=AD=97=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Micro.vue | 4 ++-- src/views/study/PortalIndex.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/portal/course/Micro.vue b/src/views/portal/course/Micro.vue index de461c67..56e94cf6 100644 --- a/src/views/portal/course/Micro.vue +++ b/src/views/portal/course/Micro.vue @@ -77,10 +77,10 @@ 图片
-
+
此课程内容无法预览，请联系管理员
-
+
此课程内容无法预览，请联系管理员
diff --git a/src/views/study/PortalIndex.vue b/src/views/study/PortalIndex.vue index b4b702e4..cc07745e 100644 --- a/src/views/study/PortalIndex.vue +++ b/src/views/study/PortalIndex.vue @@ -83,10 +83,10 @@
-
+
此课程内容无法预览，请联系管理员
-
+
此课程内容无法预览，请联系管理员
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 24/25] =?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 25/25] 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;