Merge branch 'iteration-20250221-tags' into jenkins

src/styles/index.less

@@ -22,6 +22,9 @@ body {
   background-color: #f1f5ff;
   overflow: hidden;
   --layoutTopHeight: 64px;
+  .n-form-item .n-form-item-feedback-wrapper {
+    --n-feedback-font-size: 12Px !important;
+  }
 }
 
 body > .n-drawer-container-relative {

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

@@ -108,6 +108,7 @@ export default defineComponent({
 
     onMounted(() => {
       const item = props.item;
+      const playSpeedFloor = Math.floor(item.playSpeed || 0);
       if (item.trainId) {
         forms.id = item.trainId;
         // forms.practiceSpeed = Number(item.practiceSpeed);
@@ -120,26 +121,26 @@ export default defineComponent({
 
           forms.practiceSpeed = item.practiceSpeed
             ? Number(item.practiceSpeed)
-            : item.playSpeed
-            ? item.playSpeed
+            : playSpeedFloor
+            ? playSpeedFloor
             : null;
           forms.evaluationSpeed = item.practiceSpeed
             ? Number(item.practiceSpeed)
-            : item.playSpeed
-            ? item.playSpeed
+            : playSpeedFloor
+            ? playSpeedFloor
             : null;
         } else {
           forms.evaluationScore = item.trainingTimes;
 
           forms.evaluationSpeed = item.evaluateSpeed
             ? Number(item.evaluateSpeed)
-            : item.playSpeed
-            ? item.playSpeed
+            : playSpeedFloor
+            ? playSpeedFloor
             : null;
           forms.practiceSpeed = item.evaluateSpeed
             ? Number(item.evaluateSpeed)
-            : item.playSpeed
-            ? item.playSpeed
+            : playSpeedFloor
+            ? playSpeedFloor
             : null;
         }
 
@@ -148,8 +149,8 @@ export default defineComponent({
         // xml小节从0开始，最小为0，否则为1
         forms.minScore = item.firstMeasureIsZero ? 0 : 1;
         forms.maxScore = item.practiceChapterMax ? item.practiceChapterMax : 1;
-        forms.evaluationSpeed = item.playSpeed || null;
-        forms.practiceSpeed = item.playSpeed || null;
+        forms.evaluationSpeed = playSpeedFloor || null;
+        forms.practiceSpeed = playSpeedFloor || null;
       }
       forms.firstMeasureIsZero = item.firstMeasureIsZero;
       forms.audioPlayTypeArray = item.audioPlayTypeArray || [];

src/views/natural-resources/components/my-collect/search-group-resources.tsx

@@ -163,6 +163,7 @@ export default defineComponent({
                 onClick={() => {
                   forms.type = item.value;
                   forms.audioPlayTypes = '';
+                  forms.materialTagId = null;
                   formatFirstSubject();
                   onSearch();
 

src/views/natural-resources/components/my-resources/search-group-resources.tsx

@@ -117,8 +117,9 @@ export default defineComponent({
                   // forms.subjectId = null;
                   // state.tempSubjectId = null;
 
-                  forms.materialTagId = null
+                  forms.materialTagId = null;
                   // onSearch();
+
                   formatFirstSubject();
                 }}>
                 {item.label}

src/views/natural-resources/components/share-resources/search-group-resources.tsx

@@ -305,6 +305,7 @@ export default defineComponent({
                   forms.audioPlayTypes = '';
                   data.tagActiveId = '';
                   data.childSelectId = null;
+                  forms.materialTagId = null;
                   data.selectParents = {};
 
                   formatFirstSubject();