diff --git a/marking_app/lib/common/model/event_bus/jobs/job_do_synchro_tab.dart b/marking_app/lib/common/model/event_bus/jobs/job_do_synchro_tab.dart index c08bc4f..5144183 100644 --- a/marking_app/lib/common/model/event_bus/jobs/job_do_synchro_tab.dart +++ b/marking_app/lib/common/model/event_bus/jobs/job_do_synchro_tab.dart @@ -1,3 +1,4 @@ +import 'package:collection/collection.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:marking_app/common/model/job/job_page_tab.dart'; @@ -14,14 +15,21 @@ class JobDoSynchroTab extends Object { Map toJson() => _$JobDoSynchroTabToJson(this); /// 当前tab下一个tab的pageIndex - int? getNextPageIndex([int? indexLocated]) { - if (indexLocated == null) return null; - return indexLocated == tabs.length - 1 ? null : tabs[indexLocated + 1].pageIndex; + int? getNextPageIndex([int? pageIndex]) { + if (pageIndex == null) return null; + var _index = tabs.indexWhere((e) => e.pageIndex == pageIndex); + if (_index == -1) return null; + + return _index == tabs.length - 1 ? null : tabs[_index + 1].pageIndex; } /// 当前tab上一个tab的pageIndex - int? getPreviousPageIndex([int? indexLocated]) { - if (indexLocated == null) return null; - return indexLocated == 0 ? null : tabs[indexLocated - 1].pageIndex; + int? getPreviousPageIndex([int? pageIndex]) { + if (pageIndex == null) return null; + var _index = tabs.indexWhere((e) => e.pageIndex == pageIndex); + if (_index == -1) return null; + pageIndex = _index == 0 ? null : tabs[_index - 1].pageIndex; + print('这是上一页的数据:${pageIndex}'); + return pageIndex; } } diff --git a/marking_app/lib/pages/homework_correction/do_papers_job.dart b/marking_app/lib/pages/homework_correction/do_papers_job.dart index 8199917..6353e57 100644 --- a/marking_app/lib/pages/homework_correction/do_papers_job.dart +++ b/marking_app/lib/pages/homework_correction/do_papers_job.dart @@ -579,8 +579,8 @@ class _EexamPaperAndScoringViewState extends ConsumerState