去掉无用日志

# Conflicts:
#	src/views/Login.vue

src/components/Course/exam.vue

@@ -329,6 +329,8 @@ export default {
       apiExamPaper.newPaperContent(this.info.id).then(res=>{
         if(!res.error&&res.result != ''){
           if(this.info.paperType==2){
+            //TODO1
+            console.log("调用开始考试 if paperType == 2")
             this.examPaper.json=res.result;
             let qitems=this.convertToItems(this.examPaper.json);
             this.paper ={items:qitems};
@@ -336,9 +338,11 @@ export default {
             this.curItem=qitems[this.curIndex];
             this.startTime=new Date();//记录开始时间
             this.timerValue=this.info.testDuration;
+            this.content.status=1;
             this.timer=setInterval(this.changeTimer,60000);
             this.testStart=true;
           }else{
+            console.log("调用开始考试 else paperType != 2")
             let paper= {items:res.result};
             paper.items.forEach(item=>{
               if(item.type==101){
@@ -582,8 +586,15 @@ export default {
       apiStudy.saveExam(postData).then(res=>{
         this.thisTrue = true
          if(res.status == 200) {
+            console.log("获取数据结果 考试 res ==>",res)
             this.records.push(res.result);
+            //TODO 评分更改 最终完成
+            if(res.result.score > res.result.passLine){
               this.content.status=9;//表已学习完，判断上级的章是否已完成
+            }else{
+              this.content.status=1;
+            }
+
             this.studyItemId=res.result.studyItemId;//第一次保存时是没有的，所以这里要赋值
             this.$alert('您本次考试得分：'+this.lastScore, '考试成绩', {
                   confirmButtonText: '确定',

src/components/Study/manager.vue

@@ -13,7 +13,7 @@
     </div>
     <!-- <div style="color: red;">下面的表格标题及内容需要调整完善</div> -->
     <div>
-      <el-tabs v-model="tabName" @tab-click="handleTabClick">
+      <el-tabs style="width: 100%;" v-model="tabName" @tab-click="handleTabClick">
         <el-tab-pane label="报名管理" name="second">
           <!-- <div>已报名{{study.list.length}}人，共有0人报名未成功，共有{{study.list.length}}人通过审核</div> -->
           <el-row style="margin: 20px 0;" :gutter="20">
@@ -863,4 +863,19 @@ export default {
   height: 400px;
   overflow: auto;
 }
+
+.el-tabs__nav-wrap::after {
+  display: none; /* 隐藏滚动条轨道 */
+}
+
+.el-tabs__nav-scroll {
+  overflow: hidden; /* 隐藏滚动条滑块 */
+}
+
+/* 隐藏垂直滚动条 */
+.el-table .el-table__body-wrapper::-webkit-scrollbar {
+  display: none; /* Chrome, Safari, Opera*/
+}
+
+
 </style>

src/components/VideoPlayer/index.vue

@@ -18,7 +18,6 @@
       @keydown.right.prevent="forwardCurrentTime"
       @keydown.up.prevent="increaseVolume"
       @keydown.down.prevent="lowerVolume"
-      @keydown.esc.prevent="toggleFullScreen"
       tabindex="0"
       width="100%"
       height="100%"
@@ -385,9 +384,26 @@ export default {
       console.log('\x1b[31m%s\x1b[0m','*****************加载失败**********')
     })
     // 监听全屏事件的变化，保存数据
-    window.addEventListener("fullscreenchange", () => {
+    window.addEventListener("F", () => {
       this.isFullscreen = this.isFullScreen();
     });
+    document.addEventListener('fullscreenchange',this.handleFullscreenChange);
+    document.addEventListener('webkitfullscreenchange',this.handleFullscreenChange );
+    // this.videoDom.addEventListener('keydown', function(e){
+    //   //console.log('\x1b[31m%s\x1b[0m','*****************加载失败**********')
+    //   console.log("video is exit");
+    //   if(e.key === "Escape"){
+    //     console.log("按键 退出全屏 执行")
+    //   }
+    // })
+
+    // this.videoDom.addEventListener("keydown", (e) => {
+    //   console.log("是否监听到");
+    //   if(e.keyCode == 27){
+    //     console.log("是否监听到 esc");
+    //     this.toggleFullScreen();
+    //   }
+    // });
   },
   methods: {
     //当视频由于需要缓冲下一帧而停止，解决一直计时的问题
@@ -490,6 +506,13 @@ export default {
     updateProgressBySetTime(newCurrentTime) {
       this.currentProgress = newCurrentTime / this.videoDom.duration;
     },
+    /* 点击进度条更新视频播放进度2
+    */
+    updateProgressByClickBar2(newCurrentTime,progressVideo) {
+      this.currentProgress = progressVideo;
+      this.barrageTimelineStart = newCurrentTime;
+      this.videoDom.currentTime = newCurrentTime;
+    },
     /* 提高视频音量
      */
     increaseVolume() {
@@ -540,6 +563,7 @@ export default {
     /* 切换“全屏”和“非全屏”模式
      */
     toggleFullScreen() {
+      console.log("toggleFullScreen 执行 ",this.isFullScreen())
       let element = this.$refs.area;
       if (!this.isFullScreen()) {
         if (element.requestFullscreen) {
@@ -596,6 +620,24 @@ export default {
       const currentTime = this.$refs.video.currentTime;
       this.$emit('onTimeUpdate', currentTime);
     },
+    /**
+     * 监听全屏变化
+     */
+    handleFullscreenChange() {
+      console.log("handleFullscreenChange gx this.isFullScreen()",this.isFullScreen())
+      console.log("handleFullscreenChange gx this.isFullscreen",this.isFullscreen)
+
+      if(this.isFullscreen){
+        this.isFullscreen = !!document.fullscreenElement;
+        if (!this.isFullscreen) {
+          // 退出全屏后的逻辑（如暂停视频、更新 UI 等）
+          console.log('ESC 已退出全屏 handleFullscreenChange',this.isFullscreen);
+          this.$emit('onFullscreen',false);//全屏
+        }
+      }
+
+
+    }
   },
   watch: {
     currentVolume: function () {

src/views/Login.vue

@@ -1,3 +1,4 @@
+<!--
 <template>
   <div class="login" :style="`background: url(${webBaseUrl}/temp/background.jpg) no-repeat`">
     <el-form :model="form" ref="form" :rules="rules">
@@ -24,7 +25,7 @@
       <el-form-item>
         <section>
           <el-checkbox v-model="rememberMe">记住密码</el-checkbox>
-          <!-- <span>忘记密码</span> -->
+          &lt;!&ndash; <span>忘记密码</span> &ndash;&gt;
         </section>
       </el-form-item>
       <el-form-item><el-button type="primary" @click="loginSubmit">点击登录</el-button></el-form-item>
@@ -194,3 +195,4 @@
   }
 }
 </style>
+-->

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>
@@ -668,8 +676,10 @@ export default {
       }
       apiCourse.pageList(this.params).then(rs=>{
           if(rs.status==200){
-            this.pageData = rs.result.list;
+            this.pageData = rs.result.list ? rs.result.list : [];
+            // this.pageData = rs.result.list;
             this.page.count = rs.result.count;
+            this.page.pageSize = rs.result.pageSize;
           }else{
             return this.$message.error(rs.message);
           }
@@ -939,4 +949,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">
@@ -292,7 +291,8 @@
                     <!-- <span style="font-size: 12px; color:#666666 ;">( {{cutOrgNamePath(item.authorInfo.orgInfo)}} )</span> -->
                 </div>
                 <!-- <div class="teacher-remark" v-html="item.authorInfo.sign"></div> -->
-                <div class="teacher-remark">{{cutOrgNamePath(item.authorInfo.orgInfo)}}</div>
+                <div v-if="item.teacherType === 1 " class="teacher-remark">{{cutOrgNamePath(item.authorInfo.orgInfo)}}</div>
+                <div v-else>{{item.supplier}}</div>
               </div>
               <div  style="padding-top:15px;width:70px;">
                 <followButton v-if="item.teacherName!=='BOE教师'" :auto="true" size="small" :aid="item.teacherId"></followButton>
@@ -802,6 +802,11 @@
 
 
         this.$nextTick(function(){
+            if(this.contentData.progressVideo){
+              this.$refs.myVideoPlayer.updateProgressByClickBar2(this.contentData.lastStudyTime,this.contentData.progressVideo);
+              // $this.notePlay = this.contentData.lastStudyTime;
+            }
+
             //let h0=document.getElementById('id_course_player').offsetHeight;
             let h=$this.$refs.coursePlayer.offsetHeight;
             //let h1=$this.$refs.coursePlayer.clientHeight;
@@ -1140,6 +1145,8 @@
         //   }
         // }
         this.playerBoxShow = false;
+        // this.onPlayerPlayFullscreen()
+        // this.$watermark.set(this.userInfo.name + this.userInfo.loginName);
         let $this = this;
         //这里有些不准备，如果文件未能加载，这个事件就是错误的
         this.isAppendTime=true;
@@ -1157,6 +1164,7 @@
         //   }
         // }
       },
+
       onFullscreen(full) {
         let divId = 'videowatermark';
         var div = document.getElementById('myVideoPlayer')
@@ -1176,8 +1184,11 @@
             "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) {
+              console.log("执行去除水印 ---- gx markDiv ----",markDiv);
       	      div.removeChild(markDiv);
           }
         }
@@ -1442,6 +1453,7 @@
               }
               //console.log(scon.contentId,con.id);
               con.lastStudyTime = scon.lastStudyTime;
+              con.progressVideo = scon.progressVideo;
               //以下判断是为了兼容之前的问题，学习状态
               if (scon.status) {
                 con.status = scon.status;