Ver Fonte

fix:修复问题

lex há 1 ano atrás
pai
commit
a6b70f2c28

+ 12 - 10
src/views/attend-class/index.tsx

@@ -110,16 +110,18 @@ export default defineComponent({
         const tempRows = res.data.rows || [];
         const temp: any = [];
         tempRows.forEach((row: any) => {
-          temp.push({
-            id: row.id,
-            materialId: row.materialId,
-            coverImg: row.coverImg,
-            type: row.materialType,
-            title: row.materialName,
-            isCollect: !!row.favoriteFlag,
-            isSelected: row.source === 'PLATFORM' ? true : false,
-            content: row.content
-          });
+          if (!row.removeFlag) {
+            temp.push({
+              id: row.id,
+              materialId: row.materialId,
+              coverImg: row.coverImg,
+              type: row.materialType,
+              title: row.materialName,
+              isCollect: !!row.favoriteFlag,
+              isSelected: row.source === 'PLATFORM' ? true : false,
+              content: row.content
+            });
+          }
         });
         data.knowledgePointList = temp;
         data.itemList = data.knowledgePointList.map((m: any) => {

+ 1 - 1
src/views/natural-resources/components/my-collect/index.tsx

@@ -114,7 +114,7 @@ export default defineComponent({
                   onOffShelf={() => onRemove(item)}
                   disabledMouseHover={false}
                   onClick={(val: any) => {
-                    if (val.type === 'IMG') return;
+                    if (val.type === 'IMG' || !item.enableFlag) return;
                     state.show = true;
                     state.item = val;
                   }}

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

@@ -47,6 +47,7 @@ export const saveCourseware = (params: any) => {
  */
 export const teacherKnowledgeMaterialDelete = (params: any) => {
   return request.post('/edu-app/teacherKnowledgeMaterial/delete', {
+    requestType: 'form',
     data: params
   });
 };

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

@@ -62,7 +62,8 @@ export default defineComponent({
             title: row.materialName,
             isCollect: !!row.favoriteFlag,
             isSelected: row.source === 'PLATFORM' ? true : false,
-            content: row.content
+            content: row.content,
+            removeFlag: row.removeFlag
           });
         });
 
@@ -141,7 +142,14 @@ export default defineComponent({
 
     // 预览上课
     const onPreviewAttend = () => {
-      if (forms.coursewareList.length <= 0) {
+      // 获取上架的数据
+      let count = 0;
+      forms.coursewareList.forEach((item: any) => {
+        if (!item.removeFlag) {
+          count++;
+        }
+      });
+      if (count <= 0) {
         message.error('课件不能为空');
         return;
       }
@@ -240,7 +248,13 @@ export default defineComponent({
             <NButton
               type="primary"
               onClick={() => {
-                if (forms.coursewareList.length <= 0) {
+                let count = 0;
+                forms.coursewareList.forEach((item: any) => {
+                  if (!item.removeFlag) {
+                    count++;
+                  }
+                });
+                if (count <= 0) {
                   message.error('课件不能为空');
                   return;
                 }

+ 1 - 0
src/views/prepare-lessons/components/lesson-main/train/assign-homework.tsx

@@ -114,6 +114,7 @@ export default defineComponent({
               options={BOOK_DATA.grades}
               clearable
               onUpdate:value={() => {
+                forms.classGroupId = null;
                 getClassList();
               }}
             />

+ 1 - 1
src/views/prepare-lessons/model/select-music/index.module.less

@@ -130,7 +130,7 @@
 }
 
 .spaceSection {
-  width: 76%;
+  width: 69%;
 
   &>div {
     line-height: var(--n-blank-height);