Browse Source

修复问题

lex-xin 3 months ago
parent
commit
4f68967c82

+ 19 - 4
src/views/attend-class/model/train-update/index.tsx

@@ -105,7 +105,6 @@ export default defineComponent({
 
     onMounted(() => {
       const item = props.item;
-      console.log(item, 'item-----');
       if (item.trainId) {
         forms.id = item.trainId;
         // forms.practiceSpeed = Number(item.practiceSpeed);
@@ -129,8 +128,16 @@ export default defineComponent({
         } else {
           forms.evaluationScore = item.trainingTimes;
 
-          forms.evaluationSpeed = item.evaluateSpeed ? Number(item.evaluateSpeed) : item.playSpeed ? item.playSpeed : null
-          forms.practiceSpeed = item.evaluateSpeed ? Number(item.evaluateSpeed) : item.playSpeed ? item.playSpeed : null
+          forms.evaluationSpeed = item.evaluateSpeed
+            ? Number(item.evaluateSpeed)
+            : item.playSpeed
+            ? item.playSpeed
+            : null;
+          forms.practiceSpeed = item.evaluateSpeed
+            ? Number(item.evaluateSpeed)
+            : item.playSpeed
+            ? item.playSpeed
+            : null;
         }
 
         // forms.evaluationSpeed = item.evaluateSpeed;
@@ -155,7 +162,6 @@ export default defineComponent({
           ref={formsRef}
           model={forms}
           labelAlign="right"
-          style={{ height: '300px' }}
           labelPlacement="left">
           <NFormItem
             label="训练方式"
@@ -306,6 +312,15 @@ export default defineComponent({
                   <NInputGroupLabel>分钟</NInputGroupLabel>
                 </NInputGroup>
               </NFormItem>
+
+              {/* 这里用不着,用占位的 */}
+              <NFormItem label="empty" style={{ opacity: 0 }}>
+                <NSpace class={styles.difficultySpace}>
+                  <NButton secondary class={[styles.switch]}>
+                    占位元素
+                  </NButton>
+                </NSpace>
+              </NFormItem>
             </>
           )}
 

+ 4 - 0
src/views/natural-resources/components/my-resources/index.tsx

@@ -90,6 +90,7 @@ export default defineComponent({
             instrumentIds: row.instrumentIds,
             sourceFrom: row.sourceFrom,
             background: row.background,
+            tagIds: row.tagIds, // 资源标签
             audioPlayTypeArray: row.audioPlayTypes
               ? row.audioPlayTypes.split(',')
               : [],
@@ -223,12 +224,14 @@ export default defineComponent({
                       type: item.type,
                       enableFlag: 1,
                       content: item.content,
+                      tagIds: item.tagIds,
                       id: item.id || null,
                       delFlag: item.delFlag
                     });
                   }
                 });
                 //
+                console.log(body, "body")
                 if (body.length > 0) {
                   if (state.searchGroup.type === 'MUSIC') {
                     await materialRemoveMusic(state.editIds);
@@ -397,6 +400,7 @@ export default defineComponent({
                     table.instrumentIds = item.instrumentIds;
                     table.content = item.content;
                     table.coverImg = item.coverImg;
+                    table.tagIds = item.tagIds;
 
                     if (!state.editOverIds.includes(table.id)) {
                       state.editOverIds.push(table.id);

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

@@ -183,6 +183,8 @@ export default defineComponent({
     };
 
     onMounted(async () => {
+      await catchStore.getSubjects();
+      await getMaterialTags();
       const list = props.list || [];
       const temps: any[] = [];
       list.forEach((item: any) => {
@@ -202,10 +204,6 @@ export default defineComponent({
         });
       });
       uploadForms.list = temps || [];
-
-      // console.log(temps, 'uploadForms');
-      await catchStore.getSubjects();
-      await getMaterialTags();
     });
 
     // 全选