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

# Conflicts:
#	src/components/VideoPlayer/index.vue

src/components/VideoPlayer/index.vue

@@ -397,8 +397,12 @@ export default {
     window.addEventListener("F", () => {
       this.isFullscreen = this.isFullScreen();
     });
-    window.addEventListener("ESC", () => {
-       this.toggleFullScreen();
+    this.videoDom.addEventListener("keydown", (e) => {
+      console.log("是否监听到");
+      if(e.keyCode == 27){
+        console.log("是否监听到 esc");
+        this.toggleFullScreen();
+      }
     });
   },
   methods: {

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">
@@ -461,7 +460,7 @@
       let localKey = "user_" + this.userInfo.sysId + "_gids";
       let hasIds = sessionStorage.getItem(localKey);
       this.audiences = hasIds ?? ''
-      // this.$watermark.set(this.userInfo.name + this.userInfo.loginName);
+      this.$watermark.set(this.userInfo.name + this.userInfo.loginName);
       this.courseId = this.$route.query.id;
       this.initContentId = this.$route.query.contentId;
       this.stopStudyTime();//先关闭
@@ -1147,7 +1146,7 @@
         //   }
         // }
         this.playerBoxShow = false;
-        this.onPlayerPlayFullscreen()
+        // this.onPlayerPlayFullscreen()
         // this.$watermark.set(this.userInfo.name + this.userInfo.loginName);
         let $this = this;
         //这里有些不准备，如果文件未能加载，这个事件就是错误的
@@ -1187,7 +1186,6 @@
       },
 
       onFullscreen(full) {
-        console.log("onFullscreen full 点击 exit 退出",full);
         let divId = 'videowatermark';
         var div = document.getElementById('myVideoPlayer')
         if (full) {