From 5fa79d372cf11598fe74de75cbfba5076425f2c1 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 16 Nov 2022 17:56:03 +0800 Subject: [PATCH 01/46] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/exam/Test.vue | 12 +++++++++++- src/views/study/coursenew.vue | 30 ++++-------------------------- 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/src/views/exam/Test.vue b/src/views/exam/Test.vue index 0f79de21..389309ad 100644 --- a/src/views/exam/Test.vue +++ b/src/views/exam/Test.vue @@ -242,6 +242,8 @@ export default { toScoreTow, examId:'',//考试的id taskId:'',//考试任务的id + refId:'',//关联的id + refType:'1',//关联的类型,1表默认的独立考试 lastId:'',//最后一次提交的答卷 canExam:false,//能否参加考试 noExam:false,//不能参加考试 @@ -296,7 +298,14 @@ export default { ...mapGetters(['userInfo']) }, mounted() { - this.examId = this.$route.query.id + this.examId = this.$route.query.id; + if(this.$route.query.refId){ + this.refId = this.$route.query.refId; + } + if(this.$route.query.refType){ + this.refType = this.$route.query.refType; + } + if(this.examId) { this.loadData() }else{ @@ -506,6 +515,7 @@ export default { } let that = this; let data = {}; + data.aloneId=this.taskId; data.testId = this.testPaper.id; data.testName = this.testPaper.testName; data.testDuration = this.testPaper.testDuration; diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue index 76b4e6cb..a37716ea 100644 --- a/src/views/study/coursenew.vue +++ b/src/views/study/coursenew.vue @@ -1070,7 +1070,7 @@ }, audioPause() { //console.log("暂停"); - this.stopStudyTime();//启动追加学习时长 + this.stopStudyTime();//停止追加学习时长 }, audioEnd() { //console.log("播放结束"); @@ -1342,35 +1342,13 @@ let sen = parseInt(m / 1000); //计算秒数 duration = duration + $this.appentInterval/1000;//追加的是秒 if (sen>=60) { //一分钟保存一次 - this.saveStudyDuration(duration); - // if (duration > 0) { - // let postData = { - // id: this.appentId, - // studyId: this.studyId, - // courseId: this.courseInfo.id, - // contentId: this.contentData.id, - // studyInfo: this.courseInfo.name + - // "-" + - // this.contentData.contentName, - // duration: duration - // }; - // apiStudy.appendStudyTime(postData).then(rs => { - // if (rs.status == 200) { - // $this.appentId = rs.result; - // $this.appendStartTime = new Date(); //重置开始时间 - // studyUtil.clearStudyDuration(); //清除本地存储 - // //this.appendHandle=setTimeout(function() {$this.appendStudyTime();}, $this.appentInterval); - // } else { - // console.log(rs.message); - // } - // }); - // } + this.saveStudyDuration(duration); } else { - studyUtil.setStudyDuration(duration); //添加到本地存储中 + studyUtil.setStudyDuration(duration); //添加到本地存储中 } //启动下次追加学习时长 this.appendHandle = setTimeout(function() { - $this.appendStudyTime(); + $this.appendStudyTime(); }, $this.appentInterval); }, From f3b3c97d5bad0f77cb344a359fbc9ca6bda61d5c Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Thu, 17 Nov 2022 10:41:33 +0800 Subject: [PATCH 02/46] =?UTF-8?q?1280=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Article/shareItems.vue | 1 + src/components/Case/caseItems.vue | 1 + src/components/Course/shareItem.vue | 1 + src/components/Qa/shareList.vue | 1 + src/views/exam/MyExamTask.vue | 9 +++++---- src/views/portal/qa/Answer.vue | 2 -- src/views/qa/MyList.vue | 2 +- src/views/study/Courses.vue | 2 +- src/views/ucurrency/Index.vue | 2 +- 9 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/components/Article/shareItems.vue b/src/components/Article/shareItems.vue index 13f2e825..92d27556 100644 --- a/src/components/Article/shareItems.vue +++ b/src/components/Article/shareItems.vue @@ -135,6 +135,7 @@ export default { font-size: 16px; color: #333333; font-weight: 600; + word-break:break-all; span{ font-size: 16px; margin-left: -9px; diff --git a/src/components/Case/caseItems.vue b/src/components/Case/caseItems.vue index 30da5b9f..40fc3fd5 100644 --- a/src/components/Case/caseItems.vue +++ b/src/components/Case/caseItems.vue @@ -121,6 +121,7 @@ export default { font-size: 16px; color: #333333; font-weight: 600; + word-break:break-all; span{ font-size: 16px; margin-left: -9px; diff --git a/src/components/Course/shareItem.vue b/src/components/Course/shareItem.vue index c71d7e3b..f3c2383a 100644 --- a/src/components/Course/shareItem.vue +++ b/src/components/Course/shareItem.vue @@ -166,6 +166,7 @@ export default { font-size: 16px; color: #333333; font-weight: 600; + word-break:break-all; span{ font-size: 16px; margin-left: -9px; diff --git a/src/components/Qa/shareList.vue b/src/components/Qa/shareList.vue index b93e2011..00f7b615 100644 --- a/src/components/Qa/shareList.vue +++ b/src/components/Qa/shareList.vue @@ -136,6 +136,7 @@ export default { font-size: 16px; color: #333333; font-weight: 600; + word-break:break-all; span{ font-size: 16px; margin-left: -9px; diff --git a/src/views/exam/MyExamTask.vue b/src/views/exam/MyExamTask.vue index a83c3db3..6f19d374 100644 --- a/src/views/exam/MyExamTask.vue +++ b/src/views/exam/MyExamTask.vue @@ -181,15 +181,16 @@ font-size: 14px; margin-top: 18px; display: flex; - div{ - margin-right: 40px; - } + justify-content: space-between; + // div{ + // margin-right: 40px; + // } } } .task-btns { text-align: right; margin-top: 40px; - width: 100px; + width: 150px; // height: 44px; } } diff --git a/src/views/portal/qa/Answer.vue b/src/views/portal/qa/Answer.vue index b1302193..cfe4c1e4 100644 --- a/src/views/portal/qa/Answer.vue +++ b/src/views/portal/qa/Answer.vue @@ -734,7 +734,6 @@ export default { if (res.status == 200) { this.messageSave("set"); //消息 - console.log(data,'data'); let event = { key: "AnswerBest",//设置为最佳答案 title: "回答被选为最佳答案",// @@ -747,7 +746,6 @@ export default { aname: this.userInfo.name,//当前人的姓名 status: 1 //状态，直接写1 } - console.log(event,'event'); this.$store.dispatch("userTrigger", event); this.loadAnswer(); this.getQuestionDetail(); diff --git a/src/views/qa/MyList.vue b/src/views/qa/MyList.vue index 1b502e4c..74a87fb2 100644 --- a/src/views/qa/MyList.vue +++ b/src/views/qa/MyList.vue @@ -4,7 +4,7 @@
-
我的提问
+
我的提问
diff --git a/src/views/study/Courses.vue b/src/views/study/Courses.vue index a4b9e149..2d1963b1 100644 --- a/src/views/study/Courses.vue +++ b/src/views/study/Courses.vue @@ -2,7 +2,7 @@
-
我报名的
+
我报名的
diff --git a/src/views/ucurrency/Index.vue b/src/views/ucurrency/Index.vue index 7c51d3b7..dcb505a0 100644 --- a/src/views/ucurrency/Index.vue +++ b/src/views/ucurrency/Index.vue @@ -441,7 +441,7 @@ }, legend: { top: 'center', - right: 100, + right: 60, orient: 'vertical', itemWidth: 8, itemHeight: 8, From f30a4204c9f06924c5e716998ce82be5dcac69b1 Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Thu, 17 Nov 2022 10:53:08 +0800 Subject: [PATCH 03/46] =?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/assets/styles/portal-index.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/styles/portal-index.scss b/src/assets/styles/portal-index.scss index 8393bb6b..6bb540d8 100644 --- a/src/assets/styles/portal-index.scss +++ b/src/assets/styles/portal-index.scss @@ -482,11 +482,11 @@ padding: 10px 40px; .personal-box { margin-left: 0px; - margin-top: 10px; + // margin-top: 10px; margin-bottom: 0px; } .personal-ul{ - margin-top: 7px; + margin-top: 0px; } } From de75a5f94ade46199a04aa9ddd7faaeef8befa86 Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Thu, 17 Nov 2022 10:57:34 +0800 Subject: [PATCH 04/46] =?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/assets/styles/portal-index.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/assets/styles/portal-index.scss b/src/assets/styles/portal-index.scss index 6bb540d8..2bcebc8f 100644 --- a/src/assets/styles/portal-index.scss +++ b/src/assets/styles/portal-index.scss @@ -437,6 +437,9 @@ } // boe-index @media screen and (max-width: 1366px){ + .xindex-case .case-conent .cast-time{ + font-size: 13px !important; + } .portal-index-title{ font-size: 14px; font-weight: 500; From df4274663d2615537032aeeec95f41d8089cdacb Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Thu, 17 Nov 2022 12:00:55 +0800 Subject: [PATCH 05/46] =?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/assets/styles/portal-index.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/styles/portal-index.scss b/src/assets/styles/portal-index.scss index 2bcebc8f..0c15192c 100644 --- a/src/assets/styles/portal-index.scss +++ b/src/assets/styles/portal-index.scss @@ -502,7 +502,7 @@ margin-bottom: 20px; .xindex-course-image{ - width: 220px; + width: 213px; height: 123px; ::v-deep .course-image{ height: 100% !important; @@ -553,7 +553,7 @@ height: 69px; } .case-conent{ - width: 200px; + width: 220px; height: 169px; // top:20px; // left:25px; From 9efec1b6761a33755cb7a5c13281747fbbd9e1dd Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 17 Nov 2022 12:26:32 +0800 Subject: [PATCH 06/46] =?UTF-8?q?=E8=80=83=E8=AF=95=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/weikeContent.vue | 28 ++++++++++++++++---------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/components/Course/weikeContent.vue b/src/components/Course/weikeContent.vue index c1010af0..67b8447a 100644 --- a/src/components/Course/weikeContent.vue +++ b/src/components/Course/weikeContent.vue @@ -66,7 +66,7 @@
-
保存
+
保存
@@ -92,7 +92,7 @@
-
保存
+
保存
@@ -125,7 +125,7 @@
- 保存 + 保存
@@ -231,7 +231,7 @@
- 保存 + 保存 删除
@@ -308,7 +308,7 @@
自定义考试
只显示试题 - 保 存 + 保 存 删 除
@@ -322,7 +322,7 @@ --> - + @@ -331,9 +331,9 @@ --> - + - + @@ -376,9 +376,9 @@ 最后一次 - + - 按百分制显示成绩（实际成绩*100/实际总分） + 实际成绩*100/实际总分 @@ -559,6 +559,7 @@ }, data(){ return { + loading:false, converStatus:4, courseFileShow:false, curContent:{id:'',contentType:0,contenRefId:''}, @@ -683,13 +684,14 @@ testDuration:30, showAnalysis:false, showAnswer:false, - times:1, + times:0, qnum:0,//试题数量，只是模式是随机生成试题时才会有 arrange:0, scoringType:1, passLine:60, randomMode:false, percentScore:true, + passLine:60, paperType:1,//自定义试卷 paperId:'',//试卷的id,只有paperType为2的时间才会有值 info:'',//考试说明 @@ -945,6 +947,7 @@ this.$message.error("请先保存课程信息再添加课件等信息"); return; } + this.loading=true; let postData={ type:10, content:null, @@ -1036,6 +1039,9 @@ }else{ this.$message.error(res.message); } + this.loading=false; + }).catch(err=>{ + this.loading=false; }) }, deleteContent(index){ From fd2156549960bd20ef574cf4a76debf23725a116 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Thu, 17 Nov 2022 18:14:23 +0800 Subject: [PATCH 07/46] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/case/Detail.vue | 8 ++------ src/views/study/Courses.vue | 8 ++++---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue index e2bf1578..06f9974f 100644 --- a/src/views/portal/case/Detail.vue +++ b/src/views/portal/case/Detail.vue @@ -104,8 +104,7 @@

好评榜

    -
  • - +
  • @@ -122,15 +121,13 @@ {{ item.title }} -

人气榜

    -
  • - +
  • @@ -147,7 +144,6 @@ {{ item.title }} -
diff --git a/src/views/study/Courses.vue b/src/views/study/Courses.vue index 2d1963b1..00d46855 100644 --- a/src/views/study/Courses.vue +++ b/src/views/study/Courses.vue @@ -316,11 +316,11 @@ computed: { // this.$router.push({path:'/course/micro',query:{id:item.courseId}}) // } // if(item.courseType==20){ - if(item.progress>0 && item.progress<100) { + // if(item.progress>0 && item.progress<100) { this.$router.push({path:'/course/studyindex',query:{id:item.courseId}}) - } else { - this.$router.push({path:'/course/detail',query:{id:item.courseId}}) - } + // } else { + // this.$router.push({path:'/course/detail',query:{id:item.courseId}}) + // } // } } From adc74352a948af9fd3a62341a8c9e15fc29798bf Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Thu, 17 Nov 2022 18:35:57 +0800 Subject: [PATCH 08/46] =?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/views/portal/case/Index.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue index 81b3f74c..d156e4de 100644 --- a/src/views/portal/case/Index.vue +++ b/src/views/portal/case/Index.vue @@ -78,9 +78,11 @@ +
- +
+
{{ orgDomainTranslate(item.orgDomain) }}
{{ orgDomainTranslate(item.orgDomainParent) }}
@@ -91,7 +93,7 @@
{{ item.keyword4 }}
{{ item.keyword5 }}
- +
{{ item.summary }} @@ -112,11 +114,11 @@
加载更多 数据加载中 - - + +
暂无案例，请优先学习其它案例吧～
 - 没有查询到相关内容 +
From 176ba23b2618b306927bddb10b7e4dacb5d27c95 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Thu, 17 Nov 2022 18:48:06 +0800 Subject: [PATCH 09/46] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/portal-index.scss | 4 ++-- src/components/Portal/interactBar.vue | 2 +- src/views/Index.vue | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/assets/styles/portal-index.scss b/src/assets/styles/portal-index.scss index 0c15192c..9249734d 100644 --- a/src/assets/styles/portal-index.scss +++ b/src/assets/styles/portal-index.scss @@ -451,7 +451,7 @@ width: 260px; } .case-inter-orgin{ - width: 56%; + // width: 56%; } .btn-user{ width: 70px; @@ -714,7 +714,7 @@ } @media screen and (max-width: 1680px) and (min-width:1367px){ .case-inter-orgin{ - width: 47%; + // width: 47%; } .portal-index-title{ font-size: 16px; diff --git a/src/components/Portal/interactBar.vue b/src/components/Portal/interactBar.vue index e0db020e..0ffa22c6 100644 --- a/src/components/Portal/interactBar.vue +++ b/src/components/Portal/interactBar.vue @@ -50,7 +50,7 @@
- + {{ formatNum(data.views)}}
diff --git a/src/views/Index.vue b/src/views/Index.vue index c927e315..09af0469 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -1167,7 +1167,7 @@ .case-inter-orgin{ // width: 45%; - float: left; + // float: left; margin-left: 5px; line-height: 30px; font-size: 14px; @@ -1583,7 +1583,7 @@ width: 100%; .case-inter-box{ display: flex; - margin-right: 35px; + margin-right: 46px; .case-inter-left{ flex: 1; @@ -1591,6 +1591,9 @@ } .interact-bar-index{ margin-left: auto; + ::v-deep .svg-icon{ + padding-top: 6px; + } } } From af7f7972535ce7a48d98ac7c21b93c3d267b342d Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 17 Nov 2022 19:56:53 +0800 Subject: [PATCH 10/46] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/study/coursenew.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue index a37716ea..b0ae212d 100644 --- a/src/views/study/coursenew.vue +++ b/src/views/study/coursenew.vue @@ -752,6 +752,12 @@ return; } this.interactRuning = true; + let teacherId=''; + if(this.teachers.length>0){ + teacherId=this.teachers[0].teacherId; + }else{ + teacherId=this.courseInfo.sysCreateAid + } let postData = { objType: 1, objId: this.courseId, @@ -767,7 +773,7 @@ let event = { key: "CancelPraise",//点赞 title: "取消点赞",//事件的标题 - parameters:"author:"+this.courseInfo.sysCreateAid,//用户自定义参数 name:value,name:value + parameters:"author:"+teacherId,//用户自定义参数 name:value,name:value content: "取消点赞课程",//事件的内容 objId: this.courseId,//关联的id objType: "1",//关联的类型 @@ -791,7 +797,7 @@ let event = { key: "Praise",//点赞 title: "点赞",//事件的标题 - parameters:"author:"+this.courseInfo.sysCreateAid,//用户自定义参数 name:value,name:value + parameters:"author:"+teacherId,//用户自定义参数 name:value,name:value content: "点赞了课程",//事件的内容 objId: this.courseId,//关联的id objType: "1",//关联的类型 From e570eb3b5d7179a652ca4b7a985bfdb93c1bf7a0 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Fri, 18 Nov 2022 11:06:13 +0800 Subject: [PATCH 11/46] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=94=BE=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Index.vue | 4 ++++ src/views/portal/course/Index.vue | 15 ++++----------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/views/Index.vue b/src/views/Index.vue index 09af0469..0faeaaa6 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -1112,6 +1112,10 @@ \ No newline at end of file From 2d191d69084b5db12dae004a7ce6c4e1aa930a0e Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Wed, 23 Nov 2022 17:56:15 +0800 Subject: [PATCH 39/46] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/user/Message.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/portal/user/Message.vue b/src/views/portal/user/Message.vue index c107ddee..9b246d20 100644 --- a/src/views/portal/user/Message.vue +++ b/src/views/portal/user/Message.vue @@ -154,7 +154,7 @@ export default { }, methods: { jumResearch(){ - this.$router.push('/user/Myresearch.vue'); + this.$router.push('/user/research'); // return this.webBaseUrl + '/src/views/user/myResearch.vue'; }, queryMessage(flag) { From 404df64edf5cbea41e886ff59d4b80e36f2a1f16 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 23 Nov 2022 18:03:03 +0800 Subject: [PATCH 40/46] =?UTF-8?q?=E5=8A=A0=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/AlertPopup.vue | 108 ++++++++++++++++++++++++++++++++ src/components/PortalHeader.vue | 26 ++++++-- src/views/user/Myresearch.vue | 2 +- 3 files changed, 131 insertions(+), 5 deletions(-) create mode 100644 src/components/AlertPopup.vue diff --git a/src/components/AlertPopup.vue b/src/components/AlertPopup.vue new file mode 100644 index 00000000..66447b01 --- /dev/null +++ b/src/components/AlertPopup.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue index 146028d0..fd2b5871 100644 --- a/src/components/PortalHeader.vue +++ b/src/components/PortalHeader.vue @@ -124,13 +124,13 @@ - +