From 5ac8513ca9a98ff7c07c74c69a218b8c1ba4d0e1 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Wed, 15 Jun 2022 14:28:45 +0800 Subject: [PATCH 1/6] =?UTF-8?q?pdf=E5=8A=A0=E8=BD=BD=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PdfPreview/view.vue | 24 +++++------------------- src/views/Index.vue | 2 -- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/src/components/PdfPreview/view.vue b/src/components/PdfPreview/view.vue index a5b1d4ec..623b3c6d 100644 --- a/src/components/PdfPreview/view.vue +++ b/src/components/PdfPreview/view.vue @@ -1,5 +1,5 @@ @@ -64,6 +54,7 @@ export default { }, data() { return { + loading:false, src: "", showPages: undefined, totalPages:0, @@ -79,6 +70,7 @@ export default { mounted() { // /case/demo.pdf if(this.filePath){ + this.loading = true; this.loadInitPdf(this.filePath); } window.addEventListener( @@ -129,6 +121,7 @@ export default { let loadingTask = pdf.createLoadingTask(url); this.src=loadingTask; loadingTask.promise.then((pdf) =>{ + this.loading = false; this.totalPages=pdf.numPages; if(pdf.numPages>this.initNum){ this.showPages = this.initNum; @@ -136,6 +129,7 @@ export default { this.showPages =pdf.numPages; } }).catch((err) =>{ + this.loading = false; this.$message.error("加载内容失败,请联系管理员"); }); }, @@ -157,15 +151,7 @@ export default { if(this.isscroll){ this.showPages++ this.moreState = 2; - // this.debounce(this.loadInitPdf($this.filePath),5000); - // this.debounce(,200000); } - - // if(scrollTop > 400) { - // document.querySelector('#articleAnking').style.cssText = "position: fixed;top: 0;width:242.5px"; - // } else { - // document.querySelector('#articleAnking').style.cssText = "position: static"; - // } }, debounce(func, wait) {// 非立即执行 let timeout; diff --git a/src/views/Index.vue b/src/views/Index.vue index 0ef393aa..8ab80d51 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -369,7 +369,6 @@ export default { }; }, mounted() { - //console.log(this.$Constants.fileBaseUrl,'fileBaseUrl地址'); this.getCourseData(1); this.getCaseData(); this.getArticleData(); @@ -380,7 +379,6 @@ export default { window.open('https://m.qingxuetang.com/x/?appId=qxtcorp306130','_blank'); }, toCourseDetail(item) { - if (item.type == 10) { return this.webBaseUrl + '/course/micro?id=' + item.id; } else if (item.type == 20) { From af9be97044f07d0e59f48289504eec860f857f39 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Wed, 15 Jun 2022 14:43:56 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=88=86=E4=BA=AB=E4=BC=A0title?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Portal/interactBar.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/Portal/interactBar.vue b/src/components/Portal/interactBar.vue index 12f68ec2..5598bd6d 100644 --- a/src/components/Portal/interactBar.vue +++ b/src/components/Portal/interactBar.vue @@ -459,7 +459,6 @@ export default { } }, submitShare(){ - if(this.shareUsers.length==0){ this.$message.error('请选择分享人'); return; @@ -472,7 +471,7 @@ export default { let postData={ objType:this.type, objId:this.data.id, - content:'', + content:this.data.title, isRead:false, toAid:'', toAname:'', From d220d8bfc804256d48245fcc0e9f6e163f592ac1 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 15 Jun 2022 15:03:27 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=9C=B0=E5=9D=80=20=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/course/ManageList.vue | 10 +++++++--- src/views/portal/course/Detail.vue | 11 ++++++----- src/views/portal/course/Micro.vue | 3 ++- src/views/study/PortalIndex.vue | 2 +- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/views/course/ManageList.vue b/src/views/course/ManageList.vue index be8fb855..e3187091 100644 --- a/src/views/course/ManageList.vue +++ b/src/views/course/ManageList.vue @@ -519,7 +519,7 @@ export default { this.params.sysType1 = ''; this.params.sysType2 = ''; this.params.sysType3 = ''; - + this.searchData(true); }, ...mapActions({ @@ -663,9 +663,13 @@ export default { this.qrcodeShow = true; let urlPre=window.location.protocol+'//'+window.location.host; - this.qrcode = urlPre+'/mobile/pages/resource/microDetail?id='+row.id; + //动态的地址 + urlPre=urlPre+'/m?returnUrl='+urlPre+'/mobile/pages/login/loading?returnUrl='; + //固定的地址 + urlPre='https://u.boe.com/m?returnUrl=https://u.boe.com/mobile/pages/login/loading?returnUrl='; + this.qrcode = urlPre+'/pages/resource/microDetail?id='+row.id; if(row.type==20){ - this.qrcode = urlPre+'/mobile/pages/resource/courseDetail?id='+row.id; + this.qrcode = urlPre+'/pages/resource/courseDetail?id='+row.id; } // 使用$nextTick确保数据渲染 diff --git a/src/views/portal/course/Detail.vue b/src/views/portal/course/Detail.vue index 0dd3c8f5..3b5a79f4 100644 --- a/src/views/portal/course/Detail.vue +++ b/src/views/portal/course/Detail.vue @@ -216,7 +216,7 @@ export default { this.$message.error(rs.message); } }) - + // this.getResOwnerTree().then(rs=>{ // this.resOwnerListMap=rs; // }); @@ -231,8 +231,9 @@ export default { showQrimage(){ let urlPre=window.location.protocol+'//'+window.location.host; // this.qrcode = this.webBaseUrl+'/mobile/pages/resource/courseDetail?id='+this.courseInfo.id; - this.qrcode = urlPre+'/mobile/pages/resource/courseDetail?id='+this.courseInfo.id; - console.log(this.qrcode,'qrcode'); + urlPre='https://u.boe.com/m?returnUrl=https://u.boe.com/mobile/pages/login/loading?returnUrl='; + this.qrcode = urlPre+'/pages/resource/courseDetail?id='+this.courseInfo.id; + //console.log(this.qrcode,'qrcode'); this.$nextTick(() => { this.crateQrcode(); }); @@ -312,7 +313,7 @@ export default { list.forEach((item,index)=>{ res.result.some(author=>{ if(author.aid==item.teacherId){ - + if(author.avatar){ item.avatar=this.fileBaseUrl + author.avatar; } @@ -647,7 +648,7 @@ export default { height: 68px; text-align: center; line-height: 68px; - + div{ img{ width: 68px; diff --git a/src/views/portal/course/Micro.vue b/src/views/portal/course/Micro.vue index 47563269..69eaceab 100644 --- a/src/views/portal/course/Micro.vue +++ b/src/views/portal/course/Micro.vue @@ -521,7 +521,8 @@ export default { let urlPre=window.location.protocol+'//'+window.location.host; // https://u.boe.com/mobile/pages/resource/microDetail?id=963456709515939840 // this.qrcode = this.webBaseUrl+'/mobile/pages/resource/microDetail?id='+this.courseInfo.id; - this.qrcode =urlPre+ '/mobile/pages/resource/microDetail?id='+this.courseInfo.id; + urlPre='https://u.boe.com/m?returnUrl=https://u.boe.com/mobile/pages/login/loading?returnUrl='; + this.qrcode =urlPre+ '/pages/resource/microDetail?id='+this.courseInfo.id; //console.log(this.qrcode,'qrcode'); this.$nextTick(() => { this.crateQrcode(); diff --git a/src/views/study/PortalIndex.vue b/src/views/study/PortalIndex.vue index 2d36577e..61913898 100644 --- a/src/views/study/PortalIndex.vue +++ b/src/views/study/PortalIndex.vue @@ -364,7 +364,7 @@ export default { }else{ this.blobUrl=process.env.VUE_APP_BASE_API+'/xboe/m/course/cware/resource?sign='+urlSign; } - console.log(this.blobUrl,'this.blobUrl'); + //console.log(this.blobUrl,'this.blobUrl'); }, widthOpen(url) { window.open(url, '_blank'); From f6e98a1375e849151a74329ab01d905190f14c50 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Wed, 15 Jun 2022 15:10:33 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=A4=8D?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/case/ManageList.vue | 2 +- src/views/course/ManageList.vue | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/views/case/ManageList.vue b/src/views/case/ManageList.vue index 201110ba..f38078b4 100644 --- a/src/views/case/ManageList.vue +++ b/src/views/case/ManageList.vue @@ -351,7 +351,7 @@ export default { }; }, viewTopic(data) { - window.open(this.webBaseUrl+'/case/detail?id='+data.id, '_blank'); + this.$router.push({path:'/case/detail',query:{id:data.id}}) } } }; diff --git a/src/views/course/ManageList.vue b/src/views/course/ManageList.vue index be8fb855..75b07ed7 100644 --- a/src/views/course/ManageList.vue +++ b/src/views/course/ManageList.vue @@ -203,8 +203,8 @@
- - 复制链接 + + 复制链接
@@ -397,6 +397,11 @@ export default { }, methods: { + myCopy(){ + var ele = document.getElementById("text"); + ele.select(); + document.execCommand("Copy"); + }, inputOn() { this.$forceUpdate(); }, From 5b388717c2c3c5dcd150272321d51aedd28057d4 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Wed, 15 Jun 2022 15:22:40 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/user/MyFavorites.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/views/user/MyFavorites.vue b/src/views/user/MyFavorites.vue index 5ffb8f16..7af80358 100644 --- a/src/views/user/MyFavorites.vue +++ b/src/views/user/MyFavorites.vue @@ -511,6 +511,9 @@ export default { return author.aid == item.question.sysCreateAid; }); item = Object.assign(item, obj); + if(item.orgInfo){ + item.orgInfo=cutFullName(obj.orgInfo,1); + } return item; }); } else { @@ -597,6 +600,9 @@ export default { return author.aid == item.cases.authorId; }); item = Object.assign(item, obj); + if(item.orgInfo){ + item.orgInfo=cutFullName(obj.orgInfo,1); + } return item; }); } else { @@ -636,6 +642,9 @@ export default { return author.aid == item.sysCreateAid; }); item = Object.assign(item, obj); + if(item.orgInfo){ + item.orgInfo=cutFullName(obj.orgInfo,1); + } return item; }); } else { From baef53cfc4566376d9777783247888237572a51a Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 15 Jun 2022 15:30:45 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84url=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/course/ManageList.vue | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/views/course/ManageList.vue b/src/views/course/ManageList.vue index 916e03ba..26ad5c4e 100644 --- a/src/views/course/ManageList.vue +++ b/src/views/course/ManageList.vue @@ -203,7 +203,7 @@
- + 复制链接
@@ -330,6 +330,7 @@ export default { manageStudyData: {}, expandDetails: true, qrcode: '', + pcDetailUrl:'', isExamine: 1, auditInfo: { pass: true, @@ -666,15 +667,18 @@ export default { }, showQrimage(row) { this.qrcodeShow = true; - + let urlPre=window.location.protocol+'//'+window.location.host; + //动态的地址 - urlPre=urlPre+'/m?returnUrl='+urlPre+'/mobile/pages/login/loading?returnUrl='; + //urlPre=urlPre+'/m?returnUrl='+urlPre+'/mobile/pages/login/loading?returnUrl='; //固定的地址 - urlPre='https://u.boe.com/m?returnUrl=https://u.boe.com/mobile/pages/login/loading?returnUrl='; - this.qrcode = urlPre+'/pages/resource/microDetail?id='+row.id; + let mobilePre='https://u.boe.com/m?returnUrl=https://u.boe.com/mobile/pages/login/loading?returnUrl='; + this.qrcode = mobilePre+'/pages/resource/microDetail?id='+row.id; + this.pcDetailUrl=urlPre+this.webBaseUrl+'/course/micro?id='+row.id; if(row.type==20){ - this.qrcode = urlPre+'/pages/resource/courseDetail?id='+row.id; + this.qrcode = mobilePre+'/pages/resource/courseDetail?id='+row.id; + this.pcDetailUrl=urlPre+this.webBaseUrl+'/course/detail?id='+row.id; } // 使用$nextTick确保数据渲染