diff --git a/marking_app/assets/images/job_data_right_icon.png b/marking_app/assets/images/job_data_right_icon.png
new file mode 100644
index 0000000..7c7edf4
Binary files /dev/null and b/marking_app/assets/images/job_data_right_icon.png differ
diff --git a/marking_app/assets/images/job_personal_correct_icon.png b/marking_app/assets/images/job_personal_correct_icon.png
new file mode 100644
index 0000000..8194c17
Binary files /dev/null and b/marking_app/assets/images/job_personal_correct_icon.png differ
diff --git a/marking_app/assets/images/job_personal_error_icon.png b/marking_app/assets/images/job_personal_error_icon.png
new file mode 100644
index 0000000..8c82f97
Binary files /dev/null and b/marking_app/assets/images/job_personal_error_icon.png differ
diff --git a/marking_app/assets/images/job_report_class_icon.png b/marking_app/assets/images/job_report_class_icon.png
new file mode 100644
index 0000000..525b1d5
Binary files /dev/null and b/marking_app/assets/images/job_report_class_icon.png differ
diff --git a/marking_app/assets/images/sort_icon.png b/marking_app/assets/images/sort_icon.png
new file mode 100644
index 0000000..c9a2c92
Binary files /dev/null and b/marking_app/assets/images/sort_icon.png differ
diff --git a/marking_app/lib/common/model/job/job_data_report.dart b/marking_app/lib/common/model/job/job_data_report.dart
new file mode 100644
index 0000000..efeceea
--- /dev/null
+++ b/marking_app/lib/common/model/job/job_data_report.dart
@@ -0,0 +1,125 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'job_data_report.g.dart';
+
+
+@JsonSerializable()
+class JobDataReport extends Object {
+
+  @JsonKey(name: 'jobId')
+  int jobId;
+
+  @JsonKey(name: 'jobName')
+  String jobName;
+
+  @JsonKey(name: 'gradeName')
+  String gradeName;
+
+  @JsonKey(name: 'className')
+  String? className;
+
+  @JsonKey(name: 'validCount')
+  int validCount;
+
+  @JsonKey(name: 'noAnswerCount')
+  int noAnswerCount;
+
+  @JsonKey(name: 'kgValidRate')
+  double kgValidRate;
+
+  @JsonKey(name: 'kgQuestionCount')
+  int kgQuestionCount;
+
+  @JsonKey(name: 'zgValidRate')
+  double zgValidRate;
+
+  @JsonKey(name: 'zgQuestionCount')
+  int zgQuestionCount;
+
+  @JsonKey(name: 'studentDetails')
+  List<StudentDetails> studentDetails;
+
+  JobDataReport(this.jobId,this.jobName,this.gradeName,this.className,this.validCount,this.noAnswerCount,this.kgValidRate,this.kgQuestionCount,this.zgValidRate,this.zgQuestionCount,this.studentDetails,);
+
+  factory JobDataReport.fromJson(Map<String, dynamic> srcJson) => _$JobDataReportFromJson(srcJson);
+
+  Map<String, dynamic> toJson() => _$JobDataReportToJson(this);
+
+}
+
+
+@JsonSerializable()
+class StudentDetails extends Object {
+
+  @JsonKey(name: 'studentId')
+  int studentId;
+
+  @JsonKey(name: 'studentName')
+  String studentName;
+
+  @JsonKey(name: 'kgValidCount')
+  int kgValidCount;
+
+  @JsonKey(name: 'kgValidRate')
+  int kgValidRate;
+
+  @JsonKey(name: 'zgValidCount')
+  int zgValidCount;
+
+  @JsonKey(name: 'zgValidRate')
+  int zgValidRate;
+
+  @JsonKey(name: 'kgDetails')
+  List<KgDetails> kgDetails;
+
+  @JsonKey(name: 'zgDetails')
+  List<KgDetails> zgDetails;
+
+  StudentDetails(this.studentId,this.studentName,this.kgValidCount,this.kgValidRate,this.zgValidCount,this.zgValidRate,this.kgDetails,this.zgDetails,);
+
+  factory StudentDetails.fromJson(Map<String, dynamic> srcJson) => _$StudentDetailsFromJson(srcJson);
+
+  Map<String, dynamic> toJson() => _$StudentDetailsToJson(this);
+
+}
+
+
+@JsonSerializable()
+class KgDetails extends Object {
+
+  @JsonKey(name: 'questionNo')
+  String questionNo;
+
+  @JsonKey(name: 'questionId')
+  int questionId;
+
+  @JsonKey(name: 'partName')
+  String partName;
+
+  @JsonKey(name: 'state')
+  int state;
+
+  @JsonKey(name: 'studentAnswer')
+  String? studentAnswer;
+
+  @JsonKey(name: 'questionAnswer')
+  String? questionAnswer;
+
+  @JsonKey(name: 'useTime')
+  int? useTime;
+
+  @JsonKey(name: 'annotateAnswers')
+  String? annotateAnswers;
+
+  @JsonKey(name: 'score')
+  double? score;
+
+  KgDetails(this.questionNo,this.questionId,this.partName,this.state,this.studentAnswer,this.questionAnswer,this.useTime,this.annotateAnswers,this.score,);
+
+  factory KgDetails.fromJson(Map<String, dynamic> srcJson) => _$KgDetailsFromJson(srcJson);
+
+  Map<String, dynamic> toJson() => _$KgDetailsToJson(this);
+
+}
+
+
diff --git a/marking_app/lib/common/model/job/job_report_model.dart b/marking_app/lib/common/model/job/job_report_model.dart
index 2eb5a81..7682e09 100644
--- a/marking_app/lib/common/model/job/job_report_model.dart
+++ b/marking_app/lib/common/model/job/job_report_model.dart
@@ -51,6 +51,12 @@ class JobReportModel extends Object {
   @JsonKey(name: 'overallTitles')
   List<OverallTitles> overallTitles;
 
+  @JsonKey(name: 'kgReport')
+  KgReport kgReport;
+
+  @JsonKey(name: 'zgReport')
+  ZgReport zgReport;
+
   // 前端自定义 -- 全对学生
   @JsonKey(name: 'allpairsStudents')
   List<StudentAnswerInfos>? allpairsStudents;
@@ -82,7 +88,10 @@ class JobReportModel extends Object {
     this.knowledgeInfos,
     this.questionAnswerInfos,
     this.studentAnswerInfos,
-    this.overallTitles, [
+    this.overallTitles,
+      this.kgReport,
+      this.zgReport,
+      [
     this.allpairsStudents,
     this.passStudents,
     this.disqualifiedStudents,
@@ -274,3 +283,84 @@ class OverallTitles extends Object {
 
   Map<String, dynamic> toJson() => _$OverallTitlesToJson(this);
 }
+
+@JsonSerializable()
+class KgReport extends Object {
+
+  @JsonKey(name: 'correctRate')
+  int correctRate;
+
+  @JsonKey(name: 'details')
+  List<Details> details;
+
+  KgReport(this.correctRate,this.details,);
+
+  factory KgReport.fromJson(Map<String, dynamic> srcJson) => _$KgReportFromJson(srcJson);
+
+  Map<String, dynamic> toJson() => _$KgReportToJson(this);
+
+}
+
+@JsonSerializable()
+class ZgReport extends Object {
+
+  @JsonKey(name: 'correctRate')
+  int correctRate;
+
+  @JsonKey(name: 'details')
+  List<Details> details;
+
+  ZgReport(this.correctRate,this.details,);
+
+  factory ZgReport.fromJson(Map<String, dynamic> srcJson) => _$ZgReportFromJson(srcJson);
+
+  Map<String, dynamic> toJson() => _$ZgReportToJson(this);
+
+}
+
+@JsonSerializable()
+class Details extends Object {
+
+  @JsonKey(name: 'questionNo')
+  String questionNo;
+
+  @JsonKey(name: 'questionId')
+  int questionId;
+
+  @JsonKey(name: 'partName')
+  String partName;
+
+  @JsonKey(name: 'questionType')
+  int questionType;
+
+  @JsonKey(name: 'validRate')
+  int validRate;
+
+  @JsonKey(name: 'validCount')
+  String validCount;
+
+  @JsonKey(name: 'validStudentNames')
+  List<String> validStudentNames;
+
+  @JsonKey(name: 'correctRate')
+  int correctRate;
+
+  @JsonKey(name: 'questionAnswer')
+  String questionAnswer;
+
+  @JsonKey(name: 'questionPicture')
+  String? questionPicture;
+
+  @JsonKey(name: 'priorityGeneral')
+  String priorityGeneral;
+
+  @JsonKey(name: 'priorityStudentNames')
+  List<String> priorityStudentNames;
+
+  Details(this.questionNo,this.questionId,this.partName,this.questionType,this.validRate,this.validCount,this.validStudentNames,this.correctRate,this.questionAnswer,this.questionPicture,this.priorityGeneral,this.priorityStudentNames,);
+
+  factory Details.fromJson(Map<String, dynamic> srcJson) => _$DetailsFromJson(srcJson);
+
+  Map<String, dynamic> toJson() => _$DetailsToJson(this);
+
+}
\ No newline at end of file
diff --git a/marking_app/lib/pages/homework_correction/job_report.dart b/marking_app/lib/pages/homework_correction/job_report.dart
index 661c5b4..7eaab53 100644
--- a/marking_app/lib/pages/homework_correction/job_report.dart
+++ b/marking_app/lib/pages/homework_correction/job_report.dart
@@ -7,6 +7,9 @@ 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/pages/homework_correction/widget/report_table.dart';
+import 'package:marking_app/pages/homework_correction/widget/top_count.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';
@@ -21,6 +24,7 @@ part 'job_report.g.dart';
 class JobReport extends StatefulWidget {
   final int id;
   final String title;
+
   const JobReport({required this.id, required this.title, super.key});
 
   @override
@@ -44,10 +48,14 @@ class _JobReportState extends State<JobReport> with CommonMixin {
   Future<void> getInvolveClasses() async {
     try {
       RestClient _client = await getClient();
-      BaseStructureResult<List<JobReportJoinClass>> result = await _client.getJobReportJoinClasses(widget.id);
+      BaseStructureResult<List<JobReportJoinClass>> result =
+          await _client.getJobReportJoinClasses(widget.id);
       if (result.success) {
         toUpState(setState, () {
-          involveClasses = [JobReportJoinClass(-1, '全部', -1, '全部', '全部', '全部', -1, -1, '-1'), ...(result.data ?? [])];
+          involveClasses = [
+            JobReportJoinClass(-1, '全部', -1, '全部', '全部', '全部', -1, -1, '-1'),
+            ...(result.data ?? [])
+          ];
         }, mounted);
       }
     } catch (e) {
@@ -60,7 +68,9 @@ class _JobReportState extends State<JobReport> with CommonMixin {
       RestClient _client = await getClient();
       Map<String, dynamic> param = classData?.toJson() ?? {};
       param['jobid'] = widget.id;
-      BaseStructureResult<JobReportModel?> data = await _client.getJobReport(param);
+      print('widget.id=${widget.id}');
+      BaseStructureResult<JobReportModel?> data =
+          await _client.getJobReport(param);
       if (!data.success) {
         throw Exception(data.message ?? '获取报告失败');
       }
@@ -78,7 +88,8 @@ class _JobReportState extends State<JobReport> with CommonMixin {
         RestClient _client = await getClient();
         BaseStructureResult<List<JobReportKnowledgeModel>> datas =
             await _client.getDetailKnowledge(widget.id, knowledge.knowledgeId);
-        if (!datas.success) return ToastUtils.showInfo(datas.message ?? '获取知识点失败');
+        if (!datas.success)
+          return ToastUtils.showInfo(datas.message ?? '获取知识点失败');
         knowledge.details = datas.data;
       }
 
@@ -100,7 +111,9 @@ class _JobReportState extends State<JobReport> with CommonMixin {
                       mainAxisSize: MainAxisSize.min,
                       crossAxisAlignment: CrossAxisAlignment.end,
                       children: [
-                        quickText(knowledge.knowledgeName, color: Theme.of(context1).primaryColor, size: 16.sp),
+                        quickText(knowledge.knowledgeName,
+                            color: Theme.of(context1).primaryColor,
+                            size: 16.sp),
                         quickText(
                           '的掌握情况',
                           color: Color.fromRGBO(60, 60, 60, 1),
@@ -110,102 +123,157 @@ class _JobReportState extends State<JobReport> with CommonMixin {
                       ],
                     )),
                 Expanded(
-                  child: ListView(padding: EdgeInsets.symmetric(horizontal: 12.w), children: [
-                    DataTable(
-                      sortAscending: false,
-                      columns: [
-                        DataColumn(
-                          label: quickText('班级',
-                              color: Color.fromRGBO(114, 114, 114, 1), size: 14.sp, fontWeight: FontWeight.bold),
-                        ),
-                        DataColumn(
-                          label: quickText('掌握度',
-                              color: Color.fromRGBO(114, 114, 114, 1), size: 14.sp, fontWeight: FontWeight.bold),
-                        ),
-                        DataColumn(
-                          label: quickText('人数',
-                              color: Color.fromRGBO(114, 114, 114, 1), size: 14.sp, fontWeight: FontWeight.bold),
-                        ),
-                        DataColumn(
-                          label: quickText('操作',
-                              color: Color.fromRGBO(114, 114, 114, 1), size: 14.sp, fontWeight: FontWeight.bold),
-                        ),
-                      ],
-                      rows: [
-                        ...knowledge.details?.map((e) {
-                              return DataRow(cells: [
-                                DataCell(quickText(e.className, color: Color.fromRGBO(61, 61, 61, 1))),
-                                DataCell(quickText(e.rate > 0 ? doubleToStringAsFixed(e.rate) + '%' : 0,
-                                    color: Color.fromRGBO(61, 61, 61, 1))),
-                                DataCell(quickText(e.ratio, color: Color.fromRGBO(61, 61, 61, 1))),
-                                DataCell(quickText('详情', color: Color.fromRGBO(239, 135, 20, 1)), onTap: () {
-                                  showDialog(
-                                    context: context1,
-                                    builder: (BuildContext context2) {
-                                      return Container(
-                                        margin: EdgeInsets.symmetric(vertical: 150.h, horizontal: 24.w),
-                                        padding: EdgeInsets.symmetric(vertical: 15.h),
-                                        decoration: BoxDecoration(
-                                          color: Colors.white,
-                                          borderRadius: BorderRadius.circular(18.sp),
-                                        ),
-                                        child: Column(
-                                          children: [
-                                            Container(
-                                                child: quickText(
-                                              '${e.className}的掌握情况',
-                                              color: Color.fromRGBO(239, 135, 20, 1),
-                                              size: 16.sp,
-                                              maxLines: 2,
-                                              fontWeight: FontWeight.bold,
-                                            )),
-                                            SizedBox(height: 20.h),
-                                            Expanded(
-                                              child:
-                                                  ListView(padding: EdgeInsets.symmetric(horizontal: 12.w), children: [
-                                                DataTable(
-                                                  sortAscending: false,
-                                                  columns: [
-                                                    DataColumn(
-                                                      label: quickText('学生名字',
-                                                          color: Color.fromRGBO(114, 114, 114, 1),
-                                                          size: 14.sp,
-                                                          fontWeight: FontWeight.bold),
-                                                    ),
-                                                    DataColumn(
-                                                      label: quickText('掌握度',
-                                                          color: Color.fromRGBO(114, 114, 114, 1),
-                                                          size: 14.sp,
-                                                          fontWeight: FontWeight.bold),
-                                                    ),
-                                                  ],
-                                                  rows: [
-                                                    ...e.studentReports.map((e) {
-                                                      return DataRow(
-                                                        cells: [
-                                                          DataCell(quickText(e.studentName)),
-                                                          DataCell(e.pass
-                                                              ? Icon(Icons.check_outlined, color: Colors.green)
-                                                              : Icon(Icons.close_outlined, color: Colors.red)),
-                                                        ],
-                                                      );
-                                                    }).toList()
-                                                  ],
-                                                ),
-                                              ]),
-                                            )
-                                          ],
-                                        ),
+                  child: ListView(
+                      padding: EdgeInsets.symmetric(horizontal: 12.w),
+                      children: [
+                        DataTable(
+                          sortAscending: false,
+                          columns: [
+                            DataColumn(
+                              label: quickText('班级',
+                                  color: Color.fromRGBO(114, 114, 114, 1),
+                                  size: 14.sp,
+                                  fontWeight: FontWeight.bold),
+                            ),
+                            DataColumn(
+                              label: quickText('掌握度',
+                                  color: Color.fromRGBO(114, 114, 114, 1),
+                                  size: 14.sp,
+                                  fontWeight: FontWeight.bold),
+                            ),
+                            DataColumn(
+                              label: quickText('人数',
+                                  color: Color.fromRGBO(114, 114, 114, 1),
+                                  size: 14.sp,
+                                  fontWeight: FontWeight.bold),
+                            ),
+                            DataColumn(
+                              label: quickText('操作',
+                                  color: Color.fromRGBO(114, 114, 114, 1),
+                                  size: 14.sp,
+                                  fontWeight: FontWeight.bold),
+                            ),
+                          ],
+                          rows: [
+                            ...knowledge.details?.map((e) {
+                                  return DataRow(cells: [
+                                    DataCell(quickText(e.className,
+                                        color: Color.fromRGBO(61, 61, 61, 1))),
+                                    DataCell(quickText(
+                                        e.rate > 0
+                                            ? doubleToStringAsFixed(e.rate) +
+                                                '%'
+                                            : 0,
+                                        color: Color.fromRGBO(61, 61, 61, 1))),
+                                    DataCell(quickText(e.ratio,
+                                        color: Color.fromRGBO(61, 61, 61, 1))),
+                                    DataCell(
+                                        quickText('详情',
+                                            color: Color.fromRGBO(
+                                                239, 135, 20, 1)), onTap: () {
+                                      showDialog(
+                                        context: context1,
+                                        builder: (BuildContext context2) {
+                                          return Container(
+                                            margin: EdgeInsets.symmetric(
+                                                vertical: 150.h,
+                                                horizontal: 24.w),
+                                            padding: EdgeInsets.symmetric(
+                                                vertical: 15.h),
+                                            decoration: BoxDecoration(
+                                              color: Colors.white,
+                                              borderRadius:
+                                                  BorderRadius.circular(18.sp),
+                                            ),
+                                            child: Column(
+                                              children: [
+                                                Container(
+                                                    child: quickText(
+                                                  '${e.className}的掌握情况',
+                                                  color: Color.fromRGBO(
+                                                      239, 135, 20, 1),
+                                                  size: 16.sp,
+                                                  maxLines: 2,
+                                                  fontWeight: FontWeight.bold,
+                                                )),
+                                                SizedBox(height: 20.h),
+                                                Expanded(
+                                                  child: ListView(
+                                                      padding:
+                                                          EdgeInsets.symmetric(
+                                                              horizontal: 12.w),
+                                                      children: [
+                                                        DataTable(
+                                                          sortAscending: false,
+                                                          columns: [
+                                                            DataColumn(
+                                                              label: quickText(
+                                                                  '学生名字',
+                                                                  color: Color
+                                                                      .fromRGBO(
+                                                                          114,
+                                                                          114,
+                                                                          114,
+                                                                          1),
+                                                                  size: 14.sp,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .bold),
+                                                            ),
+                                                            DataColumn(
+                                                              label: quickText(
+                                                                  '掌握度',
+                                                                  color: Color
+                                                                      .fromRGBO(
+                                                                          114,
+                                                                          114,
+                                                                          114,
+                                                                          1),
+                                                                  size: 14.sp,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .bold),
+                                                            ),
+                                                          ],
+                                                          rows: [
+                                                            ...e.studentReports
+                                                                .map((e) {
+                                                              return DataRow(
+                                                                cells: [
+                                                                  DataCell(
+                                                                      quickText(
+                                                                          e.studentName)),
+                                                                  DataCell(e
+                                                                          .pass
+                                                                      ? Icon(
+                                                                          Icons
+                                                                              .check_outlined,
+                                                                          color: Colors
+                                                                              .green)
+                                                                      : Icon(
+                                                                          Icons
+                                                                              .close_outlined,
+                                                                          color:
+                                                                              Colors.red)),
+                                                                ],
+                                                              );
+                                                            }).toList()
+                                                          ],
+                                                        ),
+                                                      ]),
+                                                )
+                                              ],
+                                            ),
+                                          );
+                                        },
                                       );
-                                    },
-                                  );
-                                }),
-                              ]);
-                            }).toList() ??
-                            [],
-                      ],
-                    ),
-                  ]),
+                                    }),
+                                  ]);
+                                }).toList() ??
+                                [],
+                          ],
+                        ),
+                      ]),
                 )
               ],
             ),
@@ -224,12 +292,17 @@ class _JobReportState extends State<JobReport> with CommonMixin {
       backgroundColor: Color.fromRGBO(245, 245, 245, 1),
       appBar: AppBar(
         backgroundColor: Colors.white,
-        title: quickText(widget.title, size: 16.sp, color: Color.fromRGBO(51, 51, 51, 1)),
+        title: Center(
+            child: quickText(
+          widget.title + '作业报告',
+          size: 16.sp,
+          color: Color.fromRGBO(51, 51, 51, 1),
+        )),
         leading: IconButton(
           icon: Icon(Icons.arrow_back_ios, color: Colors.black),
           onPressed: () => Navigator.of(context).pop(),
         ),
-        actions: [
+        /*actions: [
           // 下拉框
           $DropdownSelection(involveClasses, classData, call: (JobReportJoinClass _classData) {
             classData = _classData;
@@ -237,9 +310,10 @@ class _JobReportState extends State<JobReport> with CommonMixin {
             _future = getReport();
             toUpState(setState, () {}, mounted);
           }),
-        ],
+        ],*/
       ),
-      body: MyFutureBuilder.buildFutureBuilderOfSingleInstance<JobReportModel>(context, _future, (data) {
+      body: MyFutureBuilder.buildFutureBuilderOfSingleInstance<JobReportModel>(
+          context, _future, (data) {
         if (data == null)
           return Container(
             alignment: Alignment.center,
@@ -252,10 +326,107 @@ class _JobReportState extends State<JobReport> with CommonMixin {
           );
 
         return ListView(
-          padding: EdgeInsets.symmetric(horizontal: 10.w),
+          padding: EdgeInsets.symmetric(horizontal: 0.w),
           children: [
-            // 顶部图形数据
-            $TopGraphic(data),
+            // 下拉框
+            Container(
+              padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 10.w),
+              decoration: BoxDecoration(
+                color: Colors.white,
+              ),
+              child: Row(
+                children: [
+                  $DropdownSelection(involveClasses, classData,
+                      call: (JobReportJoinClass _classData) {
+                    classData = _classData;
+                    if (_classData.gradeId == -1) classData = null;
+                    _future = getReport();
+                    toUpState(setState, () {}, mounted);
+                  }),
+                  // Expanded(child: Text('')),
+                ],
+              ),
+            ),
+            //完成率、正确率
+            TopCount(data),
+            InkWell(
+              onTap: (){
+                RouterManager.router.navigateTo(
+                  context,
+                  RouterManager.quickDataCheckPath +
+                      '?jobId=${1}&className=',
+                  transition: getTransition(),
+                );
+              },
+              child: Text('数据快查'),
+            ),
+            //客观题
+            Container(
+              padding: EdgeInsets.symmetric(vertical: 10.r, horizontal: 10.r),
+              margin: EdgeInsets.symmetric(vertical: 10.r, horizontal: 10.r),
+              decoration: BoxDecoration(
+                color: Colors.white,
+                borderRadius: BorderRadius.all(Radius.circular(6.r)),
+              ),
+              child: Column(
+                children: [
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    crossAxisAlignment: CrossAxisAlignment.end,
+                    children: [
+                      Text('客观题',style: TextStyle(fontSize: 14.sp,color: Color(0xFF5C5C5C),fontWeight: FontWeight.w500),),
+                      SizedBox(width: 10.r,),
+                      Text('${data.kgReport.correctRate}%',style: TextStyle(fontSize: 14.sp,color: Color(0xFF6888FD),fontWeight: FontWeight.w500),),
+                    ],
+                  ),
+                  SizedBox(height: 10.r,),
+                  SizedBox(
+                    height: data.kgReport.details.length>10?300.r:data.kgReport.details.length * 50.r + 20.r,
+                    child: ReportTable(
+                      headList: ['题', '作答率','作答人数', '正确率', '标准答案', '优先批阅概况'],
+                      bodyList: data.kgReport.details,
+                      fixedCols: 1,
+                      fixedRows: 1,
+                    ),
+                  )
+                ],
+              ),
+            ),
+            //主观题
+            Container(
+              padding: EdgeInsets.symmetric(vertical: 10.r, horizontal: 10.r),
+              margin: EdgeInsets.symmetric(vertical: 10.r, horizontal: 10.r),
+              decoration: BoxDecoration(
+                color: Colors.white,
+                borderRadius: BorderRadius.all(Radius.circular(6.r)),
+              ),
+              child: Column(
+                children: [
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    crossAxisAlignment: CrossAxisAlignment.end,
+                    children: [
+                      Text('主观题',style: TextStyle(fontSize: 14.sp,color: Color(0xFF5C5C5C),fontWeight: FontWeight.w500),),
+                     SizedBox(width: 10.r,),
+                      Text('${data.zgReport.correctRate}%',style: TextStyle(fontSize: 14.sp,color: Color(0xFF6888FD),fontWeight: FontWeight.w500),),
+                    ],
+                  ),
+                  SizedBox(height: 10.r,),
+                  SizedBox(
+                    height: data.zgReport.details.length>10?300.r:data.zgReport.details.length * 50.r + 20.r,
+                    child: ReportTable(
+                      headList: ['题', '作答率','作答人数', '正确率', '查看原题', '优先批阅概况'],
+                      bodyList: data.zgReport.details,
+                      fixedCols: 1,
+                      fixedRows: 1,
+                        isKG:true,
+                    ),
+                  )
+                ],
+              ),
+            ),
+           // 顶部图形数据
+           /*  $TopGraphic(data),*/
             // 掌握知识点的情况
             $MasterKnowledgePoint(data.knowledgeInfos, detailKnowledgeCall),
             // 掌握知识点的情况
@@ -273,22 +444,37 @@ class _JobReportState extends State<JobReport> with CommonMixin {
 
 /// 下拉选择框
 @swidget
-Widget $dropdownSelection(List<JobReportJoinClass>? involveClasses, JobReportJoinClass? classData,
+Widget $dropdownSelection(
+    List<JobReportJoinClass>? involveClasses, JobReportJoinClass? classData,
     {required Function(JobReportJoinClass) call}) {
-  if (involveClasses == null) return Container(child: quickText('点击重试')); // 点击重试
-  return DropdownButton(
-    value: classData?.uniqueId ?? '-1',
-    style: TextStyle(color: Color.fromRGBO(89, 89, 89, 1), fontSize: 12.sp),
-    items: involveClasses.map((e) {
-      return DropdownMenuItem(
-        value: e.uniqueId!,
-        child: quickText(e.graduationYear + e.className, size: 12.sp, color: Colors.black),
-      );
-    }).toList(),
-    onChanged: (String? value) {
-      if (value == null) return;
-      call(involveClasses.firstWhere((element) => element.uniqueId == value));
-    },
+  if (involveClasses == null)
+    return Container(child: quickText('点击重试')); // 点击重试
+  return Container(
+    // width: 200.r,
+    padding: EdgeInsets.symmetric(horizontal: 10.r),
+    decoration: BoxDecoration(
+        color: Color(0xFFF5F5F5),
+        borderRadius: BorderRadius.vertical(
+          top: Radius.elliptical(10, 10),
+          bottom: Radius.elliptical(10, 10),
+        )),
+    child: DropdownButton(
+      value: classData?.uniqueId ?? '-1',
+      style: TextStyle(color: Color.fromRGBO(89, 89, 89, 1), fontSize: 12.sp),
+      underline: Container(),
+      // isExpanded:true,
+      items: involveClasses.map((e) {
+        return DropdownMenuItem(
+          value: e.uniqueId!,
+          child: quickText(e.graduationYear + e.className,
+              size: 12.sp, color: Colors.black),
+        );
+      }).toList(),
+      onChanged: (String? value) {
+        if (value == null) return;
+        call(involveClasses.firstWhere((element) => element.uniqueId == value));
+      },
+    ),
   );
 }
 
@@ -333,42 +519,58 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
           ),
           child: Column(
             children: [
-              Container(child: quickText('$title学生', color: Color.fromRGBO(60, 60, 60, 1), size: 15.sp)),
+              Container(
+                  child: quickText('$title学生',
+                      color: Color.fromRGBO(60, 60, 60, 1), size: 15.sp)),
               Expanded(
-                child: ListView(padding: EdgeInsets.symmetric(horizontal: 12.w), children: [
-                  DataTable(
-                    sortAscending: false,
-                    columns: [
-                      DataColumn(
-                        label: quickText('姓名',
-                            color: Color.fromRGBO(114, 114, 114, 1), size: 14.sp, fontWeight: FontWeight.bold),
+                child: ListView(
+                    padding: EdgeInsets.symmetric(horizontal: 12.w),
+                    children: [
+                      DataTable(
+                        sortAscending: false,
+                        columns: [
+                          DataColumn(
+                            label: quickText('姓名',
+                                color: Color.fromRGBO(114, 114, 114, 1),
+                                size: 14.sp,
+                                fontWeight: FontWeight.bold),
+                          ),
+                          DataColumn(
+                            label: quickText('正确率',
+                                color: Color.fromRGBO(114, 114, 114, 1),
+                                size: 14.sp,
+                                fontWeight: FontWeight.bold),
+                          ),
+                          DataColumn(
+                            label: quickText('未答题数',
+                                color: Color.fromRGBO(114, 114, 114, 1),
+                                size: 14.sp,
+                                fontWeight: FontWeight.bold),
+                          ),
+                          DataColumn(
+                            label: quickText('用时(秒)',
+                                color: Color.fromRGBO(114, 114, 114, 1),
+                                size: 14.sp,
+                                fontWeight: FontWeight.bold),
+                          ),
+                        ],
+                        rows: [
+                          ...students.map((e) {
+                            return DataRow(cells: [
+                              DataCell(quickText(e.studentName,
+                                  color: Color.fromRGBO(61, 61, 61, 1))),
+                              DataCell(quickText(
+                                  doubleToStringAsFixed(e.correctRate) + '%',
+                                  color: Color.fromRGBO(61, 61, 61, 1))),
+                              DataCell(quickText(e.noAnswerCount,
+                                  color: Color.fromRGBO(61, 61, 61, 1))),
+                              DataCell(quickText(e.useTime,
+                                  color: Color.fromRGBO(61, 61, 61, 1))),
+                            ]);
+                          }).toList(),
+                        ],
                       ),
-                      DataColumn(
-                        label: quickText('正确率',
-                            color: Color.fromRGBO(114, 114, 114, 1), size: 14.sp, fontWeight: FontWeight.bold),
-                      ),
-                      DataColumn(
-                        label: quickText('未答题数',
-                            color: Color.fromRGBO(114, 114, 114, 1), size: 14.sp, fontWeight: FontWeight.bold),
-                      ),
-                      DataColumn(
-                        label: quickText('用时(秒)',
-                            color: Color.fromRGBO(114, 114, 114, 1), size: 14.sp, fontWeight: FontWeight.bold),
-                      ),
-                    ],
-                    rows: [
-                      ...students.map((e) {
-                        return DataRow(cells: [
-                          DataCell(quickText(e.studentName, color: Color.fromRGBO(61, 61, 61, 1))),
-                          DataCell(quickText(doubleToStringAsFixed(e.correctRate) + '%',
-                              color: Color.fromRGBO(61, 61, 61, 1))),
-                          DataCell(quickText(e.noAnswerCount, color: Color.fromRGBO(61, 61, 61, 1))),
-                          DataCell(quickText(e.useTime, color: Color.fromRGBO(61, 61, 61, 1))),
-                        ]);
-                      }).toList(),
-                    ],
-                  ),
-                ]),
+                    ]),
               )
             ],
           ),
@@ -380,7 +582,8 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
   return Container(
     margin: EdgeInsets.only(top: 16.h, bottom: 10.h),
     padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 14.h),
-    decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(16.r)),
+    decoration: BoxDecoration(
+        color: Colors.white, borderRadius: BorderRadius.circular(16.r)),
     child: Column(
       mainAxisSize: MainAxisSize.min,
       children: [
@@ -430,12 +633,16 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                       ),
                     ),
                     alignment: Alignment.center,
-                    child: quickText(data.scoreTitle, color: Colors.white, size: 32.sp, fontWeight: FontWeight.bold),
+                    child: quickText(data.scoreTitle,
+                        color: Colors.white,
+                        size: 32.sp,
+                        fontWeight: FontWeight.bold),
                   ),
                 ),
               ),
             ),
-            Image.asset("assets/images/job_report_scale.png", width: 230.r, fit: BoxFit.fill),
+            Image.asset("assets/images/job_report_scale.png",
+                width: 230.r, fit: BoxFit.fill),
           ],
         ),
 
@@ -456,8 +663,10 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                 children: [
                   Expanded(
                     flex: 2,
-                    child:
-                        quickText('${data.validCount}份', color: Colors.white, size: 10.sp, fontWeight: FontWeight.bold),
+                    child: quickText('${data.validCount}份',
+                        color: Colors.white,
+                        size: 10.sp,
+                        fontWeight: FontWeight.bold),
                   ),
                   SizedBox(width: 1.2.w),
                   Expanded(
@@ -471,8 +680,11 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                         children: [
                           Expanded(
                               flex: 2,
-                              child: quickText('${doubleToStringAsFixed(data.correctRate)}%',
-                                  color: Colors.white, size: 10.sp, fontWeight: FontWeight.bold)),
+                              child: quickText(
+                                  '${doubleToStringAsFixed(data.correctRate)}%',
+                                  color: Colors.white,
+                                  size: 10.sp,
+                                  fontWeight: FontWeight.bold)),
                           Expanded(
                             flex: 5,
                             child: Container(
@@ -483,8 +695,11 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                                 shape: BoxShape.circle, // 设置为圆形
                                 color: Color.fromRGBO(254, 151, 40, 1),
                               ),
-                              child: quickText('${doubleToStringAsFixed(data.finishRate)}%',
-                                  color: Colors.white, size: 14.sp, fontWeight: FontWeight.bold),
+                              child: quickText(
+                                  '${doubleToStringAsFixed(data.finishRate)}%',
+                                  color: Colors.white,
+                                  size: 14.sp,
+                                  fontWeight: FontWeight.bold),
                             ),
                           ),
                         ],
@@ -512,10 +727,13 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                         ),
                       ),
                       SizedBox(width: 5.w),
-                      quickText('作业完成率', color: Color.fromRGBO(114, 114, 114, 1), size: 12.sp),
+                      quickText('作业完成率',
+                          color: Color.fromRGBO(114, 114, 114, 1), size: 12.sp),
                       SizedBox(width: 4.w),
                       quickText('${doubleToStringAsFixed(data.finishRate)}%',
-                          color: Color.fromRGBO(72, 72, 72, 1), size: 13.sp, fontWeight: FontWeight.bold),
+                          color: Color.fromRGBO(72, 72, 72, 1),
+                          size: 13.sp,
+                          fontWeight: FontWeight.bold),
                     ],
                   ),
                   SizedBox(height: 14.h),
@@ -531,10 +749,13 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                         ),
                       ),
                       SizedBox(width: 5.w),
-                      quickText('作业正确率', color: Color.fromRGBO(114, 114, 114, 1), size: 12.sp),
+                      quickText('作业正确率',
+                          color: Color.fromRGBO(114, 114, 114, 1), size: 12.sp),
                       SizedBox(width: 4.w),
                       quickText('${doubleToStringAsFixed(data.correctRate)}%',
-                          color: Color.fromRGBO(72, 72, 72, 1), size: 13.sp, fontWeight: FontWeight.bold),
+                          color: Color.fromRGBO(72, 72, 72, 1),
+                          size: 13.sp,
+                          fontWeight: FontWeight.bold),
                     ],
                   ),
                   SizedBox(height: 14.h),
@@ -550,10 +771,13 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                         ),
                       ),
                       SizedBox(width: 5.w),
-                      quickText('作业有效份数', color: Color.fromRGBO(114, 114, 114, 1), size: 12.sp),
+                      quickText('作业有效份数',
+                          color: Color.fromRGBO(114, 114, 114, 1), size: 12.sp),
                       SizedBox(width: 4.w),
                       quickText('${data.validCount}份',
-                          color: Color.fromRGBO(72, 72, 72, 1), size: 13.sp, fontWeight: FontWeight.bold),
+                          color: Color.fromRGBO(72, 72, 72, 1),
+                          size: 13.sp,
+                          fontWeight: FontWeight.bold),
                     ],
                   ),
                 ],
@@ -582,11 +806,16 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                           color: Color.fromRGBO(241, 241, 241, 1),
                         ),
                         child: FlutterWaveLoading(
-                          width: 140.w, //宽
-                          height: 170.h, //高
-                          isOval: false, // 是否椭圆裁切
-                          progress: data.allCorrect / data.studentCount, // 进度
-                          waveHeight: 8, //波浪高
+                          width: 140.w,
+                          //宽
+                          height: 170.h,
+                          //高
+                          isOval: false,
+                          // 是否椭圆裁切
+                          progress: data.allCorrect / data.studentCount,
+                          // 进度
+                          waveHeight: 8,
+                          //波浪高
                           milliseconds: 5000,
                           color: Color.fromRGBO(0, 179, 134, 1), //颜色
                         ),
@@ -610,21 +839,30 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                                   Column(
                                     mainAxisSize: MainAxisSize.min,
                                     children: [
-                                      quickText('人', size: 18.sp, color: Color.fromRGBO(122, 122, 122, 1)),
+                                      quickText('人',
+                                          size: 18.sp,
+                                          color:
+                                              Color.fromRGBO(122, 122, 122, 1)),
                                       SizedBox(height: 4.h)
                                     ],
                                   )
                                 ],
                               ),
-                              quickText('全对', color: Color.fromRGBO(164, 164, 164, 1), size: 16.sp),
+                              quickText('全对',
+                                  color: Color.fromRGBO(164, 164, 164, 1),
+                                  size: 16.sp),
                             ],
                           )),
                       Row(
                         mainAxisSize: MainAxisSize.min,
                         crossAxisAlignment: CrossAxisAlignment.end,
                         children: [
-                          quickText(doubleToStringAsFixed(data.allCorrect / data.studentCount * 100),
-                              size: 34.sp, color: Colors.white, fontWeight: FontWeight.bold),
+                          quickText(
+                              doubleToStringAsFixed(
+                                  data.allCorrect / data.studentCount * 100),
+                              size: 34.sp,
+                              color: Colors.white,
+                              fontWeight: FontWeight.bold),
                           SizedBox(width: 1.5.w),
                           quickText('%', size: 22.sp, color: Colors.white)
                         ],
@@ -640,14 +878,18 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                       padding: EdgeInsets.symmetric(vertical: 4.h),
                       decoration: BoxDecoration(
                         borderRadius: BorderRadius.circular(77.r),
-                        border: Border.all(color: Color.fromRGBO(188, 188, 188, 1)),
+                        border:
+                            Border.all(color: Color.fromRGBO(188, 188, 188, 1)),
                       ),
                       child: Row(
                         crossAxisAlignment: CrossAxisAlignment.center,
                         mainAxisAlignment: MainAxisAlignment.center,
                         children: [
-                          quickText('查看', size: 11.sp, color: Color.fromRGBO(118, 118, 118, 1)),
-                          Icon(Icons.arrow_forward_ios, size: 11.sp, color: Color.fromRGBO(95, 95, 95, 1))
+                          quickText('查看',
+                              size: 11.sp,
+                              color: Color.fromRGBO(118, 118, 118, 1)),
+                          Icon(Icons.arrow_forward_ios,
+                              size: 11.sp, color: Color.fromRGBO(95, 95, 95, 1))
                         ],
                       ),
                     ),
@@ -670,11 +912,16 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                           color: Color.fromRGBO(241, 241, 241, 1),
                         ),
                         child: FlutterWaveLoading(
-                          width: 140.w, //宽
-                          height: 170.h, //高
-                          isOval: false, // 是否椭圆裁切
-                          progress: data.passCount / data.studentCount, // 进度
-                          waveHeight: 8, //波浪高
+                          width: 140.w,
+                          //宽
+                          height: 170.h,
+                          //高
+                          isOval: false,
+                          // 是否椭圆裁切
+                          progress: data.passCount / data.studentCount,
+                          // 进度
+                          waveHeight: 8,
+                          //波浪高
                           milliseconds: 8000,
                           color: Color.fromRGBO(255, 134, 0, 0.84), //颜色
                         ),
@@ -698,21 +945,30 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                                   Column(
                                     mainAxisSize: MainAxisSize.min,
                                     children: [
-                                      quickText('人', size: 18.sp, color: Color.fromRGBO(122, 122, 122, 1)),
+                                      quickText('人',
+                                          size: 18.sp,
+                                          color:
+                                              Color.fromRGBO(122, 122, 122, 1)),
                                       SizedBox(height: 4.h)
                                     ],
                                   )
                                 ],
                               ),
-                              quickText('及格', color: Color.fromRGBO(164, 164, 164, 1), size: 16.sp),
+                              quickText('及格',
+                                  color: Color.fromRGBO(164, 164, 164, 1),
+                                  size: 16.sp),
                             ],
                           )),
                       Row(
                         mainAxisSize: MainAxisSize.min,
                         crossAxisAlignment: CrossAxisAlignment.end,
                         children: [
-                          quickText(doubleToStringAsFixed(data.passCount / data.studentCount * 100),
-                              size: 34.sp, color: Colors.white, fontWeight: FontWeight.bold),
+                          quickText(
+                              doubleToStringAsFixed(
+                                  data.passCount / data.studentCount * 100),
+                              size: 34.sp,
+                              color: Colors.white,
+                              fontWeight: FontWeight.bold),
                           SizedBox(width: 1.5.w),
                           quickText('%', size: 22.sp, color: Colors.white)
                         ],
@@ -728,14 +984,18 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                       padding: EdgeInsets.symmetric(vertical: 4.h),
                       decoration: BoxDecoration(
                         borderRadius: BorderRadius.circular(77.r),
-                        border: Border.all(color: Color.fromRGBO(188, 188, 188, 1)),
+                        border:
+                            Border.all(color: Color.fromRGBO(188, 188, 188, 1)),
                       ),
                       child: Row(
                         crossAxisAlignment: CrossAxisAlignment.center,
                         mainAxisAlignment: MainAxisAlignment.center,
                         children: [
-                          quickText('查看', size: 11.sp, color: Color.fromRGBO(118, 118, 118, 1)),
-                          Icon(Icons.arrow_forward_ios, size: 11.sp, color: Color.fromRGBO(95, 95, 95, 1))
+                          quickText('查看',
+                              size: 11.sp,
+                              color: Color.fromRGBO(118, 118, 118, 1)),
+                          Icon(Icons.arrow_forward_ios,
+                              size: 11.sp, color: Color.fromRGBO(95, 95, 95, 1))
                         ],
                       ),
                     ),
@@ -758,11 +1018,16 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                           color: Color.fromRGBO(241, 241, 241, 1),
                         ),
                         child: FlutterWaveLoading(
-                          width: 140.w, //宽
-                          height: 170.h, //高
-                          isOval: false, // 是否椭圆裁切
-                          progress: data.failCount / data.studentCount, // 进度
-                          waveHeight: 8, //波浪高
+                          width: 140.w,
+                          //宽
+                          height: 170.h,
+                          //高
+                          isOval: false,
+                          // 是否椭圆裁切
+                          progress: data.failCount / data.studentCount,
+                          // 进度
+                          waveHeight: 8,
+                          //波浪高
                           milliseconds: 7000,
                           color: Color.fromRGBO(255, 106, 106, 1), //颜色
                         ),
@@ -786,21 +1051,30 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                                   Column(
                                     mainAxisSize: MainAxisSize.min,
                                     children: [
-                                      quickText('人', size: 18.sp, color: Color.fromRGBO(122, 122, 122, 1)),
+                                      quickText('人',
+                                          size: 18.sp,
+                                          color:
+                                              Color.fromRGBO(122, 122, 122, 1)),
                                       SizedBox(height: 4.h)
                                     ],
                                   )
                                 ],
                               ),
-                              quickText('不及格', color: Color.fromRGBO(164, 164, 164, 1), size: 16.sp),
+                              quickText('不及格',
+                                  color: Color.fromRGBO(164, 164, 164, 1),
+                                  size: 16.sp),
                             ],
                           )),
                       Row(
                         mainAxisSize: MainAxisSize.min,
                         crossAxisAlignment: CrossAxisAlignment.end,
                         children: [
-                          quickText(doubleToStringAsFixed(data.failCount / data.studentCount * 100),
-                              size: 34.sp, color: Colors.white, fontWeight: FontWeight.bold),
+                          quickText(
+                              doubleToStringAsFixed(
+                                  data.failCount / data.studentCount * 100),
+                              size: 34.sp,
+                              color: Colors.white,
+                              fontWeight: FontWeight.bold),
                           SizedBox(width: 1.5.w),
                           quickText('%', size: 22.sp, color: Colors.white)
                         ],
@@ -816,14 +1090,18 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                       padding: EdgeInsets.symmetric(vertical: 4.h),
                       decoration: BoxDecoration(
                         borderRadius: BorderRadius.circular(77.r),
-                        border: Border.all(color: Color.fromRGBO(188, 188, 188, 1)),
+                        border:
+                            Border.all(color: Color.fromRGBO(188, 188, 188, 1)),
                       ),
                       child: Row(
                         crossAxisAlignment: CrossAxisAlignment.center,
                         mainAxisAlignment: MainAxisAlignment.center,
                         children: [
-                          quickText('查看', size: 11.sp, color: Color.fromRGBO(118, 118, 118, 1)),
-                          Icon(Icons.arrow_forward_ios, size: 11.sp, color: Color.fromRGBO(95, 95, 95, 1))
+                          quickText('查看',
+                              size: 11.sp,
+                              color: Color.fromRGBO(118, 118, 118, 1)),
+                          Icon(Icons.arrow_forward_ios,
+                              size: 11.sp, color: Color.fromRGBO(95, 95, 95, 1))
                         ],
                       ),
                     ),
@@ -846,11 +1124,16 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                           color: Color.fromRGBO(241, 241, 241, 1),
                         ),
                         child: FlutterWaveLoading(
-                          width: 140.w, //宽
-                          height: 170.h, //高
-                          isOval: false, // 是否椭圆裁切
-                          progress: data.noAnswerCount / data.studentCount, // 进度
-                          waveHeight: 8, //波浪高
+                          width: 140.w,
+                          //宽
+                          height: 170.h,
+                          //高
+                          isOval: false,
+                          // 是否椭圆裁切
+                          progress: data.noAnswerCount / data.studentCount,
+                          // 进度
+                          waveHeight: 8,
+                          //波浪高
                           milliseconds: 6000,
                           color: Color.fromRGBO(96, 96, 96, 1), //颜色
                         ),
@@ -874,13 +1157,18 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                                 Column(
                                   mainAxisSize: MainAxisSize.min,
                                   children: [
-                                    quickText('人', size: 18.sp, color: Color.fromRGBO(122, 122, 122, 1)),
+                                    quickText('人',
+                                        size: 18.sp,
+                                        color:
+                                            Color.fromRGBO(122, 122, 122, 1)),
                                     SizedBox(height: 4.h)
                                   ],
                                 )
                               ],
                             ),
-                            quickText('未做', color: Color.fromRGBO(164, 164, 164, 1), size: 16.sp),
+                            quickText('未做',
+                                color: Color.fromRGBO(164, 164, 164, 1),
+                                size: 16.sp),
                           ],
                         ),
                       ),
@@ -888,8 +1176,12 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                         mainAxisSize: MainAxisSize.min,
                         crossAxisAlignment: CrossAxisAlignment.end,
                         children: [
-                          quickText(doubleToStringAsFixed(data.noAnswerCount / data.studentCount * 100),
-                              size: 34.sp, color: Colors.white, fontWeight: FontWeight.bold),
+                          quickText(
+                              doubleToStringAsFixed(
+                                  data.noAnswerCount / data.studentCount * 100),
+                              size: 34.sp,
+                              color: Colors.white,
+                              fontWeight: FontWeight.bold),
                           SizedBox(width: 1.5.w),
                           quickText('%', size: 22.sp, color: Colors.white)
                         ],
@@ -905,14 +1197,18 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                       padding: EdgeInsets.symmetric(vertical: 4.h),
                       decoration: BoxDecoration(
                         borderRadius: BorderRadius.circular(77.r),
-                        border: Border.all(color: Color.fromRGBO(188, 188, 188, 1)),
+                        border:
+                            Border.all(color: Color.fromRGBO(188, 188, 188, 1)),
                       ),
                       child: Row(
                         crossAxisAlignment: CrossAxisAlignment.center,
                         mainAxisAlignment: MainAxisAlignment.center,
                         children: [
-                          quickText('查看', size: 11.sp, color: Color.fromRGBO(118, 118, 118, 1)),
-                          Icon(Icons.arrow_forward_ios, size: 11.sp, color: Color.fromRGBO(95, 95, 95, 1))
+                          quickText('查看',
+                              size: 11.sp,
+                              color: Color.fromRGBO(118, 118, 118, 1)),
+                          Icon(Icons.arrow_forward_ios,
+                              size: 11.sp, color: Color.fromRGBO(95, 95, 95, 1))
                         ],
                       ),
                     ),
@@ -930,7 +1226,9 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
 
 /// 掌握知识点的情况
 @swidget
-Widget $masterKnowledgePoint(BuildContext context, List<KnowledgeInfos> knowledgeInfos,
+Widget $masterKnowledgePoint(
+    BuildContext context,
+    List<KnowledgeInfos> knowledgeInfos,
     Future<void> Function(KnowledgeInfos knowledge) detailCall) {
   Widget childItem(int serialNumber, KnowledgeInfos knowItem) => Container(
         margin: EdgeInsets.only(bottom: 20.h),
@@ -946,10 +1244,14 @@ Widget $masterKnowledgePoint(BuildContext context, List<KnowledgeInfos> knowledg
                   child: Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
-                      quickText('${(serialNumber + 1).toString() + '.' + knowItem.knowledgeName}',
-                          size: 12.sp, color: Color.fromRGBO(152, 152, 152, 1)),
+                      quickText(
+                          '${(serialNumber + 1).toString() + '.' + knowItem.knowledgeName}',
+                          size: 12.sp,
+                          color: Color.fromRGBO(152, 152, 152, 1)),
                       quickText('${doubleToStringAsFixed(knowItem.rate)}%',
-                          size: 14.sp, color: Color.fromRGBO(64, 64, 64, 1), fontWeight: FontWeight.bold),
+                          size: 14.sp,
+                          color: Color.fromRGBO(64, 64, 64, 1),
+                          fontWeight: FontWeight.bold),
                     ],
                   ),
                 ),
@@ -983,8 +1285,10 @@ Widget $masterKnowledgePoint(BuildContext context, List<KnowledgeInfos> knowledg
                   child: Row(
                     mainAxisSize: MainAxisSize.min,
                     children: [
-                      quickText('查看', size: 14.sp, color: Color.fromRGBO(239, 135, 20, 1)),
-                      Icon(Icons.arrow_forward_ios, size: 11.sp, color: Color.fromRGBO(239, 135, 20, 1)),
+                      quickText('查看',
+                          size: 14.sp, color: Color.fromRGBO(239, 135, 20, 1)),
+                      Icon(Icons.arrow_forward_ios,
+                          size: 11.sp, color: Color.fromRGBO(239, 135, 20, 1)),
                     ],
                   ),
                 ),
@@ -997,16 +1301,25 @@ Widget $masterKnowledgePoint(BuildContext context, List<KnowledgeInfos> knowledg
       margin: EdgeInsets.only(top: 10.h),
       padding: EdgeInsets.symmetric(vertical: 16.h, horizontal: 12.w),
       constraints: BoxConstraints(maxHeight: 320.h),
-      decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(10.r)),
+      decoration: BoxDecoration(
+          color: Colors.white, borderRadius: BorderRadius.circular(10.r)),
       child: Column(
         children: [
           Container(
-            child: quickText('知识点掌握情况', color: Color.fromRGBO(92, 92, 92, 1), size: 14.sp, fontWeight: FontWeight.bold),
+            child: quickText('知识点掌握情况',
+                color: Color.fromRGBO(92, 92, 92, 1),
+                size: 14.sp,
+                fontWeight: FontWeight.bold),
             margin: EdgeInsets.only(bottom: 24.h),
           ),
           // ...knowledgeInfos.asMap().keys.map((e) => childItem(e, knowledgeInfos[e])).toList()
           Expanded(
-            child: ListView(children: knowledgeInfos.asMap().keys.map((e) => childItem(e, knowledgeInfos[e])).toList()),
+            child: ListView(
+                children: knowledgeInfos
+                    .asMap()
+                    .keys
+                    .map((e) => childItem(e, knowledgeInfos[e]))
+                    .toList()),
           ),
         ],
       ));
@@ -1015,13 +1328,13 @@ Widget $masterKnowledgePoint(BuildContext context, List<KnowledgeInfos> knowledg
 /// 整体表现
 @swidget
 Widget $overallPerformance(int totalNumber, List<OverallTitles> overallTitles) {
-  Map<String, Color> colorMap = {
-    '优秀': Color.fromRGBO(104, 136, 253, 1),
-    '良好': Color.fromRGBO(255, 186, 33, 1),
-    '一般': Color.fromRGBO(243, 163, 44, 1),
-    '较差': Color.fromRGBO(211, 211, 211, 1).withOpacity(0.5),
-    '很差': Color.fromRGBO(211, 211, 211, 1),
-  };
+  List colorMap = [
+    Color.fromRGBO(104, 136, 253, 1),
+    Color.fromRGBO(255, 186, 33, 1),
+    Color.fromRGBO(243, 163, 44, 1),
+    Color.fromRGBO(211, 211, 211, 1).withOpacity(0.5),
+    Color.fromRGBO(211, 211, 211, 1),
+  ];
   return Container(
     margin: EdgeInsets.only(top: 20.h),
     padding: EdgeInsets.symmetric(vertical: 16.h, horizontal: 16.w),
@@ -1035,7 +1348,10 @@ Widget $overallPerformance(int totalNumber, List<OverallTitles> overallTitles) {
       children: [
         Container(
           alignment: Alignment.center,
-          child: quickText('整体表现', color: Color.fromRGBO(92, 92, 92, 1), size: 14.sp, fontWeight: FontWeight.bold),
+          child: quickText('整体表现',
+              color: Color.fromRGBO(92, 92, 92, 1),
+              size: 14.sp,
+              fontWeight: FontWeight.bold),
           margin: EdgeInsets.only(bottom: 20.h),
         ),
         Expanded(
@@ -1044,13 +1360,19 @@ Widget $overallPerformance(int totalNumber, List<OverallTitles> overallTitles) {
               borderData: FlBorderData(show: false),
               sectionsSpace: 2,
               centerSpaceRadius: 0,
-              sections: overallTitles.map((e) {
+              sections: overallTitles.asMap().keys.map((index) {
+                var e = overallTitles[index];
                 return PieChartSectionData(
-                  color: colorMap[e.title],
+                  color: colorMap[index],
                   value: e.count / totalNumber * 100,
                   radius: 110,
-                  title: e.title + (doubleToStringAsFixed(e.count / totalNumber * 100) + '%'),
-                  titleStyle: TextStyle(fontSize: 14.sp, color: Colors.white, fontWeight: FontWeight.bold),
+                  title: e.title +
+                      (doubleToStringAsFixed(e.count / totalNumber * 100) +
+                          '%'),
+                  titleStyle: TextStyle(
+                      fontSize: 14.sp,
+                      color: Colors.white,
+                      fontWeight: FontWeight.bold),
                 );
               }).toList(),
             ),
@@ -1063,12 +1385,14 @@ Widget $overallPerformance(int totalNumber, List<OverallTitles> overallTitles) {
 
 /// 单位时间答题情况
 @swidget
-Widget $unitTimeAnsweringSituation(BuildContext context, int jobid, List<QuestionAnswerInfos> questionAnswerInfos) {
+Widget $unitTimeAnsweringSituation(BuildContext context, int jobid,
+    List<QuestionAnswerInfos> questionAnswerInfos) {
   List<String> questionNos = []; // 题号
   List<String> questionTypes = []; // 题型
   List<String> completionStatusWithinThirtySeconds = []; // 30s内完成情况
   List<String> completionStatusWithinThirtyOneSixtySeconds = []; // 31s-60s内完成情况
-  List<String> completionStatusWithinSixtyOneOneHundredAndTwenty = []; // 61s-120s内完成情况
+  List<String> completionStatusWithinSixtyOneOneHundredAndTwenty =
+      []; // 61s-120s内完成情况
   List<String> accuracys = []; // 正确率
   List<String> errorRate = []; // 错误率
   List<String> notDone = []; // 未做
@@ -1105,15 +1429,15 @@ Widget $unitTimeAnsweringSituation(BuildContext context, int jobid, List<Questio
 
     e.finishInfos.forEach((element) {
       if ('30s内完成情况' == element.title) {
-        completionStatusWithinThirtySeconds
-            .add('${element.finishCount}人完成，正确率${doubleToStringAsFixed(element.correctRate)}%');
+        completionStatusWithinThirtySeconds.add(
+            '${element.finishCount}人完成，正确率${doubleToStringAsFixed(element.correctRate)}%');
       } else if ('31-60s内完成情况' == element.title) {
-        completionStatusWithinThirtyOneSixtySeconds
-            .add('${element.finishCount}人完成，正确率${doubleToStringAsFixed(element.correctRate)}%');
+        completionStatusWithinThirtyOneSixtySeconds.add(
+            '${element.finishCount}人完成，正确率${doubleToStringAsFixed(element.correctRate)}%');
       } else {
         // 61-120s内完成情况
-        completionStatusWithinSixtyOneOneHundredAndTwenty
-            .add('${element.finishCount}人完成，正确率${doubleToStringAsFixed(element.correctRate)}%');
+        completionStatusWithinSixtyOneOneHundredAndTwenty.add(
+            '${element.finishCount}人完成，正确率${doubleToStringAsFixed(element.correctRate)}%');
       }
     });
   });
@@ -1137,12 +1461,16 @@ Widget $unitTimeAnsweringSituation(BuildContext context, int jobid, List<Questio
     height: 520.h,
     margin: EdgeInsets.only(top: 20.h),
     padding: EdgeInsets.symmetric(vertical: 16.h, horizontal: 12.w),
-    decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(10.r)),
+    decoration: BoxDecoration(
+        color: Colors.white, borderRadius: BorderRadius.circular(10.r)),
     child: Column(
       mainAxisSize: MainAxisSize.min,
       children: [
         Container(
-          child: quickText('整体表现', color: Color.fromRGBO(92, 92, 92, 1), size: 14.sp, fontWeight: FontWeight.bold),
+          child: quickText('整体表现',
+              color: Color.fromRGBO(92, 92, 92, 1),
+              size: 14.sp,
+              fontWeight: FontWeight.bold),
           margin: EdgeInsets.only(bottom: 20.h),
         ),
         Expanded(
@@ -1152,7 +1480,8 @@ Widget $unitTimeAnsweringSituation(BuildContext context, int jobid, List<Questio
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 ...mapData.entries.map((entrie) {
-                  bool isViewButton = ['查看原题', '操作'].contains(entrie.key); // 查看按钮
+                  bool isViewButton =
+                      ['查看原题', '操作'].contains(entrie.key); // 查看按钮
                   bool isRatio = ['正确率', '错误率', '未做'].contains(entrie.key);
                   bool isQuestionNo = entrie.key == '题号';
                   return Row(
@@ -1162,17 +1491,23 @@ Widget $unitTimeAnsweringSituation(BuildContext context, int jobid, List<Questio
                         width: 94.r,
                         alignment: Alignment.center,
                         margin: EdgeInsets.only(bottom: 1.h, right: 1.w),
-                        padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w),
+                        padding: EdgeInsets.symmetric(
+                            vertical: 10.h, horizontal: 8.w),
                         color: Color.fromRGBO(230, 230, 230, 1),
-                        child: quickText(entrie.key, color: Color.fromRGBO(24, 35, 77, 1), size: 12.sp, maxLines: 2),
+                        child: quickText(entrie.key,
+                            color: Color.fromRGBO(24, 35, 77, 1),
+                            size: 12.sp,
+                            maxLines: 2),
                       ),
                       ...entrie.value.map((e) {
-                        bool noHasChineseCharacter = isQuestionNo && !containsChinese(e);
+                        bool noHasChineseCharacter =
+                            isQuestionNo && !containsChinese(e);
                         return Container(
                           width: 96.r,
                           alignment: Alignment.center,
                           margin: EdgeInsets.only(bottom: 1.h, right: 1.w),
-                          padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w),
+                          padding: EdgeInsets.symmetric(
+                              vertical: 10.h, horizontal: 8.w),
                           color: Color.fromRGBO(245, 245, 245, 1),
                           child: isViewButton
                               ? InkWell(
@@ -1220,34 +1555,43 @@ Widget $unitTimeAnsweringSituation(BuildContext context, int jobid, List<Questio
                                     //   );
                                     //   return;
                                     // }
-                                    if (_qpm.questionPicture == null) return ToastUtils.showInfo('当前试题没有原题');
+                                    if (_qpm.questionPicture == null)
+                                      return ToastUtils.showInfo('当前试题没有原题');
                                     Navigator.push(
                                       context,
                                       MaterialPageRoute(builder: (_) {
                                         return Scaffold(
                                           appBar: AppBar(),
-                                          body: PhotoView(imageProvider: NetworkImage(_qpm.questionPicture!)),
+                                          body: PhotoView(
+                                              imageProvider: NetworkImage(
+                                                  _qpm.questionPicture!)),
                                         );
                                       }),
                                     );
                                   },
                                   child: Row(
                                     mainAxisSize: MainAxisSize.min,
-                                    crossAxisAlignment: CrossAxisAlignment.center,
+                                    crossAxisAlignment:
+                                        CrossAxisAlignment.center,
                                     children: [
-                                      quickText('查看', color: Color.fromRGBO(239, 135, 20, 1), size: 12.sp),
+                                      quickText('查看',
+                                          color:
+                                              Color.fromRGBO(239, 135, 20, 1),
+                                          size: 12.sp),
                                       Container(
                                         padding: EdgeInsets.only(top: 1.h),
                                         child: Icon(
                                           Icons.arrow_forward_ios,
                                           size: 10.sp,
-                                          color: Color.fromRGBO(239, 135, 20, 1),
+                                          color:
+                                              Color.fromRGBO(239, 135, 20, 1),
                                         ),
                                       ),
                                     ],
                                   ),
                                 )
-                              : RegExp(r'^\d+$').hasMatch(e) || (e.contains('%') && e.length < 4)
+                              : RegExp(r'^\d+$').hasMatch(e) ||
+                                      (e.contains('%') && e.length < 4)
                                   ? Row(
                                       mainAxisSize: MainAxisSize.min,
                                       children: [
@@ -1255,14 +1599,23 @@ Widget $unitTimeAnsweringSituation(BuildContext context, int jobid, List<Questio
                                             color: isRatio
                                                 ? Theme.of(context).primaryColor
                                                 : Color.fromRGBO(82, 82, 82, 1),
-                                            size: isRatio || noHasChineseCharacter ? 12.sp : 12.sp,
+                                            size:
+                                                isRatio || noHasChineseCharacter
+                                                    ? 12.sp
+                                                    : 12.sp,
                                             maxLines: 2),
-                                        quickText('透', color: Colors.transparent, size: 12.sp),
+                                        quickText('透',
+                                            color: Colors.transparent,
+                                            size: 12.sp),
                                       ],
                                     )
                                   : quickText(e,
-                                      color: isRatio ? Theme.of(context).primaryColor : Color.fromRGBO(82, 82, 82, 1),
-                                      size: isRatio || noHasChineseCharacter ? 12.sp : 12.sp,
+                                      color: isRatio
+                                          ? Theme.of(context).primaryColor
+                                          : Color.fromRGBO(82, 82, 82, 1),
+                                      size: isRatio || noHasChineseCharacter
+                                          ? 12.sp
+                                          : 12.sp,
                                       maxLines: 2),
                         );
                       }).toList(),
@@ -1280,7 +1633,8 @@ Widget $unitTimeAnsweringSituation(BuildContext context, int jobid, List<Questio
 
 /// 人员数据概况
 @swidget
-Widget $personnelDataOverview(BuildContext context, List<StudentAnswerInfos> studentAnswerInfos) {
+Widget $personnelDataOverview(
+    BuildContext context, List<StudentAnswerInfos> studentAnswerInfos) {
   List<String> names = [];
   List<String> useTimes = [];
   List<String> correctRates = [];
@@ -1313,12 +1667,16 @@ Widget $personnelDataOverview(BuildContext context, List<StudentAnswerInfos> stu
     height: 290.h,
     margin: EdgeInsets.only(top: 20.h),
     padding: EdgeInsets.symmetric(vertical: 16.h, horizontal: 12.w),
-    decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(10.r)),
+    decoration: BoxDecoration(
+        color: Colors.white, borderRadius: BorderRadius.circular(10.r)),
     child: Column(
       mainAxisSize: MainAxisSize.min,
       children: [
         Container(
-          child: quickText('人员数据概况', color: Color.fromRGBO(92, 92, 92, 1), size: 14.sp, fontWeight: FontWeight.bold),
+          child: quickText('人员数据概况',
+              color: Color.fromRGBO(92, 92, 92, 1),
+              size: 14.sp,
+              fontWeight: FontWeight.bold),
           margin: EdgeInsets.only(bottom: 20.h),
         ),
         Expanded(
@@ -1328,7 +1686,8 @@ Widget $personnelDataOverview(BuildContext context, List<StudentAnswerInfos> stu
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 ...mapData.entries.map((entrie) {
-                  bool isTransparentChinese = ['答题时长', '正确率', '未答题数'].contains(entrie.key); // 透明中文
+                  bool isTransparentChinese =
+                      ['答题时长', '正确率', '未答题数'].contains(entrie.key); // 透明中文
 
                   return Row(
                     crossAxisAlignment: CrossAxisAlignment.start,
@@ -1338,28 +1697,44 @@ Widget $personnelDataOverview(BuildContext context, List<StudentAnswerInfos> stu
                         alignment: Alignment.center,
                         color: Color.fromRGBO(230, 230, 230, 1),
                         margin: EdgeInsets.only(bottom: 1.h, right: 1.w),
-                        padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w),
-                        child: quickText(entrie.key, color: Color.fromRGBO(24, 35, 77, 1), size: 12.sp, maxLines: 2),
+                        padding: EdgeInsets.symmetric(
+                            vertical: 10.h, horizontal: 8.w),
+                        child: quickText(entrie.key,
+                            color: Color.fromRGBO(24, 35, 77, 1),
+                            size: 12.sp,
+                            maxLines: 2),
                       ),
                       ...entrie.value.map((e) {
-                        bool isTransparentChineseNew = isTransparentChinese && (e?.length ?? 0) == 0;
+                        bool isTransparentChineseNew =
+                            isTransparentChinese && (e?.length ?? 0) == 0;
                         return Container(
                           width: 100.r,
                           alignment: Alignment.center,
                           margin: EdgeInsets.only(bottom: 1.h, right: 1.w),
-                          padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w),
+                          padding: EdgeInsets.symmetric(
+                              vertical: 10.h, horizontal: 8.w),
                           color: Color.fromRGBO(245, 245, 245, 1),
                           child: isTransparentChineseNew
-                              ? quickText('透明', color: Colors.transparent, size: 12.sp)
+                              ? quickText('透明',
+                                  color: Colors.transparent, size: 12.sp)
                               : RegExp(r'^\d+$').hasMatch(e) || e.contains('%')
                                   ? Row(
                                       mainAxisSize: MainAxisSize.min,
                                       children: [
-                                        quickText(e, color: Color.fromRGBO(82, 82, 82, 1), size: 12.sp, maxLines: 2),
-                                        quickText('透', color: Colors.transparent, size: 12.sp),
+                                        quickText(e,
+                                            color:
+                                                Color.fromRGBO(82, 82, 82, 1),
+                                            size: 12.sp,
+                                            maxLines: 2),
+                                        quickText('透',
+                                            color: Colors.transparent,
+                                            size: 12.sp),
                                       ],
                                     )
-                                  : quickText(e, color: Color.fromRGBO(82, 82, 82, 1), size: 12.sp, maxLines: 2),
+                                  : quickText(e,
+                                      color: Color.fromRGBO(82, 82, 82, 1),
+                                      size: 12.sp,
+                                      maxLines: 2),
                         );
                       }).toList(),
                     ],
@@ -1398,5 +1773,10 @@ class QuestionPictureModel extends Object {
   String questionNo;
   int questionid;
   int jobid;
-  QuestionPictureModel({required this.jobid, required this.questionid, required this.questionNo, this.questionPicture});
+
+  QuestionPictureModel(
+      {required this.jobid,
+      required this.questionid,
+      required this.questionNo,
+      this.questionPicture});
 }
diff --git a/marking_app/lib/pages/homework_correction/quick_check_personal.dart b/marking_app/lib/pages/homework_correction/quick_check_personal.dart
new file mode 100644
index 0000000..e020182
--- /dev/null
+++ b/marking_app/lib/pages/homework_correction/quick_check_personal.dart
@@ -0,0 +1,156 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+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/pages/homework_correction/widget/student_kg_table.dart';
+import 'package:marking_app/pages/homework_correction/widget/student_zg_table.dart';
+import 'package:marking_app/utils/request/rest_client.dart';
+
+class QuickCheckPersonal extends StatefulWidget {
+  final int jobId;
+  final int studentId;
+
+  const QuickCheckPersonal(
+      {Key? key, required this.jobId, required this.studentId})
+      : super(key: key);
+
+  @override
+  State<QuickCheckPersonal> createState() => _QuickCheckPersonalState();
+}
+
+class _QuickCheckPersonalState extends State<QuickCheckPersonal>
+    with CommonMixin {
+  StudentDetails? studentInfo;
+
+  void initState() {
+    super.initState();
+    EasyLoading.show(status: 'loading...');
+    getJobPersonal();
+  }
+
+  void getJobPersonal() async {
+    RestClient _client = await getClient();
+    Map<String, dynamic> params = {};
+    // params['jobid'] = widget.jobId;
+    params['jobid'] = '521646983660101';
+    params['studentId'] = widget.studentId;
+    BaseStructureResult<StudentDetails?> data =
+        await _client.getJobPersonalReport(params);
+    EasyLoading.dismiss();
+    setState(() {
+      studentInfo = data.data;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (studentInfo == null) {
+      return Container();
+    }
+    return Scaffold(
+      backgroundColor: Color.fromRGBO(245, 245, 245, 1),
+      appBar: AppBar(
+        backgroundColor: Colors.white,
+        title: Text(
+          studentInfo!.studentName,
+          style: TextStyle(fontSize: 16.sp, color: Color(0xFF000000)),
+        ),
+        centerTitle: true,
+        leading: IconButton(
+          icon: Icon(Icons.arrow_back_ios, color: Colors.black),
+          onPressed: () => Navigator.of(context).pop(),
+        ),
+      ),
+
+      body: SingleChildScrollView(
+        child: Column(
+          children: [
+            //客观题
+            Container(
+              padding: EdgeInsets.symmetric(vertical: 14.r, horizontal: 10.r),
+              margin: EdgeInsets.symmetric(vertical: 14.r, horizontal: 14.r),
+              decoration: BoxDecoration(
+                color: Colors.white,
+                borderRadius: BorderRadius.all(Radius.circular(6.r)),
+              ),
+              child: Column(
+                children: [
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    crossAxisAlignment: CrossAxisAlignment.end,
+                    children: [
+                      Text(
+                        '客观题',
+                        style: TextStyle(
+                            fontSize: 14.sp, color: Color(0xFF5C5C5C)),
+                      ),
+                      SizedBox(
+                        width: 10.r,
+                      ),
+                      Text(
+                        '${studentInfo!.kgValidRate}%',
+                        style: TextStyle(
+                            fontSize: 14.sp, color: Color(0xFF6888FD)),
+                      ),
+                    ],
+                  ),
+                  SizedBox(height: 10.r,),
+                  SizedBox(
+                    height: studentInfo!.kgDetails.length>8?300.r:studentInfo!.kgDetails.length * 40.r + 40.r,
+                    child: StudentKgTable(
+                      headList: ['题号', '学生答案', '标准答案'],
+                      bodyList: studentInfo!.kgDetails,
+                    ),
+                  )
+                ],
+              ),
+            ),
+            SizedBox(height: 15.r,),
+            //主观题
+            Container(
+              padding: EdgeInsets.symmetric(vertical: 14.r, horizontal: 10.r),
+              margin: EdgeInsets.symmetric(vertical: 14.r, horizontal: 14.r),
+              decoration: BoxDecoration(
+                color: Colors.white,
+                borderRadius: BorderRadius.all(Radius.circular(6.r)),
+              ),
+              child: Column(
+                children: [
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    crossAxisAlignment: CrossAxisAlignment.end,
+                    children: [
+                      Text(
+                        '主观题',
+                        style: TextStyle(
+                            fontSize: 14.sp, color: Color(0xFF5C5C5C)),
+                      ),
+                      SizedBox(
+                        width: 10.r,
+                      ),
+                      Text(
+                        '${studentInfo!.zgValidRate}%',
+                        style: TextStyle(
+                            fontSize: 14.sp, color: Color(0xFF6888FD)),
+                      ),
+                    ],
+                  ),
+                  SizedBox(height: 10.r,),
+                  SizedBox(
+                    height: studentInfo!.zgDetails.length>8?300.r:studentInfo!.zgDetails.length * 40.r + 40.r,
+                    child: StudentZgTable(
+                      headList: ['题号', '用时', '批注结果','答案','批注'],
+                      bodyList: studentInfo!.zgDetails,
+                    ),
+                  )
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/marking_app/lib/pages/homework_correction/quick_data_check.dart b/marking_app/lib/pages/homework_correction/quick_data_check.dart
new file mode 100644
index 0000000..17fef7b
--- /dev/null
+++ b/marking_app/lib/pages/homework_correction/quick_data_check.dart
@@ -0,0 +1,329 @@
+import 'package:fl_chart/fl_chart.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+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/common/model/job/job_report_join_class.dart';
+import 'package:marking_app/pages/homework_correction/widget/quick_student_data_table.dart';
+import 'package:marking_app/utils/index.dart';
+import 'package:marking_app/utils/request/rest_client.dart';
+import 'package:percent_indicator/linear_percent_indicator.dart';
+
+class QuickDataCheck extends StatefulWidget {
+  final int jobId;
+  final String className;
+
+  const QuickDataCheck({Key? key, required this.jobId,required this.className}) : super(key: key);
+
+  @override
+  State<QuickDataCheck> createState() => _QuickDataCheckState();
+}
+
+class _QuickDataCheckState extends State<QuickDataCheck> with CommonMixin {
+  JobDataReport? jobData;
+
+  void initState() {
+    super.initState();
+    EasyLoading.show(status:'loading...');
+    getJobDataReport();
+  }
+
+  void getJobDataReport() async {
+    RestClient _client = await getClient();
+    Map<String, dynamic> params = {};
+    // params['jobid'] = widget.jobId;
+    params['jobid'] = '521646983660101';
+    BaseStructureResult<JobDataReport?> data =
+        await _client.getJobDataCenterReport(params);
+    EasyLoading.dismiss();
+    setState(() {
+      jobData = data.data;
+    });
+
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (jobData == null) {
+      return Container();
+    }
+    return AnnotatedRegion(
+      value: const SystemUiOverlayStyle(
+        statusBarColor: Colors.transparent,
+        systemNavigationBarIconBrightness: Brightness.light,
+        statusBarIconBrightness: Brightness.light,
+        statusBarBrightness: Brightness.dark,
+      ),
+      child: Container(
+        padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top),
+        height: MediaQuery.of(context).size.height,
+        decoration: BoxDecoration(
+            gradient: LinearGradient(
+                begin: Alignment.topCenter,
+                end: Alignment.bottomCenter,
+                colors: [
+              Color(0xFF6889FD),
+              Color(0xFFF5F5F5),
+            ],
+                stops: [
+              0.09,
+              0.3
+            ])),
+        child: Column(
+          children: [
+            Row(
+              children: [
+                IconButton(
+                  icon: Icon(Icons.arrow_back_ios, color: Colors.white),
+                  onPressed: () => Navigator.of(context).pop(),
+                ),
+                Expanded(
+                    child: Center(
+                        child: Text(
+                  '数据快查',
+                  style: TextStyle(fontSize: 16.sp, color: Colors.white),
+                ))),
+              ],
+            ),
+            SizedBox(height:10.r),
+            Expanded(child: SingleChildScrollView(
+              child: Column(
+                children: [
+                  Padding(
+                    padding: EdgeInsets.only(left: 14.r, top: 2.r),
+                    child: Row(
+                      crossAxisAlignment: CrossAxisAlignment.center,
+                      children: [
+                        Image.asset(
+                          'assets/images/job_report_class_icon.png',
+                          width: 22.r,
+                          height: 22.r,
+                        ),
+                        SizedBox(
+                          width: 6.r,
+                        ),
+                        Text(
+                          widget.className,
+                          style: TextStyle(fontSize: 14.r, color: Colors.white),
+                        )
+                      ],
+                    ),
+                  ),
+                  Container(
+                    padding: EdgeInsets.symmetric(vertical: 10.r, horizontal: 15.r),
+                    margin: EdgeInsets.symmetric(vertical: 10.r, horizontal: 14.r),
+                    decoration: BoxDecoration(
+                        color: Colors.white,
+                        borderRadius: BorderRadius.all(Radius.circular(6.r))),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            Container(
+                              width: 14.r,
+                              height: 14.r,
+                              decoration: BoxDecoration(
+                                  color: Color(0xFF4CC793),
+                                  borderRadius:
+                                  BorderRadius.all(Radius.circular(7.r))),
+                            ),
+                            SizedBox(
+                              width: 6.r,
+                            ),
+                            Text(
+                              '已提交',
+                              style: TextStyle(
+                                  fontSize: 12.sp, color: Color(0xFF333333)),
+                            ),
+                            SizedBox(
+                              width: 35.r,
+                            ),
+                            Container(
+                              width: 14.r,
+                              height: 14.r,
+                              decoration: BoxDecoration(
+                                  color: Color(0xFF6888FD),
+                                  borderRadius:
+                                  BorderRadius.all(Radius.circular(7.r))),
+                            ),
+                            SizedBox(
+                              width: 6.r,
+                            ),
+                            Text(
+                              '未提交',
+                              style: TextStyle(
+                                  fontSize: 12.sp, color: Color(0xFF333333)),
+                            )
+                          ],
+                        ),
+                        //环形图
+                        SizedBox(
+                          height: MediaQuery.of(context).size.width * 0.5,
+                          child: PieChart(
+                            PieChartData(
+                              borderData: FlBorderData(show: false),
+                              sectionsSpace: 0,
+                              centerSpaceRadius: MediaQuery.of(context).size.width * 0.1,
+                              sections: [
+                                PieChartSectionData(
+                                  color: Color(0xFF4CC793),
+                                  value: jobData!.validCount/(jobData!.validCount+jobData!.noAnswerCount) * 100,
+                                  radius: MediaQuery.of(context).size.width * 0.1 + 5,
+                                  title: '${jobData!.validCount}人',
+                                  titleStyle: TextStyle(
+                                    fontSize: 14.sp,
+                                    color: Colors.white,
+                                  ),
+                                ),
+                                PieChartSectionData(
+                                  color: Color(0xFF6888FD),
+                                  value: jobData!.noAnswerCount/(jobData!.validCount+jobData!.noAnswerCount) * 100,
+                                  radius: MediaQuery.of(context).size.width * 0.1,
+                                  title: '${jobData!.noAnswerCount}人',
+                                  titleStyle: TextStyle(
+                                    fontSize: 14.sp,
+                                    color: Colors.white,
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
+                        //  客观进度条
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          children: [
+                            Text(
+                              '客观题答题进度',
+                              style: TextStyle(
+                                  fontSize: 10.sp, color: Color(0xFF8B8B8B)),
+                            ),
+                            Text('${doubleToStringAsFixed(jobData!.kgValidRate)}%',
+                              style: TextStyle(
+                                  fontSize: 10.sp, color: Color(0xFF333333)),
+                            ),
+                          ],
+                        ),
+                        SizedBox(height: 6.r),
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          children: [
+                            Expanded(
+                                flex: 10,
+                                child: LinearPercentIndicator(
+                                  padding: EdgeInsets.zero,
+                                  animation: true,
+                                  lineHeight: 9.h,
+                                  animationDuration: 2500,
+                                  percent: jobData!.kgValidRate/100,
+                                  progressColor: Color(0xFFFF7F22),
+                                  backgroundColor: Color(0xFFEAEAEA),
+                                  barRadius: Radius.circular(10.r),
+                                )),
+                          ],
+                        ),
+                        SizedBox(height: 20.r),
+                        //  主观进度条
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          children: [
+                            Text(
+                              '主观题答题进度',
+                              style: TextStyle(
+                                  fontSize: 10.sp, color: Color(0xFF8B8B8B)),
+                            ),
+                            Text(
+                              '${doubleToStringAsFixed(jobData!.zgValidRate)}%',
+                              style: TextStyle(
+                                  fontSize: 10.sp, color: Color(0xFF333333)),
+                            ),
+                          ],
+                        ),
+                        SizedBox(height: 6.r),
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          children: [
+                            Expanded(
+                                flex: 10,
+                                child: LinearPercentIndicator(
+                                  padding: EdgeInsets.zero,
+                                  animation: true,
+                                  lineHeight: 9.h,
+                                  animationDuration: 2500,
+                                  percent: jobData!.zgValidRate/100,
+                                  progressColor: Color(0xFFFF7F22),
+                                  backgroundColor: Color(0xFFEAEAEA),
+                                  barRadius: Radius.circular(10.r),
+                                )),
+                          ],
+                        ),
+                      ],
+                    ),
+                  ),
+                  Container(
+                    padding: EdgeInsets.symmetric(vertical: 10.r, horizontal: 10.r),
+                    margin: EdgeInsets.symmetric(vertical: 10.r, horizontal: 14.r),
+                    decoration: BoxDecoration(
+                        color: Colors.white,
+                        borderRadius: BorderRadius.all(Radius.circular(6.r))),
+                    child: Column(
+                      children: [
+                        InkWell(
+                          onTap: (){
+                            jobData!.studentDetails.sort((a, b) {
+                              int num1 = a.kgValidRate + a.zgValidRate;
+                              int num2 = b.kgValidRate + b.zgValidRate;
+                              return  num2.compareTo(num1);
+                            });
+                            setState(() {
+                              jobData!.studentDetails;
+                            });
+                          },
+                          child: Row(
+                            mainAxisAlignment: MainAxisAlignment.end,
+                            children: [
+                              Text(
+                                '未提交排序',
+                                style: TextStyle(
+                                    fontSize: 12.sp, color: Color(0xFF6888FD)),
+                              ),
+                              SizedBox(
+                                width: 10.r,
+                              ),
+                              Image.asset(
+                                'assets/images/sort_icon.png',
+                                width: 14.r,
+                                height: 14.r,
+                              ),
+                            ],
+                          ),
+                        ),
+                        SizedBox(height: 10.r,),
+                        SizedBox(
+                          height: jobData!.studentDetails.length>5?350.r:jobData!.studentDetails.length * 50.r + 40.r,
+                          child: QuickStudentDataTable(
+                            headList: ['学生姓名','客观题','主观题','客观题错题','主观题错题'],
+                            bodyList: jobData!.studentDetails,
+                            jobId: widget.jobId,
+                            fixedRows: 1,
+                            fixedCols: 0,
+                          ),
+                        )
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+            ))
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/marking_app/lib/pages/homework_correction/widget/quick_student_data_table.dart b/marking_app/lib/pages/homework_correction/widget/quick_student_data_table.dart
new file mode 100644
index 0000000..7fb44fd
--- /dev/null
+++ b/marking_app/lib/pages/homework_correction/widget/quick_student_data_table.dart
@@ -0,0 +1,193 @@
+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/routes/RouterManager.dart';
+import 'package:marking_app/utils/index.dart';
+
+class QuickStudentDataTable extends StatefulWidget {
+  final List headList;
+  final List bodyList;
+  final int? fixedRows;
+  final int? fixedCols;
+  final int jobId;
+
+  const QuickStudentDataTable({
+    Key? key,
+    required this.headList,
+    required this.bodyList,
+    required this.jobId,
+    this.fixedCols = 0,
+    this.fixedRows = 0,
+  }) : super(key: key);
+
+  @override
+  State<QuickStudentDataTable> createState() => _QuickStudentDataTableState();
+}
+
+class _QuickStudentDataTableState extends State<QuickStudentDataTable> {
+  final ScrollController _controller = ScrollController();
+  int? _sortColumnIndex;
+  bool _sortAscending = true;
+
+  DataRow _getRow(int index, [Color? color]) {
+    assert(index >= 0);
+    StudentDetails item = widget.bodyList[index];
+    int num = 0;
+    item.kgDetails.forEach((element) {
+      if(element.state == 0){
+        num = num + 1;
+      }
+    });
+    item.zgDetails.forEach((element) {
+      if(element.state == 0){
+        num = num + 1;
+      }
+    });
+    return DataRow2.byIndex(
+      index: index,
+      color: color != null ? num == 0?MaterialStateProperty.all(color):MaterialStateProperty.all(Color(0xFFFFD79C)): null,
+      cells: [
+        DataCell(InkWell(
+          onTap: (){
+            RouterManager.router.navigateTo(
+              context,
+              RouterManager.quickCheckPersonalPath +
+                  '?jobId=${521646983660101}&studentId=${item.studentId}',
+              transition: getTransition(),
+            );
+          },
+          child: Center(
+            child: Padding(
+              padding: EdgeInsets.symmetric(horizontal: 5.r),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: [
+                  Text(item.studentName,
+                      style: TextStyle(fontSize: 12.sp, color: Color(0xFF6888FD))),
+                  SizedBox(width: 5.r,),
+                  Image.asset('assets/images/job_data_right_icon.png',width: 10.r,height: 10.r,)
+                ],
+              ),
+            ),
+          ),
+        )),
+        DataCell(Center(
+          child: Padding(
+            padding: EdgeInsets.symmetric(horizontal: 5.r),
+            child: Text(
+                '${(item.kgValidRate / 100 * item.kgValidCount).toInt()}/${item.kgValidCount}',
+                style: TextStyle(fontSize: 12.sp, color: Color(0xFF525252))),
+          ),
+        )),
+        DataCell(Center(
+          child: Padding(
+            padding: EdgeInsets.symmetric(horizontal: 5.r),
+            child: Text(
+                '${(item.zgValidRate / 100 * item.zgValidCount).toInt()}/${item.zgValidCount}',
+                style: TextStyle(fontSize: 12.sp, color: Color(0xFF525252))),
+          ),
+        )),
+        DataCell(
+          Padding(
+            padding: EdgeInsets.symmetric(vertical:2.r,horizontal: 5.r),
+            child: SingleChildScrollView(
+              child: Wrap(
+                  direction: Axis.horizontal,
+                  alignment: WrapAlignment.center,
+                  spacing: 2,
+                  runSpacing: 2,
+    children: List.generate(item.kgDetails.length, (index) {
+                    KgDetails kgInfo = item.kgDetails[index];
+                    return Container(
+                      width: 14.r,
+                      height: 14.r,
+                      decoration: BoxDecoration(
+                        color: kgInfo.state == 0?Color(0xFFD9D9D9):kgInfo.state == 1?Color(0xFFFF7474):Color(0xFF4CC793),
+                        borderRadius: BorderRadius.all(Radius.circular(7.r))
+                      ),
+                      child: Center(child: Text(kgInfo.questionNo,style: TextStyle(fontSize:10.sp,color: kgInfo.state == 0?Color(0xFF525252):Colors.white),)),
+                    );
+                  })),
+            ),
+          ),
+        ),
+        DataCell(  Padding(
+          padding: EdgeInsets.symmetric(vertical:2.r,horizontal: 5.r),
+          child: SingleChildScrollView(
+            child: Wrap(
+                direction: Axis.horizontal,
+                alignment: WrapAlignment.center,
+                spacing: 2,
+                runSpacing: 2,
+                children: List.generate(item.zgDetails.length, (index) {
+                  KgDetails kgInfo = item.zgDetails[index];
+                  return Container(
+                    width: 14.r,
+                    height: 14.r,
+                    decoration: BoxDecoration(
+                        color: kgInfo.state == 0?Color(0xFFD9D9D9):kgInfo.state == 1?Color(0xFFFF7474):Color(0xFF4CC793),
+                        borderRadius: BorderRadius.all(Radius.circular(7.r))
+                    ),
+                    child: Center(child: Text(kgInfo.questionNo,style: TextStyle(fontSize:10.sp,color: kgInfo.state == 0?Color(0xFF525252):Colors.white),)),
+                  );
+                })),
+          ),
+        ),),
+      ],
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return DataTable2(
+        dividerThickness: 0,
+        scrollController: _controller,
+        columnSpacing: 0,
+        horizontalMargin: 0,
+        bottomMargin: 0,
+        dataRowHeight: 50.r,
+        border: TableBorder(
+            horizontalInside: BorderSide(
+                width: 1, color: Colors.white, style: BorderStyle.solid),
+            bottom: BorderSide(
+                width: 1, color: Colors.white, style: BorderStyle.solid),
+            verticalInside: BorderSide(
+                width: 1, color: Colors.white, style: BorderStyle.solid)),
+        headingRowColor: MaterialStateProperty.resolveWith((states) =>
+            widget.fixedCols! > 0 ? Colors.white : Colors.transparent),
+        /* headingRowDecoration: BoxDecoration(
+          gradient: LinearGradient(
+            colors: [
+              Colors.grey[400]!,
+              Colors.grey[200]!,
+            ],
+            begin: Alignment.topCenter,
+            end: Alignment.bottomCenter,
+          ),
+        ),*/
+        headingRowDecoration: BoxDecoration(color: Color(0xFFE6E6E6)),
+        fixedColumnsColor: Color(0xFFE6E6E6),
+        fixedCornerColor: Colors.grey[400],
+        minWidth: MediaQuery.of(context).size.width,
+        fixedTopRows: widget.fixedRows!,
+        fixedLeftColumns: widget.fixedCols!,
+        sortColumnIndex: _sortColumnIndex,
+        sortAscending: _sortAscending,
+        // onSelectAll: (val) => setState(() => selectAll(val)),
+        columns: List.generate(widget.headList.length, (index) {
+          var item = widget.headList[index];
+          return DataColumn2(
+            label: Center(
+              child: Text(item,
+                  style: TextStyle(fontSize: 12.sp, color: Color(0xFF505767))),
+            ),
+            // size: ColumnSize.S,
+            fixedWidth: (MediaQuery.of(context).size.width - 20.r - 28.r)/5,
+          );
+        }),
+        rows: List<DataRow>.generate(widget.bodyList.length,
+            (index) => _getRow(index, Color(0xFFF5F5F5))));
+  }
+}
diff --git a/marking_app/lib/pages/homework_correction/widget/report_table.dart b/marking_app/lib/pages/homework_correction/widget/report_table.dart
new file mode 100644
index 0000000..712ae90
--- /dev/null
+++ b/marking_app/lib/pages/homework_correction/widget/report_table.dart
@@ -0,0 +1,148 @@
+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';
+
+class ReportTable extends StatefulWidget {
+  final List headList;
+  final List bodyList;
+  final int? fixedRows;
+  final int? fixedCols;
+  final bool? isKG;
+
+  const ReportTable({
+    Key? key,
+    required this.headList,
+    required this.bodyList,
+     this.fixedCols = 0,
+     this.fixedRows = 0,
+    this.isKG = false,
+  }) : super(key: key);
+
+  @override
+  State<ReportTable> createState() => _ReportTableState();
+}
+
+class _ReportTableState extends State<ReportTable> {
+  final ScrollController _controller = ScrollController();
+  int? _sortColumnIndex;
+  bool _sortAscending = true;
+
+  DataRow _getRow(int index, [Color? color]) {
+    assert(index >= 0);
+    var item = widget.bodyList[index];
+    return DataRow2.byIndex(
+      index: index,
+      color: color != null ? MaterialStateProperty.all(color) : null,
+      cells: [
+        DataCell( Center(
+          child: Padding(
+            padding: EdgeInsets.symmetric(horizontal: 5.r),
+            child:
+            Text(item.questionNo,
+                style:
+                TextStyle(fontSize: 12.sp, color: Color(0xFF525252))),
+          ),
+        )),
+        DataCell( Center(
+          child: Padding(
+            padding: EdgeInsets.symmetric(horizontal: 5.r),
+            child:
+            Text('${item.validRate}%',
+                style:
+                TextStyle(fontSize: 12.sp, color: Color(0xFF525252))),
+          ),
+        )),
+        DataCell( Center(
+          child: Padding(
+            padding: EdgeInsets.symmetric(horizontal: 5.r),
+            child:
+            Text(item.validCount,
+                style:
+                TextStyle(fontSize: 12.sp, color: Color(0xFF4CC793))),
+          ),
+        )),
+        DataCell( Center(
+          child: Padding(
+            padding: EdgeInsets.symmetric(horizontal: 5.r),
+            child:
+            Text('${item.correctRate}%',
+                style:
+                TextStyle(fontSize: 12.sp, color: Color(0xFF525252))),
+          ),
+        )),
+        DataCell( Center(
+          child: Padding(
+            padding: EdgeInsets.symmetric(horizontal: 5.r),
+            child:
+            Text(
+                widget.isKG == true?'原题':item.questionAnswer,
+                style:
+                TextStyle(fontSize: 12.sp, color: widget.isKG == true?Color(0xFFFF8A00):Color(0xFF4CC793))),
+          ),
+        )),
+        DataCell( Center(
+          child: Padding(
+            padding: EdgeInsets.symmetric(horizontal: 5.r),
+            child:
+            Text(item.priorityGeneral,
+                style:
+                TextStyle(fontSize: 12.sp, color: Color(0xFF6888FD))),
+          ),
+        )),
+      ],
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return DataTable2(
+        dividerThickness: 0,
+        scrollController: _controller,
+        columnSpacing: 0,
+        horizontalMargin: 0,
+        dataRowHeight:40.r,
+        bottomMargin: 0,
+        border: TableBorder(
+            horizontalInside: BorderSide(
+                width: 1, color: Colors.white, style: BorderStyle.solid),
+            bottom: BorderSide(
+                width: 1, color: Colors.white, style: BorderStyle.solid),
+            verticalInside: BorderSide(
+                width: 1, color: Colors.white, style: BorderStyle.solid)),
+        headingRowColor: MaterialStateProperty.resolveWith((states) =>
+            widget.fixedCols! > 0 ? Colors.white : Colors.transparent),
+        /* headingRowDecoration: BoxDecoration(
+          gradient: LinearGradient(
+            colors: [
+              Colors.grey[400]!,
+              Colors.grey[200]!,
+            ],
+            begin: Alignment.topCenter,
+            end: Alignment.bottomCenter,
+          ),
+        ),*/
+        headingRowDecoration: BoxDecoration(color: Color(0xFFE6E6E6)),
+        fixedColumnsColor: Color(0xFFE6E6E6),
+        fixedCornerColor: Colors.grey[400],
+        minWidth: widget.headList.length > 6?80.r * widget.headList.length:MediaQuery.of(context).size.width,
+        fixedTopRows:  widget.fixedRows!,
+        fixedLeftColumns: widget.fixedCols!,
+        sortColumnIndex: _sortColumnIndex,
+        sortAscending: _sortAscending,
+        // onSelectAll: (val) => setState(() => selectAll(val)),
+        columns: List.generate(widget.headList.length, (index) {
+          var item = widget.headList[index];
+          return DataColumn2(
+            label: Center(
+              child: Text(item,
+                  style: TextStyle(fontSize: 12.sp, color: Color(0xFF505767))),
+            ),
+            // size: ColumnSize.S,
+            fixedWidth: index == 0 ? 40.r:widget.headList.length > 6 ?80.r:(MediaQuery.of(context).size.width)/widget.headList.length,
+          );
+        }),
+        rows: List<DataRow>.generate(widget.bodyList.length,
+            (index) => _getRow(index, Color(0xFFF5F5F5))));
+  }
+}
diff --git a/marking_app/lib/pages/homework_correction/widget/student_kg_table.dart b/marking_app/lib/pages/homework_correction/widget/student_kg_table.dart
new file mode 100644
index 0000000..4110d45
--- /dev/null
+++ b/marking_app/lib/pages/homework_correction/widget/student_kg_table.dart
@@ -0,0 +1,103 @@
+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';
+
+class StudentKgTable extends StatefulWidget {
+  final List headList;
+  final List bodyList;
+  final int? fixedRows;
+  final int? fixedCols;
+
+  const StudentKgTable({
+    Key? key,
+    required this.headList,
+    required this.bodyList,
+    this.fixedCols = 0,
+    this.fixedRows = 0,
+  }) : super(key: key);
+
+  @override
+  State<StudentKgTable> createState() => _StudentKgTableState();
+}
+
+class _StudentKgTableState extends State<StudentKgTable> {
+  final ScrollController _controller = ScrollController();
+  int? _sortColumnIndex;
+  bool _sortAscending = true;
+
+  DataRow _getRow(int index, [Color? color]) {
+    assert(index >= 0);
+    KgDetails item = widget.bodyList[index];
+    return DataRow2.byIndex(
+      index: index,
+      color: color != null ? MaterialStateProperty.all(color): null,
+      cells: [
+        DataCell(Center(
+          child: Padding(
+            padding: EdgeInsets.symmetric(horizontal: 5.r),
+            child: Text(item.questionNo,
+                style: TextStyle(fontSize: 12.sp, color: Color(0xFF6888FD))),
+          ),
+        )),
+        DataCell(Center(
+          child: Padding(
+            padding: EdgeInsets.symmetric(horizontal: 5.r),
+            child: Text(item.studentAnswer == null?'未作答':item.studentAnswer!,
+                style: TextStyle(fontSize: 12.sp, color: Color(0xFF525252))),
+          ),
+        )),
+        DataCell(Center(
+          child: Padding(
+            padding: EdgeInsets.symmetric(horizontal: 5.r),
+            child: Text(item.annotateAnswers == null ?'无':item.annotateAnswers!,
+                style: TextStyle(fontSize: 12.sp, color: Color(0xFF525252))),
+          ),
+        )),
+      ],
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return DataTable2(
+        dividerThickness: 0,
+        scrollController: _controller,
+        columnSpacing: 0,
+        horizontalMargin: 0,
+        bottomMargin: 0,
+        dataRowHeight: 40.r,
+        headingRowHeight: 40.r,
+        border: TableBorder(
+            horizontalInside: BorderSide(
+                width: 1, color: Colors.white, style: BorderStyle.solid),
+            bottom: BorderSide(
+                width: 1, color: Colors.white, style: BorderStyle.solid),
+            verticalInside: BorderSide(
+                width: 1, color: Colors.white, style: BorderStyle.solid)),
+        headingRowColor: MaterialStateProperty.resolveWith((states) =>
+            widget.fixedCols! > 0 ? Colors.white : Colors.transparent),
+        headingRowDecoration: BoxDecoration(color: Color(0xFFE6E6E6)),
+        fixedColumnsColor: Color(0xFFE6E6E6),
+        fixedCornerColor: Colors.grey[400],
+        minWidth: MediaQuery.of(context).size.width,
+        fixedTopRows: widget.fixedRows!,
+        fixedLeftColumns: widget.fixedCols!,
+        sortColumnIndex: _sortColumnIndex,
+        sortAscending: _sortAscending,
+        // onSelectAll: (val) => setState(() => selectAll(val)),
+        columns: List.generate(widget.headList.length, (index) {
+          var item = widget.headList[index];
+          return DataColumn2(
+            label: Center(
+              child: Text(item,
+                  style: TextStyle(fontSize: 12.sp, color: Color(0xFF505767))),
+            ),
+            // size: ColumnSize.S,
+            fixedWidth: (MediaQuery.of(context).size.width - 20.r - 28.r)/3,
+          );
+        }),
+        rows: List<DataRow>.generate(widget.bodyList.length,
+            (index) => _getRow(index, Color(0xFFF5F5F5))));
+  }
+}
diff --git a/marking_app/lib/pages/homework_correction/widget/student_zg_table.dart b/marking_app/lib/pages/homework_correction/widget/student_zg_table.dart
new file mode 100644
index 0000000..d60d374
--- /dev/null
+++ b/marking_app/lib/pages/homework_correction/widget/student_zg_table.dart
@@ -0,0 +1,157 @@
+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/easy_refresh/MyEmptyWidget.dart';
+
+class StudentZgTable extends StatefulWidget {
+  final List headList;
+  final List bodyList;
+  final int? fixedRows;
+  final int? fixedCols;
+
+  const StudentZgTable({
+    Key? key,
+    required this.headList,
+    required this.bodyList,
+    this.fixedCols = 0,
+    this.fixedRows = 0,
+  }) : super(key: key);
+
+  @override
+  State<StudentZgTable> createState() => _StudentZgTableState();
+}
+
+class _StudentZgTableState extends State<StudentZgTable> {
+  final ScrollController _controller = ScrollController();
+  int? _sortColumnIndex;
+  bool _sortAscending = true;
+  
+  void showImgDialog(BuildContext context,String imgUrl){
+    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))),
+        content: SizedBox(
+          width: MediaQuery.of(context).size.width * 0.6,
+          height: MediaQuery.of(context).size.height * 0.6,
+          child: Column(
+            children: [
+              Center(
+                child: Text('批注答案',style: TextStyle(fontSize: 15.sp,color: Color(0xFF3C3C3C)),),
+              ),
+              SizedBox(height: 10.r,),
+              Image.network(imgUrl,fit: BoxFit.cover, errorBuilder: (context, error, stackTrace) {
+                return Padding(
+                  padding: EdgeInsets.only(top: 20.r),
+                    child: const MyEmptyWidget());
+              }),
+            ],
+          ),
+        ),
+      );
+    });
+  }
+
+  DataRow _getRow(int index, [Color? color]) {
+    assert(index >= 0);
+    KgDetails item = widget.bodyList[index];
+    return DataRow2.byIndex(
+      index: index,
+      color: color != null ? MaterialStateProperty.all(color): null,
+      cells: [
+        DataCell(Center(
+          child: Padding(
+            padding: EdgeInsets.symmetric(horizontal: 5.r),
+            child: Text(item.questionNo,
+                style: TextStyle(fontSize: 12.sp, color: Color(0xFF6888FD))),
+          ),
+        )),
+        DataCell(Center(
+          child: Padding(
+            padding: EdgeInsets.symmetric(horizontal: 5.r),
+            child: Text(item.useTime.toString(),
+                style: TextStyle(fontSize: 12.sp, color: Color(0xFF525252))),
+          ),
+        )),
+        DataCell(Center(
+          child: Padding(
+            padding: EdgeInsets.symmetric(horizontal: 5.r),
+            child: item.state == 2?
+            Image.asset('assets/images/job_personal_correct_icon.png',width: 18.r,height: 18.r,):
+            Image.asset('assets/images/job_personal_error_icon.png',width: 10.r,height: 10.r,),
+          ),
+        )),
+        DataCell(InkWell(
+          onTap: (){
+            showImgDialog(context,item.studentAnswer!);
+          },
+          child: Center(
+            child: Padding(
+              padding: EdgeInsets.symmetric(horizontal: 5.r),
+              child: Text('查看',
+                  style: TextStyle(fontSize: 12.sp, color: Color(0xFF3661FE))),
+            ),
+          ),
+        )),
+        DataCell(InkWell(
+          onTap: (){
+            showImgDialog(context,item.annotateAnswers!);
+          },
+          child: Center(
+            child: Padding(
+              padding: EdgeInsets.symmetric(horizontal: 5.r),
+              child: Text('查看',
+                  style: TextStyle(fontSize: 12.sp, color: Color(0xFF3661FE))),
+            ),
+          ),
+        )),
+      ],
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return DataTable2(
+        dividerThickness: 0,
+        scrollController: _controller,
+        columnSpacing: 0,
+        horizontalMargin: 0,
+        bottomMargin: 0,
+        headingRowHeight: 40.r,
+        dataRowHeight: 40.r,
+        border: TableBorder(
+            horizontalInside: BorderSide(
+                width: 1, color: Colors.white, style: BorderStyle.solid),
+            bottom: BorderSide(
+                width: 1, color: Colors.white, style: BorderStyle.solid),
+            verticalInside: BorderSide(
+                width: 1, color: Colors.white, style: BorderStyle.solid)),
+        headingRowColor: MaterialStateProperty.resolveWith((states) =>
+            widget.fixedCols! > 0 ? Colors.white : Colors.transparent),
+        headingRowDecoration: BoxDecoration(color: Color(0xFFE6E6E6)),
+        fixedColumnsColor: Color(0xFFE6E6E6),
+        fixedCornerColor: Colors.grey[400],
+        minWidth: MediaQuery.of(context).size.width,
+        fixedTopRows: widget.fixedRows!,
+        fixedLeftColumns: widget.fixedCols!,
+        sortColumnIndex: _sortColumnIndex,
+        sortAscending: _sortAscending,
+        // onSelectAll: (val) => setState(() => selectAll(val)),
+        columns: List.generate(widget.headList.length, (index) {
+          var item = widget.headList[index];
+          return DataColumn2(
+            label: Center(
+              child: Text(item,
+                  style: TextStyle(fontSize: 12.sp, color: Color(0xFF505767))),
+            ),
+            // size: ColumnSize.S,
+            fixedWidth: (MediaQuery.of(context).size.width - 20.r - 28.r)/5,
+          );
+        }),
+        rows: List<DataRow>.generate(widget.bodyList.length,
+            (index) => _getRow(index, Color(0xFFF5F5F5))));
+  }
+}
diff --git a/marking_app/lib/pages/homework_correction/widget/top_count.dart b/marking_app/lib/pages/homework_correction/widget/top_count.dart
new file mode 100644
index 0000000..98e0e46
--- /dev/null
+++ b/marking_app/lib/pages/homework_correction/widget/top_count.dart
@@ -0,0 +1,266 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:marking_app/common/model/job/job_report_model.dart';
+import 'package:marking_app/utils/index.dart';
+
+class TopCount extends StatelessWidget {
+  final JobReportModel data;
+  const TopCount(this.data,{Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: EdgeInsets.symmetric(vertical: 10.r),
+      margin: EdgeInsets.symmetric(vertical: 10.r, horizontal: 10.r),
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.all(Radius.circular(6.r)),
+      ),
+      child: Column(
+        children: [
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+            children: [
+              Container(
+                width: 81.r,
+                padding: EdgeInsets.symmetric(
+                    vertical: 10.r, horizontal: 6.r),
+                decoration: BoxDecoration(
+                  border: Border.all(
+                      width: 1.r,
+                      color: Color(0xFF4CC793),
+                      style: BorderStyle.solid),
+                  borderRadius: BorderRadius.all(Radius.circular(6.r)),
+                ),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      crossAxisAlignment: CrossAxisAlignment.end,
+                      children: [
+                        Text(
+                          doubleToStringAsFixed(data.finishRate),
+                          style: TextStyle(
+                              fontSize: 24.sp,
+                              color: Color(0xFF4CC793),
+                              fontWeight: FontWeight.w600),
+                        ),
+                        Text(
+                          '%',
+                          style: TextStyle(
+                              fontSize: 16.sp,
+                              color: Color(0xFF4CC793),
+                              fontWeight: FontWeight.w600),
+                        ),
+                      ],
+                    ),
+                    SizedBox(
+                      height: 15.r,
+                      child: Row(
+                        children: [
+                          Text(
+                            data.validCount.toString(),
+                            style: TextStyle(
+                                fontSize: 10.sp,
+                                color: Color(0xFFB0B0B0)),
+                          ),
+                          Text(
+                            '/',
+                            style: TextStyle(
+                                fontSize: 10.sp,
+                                color: Color(0xFFB0B0B0)),
+                          ),
+                          Text(
+                            data.studentCount.toString(),
+                            style: TextStyle(
+                                fontSize: 10.sp,
+                                color: Color(0xFFB0B0B0)),
+                          ),
+                        ],
+                      ),
+                    ),
+                    Text(
+                      '完成率',
+                      style: TextStyle(
+                          fontSize: 12.sp, color: Color(0xFF818181)),
+                    )
+                  ],
+                ),
+              ),
+              Container(
+                width: 81.r,
+                padding: EdgeInsets.symmetric(
+                    vertical: 10.r, horizontal: 6.r),
+                decoration: BoxDecoration(
+                  border: Border.all(
+                      width: 1.r,
+                      color: Color(0xFF4CC793),
+                      style: BorderStyle.solid),
+                  borderRadius: BorderRadius.all(Radius.circular(6.r)),
+                ),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      crossAxisAlignment: CrossAxisAlignment.end,
+                      children: [
+                        Text(
+                          doubleToStringAsFixed(data.correctRate),
+                          style: TextStyle(
+                              fontSize: 24.sp,
+                              color: Color(0xFF4CC793),
+                              fontWeight: FontWeight.w600),
+                        ),
+                        Text(
+                          '%',
+                          style: TextStyle(
+                              fontSize: 16.sp,
+                              color: Color(0xFF4CC793),
+                              fontWeight: FontWeight.w600),
+                        ),
+                      ],
+                    ),
+                    SizedBox(
+                      height: 15.r,
+                    ),
+                    Text(
+                      '正确率',
+                      style: TextStyle(
+                          fontSize: 12.sp, color: Color(0xFF818181)),
+                    )
+                  ],
+                ),
+              ),
+              Container(
+                width: 81.r,
+                padding: EdgeInsets.symmetric(
+                    vertical: 10.r, horizontal: 6.r),
+                decoration: BoxDecoration(
+                  border: Border.all(
+                      width: 1.r,
+                      color: Color(0xFF4CC793),
+                      style: BorderStyle.solid),
+                  borderRadius: BorderRadius.all(Radius.circular(6.r)),
+                ),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      crossAxisAlignment: CrossAxisAlignment.end,
+                      children: [
+                        Text(
+                          data.allCorrect.toString(),
+                          style: TextStyle(
+                              fontSize: 24.sp,
+                              color: Color(0xFF4CC793),
+                              fontWeight: FontWeight.w600),
+                        ),
+                        Text(
+                          '人',
+                          style: TextStyle(
+                              fontSize: 16.sp,
+                              color: Color(0xFF4CC793),
+                              fontWeight: FontWeight.w600),
+                        ),
+                      ],
+                    ),
+                    SizedBox(
+                      height: 10.r,
+                    ),
+                    Text(
+                      '全对',
+                      style: TextStyle(
+                          fontSize: 12.sp, color: Color(0xFF818181)),
+                    )
+                  ],
+                ),
+              ),
+            ],
+          ),
+          SizedBox(
+            height: 15.r,
+          ),
+          Padding(
+              padding: EdgeInsets.symmetric(horizontal: 15.r),
+              child: GridView.builder(
+                shrinkWrap: true,
+                  gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+                    childAspectRatio: 150 / 46,
+                    crossAxisSpacing: 2.r, //水平子 Widget 之间间距
+                    mainAxisSpacing: 2.r, //垂直子 Widget 之间间距
+                    crossAxisCount: 2, //一行的 Widget 数量
+                  ),
+                  itemCount: data.overallTitles.length,
+                  itemBuilder: (BuildContext context, index){
+                    var item = data.overallTitles[index];
+                    Color bgColor = Color(0xFF4CC793);
+                    if(item.title == '优'){
+                      bgColor = Color(0xFF4CC793);
+                    }else if(item.title == '良'){
+                      bgColor = Color(0xFFF8700D);
+                    }else if(item.title == '中'){
+                      bgColor = Color(0xFF4CC7B8);
+                    }else if(item.title == '差'){
+                      bgColor = Color(0xFFFF6F6F);
+                    }
+                    return  Container(
+                      padding: EdgeInsets.symmetric(vertical: 10.r),
+                      width: (MediaQuery.of(context).size.width - 55.r) / 2,
+                      color: Color(0xFFF5F5F5),
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.start,
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        children: [
+                          SizedBox(
+                            width: (MediaQuery.of(context).size.width - 55.r)/4 - 20.r,
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.end,
+                              children: [
+                                Container(
+                                  width: 28.r,
+                                  height: 28.r,
+                                  decoration: BoxDecoration(
+                                      color: Colors.white,
+                                      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: 14.r),
+                                      )),
+                                ),
+                              ],
+                            ),
+                          ),
+                          SizedBox(
+                            width: 20.r,
+                          ),
+                          Text(
+                            item.count.toString(),
+                            style: TextStyle(
+                                fontSize: 24.sp,
+                                fontWeight: FontWeight.w600,
+                                color: Color(0xFF595959)),
+                          ),
+                          Text(
+                            '人',
+                            style: TextStyle(
+                                fontSize: 16.sp,
+                                fontWeight: FontWeight.w600,
+                                color: Color(0xFF595959)),
+                          ),
+                        ],
+                      ),
+                    );
+                  },
+              ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/marking_app/lib/routes/RouterManager.dart b/marking_app/lib/routes/RouterManager.dart
index fec4960..8ff877f 100644
--- a/marking_app/lib/routes/RouterManager.dart
+++ b/marking_app/lib/routes/RouterManager.dart
@@ -17,7 +17,8 @@ import 'package:marking_app/pages/homework_correction/do_papers_job_exam.dart';
 import 'package:marking_app/pages/homework_correction/job_report.dart';
 import 'package:marking_app/pages/homework_correction/pages/job_list_participate_in_class.dart';
 import 'package:marking_app/pages/homework_correction/review_job.dart';
-
+import 'package:marking_app/pages/homework_correction/quick_check_personal.dart';
+import 'package:marking_app/pages/homework_correction/quick_data_check.dart';
 import 'package:marking_app/pages/login/index.dart';
 import 'package:marking_app/pages/mainPage.dart';
 import 'package:marking_app/pages/marking/do_papers.dart';
@@ -62,6 +63,9 @@ class RouterManager {
   static const String reportPersonalSubjectPath = 'report/details/reportPersonalSubject';
   static const String userMinePath = 'user/mine/index';
   static const String reportDetailPath = '/report_detail/index';
+  static const String quickDataCheckPath = '/homework_correction/quick_data_check';
+  static const String quickCheckPersonalPath = '/homework_correction/quick_check_personal';
+
   // TheMine
 
   static final FluroRouter router = FluroRouter();
@@ -252,6 +256,23 @@ class RouterManager {
     },
   );
 
+  // 数据快查
+  static final _quickDataCheckPageHandler = Handler(
+    handlerFunc: (BuildContext? context, Map<String, List<String>> params){
+      int jobId = int.parse(params['jobId']![0]);
+      String className = params['className']![0];
+      return QuickDataCheck(jobId: jobId,className:className);
+    },
+  );
+
+  // 数据快查-个人信息
+  static final _quickCheckPersonalPageHandler = Handler(
+    handlerFunc: (BuildContext? context, Map<String, List<String>> params){
+      int jobId = int.parse(params['jobId']![0]);
+      int studentId = int.parse(params['studentId']![0]);
+      return QuickCheckPersonal(jobId: jobId,studentId:studentId);
+    },
+  );
   // 开始阅卷页面
   // static final _doMarkingPapers = Handler(handlerFunc: (BuildContext? context, Map<String, List<String>> params) => MarkingPapers());
 
@@ -288,6 +309,8 @@ class RouterManager {
     router.define(jobExamPagePath, handler: _jobExamPageHandler, transitionType: TransitionType.material);
     router.define(jobListParticipateInClassPath,
         handler: _jobListParticipateInClassHandler, transitionType: TransitionType.material);
+    router.define(quickDataCheckPath, handler: _quickDataCheckPageHandler, transitionType: TransitionType.material);
+    router.define(quickCheckPersonalPath, handler: _quickCheckPersonalPageHandler, transitionType: TransitionType.material);
 
 // getTransition()
 
diff --git a/marking_app/lib/utils/request/rest_client.dart b/marking_app/lib/utils/request/rest_client.dart
index 1ef80ca..6fb3364 100644
--- a/marking_app/lib/utils/request/rest_client.dart
+++ b/marking_app/lib/utils/request/rest_client.dart
@@ -15,6 +15,7 @@ import 'package:marking_app/common/model/common/upload_img_secret_key.dart';
 import 'package:marking_app/common/model/job/job_collect_params.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_data_report.dart';
 import 'package:marking_app/common/model/job/job_do_marking_status_info.dart';
 import 'package:marking_app/common/model/job/job_note_taking_trajectory.dart';
 import 'package:marking_app/common/model/job/job_page_tab.dart';
@@ -291,3 +292,11 @@ abstract class RestClient {
   Future<BaseStructureResult<List<MarkingTasks>>> getJobListParticipateInClass(
       @the_retrofit.Query("markingId") int jobId);
 }
+// 作业 => 数据快查
+@the_retrofit.GET("/api/read/job-data-center-report")
+Future<BaseStructureResult<JobDataReport>> getJobDataCenterReport(@the_retrofit.Queries() Map<String, dynamic> params);
+
+// 作业 => 数据快查--个人
+@the_retrofit.GET("/api/read/job-data-center-student-report")
+Future<BaseStructureResult<StudentDetails>> getJobPersonalReport(@the_retrofit.Queries() Map<String, dynamic> params);
+}
\ No newline at end of file