Merge branch 'iteration-work' into jenkins

public/version.json

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

src/views/classList/modals/TrainingDetails.tsx

@@ -220,6 +220,7 @@ export default defineComponent({
             comment={studnetInfo.value.comment}
             workInfo={{
               isLook: studnetInfo.value.comment ? true : false,
+              studentAvatar: studnetInfo.value.studentAvatar,
               studentName: studnetInfo.value.studentName,
               submitTime: studnetInfo.value.submitTime,
               studentLessonTrainingId: studnetInfo.value.studentLessonTrainingId

src/views/homework-record/index.tsx

@@ -93,8 +93,9 @@ export default defineComponent({
       if (state.popSelectYearList.length > 0) {
         state.searchForm.gradeYear = state.popSelectYearList[1].id;
       }
-      // getList();
+      //
       setCache({ current: state.searchForm, saveKey: route.path });
+      getList();
     };
 
     const getModalHeight = () => {

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

@@ -364,6 +364,7 @@ export default defineComponent({
           blockScroll={false}>
           <AssignStudent
             classGroupId={props.classGroupId}
+            currentGradeNum={forms.currentGradeNum as any}
             selectIds={forms.selectIds}
             classList={forms.classList}
             onClose={() => (forms.workVisiable = false)}

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

@@ -17,6 +17,7 @@ import { useCatchStore } from '/src/store/modules/catchData';
 import { getStudentList } from '/src/views/classList/api';
 import { useThrottleFn } from '@vueuse/core';
 import TheEmpty from '/src/components/TheEmpty';
+import { getGradeYearList } from '/src/views/home/api';
 
 export default defineComponent({
   name: 'assign-student',
@@ -26,6 +27,11 @@ export default defineComponent({
       type: Array,
       default: () => []
     },
+    /** 学年 */
+    currentGradeNum: {
+      type: [String || Number],
+      default: ''
+    },
     selectIds: {
       type: Array,
       default: () => []
@@ -45,7 +51,8 @@ export default defineComponent({
       checkAllStatus: false,
       indeterminate: false,
       searchFrom: {
-        currentGradeNum: '',
+        currentGradeNum: props.currentGradeNum || '',
+        gradeYear: null,
         classGroupId: props.classGroupId || '',
         subjectId: '',
         keyword: ''
@@ -58,9 +65,27 @@ export default defineComponent({
       tableList: [] as any,
       checkboxIds: [] as any,
       selectStudents: [] as any,
-      selectKeyword: ''
+      selectKeyword: '',
+      popSelectYearList: [] as any
     });
 
+    // 获取学年
+    const getYearList = async () => {
+      try {
+        const { data } = await getGradeYearList();
+        const temp = data || [];
+        temp.forEach((i: any) => {
+          i.name = i.name + '学年';
+        });
+        state.popSelectYearList = temp || [];
+        if (temp.length > 0 && !state.searchFrom.gradeYear) {
+          state.searchFrom.gradeYear = temp[0].id;
+        }
+      } catch {
+        //
+      }
+    };
+
     const getStudentLists = async () => {
       try {
         if (state.pagination.page === 1) {
@@ -152,6 +177,7 @@ export default defineComponent({
       state.checkboxIds = props.selectIds || [];
       state.loading = true;
       await catchStore.getSubjects();
+      await getYearList();
       await getStudentLists();
       onCheckStudents();
     });

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

@@ -83,7 +83,11 @@ export default defineComponent({
         <h2>点评作业</h2>
 
         <div class={styles.header}>
-          <NAvatar class={styles.navatar} round src={defultHeade} />
+          <NAvatar
+            class={styles.navatar}
+            round
+            src={props.workInfo.studentAvatar || defultHeade}
+          />
           <div class={styles.userInfo}>
             <h3>{props.workInfo.studentName}</h3>
             <p>

src/views/studentList/modals/studentTraomomhDetails.tsx

@@ -94,6 +94,7 @@ export default defineComponent({
 
           studentLessonTrainingDetails: arr
         };
+        console.log(teacherInfo.value, ' teacherInfo.value');
       } catch (e) {
         console.log(e);
       }
@@ -202,6 +203,7 @@ export default defineComponent({
             comment={teacherInfo.value.comment}
             workInfo={{
               isLook: teacherInfo.value.comment ? true : false,
+              studentAvatar: teacherInfo.value.studentAvatar,
               studentName: teacherInfo.value.studentName,
               submitTime: teacherInfo.value.submitTime,
               studentLessonTrainingId: teacherInfo.value.studentLessonTrainingId