.gitignore

@@ -211,6 +211,3 @@ marking_app/lib/common/model/job/job_fav_student.g.dart
 marking_app/lib/common/model/job/job_data_report.g.dart
 marking_app/lib/common/model/job/job_student_history.g.dart
 marking_app/lib/pages/homework_correction/job_personal_detail.g.dart
-marking_app/lib/common/model/event_bus/jobs/job_do_papers_submit_check_switch_bus.g.dart
-marking_app/lib/common/model/event_bus/jobs/job_do_synchro_tab.g.dart
-marking_app/lib/pages/homework_correction/widget/top_count.g.dart

marking_app/lib/common/model/event_bus/jobs/job_do_papers_submit_check_switch_bus.dart

@@ -1,12 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-
-part 'job_do_papers_submit_check_switch_bus.g.dart';
-
-@JsonSerializable()
-class JobDoPapersSubmitCheckSwitchBus extends Object {
-  JobDoPapersSubmitCheckSwitchBus();
-
-  factory JobDoPapersSubmitCheckSwitchBus.fromJson(Map<String, dynamic> srcJson) => _$JobDoPapersSubmitCheckSwitchBusFromJson(srcJson);
-
-  Map<String, dynamic> toJson() => _$JobDoPapersSubmitCheckSwitchBusToJson(this);
-}

marking_app/lib/common/model/event_bus/jobs/job_do_synchro_tab.dart

@@ -1,27 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-import 'package:marking_app/common/model/job/job_page_tab.dart';
-
-part 'job_do_synchro_tab.g.dart';
-
-@JsonSerializable()
-class JobDoSynchroTab extends Object {
-  List<JobPageTab> tabs;
-
-  JobDoSynchroTab(this.tabs);
-
-  factory JobDoSynchroTab.fromJson(Map<String, dynamic> srcJson) => _$JobDoSynchroTabFromJson(srcJson);
-
-  Map<String, dynamic> 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;
-  }
-
-  /// 当前tab上一个tab的pageIndex
-  int? getPreviousPageIndex([int? indexLocated]) {
-    if (indexLocated == null) return null;
-    return indexLocated == 0 ? null : tabs[indexLocated - 1].pageIndex;
-  }
-}

marking_app/lib/common/model/job/job_report_model.dart

@@ -48,9 +48,6 @@ class JobReportModel extends Object {
   @JsonKey(name: 'studentAnswerInfos')
   List<StudentAnswerInfos> studentAnswerInfos;
 
-  @JsonKey(name: 'overallInfos')
-  Map<String,overallInfo> overallInfos;
-
   @JsonKey(name: 'overallTitles')
   List<OverallTitles> overallTitles;
 
@@ -69,14 +66,6 @@ class JobReportModel extends Object {
   @JsonKey(name: 'validStudentNames')
   List<String> validStudentNames;
 
-  @JsonKey(name: 'noAnswerStudents')
-  List<AnswerOkStudents>? noAnswerStudents;
-
-  @JsonKey(name: 'allCorrectStudents')
-  List<AnswerOkStudents>? allCorrectStudents;
-
-  @JsonKey(name: 'validStudents')
-  List<AnswerOkStudents>? validStudents;
 
   // 前端自定义 -- 全对学生
   @JsonKey(name: 'allpairsStudents')
@@ -109,16 +98,12 @@ class JobReportModel extends Object {
     this.knowledgeInfos,
     this.questionAnswerInfos,
     this.studentAnswerInfos,
-    this.overallInfos,
     this.overallTitles,
       this.kgReport,
       this.zgReport,
       this.noAnswerStudentNames,
       this.allCorrectStudentNames,
       this.validStudentNames,
-      this.noAnswerStudents,
-      this.allCorrectStudents,
-      this.validStudents,
       [
     this.allpairsStudents,
     this.passStudents,
@@ -399,20 +384,7 @@ class Details extends Object {
   @JsonKey(name: 'answerOkStudentNames')
   List<String> answerOkStudentNames;
 
-  @JsonKey(name: 'noAnswerStudents')
+  Details(this.questionNo,this.questionId,this.partName,this.questionType,this.validRate,
-  List<AnswerOkStudents>? noAnswerStudents;
-
-  @JsonKey(name: 'answerOkStudents')
-  List<AnswerOkStudents>? answerOkStudents;
-
-  @JsonKey(name: 'answerNgStudents')
-  List<AnswerOkStudents>? answerNgStudents;
-
-  @JsonKey(name: 'priorityStudents')
-  List<AnswerOkStudents>? priorityStudents;
-
-  Details(this.questionNo,this.questionId,this.partName,this.questionType,this.validRate,  this.noAnswerStudents,
-      this.answerOkStudents,this.answerNgStudents,this.priorityStudents,
       this.validCount,this.correctRate,this.questionAnswer,this.questionPicture,this.priorityGeneral,
       this.priorityStudentNames,this.answerNgStudentNames,this.noAnswerStudentNames,this.answerOkStudentNames);
 
@@ -421,38 +393,3 @@ class Details extends Object {
   Map<String, dynamic> toJson() => _$DetailsToJson(this);
 
 }
-
-
-@JsonSerializable()
-class overallInfo extends Object {
-
-  @JsonKey(name: 'count')
-  int count;
-
-  @JsonKey(name: 'students')
-  List<AnswerOkStudents> students;
-
-  overallInfo(this.count,this.students,);
-
-  factory overallInfo.fromJson(Map<String, dynamic> srcJson) => _$overallInfoFromJson(srcJson);
-
-  Map<String, dynamic> toJson() => _$overallInfoToJson(this);
-
-}
-
-@JsonSerializable()
-class AnswerOkStudents extends Object {
-
-  @JsonKey(name: 'id')
-  int id;
-
-  @JsonKey(name: 'name')
-  String name;
-
-  AnswerOkStudents(this.id,this.name,);
-
-  factory AnswerOkStudents.fromJson(Map<String, dynamic> srcJson) => _$AnswerOkStudentsFromJson(srcJson);
-
-  Map<String, dynamic> toJson() => _$AnswerOkStudentsToJson(this);
-
-}

marking_app/lib/common/model/job/marking_text_question_job_tab_params.dart

@@ -18,20 +18,17 @@ class MarkingTextQuestionJobTabParams extends Object {
   @JsonKey(name: 'studentId')
   int? studentId;
 
-  @JsonKey(name: 'defaultFirst')
-  bool? isDefaultFirst;
-
   MarkingTextQuestionJobTabParams({
     required this.taskId,
     required this.pageIndex,
-    this.isDefaultFirst,
     this.paperId,
     this.studentId,
     this.nextPageIndex,
     this.previousPageIndex,
   });
 
-  factory MarkingTextQuestionJobTabParams.fromJson(Map<String, dynamic> srcJson) => _$MarkingTextQuestionJobTabParamsFromJson(srcJson);
+  factory MarkingTextQuestionJobTabParams.fromJson(Map<String, dynamic> srcJson) =>
+      _$MarkingTextQuestionJobTabParamsFromJson(srcJson);
 
   Map<String, dynamic> toJson() => _$MarkingTextQuestionJobTabParamsToJson(this);
 }

marking_app/lib/components/ReturnToHomepage.dart

@@ -5,8 +5,7 @@ import 'package:marking_app/utils/anti_shake_throttling.dart';
 
 // 返回首页
 class ReturnToHomepage extends StatelessWidget {
-  final Color? bgColor;
+  const ReturnToHomepage({super.key});
-  const ReturnToHomepage({super.key,this.bgColor = const Color.fromRGBO(135, 135, 135, 1)});
 
   @override
   Widget build(BuildContext context) {
@@ -17,7 +16,7 @@ class ReturnToHomepage extends StatelessWidget {
       child: Container(
         padding: EdgeInsets.only(right: 4.5.w),
         alignment: Alignment.center,
-        child: Icon(Icons.home_rounded, size: 22.sp, color: bgColor),
+        child: Icon(Icons.home_rounded, size: 22.sp, color: Color.fromRGBO(135, 135, 135, 1)),
       ),
     );
   }

marking_app/lib/pages/homework_correction/do_papers_job.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:convert';
 
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
@@ -11,8 +10,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:marking_app/common/mixin/common.dart';
 import 'package:marking_app/common/model/common/base_structure_result.dart';
 import 'package:marking_app/common/model/event_bus/jobs/job_do_papers_student_bus.dart';
-import 'package:marking_app/common/model/event_bus/jobs/job_do_papers_submit_check_switch_bus.dart';
-import 'package:marking_app/common/model/event_bus/jobs/job_do_synchro_tab.dart';
 import 'package:marking_app/common/model/job/job_concerned_with_student.dart';
 import 'package:marking_app/common/model/job/job_concerned_with_student_params.dart';
 import 'package:marking_app/common/model/job/job_do_marking_status_info.dart';
@@ -25,7 +22,6 @@ import 'package:marking_app/pages/common/event_bus_mixin.dart';
 import 'package:marking_app/pages/homework_correction/components/new_version_of_homework/bottom_annotation_switch_job.dart';
 import 'package:marking_app/pages/homework_correction/eventBus/marking_text_question_job_tab_params_bus.dart';
 import 'package:marking_app/pages/homework_correction/providers/drawing_provider.dart';
-import 'package:marking_app/routes/RouterManager.dart';
 import 'package:marking_app/utils/index.dart';
 
 // utils
@@ -151,6 +147,7 @@ class ReviewStatusInfo extends HookWidget with CommonMixin {
     if (doMarkingInfo.value == null) return Container();
     return InkWell(
       onTap: () async {
+        print('点击了...');
         List<JobConcernedWithStudent>? students = await getStudents();
         if (students == null) return;
         students = students..sort((e, e1) => e.studentName.compareTo(e1.studentName));
@@ -231,18 +228,17 @@ Widget $dropdownBoxSwitchStudentsOrTypeView(BuildContext context, {required Func
   UseSwitchStudentAndType _useSwitchStudentAndType = UseSwitchStudentAndType.use(); // 学生和试卷状态
 
   // 当前tab改变时
-  useValueChanged<List<JobPageTab>?, String>(_useSwitchStudentAndType.tabs.value, (_, __) {
+  useValueChanged<JobPageTab?, String>(_useSwitchStudentAndType.currentTab.value, (_, __) {
-    _useSwitchStudentAndType.eventFire(model: JobDoSynchroTab(_useSwitchStudentAndType.tabs.value));
-  });
-
-  // 当前tab改变时
-  useValueChanged<JobPageTab?, String>(_useSwitchStudentAndType.currentTab.value, (_oldValue, __) {
     var thePageIndex = _useSwitchStudentAndType.currentTab.value?.pageIndex;
     JobDoPapersStudentBus? studentBus = _useSwitchStudentAndType.studentBusInfo.value;
     if (studentBus != null && studentBus.pageIndex == thePageIndex) return; // 获取试卷详情数据 定位到对应学生的数据 无需再通知详情获取数据
     if (thePageIndex != null) {
       _useSwitchStudentAndType.getDataForStudents(taskId: taskId, pageIndex: thePageIndex);
-      _useSwitchStudentAndType.eventFire(model: MarkingTextQuestionJobTabParamsBus(taskId, thePageIndex));
+      int indexLocated = _useSwitchStudentAndType.tabs.value.indexWhere((element) => element.pageIndex == thePageIndex);
+      _useSwitchStudentAndType.eventFire(
+          model: MarkingTextQuestionJobTabParamsBus(taskId, thePageIndex,
+              nextPageIndex: _useSwitchStudentAndType.getNextPageIndex(indexLocated),
+              previousPageIndex: _useSwitchStudentAndType.getPreviousPageIndex(indexLocated)));
     }
   });
   useValueChanged<JobConcernedWithStudent?, String>(_useSwitchStudentAndType.currentStudent.value, (oldData, __) {
@@ -251,8 +247,15 @@ Widget $dropdownBoxSwitchStudentsOrTypeView(BuildContext context, {required Func
     if (studentBus != null && studentBus.studentId == studentId) return; // 获取试卷详情数据 定位到对应学生的数据 无需再通知详情获取数据
 
     var thePageIndex = _useSwitchStudentAndType.currentTab.value?.pageIndex;
-    if (thePageIndex != null) {
+    if (thePageIndex != null) // 通知详情数据
-      _useSwitchStudentAndType.eventFire(model: MarkingTextQuestionJobTabParamsBus(taskId, thePageIndex, studentId: studentId));
+    {
+      int indexLocated = _useSwitchStudentAndType.tabs.value.indexWhere((element) => element.pageIndex == thePageIndex);
+      _useSwitchStudentAndType.eventFire(
+        model: MarkingTextQuestionJobTabParamsBus(taskId, thePageIndex,
+            studentId: studentId,
+            nextPageIndex: _useSwitchStudentAndType.getNextPageIndex(indexLocated),
+            previousPageIndex: _useSwitchStudentAndType.getPreviousPageIndex(indexLocated)),
+      );
     }
   });
 
@@ -286,24 +289,6 @@ Widget $dropdownBoxSwitchStudentsOrTypeView(BuildContext context, {required Func
             _useSwitchStudentAndType.currentTab.value =
                 _useSwitchStudentAndType.tabs.value.firstWhere((element) => moldeParams.pageIndex == element.pageIndex);
             break;
-          case JobDoPapersSubmitCheckSwitchBus: // 提交后切换试题通知
-            var _currentTab = _useSwitchStudentAndType.currentTab.value;
-            var _pageIndex = _currentTab?.pageIndex;
-            if (_currentTab == null || _pageIndex == null) return;
-            var params = MarkingTextQuestionJobTabParamsBus(taskId, _pageIndex);
-            if (_currentTab.finishCount + 1 == _currentTab.total) {
-              var _currentTabNew =
-                  _useSwitchStudentAndType.tabs.value.firstWhereOrNull((e) => e.pageIndex != _currentTab.pageIndex && e.finishCount != e.total);
-              // 如果全部都已经批阅完成就不需要跳转到不必要得批阅试题
-              if (_currentTabNew != null) params.pageIndex = _currentTabNew.pageIndex;
-            }
-            var _theCurrentPage = _useSwitchStudentAndType.tabs.value.firstWhereOrNull((element) => element.pageIndex == _pageIndex);
-            if (_theCurrentPage != null) {
-              _theCurrentPage.finishCount += 1;
-              _useSwitchStudentAndType.tabs.value = _useSwitchStudentAndType.tabs.value.map((e) => JobPageTab.fromJson(e.toJson())).toList();
-            }
-            _useSwitchStudentAndType.eventFire(model: params);
-            break;
           default:
         }
       },
@@ -312,6 +297,9 @@ Widget $dropdownBoxSwitchStudentsOrTypeView(BuildContext context, {required Func
       _useSwitchStudentAndType.eventCancel();
     };
   }, []);
+
+  var _currentTab = _useSwitchStudentAndType.currentTab.value;
+
   return Container(
     padding: EdgeInsets.only(bottom: 2.r, left: 12.r, right: 12.r),
     decoration: BoxDecoration(
@@ -360,7 +348,7 @@ Widget $dropdownBoxSwitchStudentsOrTypeView(BuildContext context, {required Func
         ),
         Expanded(flex: 1, child: SizedBox()),
         Expanded(
-          flex: 4,
+          flex: 5,
           child: Container(
             padding: EdgeInsets.only(left: 10.w),
             decoration: BoxDecoration(
@@ -401,8 +389,7 @@ Widget $dropdownBoxSwitchStudentsOrTypeView(BuildContext context, {required Func
             crossAxisAlignment: CrossAxisAlignment.center,
             mainAxisAlignment: MainAxisAlignment.end,
             children: [
-              if (_useSwitchStudentAndType.isFinish.value &&
+              if (_useSwitchStudentAndType.isFinish.value && _currentTab?.finishCount != _currentTab?.total)
-                  _useSwitchStudentAndType.tabs.value.firstWhereOrNull((e) => e.finishCount < e.total) != null)
                 Expanded(
                   child: Row(
                     mainAxisSize: MainAxisSize.min,
@@ -414,10 +401,10 @@ Widget $dropdownBoxSwitchStudentsOrTypeView(BuildContext context, {required Func
                         onTap: () => easyThrottle(
                           'DO_PAPERS_JOB_CONTINUE_TO_REVIEW',
                           () {
-                            var _currentTabNew = _useSwitchStudentAndType.tabs.value.firstWhere((e) => e.finishCount < e.total);
+                            var _pageIndex = _useSwitchStudentAndType.currentTab.value?.pageIndex;
-                            _useSwitchStudentAndType.eventFire(
+                            if (_pageIndex == null) return;
-                              model: MarkingTextQuestionJobTabParamsBus(taskId, _currentTabNew.pageIndex),
+
-                            );
+                            _useSwitchStudentAndType.eventFire(model: MarkingTextQuestionJobTabParamsBus(taskId, _pageIndex));
                           },
                         ),
                         child: quickText(
@@ -431,30 +418,6 @@ Widget $dropdownBoxSwitchStudentsOrTypeView(BuildContext context, {required Func
                     ],
                   ),
                 ),
-              Expanded(
-                child: InkWell(
-                  onTap: () => easyThrottle('DO_PAPERS_JOB_HISTORICAL_HOMEWORK', () {
-                    JobConcernedWithStudent? _studentModel = _useSwitchStudentAndType.currentStudent.value;
-                    if (_studentModel == null) return;
-                    String url =
-                        '${RouterManager.jobPersonalDetailPath}?studentId=${_studentModel.studentId}&studentName=${Uri.encodeComponent(_studentModel.studentName)}';
-                    RouterManager.router.navigateTo(context, url, transition: getTransition());
-                  }),
-                  child: Row(
-                    crossAxisAlignment: CrossAxisAlignment.end,
-                    children: [
-                      Icon(Icons.location_history, size: 12.sp, color: Color.fromRGBO(104, 103, 103, 1)),
-                      SizedBox(width: 1.w),
-                      quickText(
-                        '历史作业',
-                        size: 10.sp,
-                        decoration: TextDecoration.underline,
-                        color: Theme.of(context).primaryColor.withOpacity(0.8),
-                      ),
-                    ],
-                  ),
-                ),
-              ),
               Stack(
                 alignment: const FractionalOffset(0.52, 0.24),
                 children: [
@@ -466,6 +429,12 @@ Widget $dropdownBoxSwitchStudentsOrTypeView(BuildContext context, {required Func
                   quickText('优先', size: 4.sp, color: Colors.white),
                 ],
               ),
+              SizedBox(width: 1.2.w),
+              quickText(
+                '优先批阅',
+                size: 10.sp,
+                color: _useSwitchStudentAndType.isFirst.value ? Color.fromRGBO(76, 199, 147, 1) : Color.fromRGBO(164, 164, 164, 1),
+              ),
             ],
           ),
           // InkWell(
@@ -522,9 +491,7 @@ class ExamPaperAndScoringView extends StatefulHookConsumerWidget {
 class _EexamPaperAndScoringViewState extends ConsumerState<ExamPaperAndScoringView> with EventBusMixin, CommonMixin {
   final GlobalKey<JobPictureOverviewState> scaffoldKeyPictureOverview = GlobalKey<JobPictureOverviewState>();
   Future<MarkingTextQuestionJob?>? _future; // 考试试卷
-  MarkingTextQuestionJob? theJobData;
   bool firstLoading = true;
-  JobDoSynchroTab? synchroTabs;
   late RemoveListener _doJobObtainGradingDataProviderListener; // 批注关闭监听
 
   @override
@@ -538,23 +505,15 @@ class _EexamPaperAndScoringViewState extends ConsumerState<ExamPaperAndScoringVi
     eventOn(callback: (eventVal) {
       switch (eventVal.runtimeType) {
         case MarkingTextQuestionJobTabParamsBus:
-          var theEventVal = eventVal as MarkingTextQuestionJobTabParamsBus;
+          MarkingTextQuestionJobTabParamsBus theEventVal = eventVal as MarkingTextQuestionJobTabParamsBus;
-          bool? isDefaultFirst;
-          if (theJobData != null) {
-            isDefaultFirst = theJobData!.pageIndex < theEventVal.pageIndex;
-          }
           ref.read(doJobObtainGradingDataProvider.notifier).setVal(MarkingTextQuestionJobTabParams(
                 pageIndex: theEventVal.pageIndex,
                 taskId: theEventVal.taskId,
                 studentId: theEventVal.studentId,
                 previousPageIndex: theEventVal.previousPageIndex,
                 nextPageIndex: theEventVal.nextPageIndex,
-                isDefaultFirst: isDefaultFirst,
               ));
           break;
-        case JobDoSynchroTab:
-          synchroTabs = eventVal as JobDoSynchroTab;
-          break;
         default:
       }
     });
@@ -577,10 +536,9 @@ class _EexamPaperAndScoringViewState extends ConsumerState<ExamPaperAndScoringVi
       BaseStructureResult<MarkingTextQuestionJob> _result = await _client.getJobTabOfExam(params);
       if (_result.success) {
         var jobDetails = _result.data;
-        theJobData = jobDetails;
         if (jobDetails != null) {
-          jobDetails.previousPageIndex = synchroTabs?.getPreviousPageIndex(jobDetails.pageIndex - 1);
+          jobDetails.previousPageIndex = params.previousPageIndex;
-          jobDetails.nextPageIndex = synchroTabs?.getNextPageIndex(jobDetails.pageIndex - 1);
+          jobDetails.nextPageIndex = params.nextPageIndex;
           // 触发学生下拉选中
           try {
             // 清空已有数据
@@ -618,7 +576,6 @@ class _EexamPaperAndScoringViewState extends ConsumerState<ExamPaperAndScoringVi
         pageIndex: jobData.pageIndex,
         nextPageIndex: jobData.nextPageIndex,
         previousPageIndex: jobData.previousPageIndex,
-        isDefaultFirst: true,
       );
       if (model.paperId == 0 && jobData.nextPageIndex != null) {
         // 切换题型页面
@@ -635,7 +592,6 @@ class _EexamPaperAndScoringViewState extends ConsumerState<ExamPaperAndScoringVi
       paperId: jobData.prevId,
       nextPageIndex: jobData.nextPageIndex,
       previousPageIndex: jobData.previousPageIndex,
-      isDefaultFirst: false,
     );
     if (model.paperId == 0 && jobData.previousPageIndex != null) {
       model.paperId = null;
@@ -671,6 +627,8 @@ class _EexamPaperAndScoringViewState extends ConsumerState<ExamPaperAndScoringVi
                         final double containerHeight = constraints.maxHeight; // 展示区域总宽度
 
                         if (jobData == null) return Container(); // 没有试题展示缩略图
+
+                        // print('容器宽度：${containerWidth};容器高度：${containerHeight}');
                         return Stack(
                           children: [
                             JobPictureOverview(
@@ -742,10 +700,12 @@ class _EexamPaperAndScoringViewState extends ConsumerState<ExamPaperAndScoringVi
                   child: (jobData?.questions ?? []).isEmpty
                       ? null
                       : $ExamPaperAndScoringKeyboardView(
-                          data: jobData,
+                          data: jobData!,
                           questions: questions,
                           toNextQuestionCall: () => switchTestQuestions(jobData: jobData),
-                          switchQuestionTypes: () => eventFire(model: JobCheckSwitchingQuestionTabBus(jobData.pageIndex)),
+                          switchQuestionTypes: () {
+                            eventFire(model: JobCheckSwitchingQuestionTabBus(jobData.pageIndex));
+                          },
                           viewHomeworkNotes: (JobReviewQuestions subJobQuestion) {
                             var _theBusModel =
                                 JobNotesViewBus(taskId: jobData.taskId, paperId: jobData.paperId, questionNo: subJobQuestion.questionNo);
@@ -796,8 +756,7 @@ Widget $examPaperAndScoringKeyboardView(
         return;
       }
       // 有下一道题 自动跳转下一道题
-      // toNextQuestionCall();
+      toNextQuestionCall();
-      _useDoScoring.eventFire(model: JobDoPapersSubmitCheckSwitchBus());
     });
   }
 
@@ -865,12 +824,7 @@ Widget $examPaperAndScoringKeyboardView(
                           if (question.accuracy > 0)
                             Padding(
                               padding: EdgeInsets.only(bottom: 1.5.h),
-                              child: quickText(
+                              child: quickText('正确率：${question.accuracy}%', size: 8.sp, color: Colors.white, align: TextAlign.end),
-                                '正确率：${getDoubleRemoveZero(question.accuracy, question.accuracy.toString())}%',
-                                size: 8.sp,
-                                color: Colors.white,
-                                align: TextAlign.end,
-                              ),
                             )
                         ],
                       ),
@@ -1073,7 +1027,7 @@ Widget $examPaperAndScoringKeyboardView(
 }
 
 @swidget
-Widget $materialBtn({required Widget child, Color? bgc, Color? splashColor, GestureTapCallback? onTap, BorderRadiusGeometry? borderRadius}) {
+Widget $materialBtn({required Widget child, Color? bgc, Color? splashColor, GestureTapCallback? onTap, BorderRadius? borderRadius}) {
   return Material(
     color: bgc,
     borderRadius: borderRadius,

marking_app/lib/pages/homework_correction/hooks/do_papers_job/use_switch_student_and_type.dart

@@ -82,8 +82,8 @@ class UseSwitchStudentAndType with CommonMixin, EventBusMixin {
     RestClient client = await getClient();
     BaseStructureResult<List<JobPageTab>> result = await client.getJobOfTabs(taskId);
     if (result.success && result.data != null) {
-      tabs.value = result.data!;
       if (synchronization) {
+        tabs.value = result.data!;
         currentTab.value = tabs.value.firstWhere((e) => e.finishCount < e.total, orElse: () => tabs.value[0]);
       }
     } else {
@@ -121,9 +121,38 @@ class UseSwitchStudentAndType with CommonMixin, EventBusMixin {
           exitPromptFlag.value = true;
           return tabJob; // 不跳转
         }
+
         exitCallback();
       } else {
         // 跳转到对于位置
+        /**
+         * 
+        var continueFlag = await showDialog<bool>(
+          context: context,
+          builder: (BuildContext context1) {
+            return AlertDialog(
+              title: quickText('页码跳转提示'),
+              content: Text('当前页：${currentTab.value?.pageIndex} 已批阅完成,是否跳转到页码：${tabJob.pageIndex}继续批阅？'),
+              actions: <Widget>[
+                TextButton(
+                  child: Text('是'),
+                  onPressed: () {
+                    Navigator.of(context1).pop(true);
+                  },
+                ),
+                TextButton(
+                  child: Text('否'),
+                  onPressed: () {
+                    // 在这里处理删除操作
+                    Navigator.of(context1).pop(false);
+                  },
+                ),
+              ],
+            );
+          },
+        );
+        if (continueFlag == null || !continueFlag) return tabJob; // 不跳转
+         */
         tabs.value = tabDatas;
         if (tabJob != null) currentTab.value = tabJob;
         if (tabJob == null && exitPromptFlag.value) ToastUtils.showSuccess('最后一题提交成功');
@@ -133,6 +162,20 @@ class UseSwitchStudentAndType with CommonMixin, EventBusMixin {
     return null;
   }
 
+  /// 当前tab下一个tab的pageIndex
+  int? getNextPageIndex(int? indexLocated) {
+    if (indexLocated == null) indexLocated = currentTab.value?.pageIndex;
+    if (indexLocated == null) return null;
+    return indexLocated == tabs.value.length - 1 ? null : tabs.value[indexLocated + 1].pageIndex;
+  }
+
+  /// 当前tab上一个tab的pageIndex
+  int? getPreviousPageIndex(int? indexLocated) {
+    if (indexLocated == null) indexLocated = currentTab.value?.pageIndex;
+    if (indexLocated == null) return null;
+    return indexLocated == 0 ? null : tabs.value[indexLocated - 1].pageIndex;
+  }
+
   /// 优先批阅 ==> 取消优先批阅
   Future<void> jobPriorityReviewCancel(int jobId) async {
     RestClient _client = await getClient();

marking_app/lib/pages/homework_correction/job_personal_detail.dart

@@ -7,14 +7,12 @@ import 'package:functional_widget_annotation/functional_widget_annotation.dart';
 import 'package:marking_app/common/mixin/common.dart';
 import 'package:marking_app/common/model/common/base_structure_result.dart';
 import 'package:marking_app/common/model/job/job_student_history.dart';
-import 'package:marking_app/components/ReturnToHomepage.dart';
 import 'package:marking_app/pages/homework_correction/widget/personal_detail_topbar.dart';
 import 'package:marking_app/routes/RouterManager.dart';
 import 'package:marking_app/utils/easy_refresh/MyEmptyWidget.dart';
 import 'package:marking_app/utils/index.dart';
 import 'package:marking_app/utils/my_text.dart';
 import 'package:marking_app/utils/request/rest_client.dart';
-import 'package:marking_app/utils/right_home_icon.dart';
 import 'package:percent_indicator/percent_indicator.dart';
 import 'package:syncfusion_flutter_datepicker/datepicker.dart';
 
@@ -90,6 +88,8 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
         }
 
         totalPages = res.data!.pagedList.totalPages;
+        print('dataLists=${dataList.length}');
+        print('totalpages=$totalPages');
       });
     }
 
@@ -110,9 +110,6 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
           icon: Icon(Icons.arrow_back_ios, color: Colors.black),
           onPressed: () => Navigator.of(context).pop(),
         ),
-        actions: [
-          ReturnToHomepage(),
-        ],
         elevation: 0,
       ),
       body: Column(

marking_app/lib/pages/homework_correction/job_priority_review_set.dart

@@ -7,7 +7,6 @@ import 'package:marking_app/common/model/common/base_structure_result.dart';
 import 'package:marking_app/common/model/job/job_level_set_params.dart';
 import 'package:marking_app/common/model/job/job_review_submission.dart';
 import 'package:marking_app/common/model/job/job_student_level.dart';
-import 'package:marking_app/components/ReturnToHomepage.dart';
 import 'package:marking_app/routes/RouterManager.dart';
 import 'package:marking_app/utils/easy_refresh/MyEmptyWidget.dart';
 import 'package:marking_app/utils/index.dart';
@@ -15,10 +14,7 @@ import 'package:marking_app/utils/request/rest_client.dart';
 
 class JobPriorityReviewSet extends StatefulWidget {
   final String groupId;
-  final String title;
+  const JobPriorityReviewSet({Key? key,required this.groupId}) : super(key: key);
-
-  const JobPriorityReviewSet({Key? key, required this.groupId,required this.title})
-      : super(key: key);
 
   @override
   State<JobPriorityReviewSet> createState() => _JobPriorityReviewSetState();
@@ -29,8 +25,6 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
   late final EasyRefreshController refreshController;
   late TabController tabController;
   int tabIndex = 0;
-  List list1 = [];
-  List list2 = [];
   List levelList = [];
   bool isClicking = false;
 
@@ -41,46 +35,31 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
     refreshController = EasyRefreshController();
     tabController =
         TabController(initialIndex: tabIndex, length: 2, vsync: this);
-    getList();
+    getReadLevel();
   }
 
-  void getList() async {
+  void getReadLevel() async{
-    await getReadLevel(1);
+    RestClient _client = await getClient();
-    await getReadLevel(0);
+    BaseStructureResult<List<JobStudentLevel>> res = await _client.getJobReadLevel(widget.groupId,tabIndex == 0?1:0);
-
     setState(() {
-      levelList = [...list1, ...list2];
+      if(res.success){
+        levelList = res.data!;
         isClicking = false;
+      }else{
+        levelList = [];
+      }
     });
     EasyLoading.dismiss();
     refreshController.finishRefresh();
   }
 
-  getReadLevel(int readLevel) async {
-    RestClient _client = await getClient();
-    BaseStructureResult<List<JobStudentLevel>> res =
-        await _client.getJobReadLevel(widget.groupId, readLevel);
-    if (res.success) {
-      if (readLevel == 1) {
-        list1 = res.data!;
-      } else {
-        list2 = res.data!;
-      }
-    } else {
-      if (readLevel == 1) {
-        list1 = [];
-      } else {
-        list2 = [];
-      }
-    }
-  }
-
   void setJobReadLevel(int studentId,int level) async{
     RestClient _client = await getClient();
     JobLevelSetParams params = JobLevelSetParams(studentId, level);
         BaseStructureResult res = await _client.getSetJobReadLevel(params);
         if(res.code == 200){
-      getList();
+          getReadLevel();
+
         }
   }
 
@@ -99,7 +78,7 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
       appBar: AppBar(
         backgroundColor: Colors.white,
         title: Text(
-          widget.title,
+          '优先批阅人配置',
           style: TextStyle(fontSize: 14.sp, color: Color(0xFF333333)),
         ),
         centerTitle: true,
@@ -107,17 +86,12 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
           icon: Icon(Icons.arrow_back_ios, color: Colors.black),
           onPressed: () => Navigator.of(context).pop(),
         ),
-        actions: [
-          ReturnToHomepage(),
-        ],
       ),
       body: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          SizedBox(
+          SizedBox(height: 10.r,),
-            height: 10.r,
+          Container(
-          ),
-          /*   Container(
             padding: EdgeInsets.symmetric(horizontal: 14.r),
             decoration: BoxDecoration(
               border: Border(bottom: BorderSide(width: 1.r,color: Color(0xFFCCCCCC)))
@@ -158,7 +132,7 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
               indicatorSize: TabBarIndicatorSize.label,
                 labelPadding: const EdgeInsets.all(0),
             ),
-          ),*/
+          ),
 
           Expanded(
             child:Padding(
@@ -170,256 +144,159 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
                 header: MaterialHeader(),
                 footer: TaurusFooter(),
                 onRefresh: () async{
-                  getList();
+                  getReadLevel();
                 },
-                child: levelList.length > 0
+                child: levelList.length>0?isPadFlag?GridView(gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-                    ? isPadFlag
-                        ? GridView(
-                            gridDelegate:
-                                SliverGridDelegateWithFixedCrossAxisCount(
                   crossAxisCount: 2,
                   mainAxisSpacing: 10.r,
                   crossAxisSpacing: 10.r,
                   childAspectRatio: 556 / 112,
-                            ),
+                ),children: List.generate(levelList.length, (index) {
-                            children: List.generate(levelList.length, (index) {
                   JobStudentLevel item = levelList[index];
                   return Container(
                     padding: EdgeInsets.symmetric(horizontal: 10.r),
                     decoration: BoxDecoration(
-                                  borderRadius:
+                      borderRadius: BorderRadius.all(Radius.circular(10.r)),
-                                      BorderRadius.all(Radius.circular(10.r)),
                       color: Colors.white,
                     ),
                     child: Row(
-                                  mainAxisAlignment:
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                      MainAxisAlignment.spaceBetween,
                       children: [
-                                    Expanded(
+                        Expanded(child: Text(item.studentName,style: TextStyle(fontSize: 12.sp,color: Color(0xFF6888FD)),)),
-                                        child: Text(
+                       
-                                      item.studentName,
+                        tabIndex == 0?InkWell(
-                                      style: TextStyle(
-                                          fontSize: 12.sp,
-                                          color: Color(0xFF6888FD)),
-                                    )),
-                                    item.readLevel == 1
-                                        ? InkWell(
                           onTap: (){
                             setState(() {
                               isClicking = true;
                             });
-                                              setJobReadLevel(
+                            setJobReadLevel(item.studentGroupDetailId,0);
-                                                  item.studentGroupDetailId, 0);
+                            EasyLoading.show(status: 'loading...');
-                                              EasyLoading.show(
-                                                  status: 'loading...');
                           },
                           child: Container(
                             height: 20.r,
                             width: 70.r,
                             decoration: BoxDecoration(
-                                                borderRadius: BorderRadius.all(
+                              borderRadius: BorderRadius.all(Radius.circular(20.r)),
-                                                    Radius.circular(20.r)),
+                              color: isClicking?Color(0xFFDCE3FF):Color(0xFF6888FD),
-                                                color: isClicking
-                                                    ? Color(0xFFDCE3FF)
-                                                    : Color(0xFF6888FD),
                             ),
                             child: Center(
-                                                child: Text(
+                              child:Text('取消优先',style: TextStyle(fontSize: 10.sp,color: Colors.white),),
-                                                  '取消优先',
-                                                  style: TextStyle(
-                                                      fontSize: 10.sp,
-                                                      color: Colors.white),
                             ),
                           ),
-                                            ),
+                        ):InkWell(
-                                          )
-                                        : InkWell(
                           onTap: (){
                             setState(() {
                               isClicking = true;
                             });
-                                              setJobReadLevel(
+                            setJobReadLevel(item.studentGroupDetailId,1);
-                                                  item.studentGroupDetailId, 1);
+                            EasyLoading.show(status: 'loading...');
-                                              EasyLoading.show(
-                                                  status: 'loading...');
                           },
                           child: Container(
                             height: 20.r,
                             width: 70.r,
                             decoration: BoxDecoration(
-                                                borderRadius: BorderRadius.all(
+                              borderRadius: BorderRadius.all(Radius.circular(20.r)),
-                                                    Radius.circular(20.r)),
+                              color: isClicking?Color(0xFF6888FD):Color(0xFFFFFFFF),
-                                                color: isClicking
+                              border: Border.all(width: 1.r,color: isClicking?Color(0xFFFFFFFF):Color(0xFF6888FD)),
-                                                    ? Color(0xFF6888FD)
-                                                    : Color(0xFFFFFFFF),
-                                                border: Border.all(
-                                                    width: 1.r,
-                                                    color: isClicking
-                                                        ? Color(0xFFFFFFFF)
-                                                        : Color(0xFF6888FD)),
                             ),
                             child: Center(
-                                                child: Text(
+                              child:Text('设为优先',style: TextStyle(fontSize: 10.sp,color: isClicking?Color(0xFFFFFFFF):Color(0xFF6888FD)),),
-                                                  '设为优先',
-                                                  style: TextStyle(
-                                                      fontSize: 10.sp,
-                                                      color: isClicking
-                                                          ? Color(0xFFFFFFFF)
-                                                          : Color(0xFF6888FD)),
                             ),
                           ),
                         ),
-                                          ),
+                        SizedBox(width: 5.r,),
-                                    SizedBox(
-                                      width: 5.r,
-                                    ),
                         InkWell(
                           onTap: (){
-                                        RouterManager.router.navigateTo(context,
+                            RouterManager.router.navigateTo(context, '${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}');
-                                            '${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}');
                           },
                           child: Container(
                             height: 20.r,
                             width: 70.r,
                             decoration: BoxDecoration(
-                                            borderRadius: BorderRadius.all(
+                              borderRadius: BorderRadius.all(Radius.circular(20.r)),
-                                                Radius.circular(20.r)),
                               color: Colors.white,
-                                            border: Border.all(
+                              border: Border.all(width: 1.r,color: Color(0xFFFCA017))
-                                                width: 1.r,
-                                                color: Color(0xFFFCA017))),
-                                        child: Center(
-                                          child: Text(
-                                            '详情',
-                                            style: TextStyle(
-                                                fontSize: 10.sp,
-                                                color: Color(0xFFFCA017)),
                             ),
+                            child: Center(
+                              child: Text('详情',style: TextStyle(fontSize: 10.sp,color: Color(0xFFFCA017)),),
                             ),
                           ),
                         )
                       ],
                     ),
                   );
-                            }),
+                }),):ListView.builder(itemBuilder: (context,index){
-                          )
-                        : ListView.builder(
-                            itemBuilder: (context, index) {
                   JobStudentLevel item = levelList[index];
                   return Container(
-                                padding: EdgeInsets.symmetric(
+                    padding: EdgeInsets.symmetric(vertical:20.r,horizontal: 15.r),
-                                    vertical: 20.r, horizontal: 15.r),
                     margin: EdgeInsets.only(bottom: 15.r),
                     decoration: BoxDecoration(
-                                  borderRadius:
+                      borderRadius: BorderRadius.all(Radius.circular(10.r)),
-                                      BorderRadius.all(Radius.circular(10.r)),
                       color: Colors.white,
                     ),
                     child: Row(
-                                  mainAxisAlignment:
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                      MainAxisAlignment.spaceBetween,
                       children: [
-                                    Expanded(
+                        Expanded(child: Text(item.studentName,style: TextStyle(fontSize: 12.sp,color: Color(0xFF6888FD)),)),
-                                        child: Text(
+                        tabIndex == 0?InkWell(
-                                      item.studentName,
-                                      style: TextStyle(
-                                          fontSize: 12.sp,
-                                          color: Color(0xFF6888FD)),
-                                    )),
-                                    item.readLevel == 1
-                                        ? InkWell(
                           onTap: (){
                             setState(() {
                               isClicking = true;
                             });
-                                              setJobReadLevel(
+                            setJobReadLevel(item.studentGroupDetailId,0);
-                                                  item.studentGroupDetailId, 0);
+                            EasyLoading.show(status: 'loading...');
-                                              EasyLoading.show(
-                                                  status: 'loading...');
                           },
                           child: Container(
                             height: 24.r,
                             width: 82.r,
                             decoration: BoxDecoration(
-                                                borderRadius: BorderRadius.all(
+                              borderRadius: BorderRadius.all(Radius.circular(20.r)),
-                                                    Radius.circular(20.r)),
+                              color: isClicking?Color(0xFFDCE3FF):Color(0xFF6888FD),
-                                                color: isClicking
-                                                    ? Color(0xFFDCE3FF)
-                                                    : Color(0xFF6888FD),
                             ),
                             child: Center(
-                                                child: Text(
+                              child:Text('取消优先',style: TextStyle(fontSize: 10.sp,color: Colors.white),),
-                                                  '取消优先',
-                                                  style: TextStyle(
-                                                      fontSize: 10.sp,
-                                                      color: Colors.white),
                             ),
                           ),
-                                            ),
+                        ):InkWell(
-                                          )
-                                        : InkWell(
                           onTap: (){
-                                              setJobReadLevel(
+                            setJobReadLevel(item.studentGroupDetailId,1);
-                                                  item.studentGroupDetailId, 1);
+                            EasyLoading.show(status: 'loading...');
-                                              EasyLoading.show(
-                                                  status: 'loading...');
                           },
                           child: Container(
                             height: 24.r,
                             width: 82.r,
                             decoration: BoxDecoration(
-                                                borderRadius: BorderRadius.all(
+                              borderRadius: BorderRadius.all(Radius.circular(20.r)),
-                                                    Radius.circular(20.r)),
                               color: Color(0xFFFFFFFF),
-                                                border: Border.all(
+                              border: Border.all(width: 1.r,color: Color(0xFF6888FD)),
-                                                    width: 1.r,
-                                                    color: Color(0xFF6888FD)),
                             ),
                             child: Center(
-                                                child: Text(
+                              child:Text('设为优先',style: TextStyle(fontSize: 10.sp,color: Color(0xFF6888FD)),),
-                                                  '设为优先',
-                                                  style: TextStyle(
-                                                      fontSize: 10.sp,
-                                                      color: Color(0xFF6888FD)),
                             ),
                           ),
                         ),
-                                          ),
+                        SizedBox(width: 5.r,),
-                                    SizedBox(
-                                      width: 5.r,
-                                    ),
                         InkWell(
                           onTap: (){
-                                        RouterManager.router.navigateTo(context,
+                            RouterManager.router.navigateTo(context, '${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}');
-                                            '${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}');
                           },
                           child: Container(
                             height: 20.r,
                             width: 70.r,
                             decoration: BoxDecoration(
-                                            borderRadius: BorderRadius.all(
+                                borderRadius: BorderRadius.all(Radius.circular(20.r)),
-                                                Radius.circular(20.r)),
                                 color: Colors.white,
-                                            border: Border.all(
+                                border: Border.all(width: 1.r,color: Color(0xFFFCA017))
-                                                width: 1.r,
+                            ),
-                                                color: Color(0xFFFCA017))),
                             child: Center(
-                                          child: Text(
+                              child: Text('详情',style: TextStyle(fontSize: 10.sp,color: Color(0xFFFCA017)),),
-                                            '详情',
-                                            style: TextStyle(
-                                                fontSize: 10.sp,
-                                                color: Color(0xFFFCA017)),
-                                          ),
                             ),
                           ),
                         )
                       ],
                     ),
                   );
-                            },
+                },itemCount: levelList.length,):MyEmptyWidget(),
-                            itemCount: levelList.length,
-                          )
-                    : MyEmptyWidget(),
               ),
             ),
           )
@@ -428,3 +305,4 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
     );
   }
 }
+

marking_app/lib/pages/homework_correction/job_report.dart

@@ -8,15 +8,12 @@ import 'package:marking_app/common/model/common/base_structure_result.dart';
 import 'package:marking_app/common/model/job/job_report_join_class.dart';
 import 'package:marking_app/common/model/job/job_report_knowledge_model.dart';
 import 'package:marking_app/common/model/job/job_report_model.dart';
-import 'package:marking_app/components/ReturnToHomepage.dart';
 import 'package:marking_app/pages/homework_correction/widget/report_table.dart';
 import 'package:marking_app/pages/homework_correction/widget/top_count.dart';
-import 'package:marking_app/pages/mainPage.dart';
 import 'package:marking_app/routes/RouterManager.dart';
 import 'package:marking_app/utils/index.dart';
 import 'package:marking_app/utils/my_text.dart';
 import 'package:marking_app/utils/request/rest_client.dart';
-import 'package:marking_app/utils/right_home_icon.dart';
 import 'package:percent_indicator/linear_percent_indicator.dart';
 import 'package:photo_view/photo_view.dart';
 
@@ -255,9 +252,6 @@ class _JobReportState extends State<JobReport> with CommonMixin {
           icon: Icon(Icons.arrow_back_ios, color: Colors.black),
           onPressed: () => Navigator.of(context).pop(),
         ),
-        actions: [
-          ReturnToHomepage(),
-        ],
         /*actions: [
           // 下拉框
           $DropdownSelection(involveClasses, classData, call: (JobReportJoinClass _classData) {
@@ -302,7 +296,7 @@ class _JobReportState extends State<JobReport> with CommonMixin {
               ),
             ),
             //完成率、正确率
-            TopCount(data,classData == null?'':classData!.className,widget.id),
+            TopCount(data,classData == null?'':classData!.className),
             /*  InkWell(
               onTap: (){
                 RouterManager.router.navigateTo(
@@ -351,7 +345,6 @@ class _JobReportState extends State<JobReport> with CommonMixin {
                       bodyList: data.kgReport.details,
                       fixedCols: 1,
                       fixedRows: 1,
-                      jobId: widget.id,
                     ),
                   )
                 ],
@@ -395,7 +388,6 @@ class _JobReportState extends State<JobReport> with CommonMixin {
                       fixedCols: 1,
                       fixedRows: 1,
                       isKG: true,
-                      jobId: widget.id,
                     ),
                   )
                 ],
@@ -408,13 +400,13 @@ class _JobReportState extends State<JobReport> with CommonMixin {
                 margin: EdgeInsets.symmetric(horizontal: 10.r),
                 child: $MasterKnowledgePoint(data.knowledgeInfos, detailKnowledgeCall)),
             // 掌握知识点的情况
-           /* Container(
+            Container(
                 margin: EdgeInsets.symmetric(horizontal: 10.r),
                 child: $OverallPerformance(data.studentCount, data.overallTitles)),
             // 单位时间答题情况
             Container(
                 margin: EdgeInsets.symmetric(horizontal: 10.r),
-                child: $UnitTimeAnsweringSituation(widget.id, data.questionAnswerInfos)),*/
+                child: $UnitTimeAnsweringSituation(widget.id, data.questionAnswerInfos)),
             // 人员数据概况
             Container(
                 margin: EdgeInsets.symmetric(horizontal: 10.r), child: $PersonnelDataOverview(data.studentAnswerInfos)),

marking_app/lib/pages/homework_correction/job_student_group.dart

@@ -7,8 +7,6 @@ import 'package:marking_app/common/mixin/common.dart';
 import 'package:marking_app/common/model/common/base_structure_result.dart';
 import 'package:marking_app/common/model/job/job_student_goups.dart';
 import 'package:marking_app/common/model/user/user_info.dart';
-import 'package:marking_app/components/ReturnToHomepage.dart';
-import 'package:marking_app/pages/homework_correction/widget/student_group_list.dart';
 import 'package:marking_app/routes/RouterManager.dart';
 import 'package:marking_app/utils/easy_refresh/MyEmptyWidget.dart';
 import 'package:marking_app/utils/fast_data.dart';
@@ -58,10 +56,6 @@ class _JobStudentGroupState extends State<JobStudentGroup> with CommonMixin {
     refreshController.finishRefresh();
   }
 
-  void goNextPage(id,title){
-    RouterManager.router.navigateTo(context, '${RouterManager.jobPriorityReviewSetPath}?&groupId=$id&title=${Uri.encodeComponent(title)}',transition: getTransition());
-  }
-
   @override
   void dispose() {
     super.dispose();
@@ -84,9 +78,6 @@ class _JobStudentGroupState extends State<JobStudentGroup> with CommonMixin {
           icon: Icon(Icons.arrow_back_ios, color: Colors.black),
           onPressed: () => Navigator.of(context).pop(),
         ),
-        actions: [
-          ReturnToHomepage(),
-        ],
       ),
       body: Padding(
         padding: EdgeInsets.only(top: 15.r, left: 14.r, right: 14.r),
@@ -99,7 +90,136 @@ class _JobStudentGroupState extends State<JobStudentGroup> with CommonMixin {
           onRefresh: () async{
             getStudentGroups();
           },
-          child: StudentGroupList(studentGroups,goNextPage),
+          child: studentGroups != null && studentGroups.length > 0
+              ? isPadFlag?GridView(
+                  gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+                    crossAxisCount: 2,
+                    mainAxisSpacing: 10.r,
+                    crossAxisSpacing: 10.r,
+                    childAspectRatio: 556 / 112,
+                  ),
+                  children: List.generate(studentGroups.length, (index) {
+                    JobStudentGroups item = studentGroups[index];
+                    String classNames = item.classNames.join("  ");
+                    return InkWell(
+                      onTap: (){
+                        RouterManager.router.navigateTo(context, '${RouterManager.jobPriorityReviewSetPath}?&groupId=${item.groupId}',transition: getTransition());
+                      },
+                      child: Container(
+                        padding: EdgeInsets.symmetric(horizontal: 10.r),
+                        decoration: BoxDecoration(
+                          borderRadius: BorderRadius.all(Radius.circular(10.r)),
+                          color: Colors.white,
+                        ),
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.start,
+                          children: [
+                            Padding(
+                              padding: EdgeInsets.only(right: 8.r),
+                              child: Text(
+                                item.groupName,
+                                style: TextStyle(
+                                    fontSize: 10.sp, color: Color(0xFF6888FD)),
+                              ),
+                            ),
+                            Expanded(
+                              child: Text(
+                                classNames,
+                                style: TextStyle(
+                                  fontSize: 10.sp,
+                                  color: Color(0xFF999999),
+                                  overflow: TextOverflow.ellipsis,
+                                ),
+                                textAlign: TextAlign.end,
+                              ),
+                            ),
+                            Container(
+                              margin: EdgeInsets.only(left: 5.r),
+                              height: 20.r,
+                              width: 55.r,
+                              decoration: BoxDecoration(
+                                borderRadius:
+                                    BorderRadius.all(Radius.circular(20.r)),
+                                color: Color(0xFF6888FD),
+                              ),
+                              child: Center(
+                                child: Text(
+                                  '设置',
+                                  style: TextStyle(
+                                      fontSize: 10.sp, color: Colors.white),
+                                ),
+                              ),
+                            )
+                          ],
+                        ),
+                      ),
+                    );
+                  }),
+                ):ListView.builder(
+            itemBuilder: (context,index){
+              JobStudentGroups item = studentGroups[index];
+              String classNames = item.classNames.join("  ");
+              return Container(
+                padding: EdgeInsets.symmetric(vertical:15.r,horizontal: 10.r),
+                margin: EdgeInsets.only(bottom: 10.r),
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.all(Radius.circular(10.r)),
+                  color: Colors.white,
+                ),
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.start,
+                  children: [
+                    Padding(
+                      padding: EdgeInsets.only(right: 8.r),
+                      child: Text(
+                        item.groupName,
+                        style: TextStyle(
+                            fontSize: 14.sp, color: Color(0xFF6888FD)),
+                      ),
+                    ),
+                    Expanded(
+                      child: Text(
+                        classNames,
+                        style: TextStyle(
+                          fontSize: 12.sp,
+                          color: Color(0xFF999999),
+                          overflow: TextOverflow.ellipsis,
+                        ),
+                        textAlign: TextAlign.end,
+                      ),
+                    ),
+                    InkWell(
+                      onTap: (){
+                        RouterManager.router.navigateTo(context, '${RouterManager.jobPriorityReviewSetPath}?&groupId=${item.groupId}',transition: getTransition());
+                      },
+                      child: Container(
+                        margin: EdgeInsets.only(left: 5.r),
+                        height: 24.r,
+                        width: 55.r,
+                        decoration: BoxDecoration(
+                          borderRadius:
+                          BorderRadius.all(Radius.circular(20.r)),
+                          color: Color(0xFF6888FD),
+                        ),
+                        child: Center(
+                          child: Text(
+                            '设置',
+                            style: TextStyle(
+                                fontSize: 10.sp, color: Colors.white),
+                          ),
+                        ),
+                      ),
+                    )
+                  ],
+                ),
+              );
+            },
+            itemCount: studentGroups.length,
+          )
+              : Padding(
+                padding: EdgeInsets.only(top: MediaQuery.of(context).size.height/2 - 200.r),
+                child: MyEmptyWidget(),
+              ),
         ),
       ),
     );

marking_app/lib/pages/homework_correction/pages/job_favorite.dart

@@ -8,7 +8,6 @@ import 'package:marking_app/common/model/common/base_structure_result.dart';
 import 'package:marking_app/common/model/job/job_fav_student.dart';
 import 'package:marking_app/common/model/job/job_favorite_item_model.dart';
 import 'package:marking_app/common/model/job/job_report_join_class.dart';
-import 'package:marking_app/components/ReturnToHomepage.dart';
 import 'package:marking_app/pages/homework_correction/pages/favorite_student_dialog.dart';
 import 'package:marking_app/utils/easy_refresh/MyEmptyWidget.dart';
 import 'package:marking_app/utils/index.dart';
@@ -200,9 +199,6 @@ class _JobFavoriteState extends State<JobFavorite> with CommonMixin {
         title: quickText('收藏夹'),
         centerTitle: true,
         backgroundColor: Colors.white,
-        actions: [
-          ReturnToHomepage(),
-        ],
       ),
       body: MyFutureBuilder.buildFutureBuilderOfSingleInstance<List<Items>>(
         context,

marking_app/lib/pages/homework_correction/pages/job_list_participate_in_class.dart

@@ -9,7 +9,6 @@ import 'package:marking_app/common/model/job/job_concerned_with_student.dart';
 import 'package:marking_app/common/model/job/job_concerned_with_student_params.dart';
 import 'package:marking_app/common/model/job/job_favorite_model.dart';
 import 'package:marking_app/common/model/job/job_task_item.dart';
-import 'package:marking_app/components/ReturnToHomepage.dart';
 import 'package:marking_app/routes/RouterManager.dart';
 import 'package:marking_app/utils/index.dart';
 import 'package:marking_app/utils/my_text.dart';
@@ -409,9 +408,6 @@ class _JobListParticipateInClassState extends State<JobListParticipateInClass> w
             alignment: Alignment.center,
           ),
           backgroundColor: Colors.white,
-          actions: [
-            ReturnToHomepage(),
-          ],
         ),
         body: RefreshIndicator(
           onRefresh: () async {

marking_app/lib/pages/homework_correction/quick_check_personal.dart

@@ -4,11 +4,9 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:marking_app/common/mixin/common.dart';
 import 'package:marking_app/common/model/common/base_structure_result.dart';
 import 'package:marking_app/common/model/job/job_data_report.dart';
-import 'package:marking_app/components/ReturnToHomepage.dart';
 import 'package:marking_app/pages/homework_correction/widget/student_kg_table.dart';
 import 'package:marking_app/pages/homework_correction/widget/student_zg_table.dart';
 import 'package:marking_app/routes/RouterManager.dart';
-import 'package:marking_app/utils/common_utils.dart';
 import 'package:marking_app/utils/request/rest_client.dart';
 import 'package:marking_app/utils/toast_utils.dart';
 
@@ -73,8 +71,8 @@ class _QuickCheckPersonalState extends State<QuickCheckPersonal>
           onPressed: () => Navigator.of(context).pop(),
         ),
         actions: [
-          ReturnToHomepage(),
+          Title(
-         /* Title(
+
             color: Color(0xFF6888FD),
             child: Container(
               child: InkWell(
@@ -88,7 +86,7 @@ class _QuickCheckPersonalState extends State<QuickCheckPersonal>
               ),
               alignment: Alignment.center,
             ),
-          ),*/
+          ),
 
         ],
       ),
@@ -96,41 +94,6 @@ class _QuickCheckPersonalState extends State<QuickCheckPersonal>
       body: SingleChildScrollView(
         child: Column(
           children: [
-            Padding(
-              padding: EdgeInsets.only(top: 14.r,left: 14.r),
-              child: Row(
-                children: [
-                  InkWell(
-                    onTap: (){
-                      RouterManager.router.navigateTo(context, '${RouterManager.jobPersonalDetailPath}?studentId=${widget.studentId}&studentName=${Uri.encodeComponent(studentInfo!.studentName!)}');
-                    },
-                    child: Container(
-                      width: 93.r,
-                      height: 28.r,
-                      decoration: BoxDecoration(
-                        color: Color(0xFFEAF3FF),
-                        borderRadius: BorderRadius.circular(4.r),
-                      ),
-                      child: Center(
-                        child: Text('历史查询',style: TextStyle(fontSize: 10.r,color: Color(0xFF2080F7)),),
-                      ),
-                    ),
-                  ),
-                  SizedBox(width: 10.r,),
-                  Container(
-                    width: 93.r,
-                    height: 28.r,
-                    decoration: BoxDecoration(
-                      color: Color(0xFFEDFFF7),
-                      borderRadius: BorderRadius.circular(4.r),
-                    ),
-                    child: Center(
-                      child: Text('查看原稿',style: TextStyle(fontSize: 10.r,color: Color(0xFF4CC793)),),
-                    ),
-                  ),
-                ],
-              ),
-            ),
             //客观题
             Container(
               padding: EdgeInsets.symmetric(vertical: 14.r, horizontal: 10.r),

marking_app/lib/pages/homework_correction/quick_data_check.dart

@@ -7,14 +7,12 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:marking_app/common/mixin/common.dart';
 import 'package:marking_app/common/model/common/base_structure_result.dart';
 import 'package:marking_app/common/model/job/job_data_report.dart';
-import 'package:marking_app/components/ReturnToHomepage.dart';
 import 'package:marking_app/pages/homework_correction/widget/quick_data_check_bottom.dart';
 import 'package:marking_app/pages/homework_correction/widget/quick_student_data_table.dart';
 import 'package:marking_app/pages/homework_correction/widget/report_table.dart';
 import 'package:marking_app/utils/easy_refresh/MyEmptyWidget.dart';
 import 'package:marking_app/utils/index.dart';
 import 'package:marking_app/utils/request/rest_client.dart';
-import 'package:marking_app/utils/right_home_icon.dart';
 import 'package:percent_indicator/linear_percent_indicator.dart';
 
 class QuickDataCheckPage extends StatefulWidget {
@@ -151,7 +149,9 @@ class _QuickDataCheckPageState extends State<QuickDataCheckPage>
                     style: TextStyle(fontSize: 14.sp, color: Colors.white),
                   )),
                 )),
-                ReturnToHomepage(bgColor: Colors.white,),
+                SizedBox(
+                  width: 24.r,
+                ),
               ],
             ),
             SizedBox(height: 10.r),
@@ -404,7 +404,6 @@ class _QuickDataCheckPageState extends State<QuickDataCheckPage>
                                   bodyList: jobData!.kgReport.details,
                                   fixedCols: 1,
                                   fixedRows: 1,
-                                  jobId: widget.jobId,
                                 ),
                               )
                             ],
@@ -448,7 +447,6 @@ class _QuickDataCheckPageState extends State<QuickDataCheckPage>
                                   fixedCols: 1,
                                   fixedRows: 1,
                                   isKG: true,
-                                  jobId: widget.jobId,
                                 ),
                               )
                             ],

marking_app/lib/pages/homework_correction/widget/report_table.dart

@@ -2,8 +2,6 @@ import 'package:data_table_2/data_table_2.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart';
-import 'package:marking_app/common/model/job/job_report_model.dart';
-import 'package:marking_app/routes/RouterManager.dart';
 import 'package:marking_app/utils/easy_refresh/MyEmptyWidget.dart';
 import 'package:marking_app/utils/index.dart';
 import 'package:marking_app/utils/toast_utils.dart';
@@ -15,13 +13,11 @@ class ReportTable extends StatefulWidget {
   final int? fixedRows;
   final int? fixedCols;
   final bool? isKG;
-  final int jobId;
 
   const ReportTable({
     Key? key,
     required this.headList,
     required this.bodyList,
-    required this.jobId,
     this.fixedCols = 0,
     this.fixedRows = 0,
     this.isKG = false,
@@ -37,11 +33,7 @@ class _ReportTableState extends State<ReportTable> {
   bool _sortAscending = true;
 
   void showPeopleListDialog(
-      {required BuildContext context,
+  {required BuildContext context, required String title, required String questionNo,required List arr,List? dcList}) {
-      required String title,
-      required String questionNo,
-      required List arr,
-      List? dcList}) {
     print(dcList);
     showDialog(
         context: context,
@@ -88,52 +80,21 @@ class _ReportTableState extends State<ReportTable> {
                       ),
                     ],
                   ),
-                  SizedBox(
+                  SizedBox(height: 15.r,),
-                    height: 15.r,
+                  dcList != null?Row(
-                  ),
-                  dcList != null
-                      ? Row(
                     children: [
                       Expanded(
                           flex: 1,
-                                child: Center(
+                          child: Center(child: Text('未作答人',style: TextStyle(fontSize: 12.sp,color: Color(0xFF6A6A6A)),))),
-                                    child: Text(
-                                  '未作答人',
-                                  style: TextStyle(
-                                      fontSize: 12.sp,
-                                      color: Color(0xFF6A6A6A)),
-                                ))),
                       Expanded(
                           flex: 1,
-                                child: Center(
+                          child: Center(child: Text('答对人数',style: TextStyle(fontSize: 12.sp,color: Color(0xFF6A6A6A)),))),
-                                    child: Text(
-                                  '答对人数',
-                                  style: TextStyle(
-                                      fontSize: 12.sp,
-                                      color: Color(0xFF6A6A6A)),
-                                ))),
                       Expanded(
                         flex: 1,
-                                child: Center(
+                          child: Center(child: Text('答错人',style: TextStyle(fontSize: 12.sp,color: Color(0xFF6A6A6A)),))),
-                                    child: Text(
-                                  '答错人',
-                                  style: TextStyle(
-                                      fontSize: 12.sp,
-                                      color: Color(0xFF6A6A6A)),
-                                ))),
                     ],
-                        )
+                  ):Padding(padding: EdgeInsets.only(left: 15.r),child: Text(title,style: TextStyle(fontSize: 12.sp,color: Color(0xFF6A6A6A)),),),
-                      : Padding(
+                  SizedBox(height: 5.r,),
-                          padding: EdgeInsets.only(left: 15.r),
-                          child: Text(
-                            title,
-                            style: TextStyle(
-                                fontSize: 12.sp, color: Color(0xFF6A6A6A)),
-                          ),
-                        ),
-                  SizedBox(
-                    height: 5.r,
-                  ),
                   if(dcList != null)
                     Expanded(
                       child: ListView.builder(
@@ -142,89 +103,39 @@ class _ReportTableState extends State<ReportTable> {
                           var item = arr[index];
                           return Container(
                             padding: EdgeInsets.symmetric(vertical: 5.r),
-                            color:
+                            color: index.isOdd?Colors.white:Color(0xFFF0F0F0),
-                                index.isOdd ? Colors.white : Color(0xFFF0F0F0),
                             child: Row(
                               children: [
                                 Expanded(
                                     flex:1,
-                                    child: InkWell(
+                                    child: Center(child: Text(item['noAnswerStudentNames'],style: TextStyle(fontSize: 12.sp,color: Color(0xFF323232)),))),
-                                        onTap: () {
-                                          goQuickCheckPersonalPath(
-                                              item['noAnswerStudents'].id);
-                                        },
-                                        child: Center(
-                                            child: Text(
-                                          item['noAnswerStudents'].name,
-                                          style: TextStyle(
-                                              fontSize: 12.sp,
-                                              color: Color(0xFF323232)),
-                                        )))),
                                 Expanded(
                                     flex:1,
-                                    child: InkWell(
+                                    child: Center(child: Text(item['answerOkStudentNames'],style: TextStyle(fontSize: 12.sp,color: Color(0xFF323232)),))),
-                                        onTap: () {
-                                          goQuickCheckPersonalPath(
-                                              item['answerOkStudents'].id);
-                                        },
-                                        child: Center(
-                                            child: Text(
-                                          item['answerOkStudents'].name,
-                                          style: TextStyle(
-                                              fontSize: 12.sp,
-                                              color: Color(0xFF323232)),
-                                        )))),
                                 Expanded(
                                     flex:1,
-                                    child: InkWell(
+                                    child: Center(child: Text(item['answerNgStudentNames'],style: TextStyle(fontSize: 12.sp,color: Color(0xFF323232)),))),
-                                        onTap: () {
+
-                                          goQuickCheckPersonalPath(
-                                              item['answerNgStudents'].id);
-                                        },
-                                        child: Center(
-                                            child: Text(
-                                          item['answerNgStudents'].name,
-                                          style: TextStyle(
-                                              fontSize: 12.sp,
-                                              color: Color(0xFF323232)),
-                                        )))),
                               ],
                             ),
                           );
-                        },
+                        },itemCount: arr.length,),
-                        itemCount: arr.length,
-                      ),
                     )
+
                   else
-                    arr.length > 0
+                    arr.length>0?Expanded(
-                        ? Expanded(
                     child: ListView.builder(
                       shrinkWrap: true,
                       itemBuilder: (context,index){
-                                AnswerOkStudents item = arr[index];
+                        var item = arr[index];
-                                return InkWell(
+                      return Container(
-                                  onTap: () {
+                        padding: EdgeInsets.symmetric(vertical: 5.r,horizontal: 15.r),
-                                    goQuickCheckPersonalPath(item.id);
+                        color: index.isOdd?Colors.white:Color(0xFFF0F0F0),
-                                  },
+                        child: Text(item,style: TextStyle(fontSize: 12.sp,color: Color(0xFF323232)),),
-                                  child: Container(
-                                    padding: EdgeInsets.symmetric(
-                                        vertical: 5.r, horizontal: 15.r),
-                                    color: index.isOdd
-                                        ? Colors.white
-                                        : Color(0xFFF0F0F0),
-                                    child: Text(
-                                      item.name,
-                                      style: TextStyle(
-                                          fontSize: 12.sp,
-                                          color: Color(0xFF323232)),
-                                    ),
-                                  ),
                       );
-                              },
+                    },itemCount: arr.length,),
-                              itemCount: arr.length,
+                  ):MyEmptyWidget()
-                            ),
+
-                          )
-                        : MyEmptyWidget()
                 ],
               ),
             ),
@@ -232,71 +143,34 @@ class _ReportTableState extends State<ReportTable> {
         });
   }
 
-  void goQuickCheckPersonalPath(id) {
+  void zdHandle( BuildContext context, String title, String questionNo,List noAnswerStudentNames,List answerNgStudentNames, List answerOkStudentNames){
-    if (id != -1) {
-      RouterManager.router.navigateTo(
-        context,
-        RouterManager.quickCheckPersonalPath +
-            '?jobId=${widget.jobId}&studentId=$id',
-        transition: getTransition(),
-      );
-    }
-  }
-
-  void zdHandle(BuildContext context, String title, String questionNo,
-      List noAnswerStudents, List answerNgStudents, List answerOkStudents) {
      List list = [];
-    AnswerOkStudents student = AnswerOkStudents(-1, '-');
+
-    if (noAnswerStudents.length > answerNgStudents.length &&
+     if(noAnswerStudentNames.length>answerNgStudentNames.length && noAnswerStudentNames.length>answerOkStudentNames.length){
-        noAnswerStudents.length > answerOkStudents.length) {
+       for(int i = 0;i<noAnswerStudentNames.length;i++){
-      for (int i = 0; i < noAnswerStudents.length; i++) {
+         var obj = {'noAnswerStudentNames':noAnswerStudentNames[i],'answerNgStudentNames':answerNgStudentNames.length>i?answerNgStudentNames[i]:'-',
-        var obj = {
+         'answerOkStudentNames':answerOkStudentNames.length>i?answerOkStudentNames[i]:'-'};
-          'noAnswerStudents': noAnswerStudents[i],
-          'answerNgStudents':
-              answerNgStudents.length > i ? answerNgStudents[i] : student,
-          'answerOkStudents':
-              answerOkStudents.length > i ? answerOkStudents[i] : student
-        };
          list.add(obj);
        }
-    } else if (answerNgStudents.length > noAnswerStudents.length &&
+     }else if(answerNgStudentNames.length>noAnswerStudentNames.length && answerNgStudentNames.length>answerOkStudentNames.length){
-        answerNgStudents.length > answerOkStudents.length) {
+       for(int i = 0;i<answerNgStudentNames.length;i++){
-      for (int i = 0; i < answerNgStudents.length; i++) {
+         var obj = {'noAnswerStudentNames':noAnswerStudentNames.length>i?noAnswerStudentNames[i]:'-','answerNgStudentNames':answerNgStudentNames[i],
-        var obj = {
+           'answerOkStudentNames':answerOkStudentNames.length>i?answerOkStudentNames[i]:'-'};
-          'noAnswerStudents':
-              noAnswerStudents.length > i ? noAnswerStudents[i] : student,
-          'answerNgStudents': answerNgStudents[i],
-          'answerOkStudents':
-              answerOkStudents.length > i ? answerOkStudents[i] : student
-        };
          list.add(obj);
        }
-    } else if (answerOkStudents.length > noAnswerStudents.length &&
+     }else if(answerOkStudentNames.length>noAnswerStudentNames.length && answerOkStudentNames.length>answerNgStudentNames.length){
-        answerOkStudents.length > answerNgStudents.length) {
+       for(int i = 0;i<answerOkStudentNames.length;i++){
-      for (int i = 0; i < answerOkStudents.length; i++) {
+         var obj = {'noAnswerStudentNames':noAnswerStudentNames.length>i?noAnswerStudentNames[i]:'-','answerNgStudentNames':answerNgStudentNames.length>i?answerNgStudentNames[i]:'-',
-        var obj = {
+           'answerOkStudentNames':answerOkStudentNames[i]};
-          'noAnswerStudents':
-              noAnswerStudents.length > i ? noAnswerStudents[i] : student,
-          'answerNgStudents':
-              answerNgStudents.length > i ? answerNgStudents[i] : student,
-          'answerOkStudents': answerOkStudents[i]
-        };
          list.add(obj);
        }
      }
 
-    showPeopleListDialog(
+    showPeopleListDialog(context:context, title:title, questionNo:questionNo,arr:list,dcList:[]);
-        context: context,
-        title: title,
-        questionNo: questionNo,
-        arr: list,
-        dcList: []);
   }
 
-  void dcHandle(
+  void dcHandle( BuildContext context, String title, String questionNo,List arr){
-      BuildContext context, String title, String questionNo, List arr) {
+    showPeopleListDialog(context:context, title:title, questionNo:questionNo,arr: arr);
-    showPeopleListDialog(
-        context: context, title: title, questionNo: questionNo, arr: arr);
   }
 
   DataRow _getRow(int index, [Color? color]) {
@@ -322,8 +196,8 @@ class _ReportTableState extends State<ReportTable> {
         )),
         DataCell(InkWell(
           onTap: () {
-            zdHandle(context, '作答人数', item.questionNo, item.noAnswerStudents,
+            zdHandle(context, '作答人数', item.questionNo,item.noAnswerStudentNames,item.answerNgStudentNames,item.answerOkStudentNames);
-                item.answerNgStudents, item.answerOkStudents);
+
           },
           child: Center(
             child: Padding(
@@ -389,8 +263,7 @@ class _ReportTableState extends State<ReportTable> {
         DataCell(InkWell(
           onTap: (){
             List<String> parts = item.priorityGeneral.split('人');
-            dcHandle(context, '${parts[1]}人', item.questionNo,
+            dcHandle(context, '${parts[1]}人', item.questionNo,item.priorityStudentNames);
-                item.priorityStudents);
           },
           child: Center(
             child: Padding(
@@ -449,9 +322,7 @@ class _ReportTableState extends State<ReportTable> {
         fixedCornerColor: Colors.grey[400],
         minWidth: widget.headList.length > 6
             ? 80.r * widget.headList.length
-            : isPadFlag
+            : isPadFlag?MediaQuery.of(context).size.width:85.r * widget.headList.length,
-                ? MediaQuery.of(context).size.width
-                : 85.r * widget.headList.length,
         fixedTopRows: widget.fixedRows!,
         fixedLeftColumns: widget.fixedCols!,
         sortColumnIndex: _sortColumnIndex,
@@ -469,10 +340,8 @@ class _ReportTableState extends State<ReportTable> {
                 ? 40.r
                 : widget.headList.length > 6
                     ? 80.r
-                    : isPadFlag
+                    : isPadFlag?(MediaQuery.of(context).size.width - 8.r) /
-                        ? (MediaQuery.of(context).size.width - 8.r) /
+                        widget.headList.length:85.r,
-                            widget.headList.length
-                        : 85.r,
           );
         }),
         rows: List<DataRow>.generate(widget.bodyList.length,

marking_app/lib/pages/homework_correction/widget/student_group_list.dart

@@ -1,149 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:marking_app/common/model/job/job_student_goups.dart';
-import 'package:marking_app/utils/easy_refresh/MyEmptyWidget.dart';
-import 'package:marking_app/utils/index.dart';
-
-class StudentGroupList extends StatelessWidget {
-  final List studentGroups;
-  final Function goNextPage;
-  const StudentGroupList(this.studentGroups,this.goNextPage,{Key? key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return studentGroups != null && studentGroups.length > 0
-        ? isPad()?GridView(
-      shrinkWrap: true,
-      gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-        crossAxisCount: 2,
-        mainAxisSpacing: 10.r,
-        crossAxisSpacing: 10.r,
-        childAspectRatio: 556 / 112,
-      ),
-      children: List.generate(studentGroups.length, (index) {
-        JobStudentGroups item = studentGroups[index];
-        String classNames = item.classNames.join("  ");
-        return InkWell(
-          onTap: (){
-            goNextPage(item.groupId,item.groupName);
-            // RouterManager.router.navigateTo(context, '${RouterManager.jobPriorityReviewSetPath}?&groupId=${item.groupId}',transition: getTransition());
-          },
-          child: Container(
-            padding: EdgeInsets.symmetric(horizontal: 10.r),
-            decoration: BoxDecoration(
-              borderRadius: BorderRadius.all(Radius.circular(10.r)),
-              color: Colors.white,
-            ),
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.start,
-              children: [
-                Padding(
-                  padding: EdgeInsets.only(right: 8.r),
-                  child: Text(
-                    item.groupName,
-                    style: TextStyle(
-                        fontSize: 10.sp, color: Color(0xFF6888FD)),
-                  ),
-                ),
-                Expanded(
-                  child: Text(
-                    classNames,
-                    style: TextStyle(
-                      fontSize: 10.sp,
-                      color: Color(0xFF999999),
-                      overflow: TextOverflow.ellipsis,
-                    ),
-                    textAlign: TextAlign.end,
-                  ),
-                ),
-                Container(
-                  margin: EdgeInsets.only(left: 5.r),
-                  height: 20.r,
-                  width: 55.r,
-                  decoration: BoxDecoration(
-                    borderRadius:
-                    BorderRadius.all(Radius.circular(20.r)),
-                    color: Color(0xFF6888FD),
-                  ),
-                  child: Center(
-                    child: Text(
-                      '详情',
-                      style: TextStyle(
-                          fontSize: 10.sp, color: Colors.white),
-                    ),
-                  ),
-                )
-              ],
-            ),
-          ),
-        );
-      }),
-    ):ListView.builder(
-      shrinkWrap: true,
-      itemBuilder: (context,index){
-        JobStudentGroups item = studentGroups[index];
-        String classNames = item.classNames.join("  ");
-        return Container(
-          padding: EdgeInsets.symmetric(vertical:15.r,horizontal: 10.r),
-          margin: EdgeInsets.only(bottom: 10.r),
-          decoration: BoxDecoration(
-            borderRadius: BorderRadius.all(Radius.circular(10.r)),
-            color: Colors.white,
-          ),
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.start,
-            children: [
-              Padding(
-                padding: EdgeInsets.only(right: 8.r),
-                child: Text(
-                  item.groupName,
-                  style: TextStyle(
-                      fontSize: 14.sp, color: Color(0xFF6888FD)),
-                ),
-              ),
-              Expanded(
-                child: Text(
-                  classNames,
-                  style: TextStyle(
-                    fontSize: 12.sp,
-                    color: Color(0xFF999999),
-                    overflow: TextOverflow.ellipsis,
-                  ),
-                  textAlign: TextAlign.end,
-                ),
-              ),
-              InkWell(
-                onTap: (){
-                  goNextPage(item.groupId,item.groupName);
-                  // RouterManager.router.navigateTo(context, '${RouterManager.jobPriorityReviewSetPath}?&groupId=${item.groupId}',transition: getTransition());
-                },
-                child: Container(
-                  margin: EdgeInsets.only(left: 5.r),
-                  height: 24.r,
-                  width: 55.r,
-                  decoration: BoxDecoration(
-                    borderRadius:
-                    BorderRadius.all(Radius.circular(20.r)),
-                    color: Color(0xFF6888FD),
-                  ),
-                  child: Center(
-                    child: Text(
-                      '详情',
-                      style: TextStyle(
-                          fontSize: 10.sp, color: Colors.white),
-                    ),
-                  ),
-                ),
-              )
-            ],
-          ),
-        );
-      },
-      itemCount: studentGroups.length,
-    )
-        : Padding(
-      padding: EdgeInsets.only(top: MediaQuery.of(context).size.height/2 - 200.r),
-      child: MyEmptyWidget(),
-    );
-  }
-}

marking_app/lib/pages/homework_correction/widget/student_zg_table.dart

@@ -2,7 +2,6 @@ import 'package:data_table_2/data_table_2.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:marking_app/common/model/job/job_data_report.dart';
-import 'package:marking_app/utils/common_utils.dart';
 import 'package:marking_app/utils/easy_refresh/MyEmptyWidget.dart';
 import 'package:photo_view/photo_view.dart';
 
@@ -81,7 +80,7 @@ class _StudentZgTableState extends State<StudentZgTable> {
         DataCell(Center(
           child: Padding(
             padding: EdgeInsets.symmetric(horizontal: 5.r),
-            child: Text(CommonUtils.second2HMS(item.useTime!),
+            child: Text(item.useTime.toString(),
                 style: TextStyle(fontSize: 12.sp, color: Color(0xFF525252))),
           ),
         )),

marking_app/lib/pages/homework_correction/widget/top_count.dart

@@ -1,28 +1,24 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:functional_widget_annotation/functional_widget_annotation.dart';
 import 'package:marking_app/common/model/job/job_report_model.dart';
-import 'package:marking_app/routes/RouterManager.dart';
 import 'package:marking_app/utils/easy_refresh/MyEmptyWidget.dart';
 import 'package:marking_app/utils/index.dart';
 
-part 'top_count.g.dart';
-
 class TopCount extends StatelessWidget {
   final JobReportModel data;
   final String className;
-  final int jobId;
+  const TopCount(this.data,this.className,{Key? key}) : super(key: key);
 
-  const TopCount(this.data, this.className, this.jobId, {Key? key}) : super(key: key);
+  void showStudentListDialog(
-
+      {required BuildContext context, required String title,required List arr}) {
-  void showStudentListDialog({required BuildContext context, required String title, required List arr}) {
     showDialog(
         context: context,
         builder: (BuildContext context) {
           return AlertDialog(
             // insetPadding: EdgeInsets.symmetric(vertical: 20.r,horizontal: 20.r),
             contentPadding: EdgeInsets.all(20.r),
-            shape: RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(15.r))),
+            shape: RoundedRectangleBorder(
+                borderRadius: BorderRadius.all(Radius.circular(15.r))),
             content: SizedBox(
               width: MediaQuery.of(context).size.width * 0.7,
               height: MediaQuery.of(context).size.height * 0.7,
@@ -32,43 +28,29 @@ class TopCount extends StatelessWidget {
                   Center(
                     child: Text(
                       className + title,
-                      style: TextStyle(fontSize: 15.sp, color: Color(0xFF3C3C3C), fontWeight: FontWeight.w500),
+                      style: TextStyle(
+                          fontSize: 15.sp,
+                          color: Color(0xFF3C3C3C),
+                          fontWeight: FontWeight.w500),
                     ),
                   ),
                   SizedBox(
                     height: 5.r,
                   ),
-                  SizedBox(
+                  SizedBox(height: 15.r,),
-                    height: 15.r,
+                    arr.length>0?Expanded(
-                  ),
-                  arr.length > 0
-                      ? Expanded(
                       child: ListView.builder(
                         shrinkWrap: true,
                         itemBuilder: (context,index){
-                              AnswerOkStudents item = arr[index];
+                          var item = arr[index];
-                              return InkWell(
+                          return Container(
-                                onTap: () {
-                                  RouterManager.router.navigateTo(
-                                    context,
-                                    RouterManager.quickCheckPersonalPath + '?jobId=$jobId&studentId=${item.id}',
-                                    transition: getTransition(),
-                                  );
-                                },
-                                child: Container(
                             padding: EdgeInsets.symmetric(vertical: 5.r,horizontal: 15.r),
                             color: index.isOdd?Colors.white:Color(0xFFF0F0F0),
-                                  child: Text(
+                            child: Text(item,style: TextStyle(fontSize: 12.sp,color: Color(0xFF323232)),),
-                                    item.name,
-                                    style: TextStyle(fontSize: 12.sp, color: Color(0xFF323232)),
-                                  ),
-                                ),
                           );
-                            },
+                        },itemCount: arr.length,),
-                            itemCount: arr.length,
+                    ):MyEmptyWidget()
-                          ),
+
-                        )
-                      : MyEmptyWidget()
                 ],
               ),
             ),
@@ -76,12 +58,11 @@ class TopCount extends StatelessWidget {
         });
   }
 
+
   @override
   Widget build(BuildContext context) {
-    double leftWidth = (MediaQuery.of(context).size.width - 40.r) * 0.7 / 3;
-    double rightWidth = (MediaQuery.of(context).size.width - 40.r) * 0.3 / 2;
     return Container(
-      padding: EdgeInsets.symmetric(vertical: 10.r, horizontal: 10.r),
+      padding: EdgeInsets.symmetric(vertical: 20.r),
       margin: EdgeInsets.symmetric(vertical: 10.r, horizontal: 10.r),
       decoration: BoxDecoration(
         color: Colors.white,
@@ -90,96 +71,16 @@ class TopCount extends StatelessWidget {
       child: Column(
         children: [
           Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              InkWell(
-                onTap: () {
-                  showStudentListDialog(context: context, title: '未提交作业学生', arr: data.noAnswerStudents!);
-                },
-                child: leftContainer(context, count: data.noAnswerCount, name: '未提交', nameColor: Color(0xFFD92F2F), bgColor: Color(0xFFEEEEEE)),
-              ),
-              InkWell(
-                onTap: () {
-                  showStudentListDialog(context: context, title: '已提交作业学生', arr: data.validStudents!);
-                },
-                child: leftContainer(context, count: data.validCount, name: '已提交', nameColor: Color(0xFF4CC793), bgColor: Color(0xFFF5F5F5)),
-              ),
-              InkWell(
-                onTap: () {
-                  showStudentListDialog(context: context, title: '全对作业学生', arr: data.allCorrectStudents!);
-                },
-                child: leftContainer(context, count: data.allCorrect, name: '全对', nameColor: Color(0xFFFF9800), bgColor: Color(0xFFEEEEEE)),
-              ),
-              Container(
-                height: 92.r,
-                width: rightWidth,
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  children: [
-                    Expanded(
-                        child: InkWell(
-                      onTap: () {
-                        showStudentListDialog(context: context, title: '优等作业学生', arr: data.overallInfos['优']!.students);
-                      },
-                      child: rightContainer(
-                        count: data.overallInfos['优']!.count,
-                        bgColor: Color(0xFF56FFB8),
-                        nameColor: Color(0xFF009254),
-                        name: '优',
-                      ),
-                    )),
-                    Expanded(
-                        child: InkWell(
-                      onTap: () {
-                        showStudentListDialog(context: context, title: '中等作业学生', arr: data.overallInfos['中']!.students);
-                      },
-                      child:
-                          rightContainer(count: data.overallInfos['中']!.count, bgColor: Color(0xFFD3FF93), nameColor: Color(0xFF3F6605), name: '中'),
-                    )),
-                  ],
-                ),
-              ),
-              Container(
-                height: 92.r,
-                width: rightWidth,
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  children: [
-                    Expanded(
-                        child: InkWell(
-                      onTap: () {
-                        showStudentListDialog(context: context, title: '良等作业学生', arr: data.overallInfos['良']!.students);
-                      },
-                      child:
-                          rightContainer(count: data.overallInfos['良']!.count, bgColor: Color(0xFFFFC38C), nameColor: Color(0xFFD36500), name: '良'),
-                    )),
-                    Expanded(
-                        child: InkWell(
-                      onTap: () {
-                        showStudentListDialog(context: context, title: '差等作业学生', arr: data.overallInfos['差']!.students);
-                      },
-                      child:
-                          rightContainer(count: data.overallInfos['差']!.count, bgColor: Color(0xFFFF9D94), nameColor: Color(0xFFD12616), name: '差'),
-                    )),
-                  ],
-                ),
-              )
-            ],
-          ),
-          /* Row(
             mainAxisAlignment: MainAxisAlignment.spaceEvenly,
             children: [
               InkWell(
                 onTap: (){
-                  showStudentListDialog(
+                  showStudentListDialog(context:context,title: '未提交作业学生',arr: data.noAnswerStudentNames);
-                      context: context,
-                      title: '未提交作业学生',
-                      arr: data.noAnswerStudentNames);
                 },
                 child: Container(
                   width: 81.r,
-                  padding:
+                  padding: EdgeInsets.symmetric(
-                      EdgeInsets.symmetric(vertical: 10.r, horizontal: 6.r),
+                      vertical: 10.r, horizontal: 6.r),
                   decoration: BoxDecoration(
                     border: Border.all(
                         width: 1.r,
@@ -190,9 +91,7 @@ class TopCount extends StatelessWidget {
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      SizedBox(
+                      SizedBox(height: 5.r,),
-                        height: 5.r,
-                      ),
                       Row(
                         crossAxisAlignment: CrossAxisAlignment.end,
                         children: [
@@ -226,15 +125,12 @@ class TopCount extends StatelessWidget {
               ),
               InkWell(
                 onTap: (){
-                  showStudentListDialog(
+                  showStudentListDialog(context:context,title: '已提交作业学生',arr: data.validStudentNames);
-                      context: context,
-                      title: '已提交作业学生',
-                      arr: data.validStudentNames);
                 },
                 child: Container(
                   width: 81.r,
-                  padding:
+                  padding: EdgeInsets.symmetric(
-                      EdgeInsets.symmetric(vertical: 10.r, horizontal: 6.r),
+                      vertical: 10.r, horizontal: 6.r),
                   decoration: BoxDecoration(
                     border: Border.all(
                         width: 1.r,
@@ -245,9 +141,7 @@ class TopCount extends StatelessWidget {
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      SizedBox(
+                      SizedBox(height: 5.r,),
-                        height: 5.r,
-                      ),
                       Row(
                         crossAxisAlignment: CrossAxisAlignment.end,
                         children: [
@@ -281,15 +175,12 @@ class TopCount extends StatelessWidget {
               ),
               InkWell(
                 onTap: (){
-                  showStudentListDialog(
+                  showStudentListDialog(context:context,title: '全对作业学生',arr: data.allCorrectStudentNames);
-                      context: context,
-                      title: '全对作业学生',
-                      arr: data.allCorrectStudentNames);
                 },
                 child: Container(
                   width: 81.r,
-                  padding:
+                  padding: EdgeInsets.symmetric(
-                      EdgeInsets.symmetric(vertical: 10.r, horizontal: 6.r),
+                      vertical: 10.r, horizontal: 6.r),
                   decoration: BoxDecoration(
                     border: Border.all(
                         width: 1.r,
@@ -300,9 +191,7 @@ class TopCount extends StatelessWidget {
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      SizedBox(
+                      SizedBox(height: 5.r,),
-                        height: 5.r,
-                      ),
                       Row(
                         crossAxisAlignment: CrossAxisAlignment.end,
                         children: [
@@ -338,7 +227,7 @@ class TopCount extends StatelessWidget {
           ),
           SizedBox(
             height: 15.r,
-          ),*/
+          ),
           Padding(
               padding: EdgeInsets.symmetric(horizontal: 15.r),
               child: GridView.builder(
@@ -384,12 +273,16 @@ class TopCount extends StatelessWidget {
                                     height: 28.r,
                                     decoration: BoxDecoration(
                                         color: Colors.white,
-                                    border: Border.all(color: bgColor, width: 1.r, style: BorderStyle.solid),
+                                        border: Border.all(
+                                            color: bgColor,
+                                            width: 1.r,
+                                            style: BorderStyle.solid),
                                         borderRadius: BorderRadius.circular(14.r)),
                                     child: Center(
                                         child: Text(
                                           item.title,
-                                  style: TextStyle(color: bgColor, fontSize: 12.r),
+                                          style: TextStyle(
+                                              color: bgColor, fontSize: 12.r),
                                         )),
                                   ),
                                 ],
@@ -400,11 +293,15 @@ class TopCount extends StatelessWidget {
                             ),
                             Text(
                               item.count.toString(),
-                          style: TextStyle(fontSize: 20.sp, color: Color(0xFF595959)),
+                              style: TextStyle(
+                                  fontSize: 20.sp,
+                                  color: Color(0xFF595959)),
                             ),
                             Text(
                               '人',
-                          style: TextStyle(fontSize: 14.sp, color: Color(0xFF595959)),
+                              style: TextStyle(
+                                  fontSize: 14.sp,
+                                  color: Color(0xFF595959)),
                             ),
                           ],
                         ),
@@ -418,78 +315,3 @@ class TopCount extends StatelessWidget {
     );
   }
 }
-
-@swidget
-Widget leftContainer(context, {required int count, required String name, required Color nameColor, required Color bgColor}) {
-  double leftWidth = (MediaQuery.of(context).size.width - 40.r) * 0.7 / 3;
-  return Container(
-    width: leftWidth,
-    height: 92.r,
-    padding: EdgeInsets.symmetric(vertical: 10.r, horizontal: 6.r),
-    color: bgColor,
-    child: Column(
-      crossAxisAlignment: CrossAxisAlignment.center,
-      children: [
-        SizedBox(
-          height: 5.r,
-        ),
-        Row(
-          crossAxisAlignment: CrossAxisAlignment.end,
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Text(
-              count.toString(),
-              style: TextStyle(fontSize: 18.sp, color: Color(0xFF595959), fontWeight: FontWeight.w600),
-            ),
-            Text(
-              '人',
-              style: TextStyle(fontSize: 10.sp, color: Color(0xFF595959), fontWeight: FontWeight.w600),
-            ),
-          ],
-        ),
-        SizedBox(
-          height: 20.r,
-        ),
-        Text(
-          name,
-          style: TextStyle(fontSize: 12.sp, color: nameColor, fontWeight: FontWeight.w500),
-        )
-      ],
-    ),
-  );
-}
-
-@swidget
-Widget rightContainer({required int count, required Color bgColor, required Color nameColor, required String name}) {
-  return Container(
-    color: bgColor,
-    child: Column(
-      children: [
-        SizedBox(
-          height: 5.r,
-        ),
-        Row(
-          crossAxisAlignment: CrossAxisAlignment.end,
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Text(
-              count.toString(),
-              style: TextStyle(fontSize: 12.sp, color: nameColor, fontWeight: FontWeight.w600),
-            ),
-            Text(
-              '人',
-              style: TextStyle(fontSize: 8.sp, color: nameColor, fontWeight: FontWeight.w600),
-            ),
-          ],
-        ),
-        SizedBox(
-          height: 5.r,
-        ),
-        Text(
-          name,
-          style: TextStyle(fontSize: 12.sp, color: nameColor, fontWeight: FontWeight.w500),
-        )
-      ],
-    ),
-  );
-}

marking_app/lib/pages/report_detail/report_history.dart

@@ -1,97 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-
-class ReportHistory extends StatefulWidget {
-  const ReportHistory({Key? key}) : super(key: key);
-
-  @override
-  State<ReportHistory> createState() => _ReportHistoryState();
-}
-
-class _ReportHistoryState extends State<ReportHistory> {
-  bool isWork = true;
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Color(0xFFEDF0FF),
-      appBar: AppBar(
-        backgroundColor: Colors.white,
-        title: Text(
-          '已完成报告',
-          style: TextStyle(fontSize: 14.r, color: Color(0xFF000000)),
-        ),
-        centerTitle: true,
-        leading: IconButton(
-          icon: Icon(Icons.arrow_back_ios, color: Colors.black),
-          onPressed: () => Navigator.of(context).pop(),
-        ),
-      ),
-      body: Column(
-        children: [
-          Container(
-            width: MediaQuery.of(context).size.width * 0.8,
-            height: 40.r,
-            margin: EdgeInsets.only(
-                top: 10.r, left: MediaQuery.of(context).size.width * 0.2 / 2),
-            padding: EdgeInsets.all(2.r),
-            decoration: BoxDecoration(
-              color: Colors.white,
-              borderRadius: BorderRadius.circular(8.r),
-            ),
-            child: Row(
-              children: [
-                Expanded(
-                    child: InkWell(
-                      onTap: (){
-                        isWork = true;
-                        setState(() {
-
-                        });
-                      },
-                      child: Container(
-                  decoration: BoxDecoration(
-                      color: isWork ? Color(0xFF6988FD) : Colors.white,
-                      borderRadius: BorderRadius.circular(8.r),
-                  ),
-                  child: Center(
-                      child: Text(
-                        '作业',
-                        style: TextStyle(
-                            fontSize: 14.r,
-                            color: isWork ? Colors.white : Color(0xFF505E6E)),
-                      ),
-                  ),
-                ),
-                    )),
-                Expanded(
-                    child: InkWell(
-                      onTap: (){
-                        isWork = false;
-                        setState(() {
-
-                        });
-                      },
-                      child: Container(
-                  decoration: BoxDecoration(
-                      color: !isWork ? Color(0xFF6988FD) : Colors.white,
-                      borderRadius: BorderRadius.circular(8.r),
-                  ),
-                  child: Center(
-                      child: Text(
-                        '考试',
-                        style: TextStyle(
-                            fontSize: 14.r,
-                            color: !isWork ? Colors.white : Color(0xFF505E6E)),
-                      ),
-                  ),
-                ),
-                    )),
-              ],
-            ),
-          )
-        ],
-      ),
-    );
-  }
-}

marking_app/lib/routes/RouterManager.dart

@@ -34,7 +34,6 @@ import 'package:marking_app/pages/mine/index.dart';
 import 'package:marking_app/pages/mine/other_pages/index.dart';
 import 'package:marking_app/pages/other/agreement_page.dart';
 import 'package:marking_app/pages/report_detail/index.dart';
-import 'package:marking_app/pages/report_detail/report_history.dart';
 import 'package:marking_app/pages/reports/report_class_teacher.dart';
 import 'package:marking_app/pages/reports/report_personal_subject.dart';
 import 'package:marking_app/pages/reports/report_subject_teacher.dart';
@@ -75,8 +74,6 @@ class RouterManager {
   static const String jobPriorityReviewSetPath = '/homework_correction/job_priority_review_set';
   static const String jobStudentGroupPath = '/homework_correction/job_student_group';
   static const String jobPersonalDetailPath = '/homework_correction/job_personal_detail';
-  static const String reportCardDialogPath = '/report_detail/widgets/report_card_dialog';
-  static const String reportHistoryPath = '/report_detail/report_history';
 
   // TheMine
 
@@ -309,8 +306,7 @@ class RouterManager {
   static final _jobPriorityReviewSetPageHandler = Handler(
     handlerFunc: (BuildContext? context, Map<String, List<String>> params) {
       String groupId = params['groupId']![0];
-      String title = params['title']![0];
+      return JobPriorityReviewSet(groupId: groupId);
-      return JobPriorityReviewSet(groupId: groupId,title:title);
     },
   );
 
@@ -346,23 +342,6 @@ class RouterManager {
       return JobPersonalDetail(studentId: studentId,studentName:studentName);
     },
   );
-
-// 学生报告详情
-  static final _reportCardDialogPathHandler = Handler(
-    handlerFunc: (BuildContext? context, Map<String, List<String>> params) {
-     /* String studentName = params['studentName']![0];
-      int studentId = int.parse(params['studentId']![0]);
-      return ReportCardDialog(studentId: studentId,studentName:studentName);*/
-    },
-  );
-// 学生历史报告
-  static final _reportHistoryPathHandler = Handler(
-    handlerFunc: (BuildContext? context, Map<String, List<String>> params) {
-     /* String studentName = params['studentName']![0];
-      int studentId = int.parse(params['studentId']![0]);*/
-      return ReportHistory();
-    },
-  );
   // 开始阅卷页面
   // static final _doMarkingPapers = Handler(handlerFunc: (BuildContext? context, Map<String, List<String>> params) => MarkingPapers());
 
@@ -407,8 +386,6 @@ class RouterManager {
     router.define(jobStudentGroupPath, handler: _jobStudentGroupPageHandler, transitionType: TransitionType.material);
     router.define(jobFavoritePagePath, handler: _jobFavoritePagePathHandler, transitionType: TransitionType.material);
     router.define(jobPersonalDetailPath, handler: _jobPersonalDetailPathHandler, transitionType: TransitionType.material);
-    router.define(reportCardDialogPath, handler: _reportCardDialogPathHandler, transitionType: TransitionType.material);
-    router.define(reportHistoryPath, handler: _reportHistoryPathHandler, transitionType: TransitionType.material);
 
 // getTransition()
 

marking_app/lib/utils/common_utils.dart

@@ -18,31 +18,4 @@ class CommonUtils {
     // 这里其实就是 digest.toString()
     return hex.encode(digest.bytes);
   }
-
-  ///补零
-  static String zeroFill(int i) {
-    return i >= 10 ? "$i" : "0$i";
-  }
-  /// 秒转时分秒
-  static String second2HMS(int sec, {bool isEasy = false}) {
-    String hms = "0";
-    if (!isEasy) hms = "0秒";
-    if (sec > 0) {
-      int h = sec ~/ 3600;
-      int m = (sec % 3600) ~/ 60;
-      int s = sec % 60;
-     /* hms = "${zeroFill(h)}:${zeroFill(m)}:${zeroFill(s)}";
-      if (!isEasy) hms = "${zeroFill(h)}时${zeroFill(m)}分${zeroFill(s)}秒";*/
-      if(h>0){
-        hms = "$h时$m分$s秒";
-      }else{
-        if(m>0){
-          hms = "$m分$s秒";
-        }else{
-          hms = "$s秒";
-        }
-      }
-    }
-    return hms;
-  }
 }

marking_app/lib/utils/right_home_icon.dart

@@ -1,9 +0,0 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-
-Padding homeIcon({double? top = 5,double? right = 8,String? color = 'black'}){
-  return Padding(
-    padding: EdgeInsets.only(top:top!.r,right: right!.r),
-    child: Image.asset('assets/images/home_icon_$color.png',width: 18.r,height: 18.r,),
-  );
-}