Merge branch 'iteration-20250221-tags' into jenkins

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

@@ -95,9 +95,7 @@ export default defineComponent({
       if (trainingType === 'EVALUATION') {
         tList = [
           `${evaluateDifficult[configJson.evaluateDifficult]}`,
-          configJson.practiceChapterBegin || configJson.practiceChapterEnd
-            ? `${configJson.practiceChapterBegin}-${configJson.practiceChapterEnd}小节`
-            : '全部小节',
+          `${configJson.practiceChapterBegin || 0}-${configJson.practiceChapterEnd || 0}小节`,
           `速度${configJson.evaluateSpeed || 0}`,
           `${configJson.trainingTimes}分达标`
         ];

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

@@ -1,4 +1,11 @@
-import { PropType, defineComponent, onMounted, reactive, ref } from 'vue';
+import {
+  Fragment,
+  PropType,
+  defineComponent,
+  onMounted,
+  reactive,
+  ref
+} from 'vue';
 import styles from './index.module.less';
 import {
   NButton,
@@ -49,7 +56,7 @@ export default defineComponent({
       difficulty: 'BEGINNER', // 评测难度
       evaluationSpeed: null as any, // 评测速度
       evaluationScore: null as any, // 评测分数
-      firstMeasureIsZero: false as boolean, // 标记xml是否是从0小节开始
+      firstMeasureIsZero: false as boolean // 标记xml是否是从0小节开始
     });
     const formsRef = ref();
 
@@ -265,7 +272,7 @@ export default defineComponent({
             </NFormItem>
           </div>
           {forms.type === 'PRACTICE' && (
-            <>
+            <Fragment key={'PRACTICE'}>
               <NFormItem
                 label="练习速度"
                 path="practiceSpeed"
@@ -327,11 +334,11 @@ export default defineComponent({
                   </NButton>
                 </NSpace>
               </NFormItem>
-            </>
+            </Fragment>
           )}
 
           {forms.type === 'EVALUATION' && (
-            <>
+            <Fragment key={'EVALUATION'}>
               <NFormItem
                 label="评测难度"
                 path="type"
@@ -417,7 +424,7 @@ export default defineComponent({
                   <NInputGroupLabel>分</NInputGroupLabel>
                 </NInputGroup>
               </NFormItem>
-            </>
+            </Fragment>
           )}
         </NForm>
 

src/views/classList/components/afterWorkDetail.tsx

@@ -152,10 +152,7 @@ export default defineComponent({
               if (trainingContent) {
                 const tempList = [
                   `${evaluateDifficult[trainingContent.evaluateDifficult]}`,
-                  trainingContent.practiceChapterBegin ||
-                  trainingContent.practiceChapterEnd
-                    ? `${trainingContent.practiceChapterBegin}-${trainingContent.practiceChapterEnd}小节`
-                    : '全部小节',
+                  `${trainingContent.practiceChapterBegin || 0}-${trainingContent.practiceChapterEnd || 0}小节`,
                   `速度${trainingContent.evaluateSpeed || 0}`,
                   `${trainingContent.trainingTimes}分达标`
                 ];

src/views/classList/modals/TrainingDetails.tsx

@@ -57,9 +57,7 @@ export default defineComponent({
       if (trainingType === 'EVALUATION') {
         tList = [
           `${evaluateDifficult[configJson.evaluateDifficult]}`,
-          configJson.practiceChapterBegin || configJson.practiceChapterEnd
-            ? `${configJson.practiceChapterBegin}-${configJson.practiceChapterEnd}小节`
-            : '全部小节',
+          `${configJson.practiceChapterBegin || 0}-${configJson.practiceChapterEnd || 0}小节`,
           `速度${configJson.evaluateSpeed || 0}`,
           `${configJson.trainingTimes}分达标`
         ];

src/views/classList/modals/classTrainingDetails.tsx

@@ -52,9 +52,7 @@ export default defineComponent({
       if (trainingType === 'EVALUATION') {
         tList = [
           `${evaluateDifficult[configJson.evaluateDifficult]}`,
-          configJson.practiceChapterBegin || configJson.practiceChapterEnd
-            ? `${configJson.practiceChapterBegin}-${configJson.practiceChapterEnd}小节`
-            : '全部小节',
+          `${configJson.practiceChapterBegin || 0}-${configJson.practiceChapterEnd || 0}小节`,
           `速度${configJson.evaluateSpeed || 0}`,
           `${configJson.trainingTimes}分达标`
         ];

src/views/homework-record/detail/index.tsx

@@ -131,10 +131,7 @@ export default defineComponent({
               if (trainingContent) {
                 const tempList = [
                   `${evaluateDifficult[trainingContent.evaluateDifficult]}`,
-                  trainingContent.practiceChapterBegin ||
-                  trainingContent.practiceChapterEnd
-                    ? `${trainingContent.practiceChapterBegin}-${trainingContent.practiceChapterEnd}小节`
-                    : '全部小节',
+                  `${trainingContent.practiceChapterBegin || 0}-${trainingContent.practiceChapterEnd || 0}小节`,
                   `速度${trainingContent.evaluateSpeed || 0}`,
                   `${trainingContent.trainingTimes}分达标`
                 ];

src/views/homework-record/index.tsx

@@ -174,10 +174,7 @@ export default defineComponent({
                 if (trainingContent) {
                   const tempList = [
                     `${evaluateDifficult[trainingContent.evaluateDifficult]}`,
-                    trainingContent.practiceChapterBegin ||
-                    trainingContent.practiceChapterEnd
-                      ? `${trainingContent.practiceChapterBegin}-${trainingContent.practiceChapterEnd}小节`
-                      : '全部小节',
+                    `${trainingContent.practiceChapterBegin || 0}-${trainingContent.practiceChapterEnd || 0}小节`,
                     `速度${trainingContent.evaluateSpeed || 0}`,
                     `${trainingContent.trainingTimes}分达标`
                   ];

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

@@ -117,9 +117,9 @@ export default defineComponent({
           if (row.trainingType === 'EVALUATION') {
             tList = [
               `${evaluateDifficult[configJson.evaluateDifficult]}`,
-              configJson.practiceChapterBegin || configJson.practiceChapterEnd
-                ? `${configJson.practiceChapterBegin}-${configJson.practiceChapterEnd}小节`
-                : '全部小节',
+              `${configJson.practiceChapterBegin || 0}-${
+                configJson.practiceChapterEnd || 0
+              }小节`,
               `速度${configJson.evaluateSpeed || 0}`,
               `${configJson.trainingTimes}分达标`
             ];
@@ -132,7 +132,9 @@ export default defineComponent({
           }
           temp.push({
             typeList: tList || [],
-            audioPlayTypeArray: row.audioPlayTypes ? row.audioPlayTypes.split(',') : [],
+            audioPlayTypeArray: row.audioPlayTypes
+              ? row.audioPlayTypes.split(',')
+              : [],
             ...row
           });
         });

src/views/prepare-lessons/components/resource-main/components/select-music/index.tsx

@@ -40,9 +40,7 @@ export const typeFormat = (trainingType: string, configJson: any) => {
   if (trainingType === 'EVALUATION') {
     tList = [
       `${evaluateDifficult[configJson.evaluateDifficult]}`,
-      configJson.practiceChapterBegin || configJson.practiceChapterEnd
-        ? `${configJson.practiceChapterBegin}-${configJson.practiceChapterEnd}小节`
-        : '全部小节',
+      `${configJson.practiceChapterBegin || 0}-${configJson.practiceChapterEnd || 0}小节`,
       `速度${configJson.evaluateSpeed || 0}`,
       `${configJson.trainingTimes}分达标`
     ];

src/views/prepare-lessons/components/resource-main/index.tsx

@@ -75,7 +75,7 @@ export default defineComponent({
           childs.forEach((child: any) => {
             system?.removeChild(child);
           })
-        });  
+        });
         const parts = xmlParse.getElementsByTagName('part');
         firstMeasures = parts[0]?.getElementsByTagName('measure');
         xmlStatus = 'success';

src/views/studentList/modals/studentTraomomhDetails.tsx

@@ -56,9 +56,7 @@ export default defineComponent({
       if (trainingType === 'EVALUATION') {
         tList = [
           `${evaluateDifficult[configJson.evaluateDifficult]}`,
-          configJson.practiceChapterBegin || configJson.practiceChapterEnd
-            ? `${configJson.practiceChapterBegin}-${configJson.practiceChapterEnd}小节`
-            : '全部小节',
+          `${configJson.practiceChapterBegin || 0}-${configJson.practiceChapterEnd || 0}小节`,
           `速度${configJson.evaluateSpeed || 0}`,
           `${configJson.trainingTimes}分达标`
         ];