diff --git a/marking_app/lib/pages/homework_correction/job_priority_review_set.dart b/marking_app/lib/pages/homework_correction/job_priority_review_set.dart index 29874ba..96a7b5e 100644 --- a/marking_app/lib/pages/homework_correction/job_priority_review_set.dart +++ b/marking_app/lib/pages/homework_correction/job_priority_review_set.dart @@ -45,9 +45,9 @@ class _JobPriorityReviewSetState extends State }else{ levelList = []; } - EasyLoading.dismiss(); }); - + EasyLoading.dismiss(); + refreshController.finishRefresh(); } void setJobReadLevel(int studentId,int level) async{ @@ -131,12 +131,12 @@ class _JobPriorityReviewSetState extends State child: EasyRefresh( firstRefresh: true, taskIndependence: true, - enableControlFinishLoad: true, - enableControlFinishRefresh: true, - // emptyWidget: data.isEmpty ? const MyEmptyWidget() : null, controller: refreshController, header: MaterialHeader(), footer: TaurusFooter(), + onRefresh: () async{ + getReadLevel(); + }, child: levelList.length>0?isPadFlag?GridView(gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 2, mainAxisSpacing: 10.r, diff --git a/marking_app/lib/pages/homework_correction/job_report.dart b/marking_app/lib/pages/homework_correction/job_report.dart index 7600cdd..100c2cb 100644 --- a/marking_app/lib/pages/homework_correction/job_report.dart +++ b/marking_app/lib/pages/homework_correction/job_report.dart @@ -23,10 +23,12 @@ part 'job_report.g.dart'; /// 作业报告 class JobReport extends StatefulWidget { final int id; - final String uniqueId; + final int? schoolId; + final int? gradeId; + final String? className; final String title; - const JobReport({required this.id, required this.title,required this.uniqueId, super.key}); + const JobReport({required this.id, required this.title,this.schoolId,this.gradeId,this.className, super.key}); @override State createState() => _JobReportState(); diff --git a/marking_app/lib/pages/homework_correction/job_student_group.dart b/marking_app/lib/pages/homework_correction/job_student_group.dart index 4337ee4..3cc6bb4 100644 --- a/marking_app/lib/pages/homework_correction/job_student_group.dart +++ b/marking_app/lib/pages/homework_correction/job_student_group.dart @@ -53,6 +53,7 @@ class _JobStudentGroupState extends State with CommonMixin { } }); + refreshController.finishRefresh(); } @override @@ -81,14 +82,14 @@ class _JobStudentGroupState extends State with CommonMixin { body: Padding( padding: EdgeInsets.only(top: 15.r, left: 14.r, right: 14.r), child: EasyRefresh( - firstRefresh: true, + firstRefresh: false, taskIndependence: true, - enableControlFinishLoad: true, - enableControlFinishRefresh: true, - // emptyWidget: data.isEmpty ? const MyEmptyWidget() : null, controller: refreshController, header: MaterialHeader(), footer: TaurusFooter(), + onRefresh: () async{ + getStudentGroups(); + }, child: studentGroups != null && studentGroups.length > 0 ? isPadFlag?GridView( gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( diff --git a/marking_app/lib/routes/RouterManager.dart b/marking_app/lib/routes/RouterManager.dart index 31e0d05..b1f0997 100644 --- a/marking_app/lib/routes/RouterManager.dart +++ b/marking_app/lib/routes/RouterManager.dart @@ -184,8 +184,10 @@ class RouterManager { static final _jobReportPageHandler = Handler(handlerFunc: (BuildContext? context, Map> params) { int id = int.parse(params['id']![0]); String title = params['title']![0]; - String uniqueId = params['uniqueId']![0]; - return JobReport(id: id, title: title,uniqueId:uniqueId); + int schoolId = int.parse(params['schoolId']![0]); + int gradeId = int.parse(params['gradeId']![0]); + String className = params['className']![0]; + return JobReport(id: id, title: title,schoolId:schoolId,gradeId:gradeId,className:className); }); // 作业报告页面