From b491ddb474ded3f3f3acc7ef2d61a005b16e2b23 Mon Sep 17 00:00:00 2001 From: weinan2087 Date: Tue, 22 Nov 2022 12:03:32 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/phase2/note.js | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/api/phase2/note.js b/src/api/phase2/note.js index c5612563..b9ffa078 100644 --- a/src/api/phase2/note.js +++ b/src/api/phase2/note.js @@ -142,32 +142,32 @@ const exportPdfPre=function (data){ * */ const exportPdf=function (udata){ // return ajax.postJson(baseURL,'/xboe/subgroup/m/noteinfo/exportPdf',data); - //return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/exportPdf',data); - var url = baseURL + '/xboe/subgroup/m/noteinfo/exportPdf'; - axios({ - method: 'POST', - url: url, - data:udata, - responseType: 'blob', - headers: { 'XBOE-Access-Token':getToken(),'Content-Type':'application/pdf;charset=utf-8'} - }).then(res => { - //resolveBlob(res, mimeMap.zip); - console.log(res); - const aLink = document.createElement('a') - var blob = new Blob([res.request.response], { type: 'application/pdf' }) + return ajax.postJson(baseURL,'/xboe/subgroup/m/noteinfo/expPdf',udata); + // var url = baseURL + '/xboe/subgroup/m/noteinfo/exportPdf'; + // axios({ + // method: 'POST', + // url: url, + // data:udata, + // responseType: 'blob', + // headers: { 'XBOE-Access-Token':getToken(),'Content-Type':'application/pdf;charset=utf-8'} + // }).then(res => { + // //resolveBlob(res, mimeMap.zip); + // console.log(res); + // const aLink = document.createElement('a') + // var blob = new Blob([res.request.response], { type: 'application/pdf' }) // //从response的headers中获取filename, 后端response.setHeader("Content-disposition", "attachment; filename=xxxx.docx") 设置的文件名; //var patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*') //var contentDisposition = decodeURI(res.headers['content-disposition']) //var result = patt.exec(contentDisposition) //var fileName = result[1] //fileName = fileName.replace(/\"/g, '') - aLink.href = URL.createObjectURL(blob) - aLink.setAttribute('download','我的笔记.pdf') // 设置下载文件名称 - document.body.appendChild(aLink) - aLink.click() - document.body.removeChild(aLink) + // aLink.href = URL.createObjectURL(blob) + // aLink.setAttribute('download','我的笔记.pdf') // 设置下载文件名称 + // document.body.appendChild(aLink) + // aLink.click() + // document.body.removeChild(aLink) - }) + // }) } /** From 2ca721416fb482c8aab6a238573fcc42507dd10e Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Tue, 22 Nov 2022 17:34:00 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=A8=AA=E6=8B=89?= =?UTF-8?q?=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/myNote.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/Course/myNote.vue b/src/components/Course/myNote.vue index cbb42c77..4bca37ab 100644 --- a/src/components/Course/myNote.vue +++ b/src/components/Course/myNote.vue @@ -161,7 +161,6 @@ export default { //$this.controlHeight=h- this.listHeight=val-95; this.inputHeight=(val-220); - this.inputRows=parseInt(this.inputHeight/30); if(this.inputRows>20){ this.inputRows=20; @@ -492,6 +491,8 @@ export default { .newcote-text { // margin-top: 24px; + word-break: break-all; + word-wrap: break-word; font-size: 14px; color: #333333; height: 100%; @@ -560,15 +561,12 @@ export default { .mynote-tab { width: 180px; margin-top: 17px; - display: flex; - div { font-size: 16px; color: #666666; flex: 1; } - .noteactive span { font-weight: 600; color: #333333; From 64e4986d9d954990d8dbcef484b2196cd012dbca Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Tue, 22 Nov 2022 17:39:06 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=88=91=E5=88=86=E4=BA=AB=E7=9A=84?= =?UTF-8?q?=E6=92=A4=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Article/shareItems.vue | 11 ++++++++++- src/components/Case/caseItems.vue | 7 ++++++- src/components/Course/shareItem.vue | 7 ++++++- src/components/Qa/shareList.vue | 7 ++++++- src/icons/svg/withdraw.svg | 12 ++++++++++++ 5 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 src/icons/svg/withdraw.svg diff --git a/src/components/Article/shareItems.vue b/src/components/Article/shareItems.vue index 92d27556..9048f8f4 100644 --- a/src/components/Article/shareItems.vue +++ b/src/components/Article/shareItems.vue @@ -14,7 +14,11 @@
{{ item.time }}
- 【文章】{{item.title}} +
【文章】{{item.title}}
+
+ + 撤回 +
@@ -130,12 +134,15 @@ export default { width: 100%; padding: 30px 0; border-bottom:1px solid #e9e9e9 ; + .coures-content{ margin-top: 20px; font-size: 16px; color: #333333; font-weight: 600; word-break:break-all; + display: flex; + justify-content: space-between; span{ font-size: 16px; margin-left: -9px; @@ -143,10 +150,12 @@ export default { } .coures-head{ display: flex; + .share-name{ font-size: 14px; color: #666666; margin-right: 17px; + cursor: pointer; } .share-time{ font-size: 14px; diff --git a/src/components/Case/caseItems.vue b/src/components/Case/caseItems.vue index 40fc3fd5..b882caa1 100644 --- a/src/components/Case/caseItems.vue +++ b/src/components/Case/caseItems.vue @@ -14,7 +14,10 @@
{{ item.time }}
- 【案例】{{item.title}} +
【案例】{{item.title}}
+
+ + 撤回
@@ -122,6 +125,8 @@ export default { color: #333333; font-weight: 600; word-break:break-all; + display: flex; + justify-content: space-between; span{ font-size: 16px; margin-left: -9px; diff --git a/src/components/Course/shareItem.vue b/src/components/Course/shareItem.vue index f3c2383a..8240d184 100644 --- a/src/components/Course/shareItem.vue +++ b/src/components/Course/shareItem.vue @@ -14,7 +14,10 @@
{{ item.time }}
- 【课程】{{item.title}} +
【课程】{{item.title}}
+
+ + 撤回
@@ -167,6 +170,8 @@ export default { color: #333333; font-weight: 600; word-break:break-all; + display: flex; + justify-content: space-between; span{ font-size: 16px; margin-left: -9px; diff --git a/src/components/Qa/shareList.vue b/src/components/Qa/shareList.vue index 00f7b615..3efa91d3 100644 --- a/src/components/Qa/shareList.vue +++ b/src/components/Qa/shareList.vue @@ -14,7 +14,10 @@
{{ item.time }}
- 【问答】{{item.title}} +
【问答】{{item.title}}
+
+ + 撤回
@@ -137,6 +140,8 @@ export default { color: #333333; font-weight: 600; word-break:break-all; + display: flex; + justify-content: space-between; span{ font-size: 16px; margin-left: -9px; diff --git a/src/icons/svg/withdraw.svg b/src/icons/svg/withdraw.svg new file mode 100644 index 00000000..9bf6188f --- /dev/null +++ b/src/icons/svg/withdraw.svg @@ -0,0 +1,12 @@ + + + 编组 19 + + + + + + + + + \ No newline at end of file From c40629cb8c019252e88e060adb57e36e44968667 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Tue, 22 Nov 2022 17:41:35 +0800 Subject: [PATCH 4/8] =?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/portal/article/Detail.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/portal/article/Detail.vue b/src/views/portal/article/Detail.vue index 8750de6a..623d5b2b 100644 --- a/src/views/portal/article/Detail.vue +++ b/src/views/portal/article/Detail.vue @@ -59,7 +59,6 @@

贡献榜

From db026bb3db3e4becb9eddbdbae489e06a5af5e48 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Tue, 22 Nov 2022 17:49:50 +0800 Subject: [PATCH 5/8] =?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/components/HomePage/courseList.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/HomePage/courseList.vue b/src/components/HomePage/courseList.vue index 1058fc6d..5c958ba3 100644 --- a/src/components/HomePage/courseList.vue +++ b/src/components/HomePage/courseList.vue @@ -100,12 +100,11 @@ if(!data.contentId){ return; } - console.log(data.info,'data.info') if(!data.info.enabled || data.info.deleted){ this.$message.warning("此课程已停用或已删除"); return; } - this.$router.push({ path: '/course/detail?id=', query: { id: data.contentId } }); + this.$router.push({ path: '/course/studyindex?id=', query: { id: data.contentId } }); } } } From d4ead551391e49d3366be46a55862ce932f0b68f Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Tue, 22 Nov 2022 18:09:34 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Follow/button.vue | 1 + src/components/HomePage/homePage.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/src/components/Follow/button.vue b/src/components/Follow/button.vue index 46fb37e0..5d57c16e 100644 --- a/src/components/Follow/button.vue +++ b/src/components/Follow/button.vue @@ -143,6 +143,7 @@