Merge branch '20251212-fix-1130' of http://10.251.129.121/boeu/learning-system-portal into master-20251210

src/views/study/coursenew.vue

@@ -29,6 +29,7 @@
           --></div>
         </div>
       </div>
+    </div>
     <div class="course-content xcontent">
       <div
         class="course-playbox"
@@ -69,9 +70,7 @@
                       <img
                         class="icon-small"
                         v-if="isPraise"
-                          :src="
-                            require('@/assets/images/icon/praise-active.png')
-                          "
+                        :src="require('@/assets/images/icon/praise-active.png')"
                       />
                       <img
                         class="icon-small"
@@ -172,10 +171,12 @@
               <div v-if="resType == 41">
                 <div style="padding: 20px" v-html="contentData.content"></div>
               </div>
-                <div v-if="resType == 50" style="min-height: 500px">
+              <div
+                v-if="resType == 50 || isLoadIframe"
+                style="min-height: 500px"
+              >
                 <iframe
-                  id="iframeId"
-                    v-if="scormUrl"
+                  v-if="scormUrl || isLoadIframe"
                   :src="scormUrl"
                   frameborder="0"
                   border="0px"
@@ -256,11 +257,7 @@
               <div class="score" style="display: flex">
                 <div
                   v-if="!scoreInfo.has"
-                    style="
-                      margin-left: 10px;
-                      cursor: pointer;
-                      padding-top: 18px;
-                    "
+                  style="margin-left: 10px; cursor: pointer; padding-top: 18px"
                 >
                   <!-- <el-popover placement="top" width="300" trigger="hover"> -->
                   <!-- <div style="text-align:center;line-height:50px;padding:20px 0px">
@@ -1080,7 +1077,7 @@ export default {
       warnTitle: "测试标题",
       isFinishingStudyItem: false, // 防止重复调用完成状态更新接口
       // // 全局状态：是否正在等待接口完成
-      // isWaitingForApis: false,
+      isLoadIframe: false,
       // // 待执行的切换操作（存储点击的目标课程）
       // pendingSwitchAction: null,
     };
@@ -1097,8 +1094,6 @@ export default {
     this.stopStudyTime(); //先关闭
     this.cleanAppendTime(); //
     this.loadData();
-    // // 监听iframe接口
-    // this.checkAllApisCompleted();
   },
   computed: {
     // ai播放器相关
@@ -1349,6 +1344,13 @@ export default {
       this.$refs.mynote.showVideoTimeBtn(false);
       let $this = this;
       this.resType = r.contentType;
+      if (this.resType == 50) {
+        this.isLoadIframe = true;
+      } else {
+        setTimeout(() => {
+          this.isLoadIframe = false;
+        }, 10000);
+      }
       this.contentData = r;
       this.activeId = this.contentData.id;
       if (item) {
@@ -1603,9 +1605,7 @@ export default {
           }
         }
       }
-      setTimeout(() => {
       this.changePlayRes(r, item);
-      }, 10000);
     },
     loadScorePraiseAndTrample() {
       //加载是否请过分