Merge branch 'iteration-0906' into jenkins

src/views/classList/index.tsx

@@ -57,11 +57,11 @@ export default defineComponent({
       previewModal: false,
       previewParams: {} as any,
       lastCourse: null as any,
-      groupVisiable: false,
       groupBtnLoading: false, // 按钮是否在请求中
       subjectList: [] as any,
       showResetClass: false,
       showSubjectClass: false,
+      groupVisiable: false,
       popSelectYearList: [] as any,
       popSelectLevelList: [] as any
     });
@@ -84,6 +84,9 @@ export default defineComponent({
         gradeYear: null,
         gradeLevel: ''
       };
+      if (state.popSelectYearList.length > 0) {
+        state.searchForm.gradeYear = state.popSelectYearList[0].id;
+      }
       getList();
     };