From 7f75fd79c5e9a13918b71466a21d892d7556339f Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Tue, 23 Aug 2022 17:02:52 +0800 Subject: [PATCH 1/4] =?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/Course/courseImage.vue | 10 ++++++++ src/views/Index.vue | 37 +++++++++++++++++++++++++-- src/views/portal/course/Index.vue | 31 +++++++++++++++++++++- 3 files changed, 75 insertions(+), 3 deletions(-) diff --git a/src/components/Course/courseImage.vue b/src/components/Course/courseImage.vue index 0370ede8..dc36d480 100644 --- a/src/components/Course/courseImage.vue +++ b/src/components/Course/courseImage.vue @@ -142,6 +142,11 @@ export default { width: 100%; height: 100%; position: relative; + -moz-user-select: none; /*火狐*/ + -webkit-user-select: none; /*webkit浏览器*/ + -ms-user-select: none; /*IE10*/ + -khtml-user-select: none; /*早期浏览器*/ + user-select: none; p { display: -webkit-box; // white-space:pre-wrap; @@ -153,6 +158,11 @@ export default { color: #ffffff; position: absolute; padding-right: 10px; + -moz-user-select: none; /*火狐*/ + -webkit-user-select: none; /*webkit浏览器*/ + -ms-user-select: none; /*IE10*/ + -khtml-user-select: none; /*早期浏览器*/ + user-select: none; } .mini { top: 30%; diff --git a/src/views/Index.vue b/src/views/Index.vue index 6e4569e3..e9e8523a 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -828,6 +828,11 @@ export default { border-top-left-radius: 15px; border-bottom-left-radius: 15px; color: #ffffff; + -moz-user-select: none; /*火狐*/ + -webkit-user-select: none; /*webkit浏览器*/ + -ms-user-select: none; /*IE10*/ + -khtml-user-select: none; /*早期浏览器*/ + user-select: none; } .course-type-title { position: absolute; @@ -838,6 +843,11 @@ export default { line-height: 30px; text-align: center; color: #ffffff; + -moz-user-select: none; /*火狐*/ + -webkit-user-select: none; /*webkit浏览器*/ + -ms-user-select: none; /*IE10*/ + -khtml-user-select: none; /*早期浏览器*/ + user-select: none; } .course-flag { height: 26px; @@ -866,6 +876,11 @@ export default { font-size: 18px; font-weight: 600; color: #343434; + -moz-user-select: none; /*火狐*/ + -webkit-user-select: none; /*webkit浏览器*/ + -ms-user-select: none; /*IE10*/ + -khtml-user-select: none; /*早期浏览器*/ + user-select: none; } .course-author { margin: 5px 15px; @@ -874,11 +889,14 @@ export default { justify-content: space-between; .course-author-left { - font-size: 12px; line-height: 30px; color: #666; - + -moz-user-select: none; /*火狐*/ + -webkit-user-select: none; /*webkit浏览器*/ + -ms-user-select: none; /*IE10*/ + -khtml-user-select: none; /*早期浏览器*/ + user-select: none; // flex: 1; } } @@ -887,6 +905,11 @@ export default { line-height: 30px; font-size: 12px; color: #8590a6; + -moz-user-select: none; /*火狐*/ + -webkit-user-select: none; /*webkit浏览器*/ + -ms-user-select: none; /*IE10*/ + -khtml-user-select: none; /*早期浏览器*/ + user-select: none; } .course-score { padding: 10px 15px; @@ -906,6 +929,11 @@ export default { font-size: 12px; color: #ffb30f; line-height: 30px; + -moz-user-select: none; /*火狐*/ + -webkit-user-select: none; /*webkit浏览器*/ + -ms-user-select: none; /*IE10*/ + -khtml-user-select: none; /*早期浏览器*/ + user-select: none; } .course-score-value { font-size: 14px; @@ -914,6 +942,11 @@ export default { line-height: 30px; color: #ffb30f; font-family: 'Arial'; + -moz-user-select: none; /*火狐*/ + -webkit-user-select: none; /*webkit浏览器*/ + -ms-user-select: none; /*IE10*/ + -khtml-user-select: none; /*早期浏览器*/ + user-select: none; // font-size: 30px; } .cardmark { diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 2266e6d4..3399519d 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -858,6 +858,11 @@ export default { border-top-left-radius: 15px; border-bottom-left-radius: 15px; color: #ffffff; + -moz-user-select: none; /*火狐*/ + -webkit-user-select: none; /*webkit浏览器*/ + -ms-user-select: none; /*IE10*/ + -khtml-user-select: none; /*早期浏览器*/ + user-select: none; } .course-type-title { position: absolute; @@ -868,6 +873,11 @@ export default { line-height: 30px; text-align: center; color: #ffffff; + -moz-user-select: none; /*火狐*/ + -webkit-user-select: none; /*webkit浏览器*/ + -ms-user-select: none; /*IE10*/ + -khtml-user-select: none; /*早期浏览器*/ + user-select: none; } .course-flag { height: 26px; @@ -898,6 +908,11 @@ export default { font-size: 18px; font-weight: 600; color: #343434; + -moz-user-select: none; /*火狐*/ + -webkit-user-select: none; /*webkit浏览器*/ + -ms-user-select: none; /*IE10*/ + -khtml-user-select: none; /*早期浏览器*/ + user-select: none; } .course-author { margin: 5px 15px; @@ -926,11 +941,21 @@ export default { .course-score-value { color: #ffb30f; font-family: "Arial"; + -moz-user-select: none; /*火狐*/ + -webkit-user-select: none; /*webkit浏览器*/ + -ms-user-select: none; /*IE10*/ + -khtml-user-select: none; /*早期浏览器*/ + user-select: none; // font-size: 30px; } .course-score-no { font-size: 12px; color: #ffb30f; + -moz-user-select: none; /*火狐*/ + -webkit-user-select: none; /*webkit浏览器*/ + -ms-user-select: none; /*IE10*/ + -khtml-user-select: none; /*早期浏览器*/ + user-select: none; } } } @@ -951,8 +976,12 @@ export default { .study-num { line-height: 30px; font-size: 12px; - color: #8590a6; + -moz-user-select: none; /*火狐*/ + -webkit-user-select: none; /*webkit浏览器*/ + -ms-user-select: none; /*IE10*/ + -khtml-user-select: none; /*早期浏览器*/ + user-select: none; } .btn-label { } From 899978576a1255f44b412584fe0eac97ad2bf9e3 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Tue, 23 Aug 2022 17:12:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FileCloud/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/FileCloud/index.vue b/src/components/FileCloud/index.vue index 436489e4..9c802209 100644 --- a/src/components/FileCloud/index.vue +++ b/src/components/FileCloud/index.vue @@ -97,9 +97,9 @@ }); }, findByName(){ - if(this.findName==''){ - return; - } + // if(this.findName==''){ + // return; + // } let $vue=this; var folderId=0; apiFilecloud.findByName(this.findName).then(rs=>{ From c49eea8b40f8047face8aa10443db7fb3ca8b94d Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Tue, 23 Aug 2022 19:33:28 +0800 Subject: [PATCH 3/4] =?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/Index.vue | 5 +++++ src/views/portal/course/Index.vue | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/views/Index.vue b/src/views/Index.vue index e9e8523a..6dd0a0bb 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -786,6 +786,11 @@ export default { position: absolute; left: 0; top: 0; + -moz-user-select: none; /*火狐*/ + -webkit-user-select: none; /*webkit浏览器*/ + -ms-user-select: none; /*IE10*/ + -khtml-user-select: none; /*早期浏览器*/ + user-select: none; .interact-bar-btn{ .interact-bar-value{ display: none; diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 3399519d..0760c8ed 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -819,6 +819,11 @@ export default { position: absolute; left: 0; top: 0; + -moz-user-select: none; /*火狐*/ + -webkit-user-select: none; /*webkit浏览器*/ + -ms-user-select: none; /*IE10*/ + -khtml-user-select: none; /*早期浏览器*/ + user-select: none; .interact-bar-btn { .interact-bar-value { display: none; From a8668c42eb889df89d5691539a5b0be2aea1fbc1 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 25 Aug 2022 15:00:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=83=E8=AF=95?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/exam/Test.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/exam/Test.vue b/src/views/exam/Test.vue index 6473fad1..0f7a2739 100644 --- a/src/views/exam/Test.vue +++ b/src/views/exam/Test.vue @@ -543,13 +543,15 @@ export default { let total=0; if(this.judge.length > 0){ this.judge.forEach(item => { - if(item.answer=='true' && item.userAnswer){ + //console.log(total,'判断',item); + if(item.answer=='true' && item.userAnswer=='true'){ total+=item.defaultScore; }else{ - if(item.answer=='false' && !item.userAnswer){ + if(item.answer=='false' && item.userAnswer=='false'){ total+=item.defaultScore; } } + //console.log(total,'分数'); }); } if(this.single.length > 0){ @@ -588,6 +590,7 @@ export default { } }); } + console.log('实际得分:'+total) return total; }, reStartTest(row){ //继续考试