Ver Fonte

修改显示

lex há 1 ano atrás
pai
commit
46425b4ed2

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

@@ -37,6 +37,12 @@ import PreviewWindow from '/src/views/preview-window';
 
 export default defineComponent({
   name: 'courseware-presets',
+  props: {
+    courseWareSubjectIsNull: {
+      type: Boolean,
+      default: false
+    }
+  },
   emits: ['change'],
   setup(props, { emit }) {
     const prepareStore = usePrepareStore();
@@ -235,13 +241,18 @@ export default defineComponent({
             subjectId = Number(localStorageSubjectId);
           }
         }
-        if (subjectId && index >= 0) {
-          prepareStore.setSubjectId(subjectId);
-          // forms.subjectId = subjectId;
+        // 判断是否选择为空
+        if (props.courseWareSubjectIsNull) {
+          prepareStore.setSubjectId('');
         } else {
-          // 判断是否有缓存
-          prepareStore.setSubjectId(subjectList[0].id);
-          // forms.subjectId = subjectList[0].id;
+          if (subjectId && index >= 0) {
+            prepareStore.setSubjectId(subjectId);
+            // forms.subjectId = subjectId;
+          } else {
+            // 判断是否有缓存
+            prepareStore.setSubjectId(subjectList[0].id);
+            // forms.subjectId = subjectList[0].id;
+          }
         }
 
         // 保存
@@ -443,7 +454,13 @@ export default defineComponent({
               type="primary"
               onClick={() => {
                 eventGlobal.emit('teacher-slideshow', true);
-                emit('change', { status: true, type: 'create' });
+                emit('change', {
+                  status: true,
+                  type: 'create',
+                  courseWareSubjectIsNull: prepareStore.getSubjectId
+                    ? false
+                    : true
+                });
               }}>
               <NImage
                 class={styles.addBtnIcon}
@@ -474,7 +491,10 @@ export default defineComponent({
                           emit('change', {
                             status: true,
                             type: 'update',
-                            groupItem: { id: item.id }
+                            groupItem: { id: item.id },
+                            courseWareSubjectIsNull: prepareStore.getSubjectId
+                              ? false
+                              : true
                           });
                         }}
                         onStartClass={() =>
@@ -489,7 +509,7 @@ export default defineComponent({
                   </div>
                 ))}
                 {!forms.loading && forms.tableList.length <= 0 && (
-                  <TheEmpty class={styles.empty1} />
+                  <TheEmpty class={styles.empty1} description="暂无课件" />
                 )}
               </div>
             </NSpin>

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

@@ -424,11 +424,10 @@ export default defineComponent({
             id: props.groupItem.id,
             ...params
           });
-          message.success('修改成功');
         } else {
           await api_teacherChapterLessonCoursewareAdd(params);
-          message.success('添加成功');
         }
+        message.success('保存成功');
 
         if (hasBack) {
           emit('change', { status: false });

+ 3 - 0
src/views/prepare-lessons/components/lesson-main/index.tsx

@@ -15,6 +15,7 @@ export default defineComponent({
     const state = reactive({
       editCoursewareShow: false, // 是否编辑课件
       coursewareType: 'create' as 'create' | 'edit',
+      courseWareSubjectIsNull: false, // 课件中是否使用全部声部
       editCourseware: {} as any, //
       editWorkShow: false, // 是否编辑预设
       editWork: {} as any // 预设模板编号
@@ -74,9 +75,11 @@ export default defineComponent({
                 />
               ) : (
                 <CoursewarePresets
+                  courseWareSubjectIsNull={state.courseWareSubjectIsNull}
                   onChange={(val: any) => {
                     state.coursewareType = val.type;
                     state.editCoursewareShow = val.status;
+                    state.courseWareSubjectIsNull = val.courseWareSubjectIsNull;
                     prepareStore.setIsEditResource(val.status);
                     state.editCourseware = val.groupItem;
                   }}

+ 2 - 1
src/views/prepare-lessons/model/source-music/components/list/index.module.less

@@ -143,7 +143,8 @@
   flex-flow: row wrap;
   justify-content: flex-start;
   gap: 20px 0;
-  min-height: 232px;
+
+  // min-height: 232px;
   margin-left: -10px;
   margin-right: -10px;
 

+ 1 - 1
src/views/prepare-lessons/model/source-musician/components/list/index.tsx

@@ -170,7 +170,7 @@ export default defineComponent({
               {!state.loading && state.tableList.length <= 0 && (
                 <TheEmpty
                   style={{ minHeight: '50vh' }}
-                  description="暂无乐器百科"
+                  description="暂无音乐家"
                 />
               )}
             </div>