From d54da7dcb9f57559ea74fa5cac54c061185e9be5 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 29 Dec 2022 12:17:47 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/login.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/api/login.js b/src/api/login.js index ae06a171..9f240e29 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -33,6 +33,7 @@ const refreshToken = function(token){ // boe登录 const boeLogin = function(token){ return ajax.post('/xboe/account/boelogin',{token:token}); + //登录时，新的用户接口调用查询用户信息 //return ajax.post('/xboe/account/boenewlogin',{token:token}); } From 7901cbc5952b16386cdbcca617f9274738c64f8d Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 29 Dec 2022 12:35:39 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=80=83=E8=AF=95?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/chooseCourseFile.vue | 2 +- src/components/Course/courseExam.vue | 12 +++++++++--- src/components/Course/weikeContent.vue | 6 +++++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/components/Course/chooseCourseFile.vue b/src/components/Course/chooseCourseFile.vue index d5252794..43ee698b 100644 --- a/src/components/Course/chooseCourseFile.vue +++ b/src/components/Course/chooseCourseFile.vue @@ -122,7 +122,7 @@ this.comTypes.some(ct=>{ if(ct.resType==$this.resType){ $this.curComType=ct; - //this.findCourseFile(); + //this.findCourseFile();// return true; }else{ return false; diff --git a/src/components/Course/courseExam.vue b/src/components/Course/courseExam.vue index 2bcb4e5a..83a55f6f 100644 --- a/src/components/Course/courseExam.vue +++ b/src/components/Course/courseExam.vue @@ -14,7 +14,7 @@
- + @@ -161,6 +161,7 @@ data(){ return { loading:false, + emptyText:'加载中...', examChange:{}, //用于保存，检查是否改变 showTab:0, //显示哪个 onlyQuestion:false, //只显示问题 @@ -217,7 +218,8 @@ }, methods:{ reloadExam(){ - console.log('contentId='+this.contentId); + //console.log('contentId='+this.contentId); + this.emptyText='加载中...'; this.examPaper={items:[]}; this.examInfo.id=''; this.examInfo.paperType=1; @@ -312,9 +314,12 @@ this.showTab=2; this.examInfo.paperType=2; //选择试卷 this.examInfo.paperId=''; + + this.findExamPapers(); }, findExamPapers(){ //查询已有的考试试卷 this.usePaper.pageIndex=1; + this.emptyText='加载中...'; this.loadExamPapers(); }, loadExamPapers(){ @@ -323,7 +328,7 @@ pageSize:this.usePaper.pageSize, keyWord:this.usePaper.keyword } - + apiExamPaper.querylist(pars).then(rs=>{ if(rs.status==200){ this.usePaper.list=rs.result.list; @@ -331,6 +336,7 @@ }else{ this.$message.error('查询可用试卷失败'); } + this.emptyText='暂无搜索内容'; }) }, changePaperPage(pindex){ diff --git a/src/components/Course/weikeContent.vue b/src/components/Course/weikeContent.vue index c32cbd2c..91bc66f4 100644 --- a/src/components/Course/weikeContent.vue +++ b/src/components/Course/weikeContent.vue @@ -295,7 +295,7 @@
- + @@ -705,6 +705,7 @@ paperName:'',//选择的试卷的名称 paperJson:{items:[]}, }, + emptyText:'加载中...', exam:{ show:1, content:{id:'',contentType:61,sortIndex:3}, @@ -1300,8 +1301,10 @@ this.exam.show=2; this.exam.info.paperType=2; //选择试卷 this.exam.info.paperId=''; + this.findExamPapers(); }, findExamPapers(){ //查询已有的考试试卷 + this.emptyText='加载中...'; this.usePaper.pageIndex=1; this.loadExamPapers(); }, @@ -1318,6 +1321,7 @@ }else{ this.$message.error('查询可用试卷失败'); } + this.emptyText='暂无搜索内容'; }) }, changePaperPage(pindex){ From a58d582051cf8f763a00586ff5301e8ed9b53930 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 29 Dec 2022 12:45:40 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=86=85=E8=80=83?= =?UTF-8?q?=E8=AF=95=20=EF=BC=8C=E6=97=B6=E9=97=B4=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseExam.vue | 4 ++-- src/components/Course/courseForm.vue | 2 +- src/components/Course/simpleTestPaper.vue | 2 +- src/components/Course/weikeContent.vue | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/Course/courseExam.vue b/src/components/Course/courseExam.vue index 83a55f6f..e43cebeb 100644 --- a/src/components/Course/courseExam.vue +++ b/src/components/Course/courseExam.vue @@ -105,7 +105,7 @@ {{examInfo.paperType==1? '自定义试卷':'使用考试试卷: '+usePaper.paperName}} - {{examInfo.passScore}}分钟 + {{examInfo.testDuration}}分钟 {{examInfo.passLine}}% @@ -314,7 +314,7 @@ this.showTab=2; this.examInfo.paperType=2; //选择试卷 this.examInfo.paperId=''; - + this.findExamPapers(); }, findExamPapers(){ //查询已有的考试试卷 diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index f35d8aa3..840863e4 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -1044,7 +1044,7 @@ export default { //设置状态 }, addNewContent(sec) { - console.log(sec,'sec'); + //console.log(sec,'sec'); this.resetCurCourseContent(); this.curContent.csectionId = sec.id; this.orderValue(sec.id); diff --git a/src/components/Course/simpleTestPaper.vue b/src/components/Course/simpleTestPaper.vue index 42dac608..8180a6c5 100644 --- a/src/components/Course/simpleTestPaper.vue +++ b/src/components/Course/simpleTestPaper.vue @@ -177,7 +177,7 @@ //let gen= snowflakeGenerator(512).next().value; //let qid=snowflakeGenerator(512).next().value; let qid=this.generator.next().value; - console.log(qid); + //console.log(qid); let q={ id: qid, type: t, diff --git a/src/components/Course/weikeContent.vue b/src/components/Course/weikeContent.vue index 91bc66f4..530c282f 100644 --- a/src/components/Course/weikeContent.vue +++ b/src/components/Course/weikeContent.vue @@ -422,7 +422,7 @@ - {{exam.info.passScore}}分钟 + {{exam.info.testDuration}}分钟 From b8071a74554bd045413e709d5999d7aa0f5352dc Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 29 Dec 2022 14:05:20 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E6=97=B6=E7=9A=84=E6=8E=A7=E5=88=B6=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FileUpload/index.vue | 23 ++++++++-- src/components/UserCenter/menu.vue | 4 +- src/views/course/Courseware.vue | 69 +++++++++++++++++++---------- src/views/user/Setting.vue | 1 - 4 files changed, 66 insertions(+), 31 deletions(-) diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index a84bbd49..6cd3b36f 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -185,7 +185,7 @@ export default { }, // 文件个数超出 handleExceed(res) { - this.$message({message:`只允许上传单个文件`,type:'error',offset:100}); + this.$message({message:`一次性最多上传${this.limit}个文件`,type:'error',offset:100}); }, // 上传失败 handleUploadError(err) { @@ -193,16 +193,31 @@ export default { this.$message({message:"上传失败, 请重试",type:'error',offset:100}); }, // 上传成功回调 - handleUploadSuccess(res, file) { + handleUploadSuccess(res, file,fileList) { if(res.status == 200) { - this.fileList = []; + //this.fileList = []; + //console.log(file,'file'); + //console.log(fileList,'fileList'); this.isLoading = false; this.$message({message:"上传成功",type:'success',offset:100}); + let delIdx=-1; + fileList.some((fl,flIndx)=>{ + if(fl.uid==file.uid){ + delIdx=flIndx; + return true; + }else{ + return false; + } + }); + if(delIdx>-1){ + fileList.splice(delIdx,1); + } } else { this.isLoading = false; - this.fileList = []; + //this.fileList = []; this.$message({message:"上传失败",type:'error',offset:100}); } + this.$emit("success", res); }, // 删除文件 diff --git a/src/components/UserCenter/menu.vue b/src/components/UserCenter/menu.vue index c5a1bc68..ec6dfaaa 100644 --- a/src/components/UserCenter/menu.vue +++ b/src/components/UserCenter/menu.vue @@ -415,9 +415,9 @@ export default { this.getLastStudy(); }, mounted() { - console.log(this.userInfo.loginName,'this.userInfo.loginName'); + //console.log(this.userInfo.loginName,'this.userInfo.loginName'); let flag=testUser.isTest(this.userInfo.loginName); - console.log(flag,'this.isTest22'); + //console.log(flag,'this.isTest22'); this.isTest=flag; // if(testUser.isTest(this.userInfo.loginName)){ // console.log(this.isTest,'this.isTest'); diff --git a/src/views/course/Courseware.vue b/src/views/course/Courseware.vue index 2f58f760..79254eac 100644 --- a/src/views/course/Courseware.vue +++ b/src/views/course/Courseware.vue @@ -363,15 +363,17 @@ export default { }, mounted() { this.upload.orgId=this.userInfo.departId; + this.upload.orgName=this.userInfo.departName; + this.needOrg=''; //console.log(this.upload.orgId,'this.upload.orgId') - if(this.upload.orgId){ - apiUserBasic.getOrgInfo(this.upload.orgId).then(rs=>{ - if(rs.status==200){ - this.upload.orgName=rs.result.name; - this.needOrg=''; - } - }); - } + // if(this.upload.orgId){ + // apiUserBasic.getOrgInfo(this.upload.orgId).then(rs=>{ + // if(rs.status==200){ + // this.upload.orgName=rs.result.name; + // this.needOrg=''; + // } + // }); + // } this.loadResOwners(); this.getResOwnerTree().then(rs => { this.resOwnerListMap = rs; @@ -508,7 +510,7 @@ export default { }); } }, - async handleUploadSuccess(rs) { + handleUploadSuccess(rs) { if (rs.status === 200) { let type = toContentType(rs.result.fileType); // ["doc", "xls", "ppt","docx", "xlsx", "pptx","png","txt", "pdf","jpg","gif","bmp","mp4","mp3"] @@ -516,6 +518,7 @@ export default { this.$message.error('文件名称请不要超过100个字符'); return; } + //console.log('上传文件：'+rs.result.displayName); const data = { orgId:this.upload.orgId, orgName:this.upload.orgName, @@ -528,23 +531,41 @@ export default { resType: type //文件类型,10视频，20音频，30图片， 40 文档，50表图文，60表scrom包,90表其它， // remark: 备注说明，可以为空，不填 }; - try { - const { result, status } = await coueseFile.saveUpload(data); - if (status === 200) { - result.device1 = true; - result.device2 = true; - result.minute=''; - if(result.duration){ - result.minute=Math.round(result.duration/60); //四舍五入 + //try { + coueseFile.saveUpload(data).then(res=>{ + if(res.status==200){ + //console.log('上传文件成功：'+rs.result.displayName); + res.result.device1 = true; + res.result.device2 = true; + res.result.minute=''; + if(res.result.duration){ + res.result.minute=Math.round(res.result.duration/60); //四舍五入 + } + this.fileList.push(res.result); + }else{ + this.$message.error(res.message); } + }).catch (error=>{ + console.log(error,'error') + //this.$message.error(error); + }); + // const { result, status } = coueseFile.saveUpload(data); + // if (status === 200) { + // console.log('上传文件成功：'+rs.result.displayName); + // result.device1 = true; + // result.device2 = true; + // result.minute=''; + // if(result.duration){ + // result.minute=Math.round(result.duration/60); //四舍五入 + // } - this.fileList.push(result); - } else { - this.$message.error(error); - } - } catch (error) { - this.$message.error(error); - } + // this.fileList.push(result); + // } else { + // this.$message.error(error); + // } + //} catch (error) { + // this.$message.error(error); + //} } else { this.$message.error(rs.message); } diff --git a/src/views/user/Setting.vue b/src/views/user/Setting.vue index f9f4f570..5ddc1bb9 100644 --- a/src/views/user/Setting.vue +++ b/src/views/user/Setting.vue @@ -394,7 +394,6 @@ Teacherinfo(){ this.workname=[]; this.checkboxtearGroup=[]; - apiTeach.detailTeacher(this.userInfo.aid).then(res =>{ if(res.result.courses){ this.teachform.courses = res.result.courses; From a18320e755605837e7212853f65cfceb141f6d35 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 29 Dec 2022 15:37:51 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=95=99=E5=B8=88=E8=81=8C=E4=B8=9A?= =?UTF-8?q?=E7=85=A7=EF=BC=8C=E5=9B=BE=E7=89=87=E7=A7=BB=E9=99=A4=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ImageUpload/index.vue | 10 +++++----- src/views/course/Courseware.vue | 20 ++++++++++---------- src/views/user/Setting.vue | 10 ++++++---- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue index 69fbf029..140f6234 100644 --- a/src/components/ImageUpload/index.vue +++ b/src/components/ImageUpload/index.vue @@ -1,5 +1,5 @@