From 2b8b02027754b604622c5afa84f3c6019d6f537b Mon Sep 17 00:00:00 2001 From: weinan2087 Date: Tue, 18 Oct 2022 11:16:13 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BC=95=E5=AF=BC?= =?UTF-8?q?=E9=A1=B5=E7=9A=84=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Portal/guideBox.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Portal/guideBox.vue b/src/components/Portal/guideBox.vue index 89704008..02a31ead 100644 --- a/src/components/Portal/guideBox.vue +++ b/src/components/Portal/guideBox.vue @@ -136,8 +136,8 @@ position: relative; .close-right{ position: absolute; - right:-136px; - top:45px; + right:3%; + top:3%; } ::v-deep .swiper-wrapper{ From abf85c0daae5cd59d790d5918d739ca59bc15cdb Mon Sep 17 00:00:00 2001 From: 86182 Date: Tue, 18 Oct 2022 11:22:55 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=AF=BC=E5=87=BApdf=E5=92=8Cexcel?= =?UTF-8?q?=E4=B9=B1=E7=A0=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/phase2/note.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/phase2/note.js b/src/api/phase2/note.js index 7a0777e4..327fd5f6 100644 --- a/src/api/phase2/note.js +++ b/src/api/phase2/note.js @@ -105,7 +105,7 @@ const ids=function (data){ * */ const exportExcel=function (data){ // return ajax.postJsonToFile(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data); - return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data); + return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data,{responseType: 'blob'}); } /** @@ -115,7 +115,7 @@ const exportExcel=function (data){ * } * */ const exportExcelPre=function (data){ - return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/excel-detail',data); + return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/excel-detail',data,{responseType: 'blob'}); } /** From 16a48eb8048c464838de3d8c75156f6074002a87 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Tue, 18 Oct 2022 11:34:23 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=8B=8B=E7=AB=A0=E8=A7=84=E5=88=99?= =?UTF-8?q?=E6=8D=A2=E6=88=90=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/portal-index.scss | 12 +++ src/views/medal/Index.vue | 2 +- src/views/medal/urules.vue | 120 ++++++++++++++-------------- 3 files changed, 74 insertions(+), 60 deletions(-) diff --git a/src/assets/styles/portal-index.scss b/src/assets/styles/portal-index.scss index b123b05f..0b63c763 100644 --- a/src/assets/styles/portal-index.scss +++ b/src/assets/styles/portal-index.scss @@ -435,6 +435,9 @@ } // boe-index @media screen and (max-width: 1366px){ + .medal-index{ // 勋章规则控制 + margin: 40px 26px 0 26px; + } .xindex-content{ width: 1100px; } @@ -669,6 +672,9 @@ } } @media screen and (max-width: 1680px) and (min-width:1367px){ + .medal-index{ // 勋章规则控制 + margin: 40px 50px 0 50px; + } .xindex-content{ width: 1366px; } @@ -893,6 +899,9 @@ } @media screen and (max-width: 1920px) and (min-width: 1681px){ + .medal-index{ // 勋章规则控制 + margin: 40px 60px 0 60px; + } .xindex-content{ width: 1690px; } @@ -1123,6 +1132,9 @@ } @media screen and (min-width: 1921px){ + .medal-index{ // 勋章规则控制 + margin: 40px 60px 0 60px; + } .xindex-content{ width: 1880px; } diff --git a/src/views/medal/Index.vue b/src/views/medal/Index.vue index 5e92bf5e..39d38507 100644 --- a/src/views/medal/Index.vue +++ b/src/views/medal/Index.vue @@ -275,7 +275,7 @@ } .medal-index{ width: 144px; - margin: 40px 60px 0 60px; + text-align: center; diff --git a/src/views/medal/urules.vue b/src/views/medal/urules.vue index cf98d310..1aad5d3d 100644 --- a/src/views/medal/urules.vue +++ b/src/views/medal/urules.vue @@ -9,73 +9,75 @@
勋章等级
-
跬步千里
-
持之以恒
-
知识贡献者
-
社交达人
+
{{ru.name}}
-
-
LV.1
-
累计学习 1 h
-
连续 1 天活跃且学习时长 >=10分钟
-
累计上传 1 个知识 （课程、文章、笔记）
-
累计被赞 10 次
-
-
-
LV.2
-
累计学习 5 h
-
连续 5 天活跃且学习时长 >=10分钟
-
累计上传 5 个知识 （课程、文章、笔记）
-
累计被赞 30 次
-
-
-
LV.3
-
累计学习 10 h
-
连续 15 天活跃且学习时长 >=10分钟
-
累计上传 10 个知识 （课程、文章、笔记）
-
累计被赞 50 次
-
-
-
LV.4
-
累计学习 50 h
-
连续 30 天活跃且学习时长 >=10分钟
-
累计上传 20 个知识 （课程、文章、笔记）
-
累计被赞 100 次
-
-
-
LV.5
-
累计学习 100 h
-
连续 70 天活跃且学习时长 >=10分钟
-
累计上传 50 个知识 （课程、文章、笔记）
-
累计被赞 200 次
-
-
-
LV.6
-
累计学习 300 h
-
连续 120 天活跃且学习时长 >=10分钟
-
累计上传 100 个知识 （课程、文章、笔记）
-
累计被赞 500 次
-
-
-
LV.7
-
累计学习 500 h
-
连续 200 天活跃且学习时长 >=10分钟
-
累计上传 300 个知识 （课程、文章、笔记）
-
累计被赞 1000 次
-
-
-
LV.8
-
累计学习 1000 h
-
连续 365 天活跃且学习时长 >=10分钟
-
累计上传 800 个知识 （课程、文章、笔记）
-
累计被赞 2000 次
+
+
LV.{{item.level}}
+
{{item.study}}
+
{{item.day}}
+
{{item.steadily}}
+
{{item.popularity}}
From c9015d3ce19c2ab7516efb587d5b2acd2b8ba767 Mon Sep 17 00:00:00 2001 From: 86182 Date: Tue, 18 Oct 2022 11:41:03 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=AF=BC=E5=87=BApdf=E6=89=93=E4=B8=8D?= =?UTF-8?q?=E5=BC=80=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/phase2/note.js | 4 ++-- src/views/user/Mynotes.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/phase2/note.js b/src/api/phase2/note.js index 327fd5f6..7a0777e4 100644 --- a/src/api/phase2/note.js +++ b/src/api/phase2/note.js @@ -105,7 +105,7 @@ const ids=function (data){ * */ const exportExcel=function (data){ // return ajax.postJsonToFile(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data); - return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data,{responseType: 'blob'}); + return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data); } /** @@ -115,7 +115,7 @@ const exportExcel=function (data){ * } * */ const exportExcelPre=function (data){ - return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/excel-detail',data,{responseType: 'blob'}); + return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/excel-detail',data); } /** diff --git a/src/views/user/Mynotes.vue b/src/views/user/Mynotes.vue index ce9babcd..190482ff 100644 --- a/src/views/user/Mynotes.vue +++ b/src/views/user/Mynotes.vue @@ -300,7 +300,7 @@ export default { this.$message.error('导出失败'); } else { const link = document.createElement('a');// 创建a标签 - let blob = new Blob([res],{type: 'application/vnd.ms-pdf;charset=UTF-8'}); // 设置文件类型 + let blob = new Blob([res],{type: 'application/vnd.pdf;charset=UTF-8'}); // 设置文件类型 link.style.display = "none"; link.href = URL.createObjectURL(blob); // 创建URL link.setAttribute("download", "我的笔记.pdf"); From 7f1bc656667cf9f361baceca89c176c3a82694ce Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Tue, 18 Oct 2022 11:39:42 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E5=8D=A0=E4=BD=8D=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/user/ranking.vue | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/views/user/ranking.vue b/src/views/user/ranking.vue index 4780ce9d..ae71b6d3 100644 --- a/src/views/user/ranking.vue +++ b/src/views/user/ranking.vue @@ -4,7 +4,10 @@
经验值排行榜 - + +
占位内容
占位内容
+ +
@@ -99,7 +102,11 @@
- 学习时长排行榜 + 学习时长排行榜 + +
占位内容
占位内容
+ +
@@ -179,7 +186,11 @@
- 学习天数排行榜 + 学习天数排行榜 + +
占位内容
占位内容
+ +
From 411b50c81989ae83032381859ab1d5e796e61b3b Mon Sep 17 00:00:00 2001 From: 86182 Date: Tue, 18 Oct 2022 11:45:30 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=AF=BC=E5=87=BApdf=E6=89=93=E4=B8=8D?= =?UTF-8?q?=E5=BC=80=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/user/Mynotes.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/user/Mynotes.vue b/src/views/user/Mynotes.vue index 190482ff..1ae064db 100644 --- a/src/views/user/Mynotes.vue +++ b/src/views/user/Mynotes.vue @@ -300,7 +300,8 @@ export default { this.$message.error('导出失败'); } else { const link = document.createElement('a');// 创建a标签 - let blob = new Blob([res],{type: 'application/vnd.pdf;charset=UTF-8'}); // 设置文件类型 + // let blob = new Blob([res],{type: 'application/vnd.ms-pdf;charset=UTF-8'}); // 设置文件类型 + let blob = new Blob([res],{type: 'application/pdf;charset=UTF-8'}); // 设置文件类型 link.style.display = "none"; link.href = URL.createObjectURL(blob); // 创建URL link.setAttribute("download", "我的笔记.pdf"); @@ -326,7 +327,7 @@ export default { this.$message.error('导出失败'); } else { const link = document.createElement('a');// 创建a标签 - let blob = new Blob([res],{type: 'application/vnd.ms-excel;charset=UTF-8'}); // 设置文件类型 + let blob = new Blob([res],{type: 'application/vnd.;charset=UTF-8'}); // 设置文件类型 link.style.display = "none"; link.href = URL.createObjectURL(blob); // 创建URL link.setAttribute("download", "我的笔记.xls"); From 0ab25da6ba8a74389e29743bf0d6f70a260b2cf0 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Tue, 18 Oct 2022 11:49:07 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E8=8F=9C=E5=8D=95bug=E4=BF=AE=E6=94=B9?= 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 7077796a..a58834b6 100644 --- a/src/components/UserCenter/menu.vue +++ b/src/components/UserCenter/menu.vue @@ -14,7 +14,7 @@ :default-active="activeMenu" router active-text-color="#3379FB" - :default-openeds="['manageTodo','manageFinish','teacherTodo','teacherFinish','myqa', 'mystudy', 'course', 'exam', 'u001', 'u002', 'u003', 'u004']" + :default-openeds="['manageTodo','manageFinish','teacherTodo','teacherFinish','myqa','notice','mystudy', 'course', 'exam', 'u001', 'u002', 'u003', 'u004']" class="el-menu-vertical" @open="handleOpen" @close="handleClose" @@ -277,7 +277,7 @@ 我的文章 - +