Merge branch 'iteration-class'

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

@@ -634,7 +634,7 @@ export default defineComponent({
                   forms.previewParams = {
                     type: 'class',
                     classId: res.data, // 上课编号
-                    classGroupId: item.id,
+                    classGroupId: item.classGroupId,
                     subjectId: prepareStore.getSubjectId,
                     detailId: prepareStore.getSelectKey,
                     lessonCourseId: prepareStore.getBaseCourseware.id
@@ -648,7 +648,7 @@ export default defineComponent({
                     query: {
                       type: 'class',
                       classId: res.data, // 上课编号
-                      classGroupId: item.id,
+                      classGroupId: item.classGroupId,
                       subjectId: prepareStore.getSubjectId,
                       detailId: prepareStore.getSelectKey,
                       lessonCourseId: prepareStore.getBaseCourseware.id

src/views/prepare-lessons/index.tsx

@@ -1,4 +1,4 @@
-import { defineComponent, onMounted, ref, computed } from 'vue';
+import { defineComponent, onMounted, ref, computed, onUnmounted } from 'vue';
 import styles from './index.module.less';
 import DirectoryList from './components/directory-main';
 import LessonMain from './components/lesson-main';
@@ -51,11 +51,14 @@ export default defineComponent({
       prepareStore.setIsAddTrain(false);
       prepareStore.setIsEditResource(false);
       prepareStore.setIsEditTrain(false);
-      prepareStore.setSubjectId('');
+      // prepareStore.setSubjectId('');
       // prepareStore.setCoursewareList([]);
       // prepareStore.setTreeList([]);
       // prepareStore.setTrainList([]);
     });
+    onUnmounted(() => {
+      prepareStore.setSubjectId('');
+    });
     return () => (
       <div class={styles.prepareLessons}>
         {/* 左侧目录 */}