lex 1 рік тому
батько
коміт
8d1b718daf

+ 2 - 2
src/views/home/index.tsx

@@ -139,8 +139,8 @@ export default defineComponent({
           enableFlag: 1,
           page: 1,
           rows: 99,
-          type: 'COURSEWARE',
-          currentGradeNum: forms.applyClassItem.currentGradeNum
+          type: 'COURSEWARE'
+          // currentGradeNum: forms.applyClassItem.currentGradeNum
         });
 
         forms.list = data.rows.map((item: any) => {

+ 1 - 0
src/views/prepare-lessons/api.ts

@@ -21,6 +21,7 @@ export const lessonCoursewareDetail = (params: any) => {
  */
 export const lessonCoursewareRemove = (params: any) => {
   return request.post('/edu-app/lessonCourseware/remove', {
+    requestType: 'form',
     data: params
   });
 };

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

@@ -43,8 +43,9 @@ export default defineComponent({
     const getList = async () => {
       forms.loadingStatus = true;
       try {
-        // 判断是否有选择对应的课件
-        if (!prepareStore.getSelectKey) return (forms.loadingStatus = false);
+        // 判断是否有选择对应的课件 或声部
+        if (!prepareStore.getSelectKey || !prepareStore.getSubjectId)
+          return (forms.loadingStatus = false);
         const { data } = await queryCourseware({
           coursewareDetailKnowledgeId: prepareStore.getSelectKey,
           subjectId: prepareStore.getSubjectId,
@@ -82,6 +83,13 @@ export default defineComponent({
         getList();
       }
     );
+    // 声部变化时
+    watch(
+      () => prepareStore.getSubjectId,
+      () => {
+        getList();
+      }
+    );
     watch(
       () => prepareStore.getIsAddResource,
       (val: boolean) => {

+ 3 - 3
src/views/prepare-lessons/index.tsx

@@ -34,9 +34,9 @@ export default defineComponent({
       prepareStore.setSelectResourceStatus(false);
       prepareStore.setIsAddResource(false);
       prepareStore.setIsAddTrain(false);
-      prepareStore.setCoursewareList([]);
-      prepareStore.setTreeList([]);
-      prepareStore.setTrainList([]);
+      // prepareStore.setCoursewareList([]);
+      // prepareStore.setTreeList([]);
+      // prepareStore.setTrainList([]);
     });
     return () => (
       <div class={styles.prepareLessons}>

+ 1 - 1
src/views/prepare-lessons/model/select-resources/select-item/resource-search-group/index.tsx

@@ -92,7 +92,7 @@ export default defineComponent({
                       forms.bookVersionId === music.id ? 'primary' : 'default'
                     }
                     onClick={() => {
-                      forms.bookVersionId = music.value;
+                      forms.bookVersionId = music.id;
                       throttleFn();
                     }}>
                     {music.name}