乐器id传递

src/views/attend-class/component/pptList.tsx

@@ -13,6 +13,10 @@ export default defineComponent({
     fromType: {
       type: String, // 'PLATFORM' | 'TEACHER' | 'CLASS'
       default: 'TEACHER'
+    },
+    instrumentId: {
+      type: String,
+      default: ''
     }
   },
   emits: ['initPPT', 'changeSlideIndex', 'init'],
@@ -21,9 +25,9 @@ export default defineComponent({
     const iframeRef = ref<HTMLIFrameElement>();
     const src = `${vaildPPTUrl()}/#/pptScreen?id=${
       props.pptData.id
-    }&Authorization=${userStore.getToken}&hideFullScreen=true&fromType=${
-      props.fromType
-    }`;
+    }&instrumentId=${props.instrumentId}&Authorization=${
+      userStore.getToken
+    }&hideFullScreen=true&fromType=${props.fromType}`;
     // 上一页下一页
     function handleChangeSlide(type: 'prev' | 'next') {
       iframeRef.value?.contentWindow?.postMessage(

src/views/attend-class/index.tsx

@@ -1985,6 +1985,7 @@ export default defineComponent({
                           onChangeSlideIndex={({ slideIndex }) => {
                             pptData.activeLen = slideIndex;
                           }}
+                          instrumentId={data.instrumentId}
                           pptData={m}></PptList>
                       )}
                     </div>

src/views/prepare-lessons/components/lesson-main/courseware-presets/index.tsx

@@ -610,12 +610,18 @@ export default defineComponent({
               getCoursewareList();
               eventGlobal.emit('openCoursewareChanged');
               const { teacherSaveFlag, id, chapterKnowledgeList } = res.data;
-              handleRouterPPT({
-                teacherSaveFlag,
-                id,
-                pptId:
-                  chapterKnowledgeList[0]?.chapterKnowledgeMaterialList[0]?.id
-              });
+              const instrumentIdTab = prepareStore.getInstrumentId;
+              handleRouterPPT(
+                {
+                  teacherSaveFlag,
+                  id,
+                  pptId:
+                    chapterKnowledgeList[0]?.chapterKnowledgeMaterialList[0]?.id
+                },
+                pptCourseware.subjects.includes(instrumentIdTab)
+                  ? instrumentIdTab
+                  : pptCourseware.subjects[0]
+              );
             }
           });
         }
@@ -632,7 +638,10 @@ export default defineComponent({
       pptCourseware.openFlagEnable = item.openFlagEnable;
       pptCourseware.pptCoursewareShow = true;
     }
-    async function handleRouterPPT(item: Record<string, any>) {
+    async function handleRouterPPT(
+      item: Record<string, any>,
+      instrumentId: string
+    ) {
       // 当teacherSaveFlag为false时候，需要把平台数据转为老师自己的课件
       if (!item.teacherSaveFlag) {
         await api_coursewareToTeacherCourseware(item.id);
@@ -640,7 +649,11 @@ export default defineComponent({
       }
       const href = `${vaildPPTUrl()}/#/pptEditor?id=${
         item.pptId
-      }&Authorization=${userStore.getToken}`;
+      }&Authorization=${
+        userStore.getToken
+      }&instrumentId=${instrumentId}&lessonCoursewareKnowledgeId=${
+        prepareStore.getSelectKey
+      }&fromType=TEACHER`;
       window.open(href);
     }
     onMounted(async () => {
@@ -815,7 +828,10 @@ export default defineComponent({
                             if (item.coursewareType === 'PPT') {
                               if (type === 'PPT') {
                                 // 进入 ppt 编辑页面
-                                handleRouterPPT(item);
+                                handleRouterPPT(
+                                  item,
+                                  prepareStore.getInstrumentId
+                                );
                               } else {
                                 handlePptEdit(item);
                               }