Browse Source

修复问题

lex-xin 1 month ago
parent
commit
4f7b329d00

+ 1 - 1
src/views/courseware-list/component/book/index.tsx

@@ -64,7 +64,7 @@ export default defineComponent({
       const height = document.body.clientHeight * 0.8;
 
       data.height = height;
-      data.width = height * (210 / 297) * 2;
+      data.width = Math.ceil(height * (210 / 297) * 2);
       book.turn({
         autoCenter: true,
         duration: 1000,

+ 15 - 5
src/views/courseware-list/index.tsx

@@ -40,7 +40,7 @@ export default defineComponent({
   name: 'courseware-list',
   setup() {
     const popoverShow = ref(false);
-    const baseBookVersionList = ref([] as any);
+    // const baseBookVersionList = ref([] as any);
     const bookVersionList = ref([] as any);
     // 返回
     const goback = () => {
@@ -73,14 +73,25 @@ export default defineComponent({
       try {
         const { data } = await api_bookVersionPage({ type: 'COURSEWARE' });
         const result = data.rows || [];
-        baseBookVersionList.value = result.map((item: any) => {
+        // baseBookVersionList.value = result.map((item: any) => {
+        //   return {
+        //     bookVersionId: item.id,
+        //     bookVersionName: item.name
+        //   };
+        // });
+        // ...deepClone(baseBookVerionList.value),
+
+        bookVersionList.value = result.map((item: any) => {
           return {
             bookVersionId: item.id,
             bookVersionName: item.name
           };
         });
-        bookVersionList.value = deepClone(baseBookVersionList.value);
-        const index = baseBookVersionList.value.findIndex(
+        bookVersionList.value.push({
+          bookVersionId: -1,
+          bookVersionName: '自定义'
+        });
+        const index = bookVersionList.value.findIndex(
           (item: any) => item.bookVersionId == coursewareStorage.bookVersionId
         );
         // 判断列表中是存在,缓存的教材数据
@@ -235,7 +246,6 @@ export default defineComponent({
           class={[
             styles.content,
             data.courseRecord?.id ? styles.courseDetails : ''
-            // data.list.length <= 0 && !data.loading ? styles.contentEmpty : ''
           ]}>
           <div class={styles.wrapLeft}>
             {data.courseRecord ? (

+ 1 - 0
src/views/courseware-play/component/points.tsx

@@ -145,6 +145,7 @@ export default defineComponent({
                     know.materialInfo.map((material: any, index: number) => {
                       return (
                         <div
+                          key={material.id}
                           class={[
                             styles.matItem,
                             props.itemActive == material.id

+ 1 - 1
src/views/courseware-play/component/video-item/index.tsx

@@ -220,7 +220,7 @@ export default defineComponent({
         });
 
         videoItem.value.on('progress', (e: any) => {
-          console.log(e, 'progress');
+          // console.log(e, 'progress');
         });
       }
     };

+ 12 - 5
src/views/courseware-play/index.tsx

@@ -702,7 +702,8 @@ export default defineComponent({
           if (detailIndex - 1 >= 0) {
             changeCourseWareItem(
               {
-                id: data.courseDetails[detailIndex - 1].courseId
+                id: data.courseDetails[detailIndex - 1].courseId,
+                coursewareNum: 1,
               },
               type
             );
@@ -807,10 +808,16 @@ export default defineComponent({
           const detailIndex = data.courseDetails.findIndex(
             (item: any) => item.courseId === data.courseId
           );
+          console.log({
+            1: detailIndex + 1 >= data.courseDetails.length - 1,
+            detailIndex,
+            length: data.courseDetails.length
+          })
           if (detailIndex + 1 >= data.courseDetails.length - 1) {
             changeCourseWareItem(
               {
-                id: data.courseDetails[detailIndex + 1].courseId
+                id: data.courseDetails[detailIndex + 1].courseId,
+                coursewareNum: 1,
               },
               type
             );
@@ -1125,6 +1132,8 @@ export default defineComponent({
               : '当前是课件最后一个资源,是否切换下一个课件?'
         };
         showSelectCourseware.value = true;
+
+        handleStop()
       }
     };
 
@@ -1396,9 +1405,7 @@ export default defineComponent({
                           pptData.isAnimationed = isAnimationed;
                         }}
                         pptData={m}
-                        fromType={
-                          data.courseId ? 'CLASS' : 'PLATFORM'
-                        }></PptList>
+                        fromType={m.fromType}></PptList>
                     )}
                   </div>
                 ) : (