From 0ae9d16f05c17331e0e28936b14cb34b105287a8 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Tue, 14 Jun 2022 16:20:30 +0800 Subject: [PATCH 1/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/course/Courseware.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/course/Courseware.vue b/src/views/course/Courseware.vue index bcfa5fc1..d489243b 100644 --- a/src/views/course/Courseware.vue +++ b/src/views/course/Courseware.vue @@ -359,7 +359,6 @@ export default { search(){ this.params.pageIndex = 1; this.getSearch(); - }, reset() { this.params.self = null; @@ -432,6 +431,7 @@ export default { if (status === 200) { this.$message.success('保存成功'); this.editCoursewareShow = false; + this.getSearch(); } else { this.$message.error(message); } From 8c6c95669d8ecd48068a1fdbe820fb4b5d5cf1d7 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Tue, 14 Jun 2022 16:49:24 +0800 Subject: [PATCH 2/8] pdf --- src/components/PdfPreview/view.vue | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/components/PdfPreview/view.vue b/src/components/PdfPreview/view.vue index 960dc9ec..68124fbb 100644 --- a/src/components/PdfPreview/view.vue +++ b/src/components/PdfPreview/view.vue @@ -149,20 +149,21 @@ export default { let outerHeight = document.documentElement.clientHeight let scrollTop = document.documentElement.scrollTop let $this=this; + if(this.pdfpage >= this.totalPages){ + this.isscroll = false; + this.moreState = 3; + } + if(this.showPages >= this.totalPages){ + this.isscroll = false; + this.moreState = 3; + } if(this.isscroll){ this.showPages++ this.moreState = 2; // this.debounce(this.loadInitPdf($this.filePath),5000); // this.debounce(,200000); } - if(this.pdfpage >= this.totalPages){ - this.isscroll = false; - this.moreState = 3; - } - if(this.showPages >= this.totalPages){ - this.isscroll = false; - this.moreState = 3; - } + // if(scrollTop > 400) { // document.querySelector('#articleAnking').style.cssText = "position: fixed;top: 0;width:242.5px"; // } else { From 4516a42a21a47a83fbd85c408481608fa2e910e8 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Tue, 14 Jun 2022 16:54:26 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/case/Index.vue | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue index 31c8b7e7..4f8dbb5d 100644 --- a/src/views/portal/case/Index.vue +++ b/src/views/portal/case/Index.vue @@ -642,13 +642,6 @@ export default { } }); }, - getAnkingData() { - apiCase.usernameList(10).then(res => { - if (res.status == 200) { - this.ankingList = res.result; - } - }); - }, getPopularity() { apiCase.queryPraises(5).then(res => { if (res.status == 200) { From 64887a0cea42a5b3cd3597f09aae6b394282a216 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Tue, 14 Jun 2022 17:03:29 +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/components/UcHeader/Index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/UcHeader/Index.vue b/src/components/UcHeader/Index.vue index 28ad5de5..2038af56 100644 --- a/src/components/UcHeader/Index.vue +++ b/src/components/UcHeader/Index.vue @@ -23,9 +23,9 @@ 学习时长:{{userInfo.studyTotalH}}小时
- 学员 - 教师 - 管理员 + 学员 + 教师 + 管理员
From 219260f580f708fbc235546b11a60c282204ee22 Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Tue, 14 Jun 2022 18:12:28 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=BA=95=E9=83=A8=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/images/foot-fonts.png | Bin 0 -> 27582 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 public/images/foot-fonts.png diff --git a/public/images/foot-fonts.png b/public/images/foot-fonts.png new file mode 100644 index 0000000000000000000000000000000000000000..3911d16ce3b3a6ee2787e79225ad37ae09c34b34 GIT binary patch literal 27582 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 Y02L?9p#yWf|1nWZQC3X`E@cAyFRZ_>?EnA( literal 0 HcmV?d00001 From 8c7599ff55decae561aef682edefd34c55630c60 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Tue, 14 Jun 2022 18:28:03 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=8C=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/article/Detail.vue | 16 +++- src/views/portal/case/Detail.vue | 139 ++++++++++++++-------------- src/views/portal/case/Index.vue | 6 +- src/views/portal/course/Index.vue | 6 +- src/views/portal/qa/Answer.vue | 12 ++- src/views/portal/qa/Detail.vue | 3 +- 6 files changed, 100 insertions(+), 82 deletions(-) diff --git a/src/views/portal/article/Detail.vue b/src/views/portal/article/Detail.vue index c753ea75..04c6142e 100644 --- a/src/views/portal/article/Detail.vue +++ b/src/views/portal/article/Detail.vue @@ -6,9 +6,9 @@ 文章列表 文章详情 -
+
- +
@@ -49,7 +49,10 @@
- + +
+ +
@@ -84,6 +87,7 @@
+ @@ -127,6 +131,7 @@ export default { }, data() { return { + noData:true, shareInfo:{ name:'', load:false, @@ -142,7 +147,6 @@ export default { orgInfo:'', code:'', sex:null, - }, ankingList: [], diagSync:false,//控制弹窗 @@ -208,8 +212,10 @@ export default { this.articleDetailData=res.result; //if(this.articleDetailData.toString()!='{}'){ this.getAuthorInfo(this.articleDetailData) - //} + }else{ + this.noData = false; + this.$message.error(res.message); } }).catch(err=>{ this.$message.error("获取数据失败") diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue index 194d5a3d..b5a32f01 100644 --- a/src/views/portal/case/Detail.vue +++ b/src/views/portal/case/Detail.vue @@ -6,76 +6,79 @@ 案例列表 案例详情 -
+
- - - -
{{ caseDetail.title }}
-
- - 案主:{{ authorInfo.name }} - 工号:{{ authorInfo.code }} - 组织:{{ authorInfo.orgInfo }} - {{ caseDetail.sysCreateTime.substring(0,10) }} -
- - -
-
{{ orgDomainTranslate(caseDetail.orgDomain) }}
-
{{ orgDomainTranslate(caseDetail.orgDomainParent) }}
-
{{ majorTypeTranslate(caseDetail.majorType) }}
-
{{ caseDetail.keyword1 }}
-
{{ caseDetail.keyword2 }}
-
{{ caseDetail.keyword3 }}
-
{{ caseDetail.keyword4 }}
-
{{ caseDetail.keyword5 }}
- -
-
{{ caseDetail.summary }}
-
- - -
-
- - - - -
-
-
-
-
- - + + + +
{{ caseDetail.title }}
+
+ + 案主:{{ authorInfo.name }} + 工号:{{ authorInfo.code }} + 组织:{{ authorInfo.orgInfo }} + {{ caseDetail.sysCreateTime.substring(0,10) }} +
+ + +
+
{{ orgDomainTranslate(caseDetail.orgDomain) }}
+
{{ orgDomainTranslate(caseDetail.orgDomainParent) }}
+
{{ majorTypeTranslate(caseDetail.majorType) }}
+
{{ caseDetail.keyword1 }}
+
{{ caseDetail.keyword2 }}
+
{{ caseDetail.keyword3 }}
+
{{ caseDetail.keyword4 }}
+
{{ caseDetail.keyword5 }}
+ +
+
{{ caseDetail.summary }}
+
+ + +
+
+ + + + +
+
+
+
+
+ + +
+
+
+
+ +
+
+ 返回顶部 +
+
+
-
-
- -
-
- 返回顶部 -
+ +
+
-
+
+
+
+
- -
- -
- - -
@@ -95,7 +98,7 @@ {{index+1}} - + {{ item.sysCreateUname }} @@ -119,7 +122,7 @@ {{index+1}} - + {{ item.title }} @@ -143,7 +146,7 @@ {{index+1}} - + {{ item.title }} @@ -184,6 +187,7 @@ export default { }, data() { return { + noData:true, zoomShow:true, isTopBoxShow:true, toUsers:[], @@ -363,6 +367,7 @@ export default { } }else{ + this.noData=false; this.$message.error(res.message) } }); diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue index 4f8dbb5d..784ce65b 100644 --- a/src/views/portal/case/Index.vue +++ b/src/views/portal/case/Index.vue @@ -147,7 +147,7 @@ {{index+1}} - + {{ item.sysCreateUname }} @@ -171,7 +171,7 @@ {{index+1}} - + {{ item.title }} @@ -195,7 +195,7 @@ {{index+1}} - + {{ item.title }} diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 21724e5f..cc968786 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -217,7 +217,7 @@ {{index+1}} - + {{ item.name }} @@ -241,7 +241,7 @@ {{index+1}} - + {{ item.name }} @@ -266,7 +266,7 @@ {{index+1}} - + {{ item.courseName }} diff --git a/src/views/portal/qa/Answer.vue b/src/views/portal/qa/Answer.vue index 3f9b6b90..6e12204a 100644 --- a/src/views/portal/qa/Answer.vue +++ b/src/views/portal/qa/Answer.vue @@ -8,7 +8,7 @@
- +
@@ -189,7 +189,10 @@
- + +
+ +
@@ -287,6 +290,7 @@ export default { }, data() { return { + noData:true, qaFormCheckedShow: false, checked: false, // sex:null, @@ -424,12 +428,14 @@ export default { res.result.avatar = ""; res.result.name = ""; res.result.orgInfo = ""; - res.result.sex = null; this.detailData = res.result; if (JSON.stringify(this.detailData) != "{}") { this.getQaUserData(this.detailData); } + }else{ + this.noData = false; + this.$message.error(res.message); } }); }, diff --git a/src/views/portal/qa/Detail.vue b/src/views/portal/qa/Detail.vue index 2408880f..e35b6ee1 100644 --- a/src/views/portal/qa/Detail.vue +++ b/src/views/portal/qa/Detail.vue @@ -408,12 +408,13 @@ export default { res.result.avatar = ""; res.result.name = ""; res.result.orgInfo = ""; - res.result.sex = null; this.detailData = res.result; if (JSON.stringify(this.detailData) != "{}") { this.getQaUserData(this.detailData); } + }else{ + this.$message.error(res.message); } }); }, From 093609612165e869392f0fefb3b3af25cfc6e00b Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Tue, 14 Jun 2022 18:46:47 +0800 Subject: [PATCH 7/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/App.vue | 7 ++++++- src/views/Index.vue | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/App.vue b/src/App.vue index 253a2d0a..1b3fb6aa 100644 --- a/src/App.vue +++ b/src/App.vue @@ -31,5 +31,10 @@ .u-page{ padding: 10px; } - +.text-tooltip{ + background: #efeff1 !important; + border: 1px solid #e7e7e7 !important; + box-shadow: 0px 1px 5px 1px rgba(92,98,111,.3); +} + diff --git a/src/views/Index.vue b/src/views/Index.vue index abb9298e..4ea8e1b9 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -460,7 +460,7 @@ export default { orderField: 'id' }; if (this.caseList.orderType == 2) { - params.orderField = 'praises'; + params.orderField = 'comments'; } apiCase.indexList(params).then(res => { if (res.status == 200) { From 2688ca6b202d0d232c1da2be126891c78831dede Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Tue, 14 Jun 2022 19:28:24 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BB=8E=E7=B3=BB=E7=BB=9F=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=B0=81=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/auditCourse1.vue | 32 +++++++++++++++++++++++++- src/components/Course/auditCourse2.vue | 32 +++++++++++++++++++++++++- src/components/Course/courseForm.vue | 2 +- src/components/FileCloud/index.vue | 4 +++- 4 files changed, 66 insertions(+), 4 deletions(-) diff --git a/src/components/Course/auditCourse1.vue b/src/components/Course/auditCourse1.vue index fa6543ce..594043bb 100644 --- a/src/components/Course/auditCourse1.vue +++ b/src/components/Course/auditCourse1.vue @@ -58,7 +58,10 @@ - +
+ + +
上传为16:9(如:800*450)的png或jpg图片
@@ -212,6 +215,8 @@
+ +
@@ -237,6 +242,7 @@ import apiTag from "../../api/modules/tag.js"; import videoPlayer from "@/components/VideoPlayer/index.vue"; import audioPlayer from "@/components/AudioPlayer/index.vue"; import apiCourseFile from '@/api/modules/courseFile.js'; +import filecloud from '@/components/FileCloud/index.vue'; import { mapGetters, mapActions } from "vuex"; // import hyperLink from '@/components/Course/hyperLink.vue'; export default { @@ -246,6 +252,7 @@ export default { catalogCourseware, imageUpload, exam, + filecloud, homework, assess, WxEditor, @@ -279,6 +286,9 @@ export default { }, data() { return { + dlgFileChoose:{ + show:false + }, converStatus:4, courseType: courseType, isEdit: true, @@ -350,6 +360,26 @@ export default { }); }, methods: { + + chooseFile(){ + this.dlgFileChoose.show=true; + }, + choseChoose(){ + this.dlgFileChoose.show=false; + }, + changeCourseImage(img){ + if(!img.path){ + return; + } + //console.log(img); + this.dlgFileChoose.show=false; + this.courseInfo.coverImg = img.path; + this.courseCoverurl = this.fileUrl+img.path; + }, + acceptimage(value){ + this.courseInfo.coverImg = value.path; + this.courseCoverurl = value.path; + }, ...mapActions({ getResOwnerTree: "resOwner/getResOwnerTree", loadResOwners: "resOwner/loadResOwners", diff --git a/src/components/Course/auditCourse2.vue b/src/components/Course/auditCourse2.vue index d94db1fd..2f740e74 100644 --- a/src/components/Course/auditCourse2.vue +++ b/src/components/Course/auditCourse2.vue @@ -73,7 +73,10 @@ - +
+ + +
上传为16:9(如:800*450)的png或jpg图片
@@ -250,6 +253,8 @@
+ +
@@ -277,6 +282,7 @@ import audioPlayer from '@/components/AudioPlayer/index.vue'; import { mapGetters,mapActions} from 'vuex'; import hyperLink from '@/components/Course/hyperLink.vue'; import apiCourseFile from '../../api/modules/courseFile.js'; +import filecloud from '@/components/FileCloud/index.vue'; export default { name:"auditCourse2", components: { @@ -284,6 +290,7 @@ export default { catalogCourseware, imageUpload, exam, + filecloud, homework, assess, WxEditor, @@ -315,6 +322,9 @@ export default { }, data() { return { + dlgFileChoose:{ + show:false + }, converStatus:4, curriculumData:{ url:'', @@ -391,6 +401,26 @@ export default { }) }, methods: { + + chooseFile(){ + this.dlgFileChoose.show=true; + }, + choseChoose(){ + this.dlgFileChoose.show=false; + }, + changeCourseImage(img){ + if(!img.path){ + return; + } + //console.log(img); + this.dlgFileChoose.show=false; + this.courseInfo.coverImg = img.path; + this.courseCoverurl = this.fileUrl+img.path; + }, + acceptimage(value){ + this.courseInfo.coverImg = value.path; + this.courseCoverurl = value.path; + }, ...mapActions({ getResOwnerTree:'resOwner/getResOwnerTree', loadResOwners:'resOwner/loadResOwners', diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index d0df5854..abf640a2 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -53,7 +53,7 @@
- +
diff --git a/src/components/FileCloud/index.vue b/src/components/FileCloud/index.vue index 9dca5bb5..436489e4 100644 --- a/src/components/FileCloud/index.vue +++ b/src/components/FileCloud/index.vue @@ -1,6 +1,6 @@