Merge branch 'iteration-20240924' into jenkins

src/views/home/components/practiceData.tsx

@@ -165,7 +165,7 @@ export default defineComponent({
       sorter: true,
       sortOrder: false as any,
       render(row: any) {
-        return row.publishScore || 0
+        return row.publishScore === null ? '--' : row.publishScore
       }
     });
 

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

@@ -411,6 +411,9 @@ export default defineComponent({
           });
           window.open(href, +new Date() + '');
         }
+
+        forms.showAttendClass = false;
+        forms.instrumentErrorVisiable = false;
       } else {
         forms.showAttendClass = true;
         forms.attendClassType = 'change';

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

@@ -200,7 +200,7 @@ export default defineComponent({
         return true
       }
       // 过滤一些不做校验的素材
-      const checkType = ['IMG', 'VIDEO', 'SONG', 'MUSIC', 'PPT', 'LISTEN', 'MUSICIAN']
+      const checkType = ['IMG', 'VIDEO', 'SONG', 'MUSIC', 'PPT', 'LISTEN']
       if(!checkType.includes(type)) {
         return false
       }
@@ -361,6 +361,7 @@ export default defineComponent({
                   isSelected:
                     relateMaterialInfo.sourceFrom === 'PLATFORM' ? true : false,
                   materialId: relateMaterialInfo.id,
+                  isError: checkCurrentIsInstrument(relateMaterialInfo.instrumentIds, relateMaterialInfo.type),
                   // removeFlag: relateMaterialInfo.,
                   title: relateMaterialInfo.name,
                   type: relateMaterialInfo.type
@@ -525,7 +526,7 @@ export default defineComponent({
           return;
         }
         if (forms.subjects.length <= 0) {
-          message.error('请选择课件声部');
+          message.error('请选择课件乐器');
           return;
         }
         if (forms.coursewareList.length <= 0) {