Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/portal

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%;

src/components/FileCloud/index.vue

@@ -97,9 +97,9 @@
         	});
         },
         findByName(){
-          if(this.findName==''){
+          // if(this.findName==''){
-            return;
+          //   return;
-          }
+          // }
           let $vue=this;
           var folderId=0;
           apiFilecloud.findByName(this.findName).then(rs=>{

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;
@@ -828,6 +833,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 +848,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 +881,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 +894,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 +910,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 +934,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 +947,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 {

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){ //继续考试

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;
@@ -858,6 +863,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 +878,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 +913,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 +946,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 +981,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 {
 }