Merge branch 'iteration-20241018-courseware' into jenkins-main

src/components/globalTools/index.tsx

@@ -64,7 +64,6 @@ export default defineComponent({
         type == 'width'
           ? document.documentElement.clientWidth
           : document.documentElement.clientHeight;
-      console.log(value, clientNum)
       return {
         pos: ((clientNum - value) / 2).toFixed(5)
       };
@@ -140,7 +139,7 @@ export default defineComponent({
     //重新计算位置 居中
     function refreshPos() {
       // computePos("height", iconToolsDom.value?.clientHeight ||
-      console.log(iconToolsDom.value?.clientHeight);
+      // console.log(iconToolsDom.value?.clientHeight);
       const posHeight = computePos(
         'height',
         iconToolsDom.value?.clientHeight || 0

src/views/coursewarePlay/component/courseware-type/index.module.less

@@ -127,7 +127,7 @@
     &::before {
       content: '';
       position: absolute;
-      left: 5px;
+      left: 0;
       width: 5px;
       height: 100%;
       background: linear-gradient(270deg, rgba(0, 0, 0, 0.25) 0%, rgba(0, 0, 0, 0.03) 100%);

src/views/coursewarePlay/component/points.tsx

@@ -42,8 +42,6 @@ export default defineComponent({
       }
     )
 
-    console.log(pointData.active, 'pointData.active', props.data, props.tabActive)
-
     // 获取对应图片
     const getImage = (item: any) => {
       if (item.type === 'VIDEO') {

src/views/coursewarePlay/index.tsx

@@ -1200,10 +1200,17 @@ export default defineComponent({
             {activeData.model && (
               <div class={styles.leftFixedBtns} onClick={(e: Event) => e.stopPropagation()}>
                 <div class={[styles.btnsWrap, styles.prePoint]}>
-                  <div class={styles.fullBtn} onClick={() => (popupData.coursewareOpen = true)}>
+                  {state.platformType === 'TEACHER' && <div class={styles.fullBtn} onClick={() => {
+                    popupData.coursewareOpen = true
+                    handleStop()
+                  }}>
                     <img src={iconCourseType} />
-                  </div>
-                  <div class={styles.fullBtn} onClick={() => (popupData.open = true)}>
+                  </div>}
+                  
+                  <div class={styles.fullBtn} onClick={() => {
+                    popupData.open = true
+                    handleStop()
+                  }}>
                     <img src={iconMenu} />
                     {/* <span>知识点</span> */}
                   </div>

src/views/coursewarePlay/playRecordTime.tsx

@@ -29,6 +29,15 @@ export default defineComponent({
         handleStartInterval()
       }
     })
+
+    watch(() => props.isCurrentCoursewareMenu, () => {
+      if (!props.isCurrentCoursewareMenu) {
+        handleOut()
+      } else {
+        getPlayTime(true)
+      }
+    })
+
     const handleOut = () => {
       clearInterval(timerRecord.value)
       handleRecord(true)
@@ -56,8 +65,8 @@ export default defineComponent({
       return _total
     })
 
-    const getPlayTime = async () => {
-      saveModel.loading = true
+    const getPlayTime = async (noLoading: boolean = false) => {
+      if(!noLoading) saveModel.loading = true
       try {
         const res: any = await request.post(
           `${state.platformApi}/courseSchedule/getCoursewarePlayTime?courseScheduleId=${route.query.courseId}`