diff --git a/marking_app/lib/pages/homework_correction/pages/job_list_participate_in_class.dart b/marking_app/lib/pages/homework_correction/pages/job_list_participate_in_class.dart index f8eb5c2..682db5a 100644 --- a/marking_app/lib/pages/homework_correction/pages/job_list_participate_in_class.dart +++ b/marking_app/lib/pages/homework_correction/pages/job_list_participate_in_class.dart @@ -266,7 +266,14 @@ class _JobListParticipateInClassState extends State w } // 收藏夹 - void bookmarks(MarkingTasks task) {} + void bookmarks(MarkingTasks task) { + RouterManager.router.navigateTo( + context, + RouterManager.jobFavoritePagePath + + '?className=${Uri.encodeComponent(task.className)}&jobId=${widget.jobId}&schoolId=${task.dpcSchoolId}&gradeId=${task.dpcGradeId}', + transition: getTransition(), + ); + } // 数据快查 void quickDataCheck(MarkingTasks task) { @@ -279,7 +286,6 @@ class _JobListParticipateInClassState extends State w // 查看作业报告 void jobViewReport(MarkingTasks task) { - print('这个歌.............'); RouterManager.router.navigateTo( context, RouterManager.jobReportPagePath + @@ -622,7 +628,7 @@ class TabletEndCompleted extends StatelessWidget { color: Color.fromRGBO(244, 244, 244, 1), borderRadius: BorderRadius.circular(20.r), child: InkWell( - onTap: () async {}, + onTap: () => bookmarks(taskItem), borderRadius: BorderRadius.circular(8.r), child: Container( alignment: Alignment.center, @@ -809,7 +815,7 @@ class MobileEndCompleted extends StatelessWidget { color: Color.fromRGBO(244, 244, 244, 1), borderRadius: BorderRadius.circular(20.r), child: InkWell( - onTap: () async {}, + onTap: () => bookmarks(task), borderRadius: BorderRadius.circular(8.r), child: Container( alignment: Alignment.center, @@ -990,7 +996,7 @@ Widget $itemDataViewOfPad( color: Color.fromRGBO(244, 244, 244, 1), borderRadius: BorderRadius.circular(20.r), child: InkWell( - onTap: () async {}, + onTap: () => bookmarks(task), borderRadius: BorderRadius.circular(8.r), child: Container( alignment: Alignment.center, @@ -1051,7 +1057,7 @@ Widget $itemDataViewOfPad( color: Color.fromRGBO(244, 244, 244, 1), borderRadius: BorderRadius.circular(20.r), child: InkWell( - onTap: () async {}, + onTap: () => bookmarks(task), borderRadius: BorderRadius.circular(8.r), child: Container( alignment: Alignment.center, @@ -1242,7 +1248,7 @@ Widget $itemDataView( color: Color.fromRGBO(244, 244, 244, 1), borderRadius: BorderRadius.circular(20.r), child: InkWell( - onTap: () async {}, + onTap: () => bookmarks(task), borderRadius: BorderRadius.circular(8.r), child: Container( alignment: Alignment.center, @@ -1303,7 +1309,7 @@ Widget $itemDataView( color: Color.fromRGBO(244, 244, 244, 1), borderRadius: BorderRadius.circular(20.r), child: InkWell( - onTap: () async {}, + onTap: () => bookmarks(task), borderRadius: BorderRadius.circular(8.r), child: Container( alignment: Alignment.center, diff --git a/marking_app/lib/routes/RouterManager.dart b/marking_app/lib/routes/RouterManager.dart index b5bcd33..31d5cc0 100644 --- a/marking_app/lib/routes/RouterManager.dart +++ b/marking_app/lib/routes/RouterManager.dart @@ -17,6 +17,7 @@ import 'package:marking_app/pages/homework_correction/do_papers_job_exam.dart'; import 'package:marking_app/pages/homework_correction/job_priority_review_set.dart'; import 'package:marking_app/pages/homework_correction/job_report.dart'; import 'package:marking_app/pages/homework_correction/job_student_group.dart'; +import 'package:marking_app/pages/homework_correction/pages/job_favorite.dart'; import 'package:marking_app/pages/homework_correction/pages/job_list_participate_in_class.dart'; import 'package:marking_app/pages/homework_correction/review_job.dart'; import 'package:marking_app/pages/homework_correction/quick_check_personal.dart'; @@ -59,6 +60,8 @@ class RouterManager { static const String jobExamPagePath = '/job/exam/index'; // 作业 ==> 列表 ==> 参与班级 static const String jobListParticipateInClassPath = '/job/list/participateInClass'; + // 作业 ==> 收藏页面 + static const String jobFavoritePagePath = '/job/favorite/index'; static const String reportClassTeacherPath = 'report/details/reportClassTeacher'; static const String reportSubjectTeacherPath = 'report/details/reportSubjectTeacher'; @@ -193,7 +196,7 @@ class RouterManager { gradeId = int.parse(params['gradeId']![0]); } String? className = params['className']?[0]; - return JobReport(id: id, title: title,schoolId:schoolId,gradeId:gradeId,className:className); + return JobReport(id: id, title: title, schoolId: schoolId, gradeId: gradeId, className: className); }); // 作业报告页面 @@ -290,19 +293,28 @@ class RouterManager { //优先配置 static final _jobPriorityReviewSetPageHandler = Handler( - handlerFunc: (BuildContext? context, Map> params){ + handlerFunc: (BuildContext? context, Map> params) { String groupId = params['groupId']![0]; - return JobPriorityReviewSet(groupId:groupId); + return JobPriorityReviewSet(groupId: groupId); }, ); //学生分组 static final _jobStudentGroupPageHandler = Handler( - handlerFunc: (BuildContext? context, Map> params){ + handlerFunc: (BuildContext? context, Map> params) { return JobStudentGroup(); }, ); - + //作业收藏页面 + static final _jobFavoritePagePathHandler = Handler( + handlerFunc: (BuildContext? context, Map> params) { + int jobId = int.parse(params['jobId']![0]); + int gradeId = int.parse(params['gradeId']![0]); + int schoolId = int.parse(params['schoolId']![0]); + String className = params['className']![0]; + return JobFavorite(jobId: jobId, gradeId: gradeId, schoolId: schoolId, className: className); + }, + ); // 开始阅卷页面 // static final _doMarkingPapers = Handler(handlerFunc: (BuildContext? context, Map> params) => MarkingPapers()); @@ -343,8 +355,10 @@ class RouterManager { router.define(quickDataCheckPath, handler: _quickDataCheckPageHandler, transitionType: TransitionType.material); router.define(quickCheckPersonalPath, handler: _quickCheckPersonalPageHandler, transitionType: TransitionType.material); - router.define(jobPriorityReviewSetPath, handler: _jobPriorityReviewSetPageHandler, transitionType: TransitionType.material); + router.define(jobPriorityReviewSetPath, + handler: _jobPriorityReviewSetPageHandler, transitionType: TransitionType.material); router.define(jobStudentGroupPath, handler: _jobStudentGroupPageHandler, transitionType: TransitionType.material); + router.define(jobFavoritePagePath, handler: _jobFavoritePagePathHandler, transitionType: TransitionType.material); // getTransition()