Merge branch 'pingcode-20240615' into dev0515

# Conflicts:
#	src/views/study/coursenew.vue

src/views/study/coursenew.vue

@@ -437,6 +437,7 @@
         cumulativeDuration:0, //非音频累计时长
         maxDuration:0, //非音频最大时长
         defaultMaxTime:1800, //非音频默认最大时间
+        videoIndex: 0 // 当前视频index
       }
     },
     mounted() {
@@ -1170,6 +1171,13 @@
               itemId: this.contentData.studyItemId,
               videoTime: intTime
             };
+            var time = localStorage.getItem('videoProgressData')
+            var arr = time&&JSON.parse(time) || {}
+            if(arr[this.blobUrl]) {
+              postData.progressVideo = arr[this.blobUrl]
+              postData.contentId = this.contentList[this.videoIndex].id
+              postData.courseId = this.contentList[this.videoIndex].courseId
+            }
             //console.log('记录播放时间')
             apiStudy.studyVideoTime(postData).then(rs => {
               if (rs.status != 200) {
@@ -1211,6 +1219,13 @@
             itemId: this.contentData.studyItemId,
             videoTime: intTime
           };
+          var time = localStorage.getItem('videoProgressData')
+          var arr = time&&JSON.parse(time) || {}
+          if(arr[this.blobUrl]) {
+            postData.progressVideo = arr[this.blobUrl]
+            postData.contentId = this.contentList[this.videoIndex].id
+            postData.courseId = this.contentList[this.videoIndex].courseId
+          }
           //console.log('记录播放时间')
           apiStudy.studyVideoTime(postData).then(rs => {
             if (rs.status != 200) {
@@ -1381,9 +1396,11 @@
             // this.showRes(this.contentList[0]);
             //console.log(this.catalogTree,'ccccc22222')
             this.showRes(this.catalogTree[0].children[0])
+            this.videoIndex = 0
           } else {
              //console.log(this.contentList[0],'ccccc3333')
             this.showRes(this.contentList[playIndex]);
+            this.videoIndex = playIndex
           }
         }
       },
@@ -1444,7 +1461,7 @@
           }
         });
       },
-      progress(val) { 
+      progress(val) {
         const progressValue = parseFloat(val) * 100;
         this.sendEventProgress = Number(progressValue.toFixed(2));
        },
@@ -1590,7 +1607,7 @@
 
       finishStudyItem() { //设置完成学习的内容,针对于音视频的内容
         if (!this.contentData.studyItemId) {
-          // 这种可能没有，不过这里也是为了万中那个1
+          //这种可能没有，不过这里也是为了万中那个1
           this.saveStudyInfo();
         } else {
           let params = {