修改问题

src/views/attend-class/index.tsx

@@ -1945,9 +1945,21 @@ export default defineComponent({
                 }}
                 classGroupId={data.classGroupId}
                 courseScheduleId={data.classId}
-                onChange={(val: any) => {
+                onChange={async (val: any) => {
                   data.modelTrainStatus = val.status;
                   // getCoursewareList();
+                  if (val.saveWork) {
+                    try {
+                      const res =
+                        await api_teacherChapterLessonCoursewareDetail(
+                          data.courseId
+                        );
+
+                      data.lessonPreTrainingId = res.data.lessonPreTrainingId;
+                    } catch {
+                      //
+                    }
+                  }
                 }}
               />
             </div>

src/views/classList/index.tsx

@@ -618,7 +618,7 @@ export default defineComponent({
           display-directive="if"
           preset="card"
           class={['modalTitle background']}
-          title={'修改声部'}>
+          title={'修改乐器'}>
           <ResetSubject
             activeRow={state.activeRow}
             onGetList={() => getList()}
@@ -631,7 +631,7 @@ export default defineComponent({
           style={{ width: '500px' }}
           preset="card"
           class={['modalTitle background']}
-          title={'修改声部'}>
+          title={'修改乐器'}>
           {state.showSubjectClass ? (
             <UpdateSubject
               activeRow={state.activeRow}

src/views/natural-resources/components/my-resources/save-modal/index.tsx

@@ -103,7 +103,15 @@ export default defineComponent({
       // 文件大小
       let isLt2M = true;
 
-      const allowedExtensions = ['jpg', 'jpeg', 'png', 'mp4', 'ppt', 'pptx'];
+      const allowedExtensions = [
+        'jpg',
+        'jpeg',
+        'png',
+        'mp4',
+        'ppt',
+        'pptx',
+        'mp3'
+      ];
       if (!isAllowedFileType(file.file.name, allowedExtensions)) {
         message.error('文件格式不支持');
         return false;

src/views/natural-resources/components/my-resources/upload-modal/index.tsx

@@ -240,18 +240,23 @@ export default defineComponent({
                     />
 
                     <div class={styles.commonType}>
-                      <NButton
-                        class={styles.changeCover}
-                        type="default"
-                        bordered={false}
-                        onClick={() => {
-                          changeCover.uploadIndex = index;
-                          changeCover.uploadImg = item.coverImg;
-                          changeCover.uploadType = item.type;
-                          changeCover.uploadCoverStatus = true;
-                        }}>
-                        更换封面
-                      </NButton>
+                      {item.type !== 'IMG' ? (
+                        <NButton
+                          class={styles.changeCover}
+                          type="default"
+                          bordered={false}
+                          onClick={() => {
+                            changeCover.uploadIndex = index;
+                            changeCover.uploadImg = item.coverImg;
+                            changeCover.uploadType = item.type;
+                            changeCover.uploadCoverStatus = true;
+                          }}>
+                          更换封面
+                        </NButton>
+                      ) : (
+                        <span></span>
+                      )}
+
                       <div>
                         是否公开
                         <NSwitch
@@ -296,7 +301,7 @@ export default defineComponent({
                     <NCascader
                       v-model:value={item.instrumentIds}
                       placeholder="请选择素材可用乐器(可多选)"
-                      options={catchStore.getSubjectList}
+                      options={catchStore.getEnableSubjects}
                       checkStrategy="child"
                       showPath={false}
                       childrenField="instruments"
@@ -314,7 +319,7 @@ export default defineComponent({
                               text
                               style=" --n-width: 100% "
                               onClick={() =>
-                                chioseAll(item, catchStore.getSubjectList)
+                                chioseAll(item, catchStore.getEnableSubjects)
                               }>
                               全选
                             </NButton>

src/views/natural-resources/model/add-teaching/index.tsx

@@ -249,7 +249,7 @@ export default defineComponent({
                   }}>
                   <NCascader
                     placeholder="请选择乐器"
-                    options={catchStore.getSubjectList}
+                    options={catchStore.getEnableSubjects}
                     v-model:value={form.instrumentIds}
                     checkStrategy="child"
                     showPath={false}

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

@@ -204,7 +204,7 @@ export default defineComponent({
         prepareStore.setIsEditTrain(false);
         forms.removeIds = [];
         // getList();
-        emit('change', { status: false });
+        emit('change', { status: false, saveWork: true });
       } catch {
         //
       }

src/views/prepare-lessons/components/resource-main/components/resource-item/resource-search-group/index.tsx

@@ -72,9 +72,9 @@ export default defineComponent({
 
           <div class={styles.searchSelect}>
             <NCascader
-              placeholder="全部声部"
+              placeholder="全部乐器"
               options={[
-                { name: '全部声部', id: '' },
+                { name: '全部乐器', id: '' },
                 ...catchStore.getSubjectList
               ]}
               clearable

src/views/prepare-lessons/model/related-class/index.tsx

@@ -38,7 +38,7 @@ export default defineComponent({
       },
       tableList: [] as any,
       searchGroup: {
-        instrumentId: props.instrumentId ? Number(props.instrumentId) : '',
+        instrumentId: props.instrumentId ? props.instrumentId : '',
         keyword: null
       }
     });

src/views/prepare-lessons/model/select-resources/select-item/index.tsx

@@ -116,19 +116,12 @@ export default defineComponent({
     const throttledFnSearch = useDebounceFn(item => {
       state.pagination.page = 1;
       state.tableList = [];
-      if (item.type === 'MUSIC') {
-        const { subjectId, ...res } = item;
-        state.searchGroup = Object.assign(state.searchGroup, {
-          ...res,
-          musicalInstrumentId: subjectId,
-          subjectId: null
-        });
-      } else {
-        state.searchGroup = Object.assign(state.searchGroup, {
-          ...item,
-          musicalInstrumentId: null
-        });
-      }
+      const { subjectId, ...res } = item;
+      state.searchGroup = Object.assign(state.searchGroup, {
+        ...res,
+        musicalInstrumentId: subjectId,
+        subjectId: null
+      });
       getList();
     }, 500);
 

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

@@ -279,18 +279,14 @@ export default defineComponent({
                 </NButton>
               ))} */}
               {catchStore.getSubjectInstruments.map((subject: any) =>
-                subject.instruments &&
-                subject.instruments.length > 1 &&
-                forms.type === 'MUSIC' ? (
+                subject.instruments && subject.instruments.length > 1 ? (
                   <NPopselect
                     options={subject.instruments}
                     trigger="hover"
                     scrollable
                     v-model:value={state.tempSubjectId}
                     onUpdate:value={() => {
-                      if (forms.type === 'MUSIC') {
-                        forms.subjectId = state.tempSubjectId;
-                      }
+                      forms.subjectId = state.tempSubjectId;
                       onSearch();
                     }}
                     key={subject.value}
@@ -309,17 +305,11 @@ export default defineComponent({
                   <span
                     class={[
                       styles.textBtn,
-                      (forms.type === 'MUSIC'
-                        ? forms.subjectId === subject.value
-                        : forms.subjectId === subject.id) &&
-                        styles.textBtnActive
+
+                      forms.subjectId === subject.value && styles.textBtnActive
                     ]}
                     onClick={() => {
-                      if (forms.type === 'MUSIC') {
-                        forms.subjectId = subject.value;
-                      } else {
-                        forms.subjectId = subject.id;
-                      }
+                      forms.subjectId = subject.value;
                       state.tempSubjectId = null;
                       onSearch();
                     }}>