Bläddra i källkod

Merge branch 'iteration-work' into jenkins

lex 1 år sedan
förälder
incheckning
8787f773c6

+ 1 - 1
public/version.json

@@ -1 +1 @@
-{"version":1708227045832}
+{ "version": 1708227045832 }

+ 2 - 1
src/components/layout/layoutSilder.tsx

@@ -84,7 +84,8 @@ export default defineComponent({
         normalIcon: iconHomeWork,
         isActive: false,
         id: 9,
-        path: '/homework-record'
+        path: '/homework-record',
+        lightList: ['/homework-record-detail']
       },
       {
         activeIcon: icon_1_1,

+ 2 - 0
src/views/homework-record/detail/index.module.less

@@ -130,6 +130,8 @@
     }
 
     .nums {
+      display: flex;
+      align-items: center;
       font-size: max(26px, 18Px);
       font-family: DINAlternate, DINAlternate;
       font-weight: bold;

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

@@ -233,7 +233,7 @@ export default defineComponent({
               <div class={styles.stitcConent}>
                 <NSpace size={[38, 0]}>
                   <NProgress
-                    percentage={state.workInfo.trainingRate || 0}
+                    percentage={state.workInfo.trainingRate * 100 || 0}
                     // percentage={20}
                     offset-degree={180}
                     type="circle"
@@ -250,14 +250,17 @@ export default defineComponent({
                     </div>
                   </NProgress>
                   <NProgress
-                    percentage={state.workInfo.trainingRate || 0}
+                    percentage={state.workInfo.trainingRate * 100 || 0}
                     offset-degree={180}
                     type="circle"
                     rail-color={'EDEFFA'}
                     color={'#64A5FF'}>
                     <div class={styles.contentRect}>
                       <div class={styles.nums}>
-                        {state.workInfo.trainingRate || 0}%
+                        {Number(
+                          (state.workInfo.trainingRate * 100 || 0).toFixed(2)
+                        ) || 0}
+                        %
                       </div>
                       <div class={styles.text}>提交率</div>
                     </div>
@@ -277,14 +280,17 @@ export default defineComponent({
                     </div>
                   </NProgress>
                   <NProgress
-                    percentage={state.workInfo.qualifiedRate || 0}
+                    percentage={state.workInfo.qualifiedRate * 100 || 0}
                     offset-degree={180}
                     type="circle"
                     rail-color={'EDEFFA'}
                     color={'#40CEAE'}>
                     <div class={styles.contentRect}>
                       <div class={styles.nums}>
-                        {state.workInfo.qualifiedRate || 0}%
+                        {Number(
+                          (state.workInfo.qualifiedRate * 100 || 0).toFixed(2)
+                        ) || 0}
+                        %
                       </div>
                       <div class={styles.text}>合格率</div>
                     </div>

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

@@ -49,7 +49,7 @@ export default defineComponent({
         if (!prepareStore.getSelectKey) return (forms.loadingStatus = false);
         const { data } = await lessonPreTrainingV2Page({
           page: 1,
-          coursewareDetailKnowledgeId: prepareStore.getSelectKey
+          coursewareKnowledgeDetailId: prepareStore.getSelectKey
         });
         const result = data.rows || [];
         const tempList: any = [];
@@ -193,6 +193,16 @@ export default defineComponent({
                         message.error('作业预设不能为空');
                         return;
                       }
+                      let count = 0;
+                      item.lessonPreTrainingDetails?.forEach((item: any) => {
+                        if (!item.removeFlag) {
+                          count++;
+                        }
+                      });
+                      if (count <= 0) {
+                        message.error('作业内容不能为空');
+                        return;
+                      }
                       forms.assignHomeworkStatus = true;
                       forms.selectItem = item;
                     }}

+ 2 - 0
src/views/prepare-lessons/components/lesson-main/train/assign-student/index.tsx

@@ -75,6 +75,8 @@ export default defineComponent({
         const rows = data.rows || [];
         state.tableList.push(...rows);
         state.finshed = data.pages <= data.current ? true : false;
+
+        onCheckStudents();
       } catch {
         //
         state.loading = false;

+ 6 - 6
src/views/studentList/modals/comment-work/index.tsx

@@ -41,11 +41,11 @@ export default defineComponent({
       commentRemind: true
     });
     const onSubmit = async () => {
-      const isCommentRemind = storage.get('isCommentRemind');
-      if (isCommentRemind != 1) {
-        state.removeVisiable1 = true;
-        return;
-      }
+      // const isCommentRemind = storage.get('isCommentRemind');
+      // if (isCommentRemind != 1) {
+      //   state.removeVisiable1 = true;
+      //   return;
+      // }
       state.btnLoading = true;
       try {
         await api_setComment({
@@ -131,7 +131,7 @@ export default defineComponent({
             </p>
             <div class={styles.selectBtn}>
               <NCheckbox v-model:checked={state.commentRemind}>
-                下次不提醒
+                下次不提醒
               </NCheckbox>
             </div>
 

+ 2 - 2
vite.config.ts

@@ -23,8 +23,8 @@ function resolve(dir: string) {
 }
 // https://vitejs.dev/config/
 // https://github.com/vitejs/vite/issues/1930 .env
-const proxyUrl = 'https://dev.kt.colexiu.com/';
-// const proxyUrl = 'https://test.lexiaoya.cn';
+// const proxyUrl = 'https://dev.kt.colexiu.com/';
+const proxyUrl = 'https://test.lexiaoya.cn';
 // const proxyUrl = 'http://192.168.3.14:7989';
 const now = new Date().getTime();
 export default defineConfig(() => {