修改显示小节

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

@@ -87,8 +87,8 @@ export default defineComponent({
       if (trainingType === 'EVALUATION') {
         tList = [
           `${evaluateDifficult[configJson.evaluateDifficult]}`,
-          configJson.evaluateChapterBegin || configJson.evaluateChapterEnd
-            ? `${configJson.evaluateChapterBegin}-${configJson.evaluateChapterEnd}小节`
+          configJson.practiceChapterBegin || configJson.practiceChapterEnd
+            ? `${configJson.practiceChapterBegin}-${configJson.practiceChapterEnd}小节`
             : '全部小节',
           // `速度${configJson.evaluateSpeed}`,
           `${configJson.trainingTimes}分合格`

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

@@ -71,15 +71,13 @@ export default defineComponent({
             trainingConfigJson: ''
           };
           const configJson: any = {};
+          configJson.practiceChapterBegin = forms.minScore;
+          configJson.practiceChapterEnd = forms.maxScore;
           if (forms.type === 'PRACTICE') {
-            configJson.practiceChapterBegin = forms.minScore;
-            configJson.practiceChapterEnd = forms.maxScore;
             configJson.practiceSpeed = forms.practiceSpeed;
             configJson.trainingTimes = forms.practiceTimes;
           } else {
             configJson.evaluateDifficult = forms.difficulty;
-            configJson.evaluateChapterBegin = forms.minScore;
-            configJson.evaluateChapterEnd = forms.maxScore;
             configJson.evaluateSpeed = forms.evaluationSpeed;
             configJson.trainingTimes = forms.evaluationScore;
           }
@@ -108,16 +106,13 @@ export default defineComponent({
       const item = props.item;
       if (item.trainId) {
         forms.id = item.trainId;
-
         forms.practiceSpeed = item.practiceSpeed;
         forms.type = item.trainingType;
+        forms.minScore = item.practiceChapterBegin;
+        forms.maxScore = item.practiceChapterEnd;
         if (item.trainingType === 'PRACTICE') {
           forms.practiceTimes = item.trainingTimes;
-          forms.minScore = item.evaluateChapterBegin;
-          forms.maxScore = item.evaluateChapterEnd;
         } else {
-          forms.minScore = item.practiceChapterBegin;
-          forms.maxScore = item.practiceChapterEnd;
           forms.evaluationScore = item.trainingTimes;
         }
         forms.difficulty = item.evaluateDifficult || 'BEGINNER';
@@ -165,62 +160,62 @@ export default defineComponent({
               </NButton>
             </NSpace>
           </NFormItem>
+          <div class={styles.scoreGroup}>
+            <NFormItem
+              label={forms.type === 'PRACTICE' ? '练习小节' : '评测小节'}
+              path="minScore"
+              rule={[
+                {
+                  required: true,
+                  message: '请输入最小练习小节',
+                  trigger: ['blur', 'change'],
+                  type: 'number'
+                }
+              ]}>
+              <NInputNumber
+                v-model:value={forms.minScore}
+                showButton={false}
+                min={1}
+                max={forms.baseMaxScore}
+                placeholder="最小练习小节"
+                onUpdate:value={() => {
+                  forms.maxScore = null;
+                }}
+                clearable
+              />
+            </NFormItem>
+            <div
+              style={{
+                '--n-feedback-height': '24px',
+                display: 'flex',
+                alignItems: 'center',
+                margin: '-2px 2% 0 2%',
+                marginBottom: 'var(--n-feedback-height)'
+              }}>
+              -
+            </div>
+            <NFormItem
+              path="maxScore"
+              rule={[
+                {
+                  required: true,
+                  message: '请输入最大练习小节',
+                  trigger: ['blur', 'change'],
+                  type: 'number'
+                }
+              ]}>
+              <NInputNumber
+                v-model:value={forms.maxScore}
+                showButton={false}
+                min={forms.minScore || 1}
+                max={forms.baseMaxScore}
+                placeholder="最大练习小节"
+                clearable
+              />
+            </NFormItem>
+          </div>
           {forms.type === 'PRACTICE' && (
             <>
-              <div class={styles.scoreGroup}>
-                <NFormItem
-                  label="练习小节"
-                  path="minScore"
-                  rule={[
-                    {
-                      required: true,
-                      message: '请输入最小练习小节',
-                      trigger: ['blur', 'change'],
-                      type: 'number'
-                    }
-                  ]}>
-                  <NInputNumber
-                    v-model:value={forms.minScore}
-                    showButton={false}
-                    min={1}
-                    max={forms.baseMaxScore}
-                    placeholder="最小练习小节"
-                    onUpdate:value={() => {
-                      forms.maxScore = null;
-                    }}
-                    clearable
-                  />
-                </NFormItem>
-                <div
-                  style={{
-                    '--n-feedback-height': '24px',
-                    display: 'flex',
-                    alignItems: 'center',
-                    margin: '-2px 2% 0 2%',
-                    marginBottom: 'var(--n-feedback-height)'
-                  }}>
-                  -
-                </div>
-                <NFormItem
-                  path="maxScore"
-                  rule={[
-                    {
-                      required: true,
-                      message: '请输入最大练习小节',
-                      trigger: ['blur', 'change'],
-                      type: 'number'
-                    }
-                  ]}>
-                  <NInputNumber
-                    v-model:value={forms.maxScore}
-                    showButton={false}
-                    min={forms.minScore || 1}
-                    max={forms.baseMaxScore}
-                    placeholder="最大练习小节"
-                    clearable
-                  />
-                </NFormItem>
-              </div>
               <NFormItem
                 label="练习速度"
                 path="practiceSpeed"

src/views/classList/modals/TrainingDetails.tsx

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

src/views/classList/modals/classTrainingDetails.tsx

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

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

@@ -102,8 +102,10 @@ export default defineComponent({
           if (row.trainingType === 'EVALUATION') {
             tList = [
               `${evaluateDifficult[configJson.evaluateDifficult]}`,
-              '全部小节',
-              `${configJson.evaluateChapterBegin}-${configJson.evaluateChapterEnd}小节`, // `速度${configJson.evaluateSpeed}`,
+              configJson.practiceChapterBegin || configJson.practiceChapterEnd
+                ? `${configJson.practiceChapterBegin}-${configJson.practiceChapterEnd}小节`
+                : '全部小节',
+              // `速度${configJson.evaluateSpeed}`,
               `${configJson.trainingTimes}分合格`
             ];
           } else {

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

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

src/views/studentList/modals/studentTraomomhDetails.tsx

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