lex-xin 6 місяців тому
батько
коміт
567b61b8ac

+ 2 - 2
src/utils/contants.ts

@@ -45,8 +45,8 @@ export const evaluateDifficult = {
  */
 export const trainingStatus = {
   UNSUBMITTED: '未提交',
-  SUBMITTED: '不合格',
-  TARGET: '合格'
+  SUBMITTED: '未达标',
+  TARGET: '达标'
 } as any;
 
 /** 周 */

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

@@ -99,7 +99,7 @@ export default defineComponent({
             ? `${configJson.practiceChapterBegin}-${configJson.practiceChapterEnd}小节`
             : '全部小节',
           // `速度${configJson.evaluateSpeed}`,
-          `${configJson.trainingTimes}分合格`
+          `${configJson.trainingTimes}分达标`
         ];
       } else {
         tList = [

+ 1 - 1
src/views/attend-class/model/train-type/index.tsx

@@ -268,7 +268,7 @@ export default defineComponent({
               </NProgress>
               <p class={styles.disPreviewDivide}>
                 {props.item.trainingType === 'EVALUATION'
-                  ? '合格分数'
+                  ? '达标分数'
                   : '练习时长要求'}
                 {props.item.allTimes}
                 {props.item.trainingType === 'EVALUATION' ? '分' : '分钟'}

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

@@ -352,12 +352,12 @@ export default defineComponent({
                 />
               </NFormItem> */}
               <NFormItem
-                label="合格分数"
+                label="达标分数"
                 path="evaluationScore"
                 rule={[
                   {
                     required: true,
-                    message: '请输入合格分数',
+                    message: '请输入达标分数',
                     trigger: ['blur', 'change'],
                     type: 'number'
                   }
@@ -370,7 +370,7 @@ export default defineComponent({
                     showButton={false}
                     style={{ width: '100%' }}
                     v-model:value={forms.evaluationScore}
-                    placeholder="请输入合格分数"
+                    placeholder="请输入达标分数"
                     clearable
                   />
                   <NInputGroupLabel>分</NInputGroupLabel>

+ 2 - 2
src/views/classList/components/afterWork.tsx

@@ -159,7 +159,7 @@ export default defineComponent({
           key: 'trainingNum'
         },
         {
-          title: '合格人数',
+          title: '达标人数',
           key: 'standardNum'
         },
         {
@@ -170,7 +170,7 @@ export default defineComponent({
           }
         },
         {
-          title: '合格率',
+          title: '达标率',
           key: 'qualifiedRate',
           render(row: any) {
             return <>{row.qualifiedRate}%</>;

+ 5 - 5
src/views/classList/components/afterWorkDetail.tsx

@@ -156,7 +156,7 @@ export default defineComponent({
                   trainingContent.practiceChapterEnd
                     ? `${trainingContent.practiceChapterBegin}-${trainingContent.practiceChapterEnd}小节`
                     : '全部小节',
-                  `${trainingContent.trainingTimes}分合格`
+                  `${trainingContent.trainingTimes}分达标`
                 ];
                 eTitle += tempList.join(' | ') + ';';
               }
@@ -209,10 +209,10 @@ export default defineComponent({
                   <p class={styles.nosub}>未提交</p>
                 ) : null}
                 {row.trainingStatus == 'SUBMITTED' ? (
-                  <p class={styles.ison}>不合格</p>
+                  <p class={styles.ison}>未达标</p>
                 ) : null}
                 {row.trainingStatus == 'TARGET' ? (
-                  <p class={styles.isok}>合格</p>
+                  <p class={styles.isok}>达标</p>
                 ) : null}
               </div>
             );
@@ -378,7 +378,7 @@ export default defineComponent({
                         {state.workInfo.standardNum || 0}
                         <span>人</span>
                       </div>
-                      <div class={styles.text}>合格人数</div>
+                      <div class={styles.text}>达标人数</div>
                     </div>
                   </NProgress>
                   <NProgress
@@ -392,7 +392,7 @@ export default defineComponent({
                       <div class={styles.nums}>
                         {state.workInfo.qualifiedRate || 0}%
                       </div>
-                      <div class={styles.text}>合格率</div>
+                      <div class={styles.text}>达标率</div>
                     </div>
                   </NProgress>
                 </NSpace>

+ 1 - 1
src/views/classList/modals/TrainingDetails.tsx

@@ -61,7 +61,7 @@ export default defineComponent({
             ? `${configJson.practiceChapterBegin}-${configJson.practiceChapterEnd}小节`
             : '全部小节',
           // `速度${configJson.evaluateSpeed}`,
-          `${configJson.trainingTimes}分合格`
+          `${configJson.trainingTimes}分达标`
         ];
         // console.log('configJson.evaluateDifficult--', tList);
       } else {

+ 1 - 1
src/views/classList/modals/classTrainingDetails.tsx

@@ -56,7 +56,7 @@ export default defineComponent({
             ? `${configJson.practiceChapterBegin}-${configJson.practiceChapterEnd}小节`
             : '全部小节',
           // `速度${configJson.evaluateSpeed}`,
-          `${configJson.trainingTimes}分合格`
+          `${configJson.trainingTimes}分达标`
         ];
       } else {
         tList = [

+ 10 - 10
src/views/home/components/trainData.tsx

@@ -100,7 +100,7 @@ export default defineComponent({
           key: 'trainingNum'
         },
         {
-          title: '合格人数',
+          title: '达标人数',
           key: 'standardNum'
         },
         {
@@ -111,7 +111,7 @@ export default defineComponent({
           }
         },
         {
-          title: '合格率',
+          title: '达标率',
           key: 'qualifiedRate',
           render(row: any) {
             return <>{row.qualifiedRate}%</>;
@@ -225,8 +225,8 @@ export default defineComponent({
           show: false,
           selected: {
             //在这里设置默认展示就ok了
-            合格人数: qualifiedFlag.value,
-            不合格人数: unqualifiedFlag.value
+            达标人数: qualifiedFlag.value,
+            未达标人数: unqualifiedFlag.value
           }
         },
         xAxis: {
@@ -281,7 +281,7 @@ export default defineComponent({
             data: payForm.studentList,
             symbolSize: 10,
             type: 'line',
-            name: '不合格人数',
+            name: '未达标人数',
             symbol: 'circle',
             smooth: true,
             itemStyle: {
@@ -320,7 +320,7 @@ export default defineComponent({
           {
             data: payForm.payInfoList,
             type: 'line',
-            name: '合格人数',
+            name: '达标人数',
             symbolSize: 10,
             symbol: 'circle',
             smooth: true,
@@ -452,7 +452,7 @@ export default defineComponent({
                     人次
                   </div>
                 </p>
-                <p class={styles.TrainDataItemsubTitle}>合格总人次</p>
+                <p class={styles.TrainDataItemsubTitle}>达标总人次</p>
               </div>
               <div class={styles.TrainDataItem}>
                 <p class={styles.TrainDataItemTitle}>
@@ -480,7 +480,7 @@ export default defineComponent({
                     %
                   </div>
                 </p>
-                <p class={styles.TrainDataItemsubTitle}>作业合格率</p>
+                <p class={styles.TrainDataItemsubTitle}>作业达标率</p>
               </div>
             </div>
             <div class={styles.TrainDataTopRight}>
@@ -494,7 +494,7 @@ export default defineComponent({
                   qualifiedFlag.value ? '' : styles.DataTopRightItemDis
                 ]}>
                 <div class={styles.DataTopRightDot}></div>
-                <p>合格人数</p>
+                <p>达标人数</p>
               </div>
               <div
                 onClick={() => {
@@ -506,7 +506,7 @@ export default defineComponent({
                   unqualifiedFlag.value ? '' : styles.DataTopRightItemDis
                 ]}>
                 <div class={[styles.DataTopRightDot, styles.red]}></div>
-                <p>不合格人数</p>
+                <p>未达标人数</p>
               </div>
             </div>
           </div>

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

@@ -135,7 +135,7 @@ export default defineComponent({
                   trainingContent.practiceChapterEnd
                     ? `${trainingContent.practiceChapterBegin}-${trainingContent.practiceChapterEnd}小节`
                     : '全部小节',
-                  `${trainingContent.trainingTimes}分合格`
+                  `${trainingContent.trainingTimes}分达标`
                 ];
                 eTitle += tempList.join(' | ') + ';';
               }
@@ -198,10 +198,10 @@ export default defineComponent({
                   <p class={styles.nosub}>未提交</p>
                 ) : null}
                 {row.trainingStatus == 'SUBMITTED' ? (
-                  <p class={styles.ison}>不合格</p>
+                  <p class={styles.ison}>未达标</p>
                 ) : null}
                 {row.trainingStatus == 'TARGET' ? (
-                  <p class={styles.isok}>合格</p>
+                  <p class={styles.isok}>达标</p>
                 ) : null}
               </div>
             );
@@ -368,7 +368,7 @@ export default defineComponent({
                         {state.workInfo.standardNum || 0}
                         <span>人</span>
                       </div>
-                      <div class={styles.text}>合格人数</div>
+                      <div class={styles.text}>达标人数</div>
                     </div>
                   </NProgress>
                   <NProgress
@@ -382,7 +382,7 @@ export default defineComponent({
                       <div class={styles.nums}>
                         {state.workInfo.qualifiedRate || 0}%
                       </div>
-                      <div class={styles.text}>合格率</div>
+                      <div class={styles.text}>达标率</div>
                     </div>
                   </NProgress>
                 </NSpace>

+ 3 - 3
src/views/homework-record/index.tsx

@@ -178,7 +178,7 @@ export default defineComponent({
                     trainingContent.practiceChapterEnd
                       ? `${trainingContent.practiceChapterBegin}-${trainingContent.practiceChapterEnd}小节`
                       : '全部小节',
-                    `${trainingContent.trainingTimes}分合格`
+                    `${trainingContent.trainingTimes}分达标`
                   ];
                   eTitle += tempList.join(' | ') + ';';
                 }
@@ -613,12 +613,12 @@ export default defineComponent({
                           {item.trainingRate || 0}%
                         </span>
                         <NDivider vertical />
-                        <span class={styles.title}>合格人数:</span>
+                        <span class={styles.title}>达标人数:</span>
                         <span class={styles.text}>
                           {item.standardNum || 0}人
                         </span>
                         <NDivider vertical />
-                        <span class={styles.title}>合格率:</span>
+                        <span class={styles.title}>达标率:</span>
                         <span class={styles.text}>
                           {item.qualifiedRate || 0}%
                         </span>

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

@@ -124,7 +124,7 @@ export default defineComponent({
                 ? `${configJson.practiceChapterBegin}-${configJson.practiceChapterEnd}小节`
                 : '全部小节',
               // `速度${configJson.evaluateSpeed}`,
-              `${configJson.trainingTimes}分合格`
+              `${configJson.trainingTimes}分达标`
             ];
           } else {
             tList = [

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

@@ -45,7 +45,7 @@ export const typeFormat = (trainingType: string, configJson: any) => {
         ? `${configJson.practiceChapterBegin}-${configJson.practiceChapterEnd}小节`
         : '全部小节',
       // `速度${configJson.evaluateSpeed}`,
-      `${configJson.trainingTimes}分合格`
+      `${configJson.trainingTimes}分达标`
     ];
   } else {
     tList = [

+ 2 - 2
src/views/studentList/components/studentAfterWork.tsx

@@ -174,11 +174,11 @@ export default defineComponent({
                 ) : null}
                 {row.trainingStatus == 'SUBMITTED' ? (
                   <p style={{ color: '#EA4132' }} class={styles.ison}>
-                    不合格
+                    未达标
                   </p>
                 ) : null}
                 {row.trainingStatus == 'TARGET' ? (
-                  <p class={styles.isok}>合格</p>
+                  <p class={styles.isok}>达标</p>
                 ) : null}
               </div>
             );

+ 1 - 1
src/views/studentList/modals/studentTraomomhDetails.tsx

@@ -60,7 +60,7 @@ export default defineComponent({
             ? `${configJson.practiceChapterBegin}-${configJson.practiceChapterEnd}小节`
             : '全部小节',
           // `速度${configJson.evaluateSpeed}`,
-          `${configJson.trainingTimes}分合格`
+          `${configJson.trainingTimes}分达标`
         ];
         // console.log('configJson.evaluateDifficult--', tList);
       } else {