Merge branch '250220-pre-126-177-gx' into master_1202

# Conflicts:
#	src/views/portal/case/Index.vue
#	src/views/study/Courses.vue

src/views/course/ManageList.vue

@@ -195,7 +195,15 @@
       </template>
     </el-dialog>
     <!--课程管理-->
-    <el-dialog custom-class="g-dialog" title="课程学习管理" width="900px" :visible.sync="manageStudy.dlgShow" :close-on-click-modal="false">
+    <el-dialog 
+        custom-class="g-dialog" 
+        title="课程学习管理" 
+        width="900px"
+        height="900px" 
+        :visible.sync="manageStudy.dlgShow" 
+        :close-on-click-modal="false"
+        
+        >
       <manager :manageStudyData="manageStudyData" :isShowDialog="manageStudy.dlgShow"></manager>
       <template #footer>
         <el-button @click="manageStudy.dlgShow = false">关闭</el-button>
@@ -939,4 +947,8 @@ export default {
     }
   }
 }
+
+.el-dialog__body {
+  overflow: hidden;
+}
 </style>

src/views/portal/case/Index.vue

@@ -1507,7 +1507,7 @@ export default {
                 };
               });
               res.result.list.forEach(item=>{
-                item.viewRankTags = (item.viewRankTags||[]).slice(0,2)||[]
+                item.viewRankTags = item.viewRankTags?.slice(0,2)||[]
               })
               this.caseList.list = res.result.list
               this.getCaseUserData(res.result.list);
@@ -1562,7 +1562,7 @@ export default {
                 };
               });
               res.result.list.forEach(item=>{
-                item.viewRankTags = (item.viewRankTags||[]).slice(0,2)||[]
+                item.viewRankTags = item.viewRankTags?.slice(0,2)||[]
               })
               this.caseList.list = res.result.list
               this.getCaseUserData(res.result.list);
@@ -1605,7 +1605,7 @@ export default {
           }
           console.log(res?.result?.list ,'有没有数据1');
           res.result.list.forEach(item=>{
-              item.viewRankTags = (item.viewRankTags||[]).slice(0,2)||[]
+            item.viewRankTags = item.viewRankTags?.slice(0,2)||[]
           })
           console.log(res?.result?.list ,'有没有数据2');
           this.caseList.list = res.result.list

src/views/study/Courses.vue

@@ -254,7 +254,7 @@ export default {
             let localCourseIds=[];//本地在线课程的id集合
             res.result.list.forEach(item=>{
               if(item.courseImage?.startsWith('/upload')){
-                 item.courseImage=$this.fileUrl+item.courseImage.substring(7)
+                 item.courseImage=$this.fileUrl+item.courseImage?.substring(7)
               }
               if(item.source==2){
                 localCourseIds.push(item.id);

src/views/study/coursenew.vue

@@ -167,7 +167,6 @@
             </div>
             <!-- 课程单元  -->
             <div class="course-units" v-if="tab == 1">
-
               <div :style="`height: ${controlHeight}px;overflow-y: auto;`">
                 <div class="catalog" v-if="courseInfo.type == 20">
                   <div  v-for="(item, index) in catalogTree" :key="index" :name="index">
@@ -755,7 +754,7 @@
         if (this.contentData.status < 2) {
           // this.contentData.status = 2; //进行中
           if(r.contentType != 61&&r.contentType != 20 && r.contentType != 10){
-            setTimeout(() => {              
+            setTimeout(() => {
               this.isContentTypeTwo = r.contentType
               $this.isShowTime()
               }, 2000);
@@ -817,7 +816,7 @@
             //console.log(h,$this.controlHeight,'$this.controlHeight');
         })
 
-        
+
         //console.log('this.contentData11:',this.contentData,this.curriculumData)
         // 视频设置禁用处理逻辑,如果用户已全部观看完该视频，则设置为能全部拖动的逻辑，把isDrag设置为true即可,同时删除本地存储的数据
         if(this.contentData.progressVideo ===1){
@@ -1140,6 +1139,8 @@
         //   }
         // }
         this.playerBoxShow = false;
+        // this.onPlayerPlayFullscreen()
+        // this.$watermark.set(this.userInfo.name + this.userInfo.loginName);
         let $this = this;
         //这里有些不准备，如果文件未能加载，这个事件就是错误的
         this.isAppendTime=true;
@@ -1157,6 +1158,7 @@
         //   }
         // }
       },
+      
       onFullscreen(full) {
         let divId = 'videowatermark';
         var div = document.getElementById('myVideoPlayer')
@@ -1176,9 +1178,12 @@
             "position:absolute;pointer-events: none; width: 100%;height: 100%;top:0;left:0;bottom: 0;right: 0; display: flex;justify-content: center;flex-wrap: wrap;overflow: hidden; opacity:0.3;padding-top:10px";
           div.appendChild(div3);
         } else {
+          console.log("去除水印 ---- gx ----");
           var markDiv = div.querySelector("#" + divId);
+          console.log("去除水印 ---- gx markDiv ----",markDiv);
           if (markDiv) {
-      	     div.removeChild(markDiv);
+              console.log("执行去除水印 ---- gx markDiv ----",markDiv);
+      	      div.removeChild(markDiv);
           }
         }
       },
@@ -1546,7 +1551,7 @@
           }
         }
       },
-      progress(val) { 
+      progress(val) {
         const progressValue = parseFloat(val) * 100;
         this.sendEventProgress = Number(progressValue.toFixed(2));
        },