Merge branch 'iteration-20240417-subject' into jenkins

src/views/classList/index.module.less

@@ -47,10 +47,15 @@
   .studentTransfer {
     position: relative;
 
+    .showGradeSection {
+      display: flex;
+      align-items: center;
+    }
+
     .smallArrow {
       right: 166px;
-      top: 15px;
-      position: absolute;
+      // top: 15px;
+      // position: absolute;
       width: 12px;
       height: 12px;
       cursor: pointer;

src/views/classList/modals/restStudentBox.tsx

@@ -41,6 +41,7 @@ export default defineComponent({
     const classList = ref([] as any);
     console.log(props.activeRow, 'activeRow');
     const targetClass = reactive({
+      gradeYear: null,
       name: '',
       id: ''
     });
@@ -72,6 +73,7 @@ export default defineComponent({
           return {
             label: item.name,
             key: item.id,
+            gradeYear: item.gradeYear,
             disabled: item.id == props.activeRow.id
           };
         });
@@ -79,9 +81,11 @@ export default defineComponent({
         if (classList.value[0].disabled) {
           targetClass.name = classList.value[1].label;
           targetClass.id = classList.value[1].key;
+          targetClass.gradeYear = classList.value[1].gradeYear;
         } else {
           targetClass.name = classList.value[0].label;
           targetClass.id = classList.value[0].key;
+          targetClass.gradeYear = classList.value[0].gradeYear;
         }
 
         const tarRes = await getCLassStudentList(targetClass.id);
@@ -106,6 +110,7 @@ export default defineComponent({
       classList.value.forEach((item: any) => {
         if (item.key == val) {
           targetClass.name = item.label;
+          targetClass.gradeYear = item.gradeYear;
           targetClass.id = item.key;
         }
       });
@@ -330,8 +335,14 @@ export default defineComponent({
                       chioseClass(value);
                     }}
                     scrollable>
-                    <div>
-                      {targetClass.name}
+                    <div class={styles.showGradeSection}>
+                      <div>
+                        {targetClass.name}
+                        {targetClass.gradeYear && (
+                          <span>（{targetClass.gradeYear}学年）</span>
+                        )}
+                      </div>
+                      {/* gradeYear */}
                       <NImage
                         class={styles.smallArrow}
                         src={smallArrow}