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

src/components/VideoPlayer/index.vue

@@ -384,6 +384,15 @@ export default {
     this.videoDom.addEventListener('error', function(){
       console.log('\x1b[31m%s\x1b[0m','*****************加载失败**********')
     })
+
+    this.videoDom.addEventListener('keydown', function(e){
+      //console.log('\x1b[31m%s\x1b[0m','*****************加载失败**********')
+      console.log("video is exit");
+      if(e.key === "Escape"){
+        console.log("按键 退出全屏 执行")
+      }
+    })
+
     // 监听全屏事件的变化，保存数据
     window.addEventListener("F", () => {
       this.isFullscreen = this.isFullScreen();

src/views/study/coursenew.vue

@@ -461,7 +461,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();//先关闭