.gitignore

@@ -187,14 +187,3 @@ marking_app/lib/pages/homework_correction/eventBus/job_notes_view_bus.g.dart
 marking_app/lib/common/model/job/job_report_model.g.dart
 marking_app/lib/common/model/job/job_report_join_class.g.dart
 marking_app/lib/pages/homework_correction/job_report.g.dart
-marking_app/lib/common/model/report/detail_base_info.g.dart
-marking_app/lib/common/model/report/exam_records_all.g.dart
-marking_app/lib/common/model/report/exam_records_params.g.dart
-marking_app/lib/common/model/report/exam_records.g.dart
-marking_app/lib/common/model/report/question_know_point.g.dart
-marking_app/lib/common/model/report/report_card_params.g.dart
-marking_app/lib/common/model/report/report_card.g.dart
-marking_app/lib/common/model/report/report_marking_detail_params.g.dart
-marking_app/lib/common/model/report/report_marking_detail.g.dart
-marking_app/lib/common/model/job/job_report_knowledge_model.g.dart
-marking_app/lib/common/model/job/job_report_question_deatil_model.g.dart

marking_app/lib/common/config/request_config.dart

@@ -15,13 +15,13 @@ class RequestConfig {
   static const devLoginBaseUrl = "http://192.168.2.9:6400"; // 基本请求接口
   static const devBaseUrlOfReport = "http://192.168.2.9:4000"; // 获取报告接口*/
 
-  static const devBaseUrl = "https://mk-hw.23544.com"; // 基本请求
+  static const devBaseUrl = "https://mk-api.23544.com/mb-cli"; // 基本请求
-  static const devLoginBaseUrl = "https://mk-hw.23544.com"; // 登录接口
+  static const devLoginBaseUrl = "https://mk-api.23544.com"; // 登录接口
   static const devBaseUrlOfReport = "https://dc-api.23544.com"; // 获取报告接口
 
   /* 正式地址  */
-  static const proBaseUrl = "https://mk-hw.23544.com"; // 基本请求
+  static const proBaseUrl = "https://mk-api.23544.com/mb-cli"; // 基本请求
-  static const proLoginBaseUrl = "https://mk-hw.23544.com"; // 登录接口
+  static const proLoginBaseUrl = "https://mk-api.23544.com"; // 登录接口
   static const proBaseUrlOfReport = "https://dc-api.23544.com"; // 获取报告接口
   static const proBaseUrlOfHomework = "https://mk-hw.23544.com/hw"; // 获取作业接口
 

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

@@ -2,18 +2,15 @@ import 'package:json_annotation/json_annotation.dart';
 
 part 'job_concerned_with_student_params.g.dart';
 
-@JsonSerializable(includeIfNull: false)
+@JsonSerializable()
 class JobConcernedWithStudentParams extends Object {
   @JsonKey(name: 'taskIds')
   List<int> taskIds;
 
-  @JsonKey(name: 'pageIndex')
-  int? pageIndex;
-
   @JsonKey(name: 'isCommit')
   bool? isCommit;
 
-  JobConcernedWithStudentParams(this.taskIds, {this.isCommit, this.pageIndex});
+  JobConcernedWithStudentParams(this.taskIds, {this.isCommit});
 
   factory JobConcernedWithStudentParams.fromJson(Map<String, dynamic> srcJson) =>
       _$JobConcernedWithStudentParamsFromJson(srcJson);

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

@@ -1,13 +1,9 @@
 import 'package:json_annotation/json_annotation.dart';
-import 'package:uuid/uuid.dart';
 
 part 'job_report_join_class.g.dart';
 
 @JsonSerializable()
 class JobReportJoinClass extends Object {
-  @JsonKey(name: 'uniqueId')
-  String? uniqueId;
-
   @JsonKey(name: 'schoolId')
   int schoolId;
 
@@ -32,11 +28,16 @@ class JobReportJoinClass extends Object {
   @JsonKey(name: 'submitCount')
   int submitCount;
 
-  JobReportJoinClass(this.schoolId, this.schoolName, this.gradeId, this.gradeName, this.graduationYear, this.className,
+  JobReportJoinClass(
-      this.toBeSubmitCount, this.submitCount,
+    this.schoolId,
-      [this.uniqueId]) {
+    this.schoolName,
-    if (uniqueId == null) uniqueId = Uuid().v1();
+    this.gradeId,
-  }
+    this.gradeName,
+    this.graduationYear,
+    this.className,
+    this.toBeSubmitCount,
+    this.submitCount,
+  );
 
   factory JobReportJoinClass.fromJson(Map<String, dynamic> srcJson) => _$JobReportJoinClassFromJson(srcJson);
 

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

@@ -1,67 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-
-part 'job_report_knowledge_model.g.dart';
-
-@JsonSerializable()
-class JobReportKnowledgeModel extends Object {
-  @JsonKey(name: 'schoolId')
-  int schoolId;
-
-  @JsonKey(name: 'schoolName')
-  String schoolName;
-
-  @JsonKey(name: 'gradeId')
-  int gradeId;
-
-  @JsonKey(name: 'gradeName')
-  String gradeName;
-
-  @JsonKey(name: 'className')
-  String className;
-
-  @JsonKey(name: 'rate')
-  double rate;
-
-  @JsonKey(name: 'ratio')
-  String ratio;
-
-  @JsonKey(name: 'noAnswerCount')
-  int noAnswerCount;
-
-  @JsonKey(name: 'studentReports')
-  List<StudentReports> studentReports;
-
-  JobReportKnowledgeModel(
-    this.schoolId,
-    this.schoolName,
-    this.gradeId,
-    this.gradeName,
-    this.className,
-    this.rate,
-    this.ratio,
-    this.noAnswerCount,
-    this.studentReports,
-  );
-
-  factory JobReportKnowledgeModel.fromJson(Map<String, dynamic> srcJson) => _$JobReportKnowledgeModelFromJson(srcJson);
-
-  Map<String, dynamic> toJson() => _$JobReportKnowledgeModelToJson(this);
-}
-
-@JsonSerializable()
-class StudentReports extends Object {
-  @JsonKey(name: 'studentName')
-  String studentName;
-
-  @JsonKey(name: 'pass')
-  bool pass;
-
-  StudentReports(
-    this.studentName,
-    this.pass,
-  );
-
-  factory StudentReports.fromJson(Map<String, dynamic> srcJson) => _$StudentReportsFromJson(srcJson);
-
-  Map<String, dynamic> toJson() => _$StudentReportsToJson(this);
-}

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

@@ -1,7 +1,5 @@
 import 'package:json_annotation/json_annotation.dart';
 
-import 'job_report_knowledge_model.dart';
-
 part 'job_report_model.g.dart';
 
 @JsonSerializable()
@@ -51,22 +49,6 @@ class JobReportModel extends Object {
   @JsonKey(name: 'overallTitles')
   List<OverallTitles> overallTitles;
 
-  // 前端自定义 -- 全对学生
-  @JsonKey(name: 'allpairsStudents')
-  List<StudentAnswerInfos>? allpairsStudents;
-
-  // 前端自定义 -- 及格学生
-  @JsonKey(name: 'passStudents')
-  List<StudentAnswerInfos>? passStudents;
-
-  // 前端自定义 -- 不及格学生
-  @JsonKey(name: 'disqualifiedStudents')
-  List<StudentAnswerInfos>? disqualifiedStudents;
-
-  // 前端自定义 -- 未做学生
-  @JsonKey(name: 'notdoneStudents')
-  List<StudentAnswerInfos>? notdoneStudents;
-
   JobReportModel(
     this.studentCount,
     this.finishRate,
@@ -82,36 +64,8 @@ class JobReportModel extends Object {
     this.knowledgeInfos,
     this.questionAnswerInfos,
     this.studentAnswerInfos,
-    this.overallTitles, [
+    this.overallTitles,
-    this.allpairsStudents,
+  );
-    this.passStudents,
-    this.disqualifiedStudents,
-    this.notdoneStudents,
-  ]) {
-    this.allpairsStudents = [];
-    this.passStudents = [];
-    this.disqualifiedStudents = [];
-    this.notdoneStudents = [];
-    // 赋值数据
-    studentAnswerInfos.forEach((item) {
-      if (item.correctRate == 100 && item.noAnswerCount == 0) {
-        // 全对
-        allpairsStudents?.add(item);
-      }
-      if (item.correctRate >= 60 && item.correctRate < 100) {
-        // 及格
-        passStudents?.add(item);
-      }
-      if (item.correctRate >= 0 && item.correctRate < 60) {
-        // 不及格
-        disqualifiedStudents?.add(item);
-      }
-      if (questionAnswerInfos.length == item.noAnswerCount) {
-        // 未做
-        notdoneStudents?.add(item);
-      }
-    });
-  }
 
   factory JobReportModel.fromJson(Map<String, dynamic> srcJson) => _$JobReportModelFromJson(srcJson);
 
@@ -129,9 +83,6 @@ class KnowledgeInfos extends Object {
   @JsonKey(name: 'rate')
   double rate;
 
-  @JsonKey(name: 'details')
-  List<JobReportKnowledgeModel>? details;
-
   KnowledgeInfos(
     this.knowledgeId,
     this.knowledgeName,
@@ -166,9 +117,6 @@ class QuestionAnswerInfos extends Object {
   @JsonKey(name: 'errorRate')
   double errorRate;
 
-  @JsonKey(name: 'questionPicture')
-  String? questionPicture;
-
   @JsonKey(name: 'noAnswerRate')
   double noAnswerRate;
 
@@ -181,7 +129,6 @@ class QuestionAnswerInfos extends Object {
     this.correctRate,
     this.errorRate,
     this.noAnswerRate,
-    this.questionPicture,
   );
 
   factory QuestionAnswerInfos.fromJson(Map<String, dynamic> srcJson) => _$QuestionAnswerInfosFromJson(srcJson);

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

@@ -1,124 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-
-part 'job_report_question_deatil_model.g.dart';
-
-@JsonSerializable()
-class JobReportQuestionDeatilModel extends Object {
-  @JsonKey(name: 'jobName')
-  String? jobName;
-
-  @JsonKey(name: 'schoolId')
-  int schoolId;
-
-  @JsonKey(name: 'schoolName')
-  String schoolName;
-
-  @JsonKey(name: 'gradeId')
-  int gradeId;
-
-  @JsonKey(name: 'gradeName')
-  String gradeName;
-
-  @JsonKey(name: 'className')
-  String className;
-
-  @JsonKey(name: 'rate')
-  double rate;
-
-  @JsonKey(name: 'ratio')
-  String ratio;
-
-  @JsonKey(name: 'noAnswerCount')
-  int noAnswerCount;
-
-  @JsonKey(name: 'finishInfos')
-  List<FinishInfos> finishInfos;
-
-  @JsonKey(name: 'studentReports')
-  List<StudentReports> studentReports;
-
-  JobReportQuestionDeatilModel(
-    this.jobName,
-    this.schoolId,
-    this.schoolName,
-    this.gradeId,
-    this.gradeName,
-    this.className,
-    this.rate,
-    this.ratio,
-    this.noAnswerCount,
-    this.finishInfos,
-    this.studentReports,
-  );
-
-  factory JobReportQuestionDeatilModel.fromJson(Map<String, dynamic> srcJson) =>
-      _$JobReportQuestionDeatilModelFromJson(srcJson);
-
-  Map<String, dynamic> toJson() => _$JobReportQuestionDeatilModelToJson(this);
-}
-
-@JsonSerializable()
-class FinishInfos extends Object {
-  @JsonKey(name: 'title')
-  String title;
-
-  @JsonKey(name: 'finishCount')
-  int finishCount;
-
-  @JsonKey(name: 'correctRate')
-  int correctRate;
-
-  FinishInfos(
-    this.title,
-    this.finishCount,
-    this.correctRate,
-  );
-
-  factory FinishInfos.fromJson(Map<String, dynamic> srcJson) => _$FinishInfosFromJson(srcJson);
-
-  Map<String, dynamic> toJson() => _$FinishInfosToJson(this);
-}
-
-@JsonSerializable()
-class StudentReports extends Object {
-  @JsonKey(name: 'studentName')
-  String studentName;
-
-  @JsonKey(name: 'pass')
-  bool pass;
-
-  @JsonKey(name: 'finishInfos')
-  List<FinishInfo> finishInfos;
-
-  StudentReports(
-    this.studentName,
-    this.pass,
-    this.finishInfos,
-  );
-
-  factory StudentReports.fromJson(Map<String, dynamic> srcJson) => _$StudentReportsFromJson(srcJson);
-
-  Map<String, dynamic> toJson() => _$StudentReportsToJson(this);
-}
-
-@JsonSerializable()
-class FinishInfo extends Object {
-  @JsonKey(name: 'title')
-  String title;
-
-  @JsonKey(name: 'finishCount')
-  int finishCount;
-
-  @JsonKey(name: 'correctRate')
-  double correctRate;
-
-  FinishInfo(
-    this.title,
-    this.finishCount,
-    this.correctRate,
-  );
-
-  factory FinishInfo.fromJson(Map<String, dynamic> srcJson) => _$FinishInfoFromJson(srcJson);
-
-  Map<String, dynamic> toJson() => _$FinishInfoToJson(this);
-}

marking_app/lib/common/model/report/detail_base_info.dart

@@ -58,10 +58,10 @@ class BaseInfo extends Object {
   String ratePass;
 
   @JsonKey(name: 'TotalRank')
-  int? totalRank;
+  int totalRank;
 
   @JsonKey(name: 'JoinCount')
-  int? joinCount;
+  int joinCount;
 
   BaseInfo(this.examName,this.examType,this.grade,this.subject,this.examTime,this.totalScore,this.avgScore,this.maxScore,this.rateGood,this.ratePass,this.totalRank,this.joinCount,);
 

marking_app/lib/pages/homework_correction/components/new_version_of_homework/homework_tasks_view_item.dart

@@ -1,4 +1,5 @@
 import 'package:achievement_view/achievement_view.dart';
+import 'package:badges/badges.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
@@ -247,13 +248,7 @@ Widget $completedHomeworkView(BuildContext context,
           taskIds: jobTaskItem.markingTasks.map((e) => e.id).toList(),
         ),
         InkWell(
-          onTap: () {
+          onTap: () {},
-            RouterManager.router.navigateTo(
-              context,
-              RouterManager.jobReportPagePath + '?title=${Uri.encodeComponent(jobTaskItem.title)}&id=${jobTaskItem.id}',
-              transition: getTransition(),
-            );
-          },
           child: Row(
             children: [
               Expanded(flex: 1, child: SizedBox()),
@@ -358,9 +353,9 @@ Widget $completedHomeworkChildView(
       ),
       SizedBox(height: 10.h),
       $CompletedHomeworkInfoBox(
-        precision: taskItem.precision / 100,
+        precision: jobTaskItem.precision / 100,
-        objectivePrecision: taskItem.objectivePrecision / 100,
+        objectivePrecision: jobTaskItem.objectivePrecision / 100,
-        subjectivePrecision: taskItem.subjectivePrecision / 100,
+        subjectivePrecision: jobTaskItem.subjectivePrecision / 100,
         submittedQuantity: taskItem.commitStudentCount,
         unsubmittedQuantity: taskItem.studentCount - taskItem.commitStudentCount,
         showStudentsCall: showStudentsCall,
@@ -440,8 +435,7 @@ Widget $completedHomeworkProgressBar(
   required Color color,
   required double percent,
 }) {
-  var percentStr = '${doubleToStringAsFixed(percent * 100)}%';
+  var percentStr = '${getDoubleRemoveZero(percent * 100)}%';
-
   return Container(
     margin: EdgeInsets.symmetric(vertical: 10.h),
     child: Row(

marking_app/lib/pages/homework_correction/do_papers_job.dart

@@ -113,7 +113,6 @@ Widget $dropdownBoxSwitchStudentsOrTypeView(BuildContext context,
     JobDoPapersStudentBus? studentBus = _useSwitchStudentAndType.studentBusInfo.value;
     if (studentBus != null && studentBus.pageIndex == thePageIndex) return; // 获取试卷详情数据 定位到对应学生的数据 无需再通知详情获取数据
     if (thePageIndex != null) {
-      _useSwitchStudentAndType.getDataForStudents(taskId: taskId, pageIndex: thePageIndex);
       int indexLocated = _useSwitchStudentAndType.tabs.value.indexWhere((element) => element.pageIndex == thePageIndex);
       _useSwitchStudentAndType.eventFire(
           model: MarkingTextQuestionJobTabParamsBus(taskId, thePageIndex,
@@ -121,22 +120,19 @@ Widget $dropdownBoxSwitchStudentsOrTypeView(BuildContext context,
               previousPageIndex: _useSwitchStudentAndType.getPreviousPageIndex(indexLocated)));
     }
   });
-  useValueChanged<JobConcernedWithStudent?, String>(_useSwitchStudentAndType.currentStudent.value, (oldData, __) {
+  useValueChanged<JobConcernedWithStudent?, String>(_useSwitchStudentAndType.currentStudent.value, (_, __) {
     var studentId = _useSwitchStudentAndType.currentStudent.value?.studentId;
     JobDoPapersStudentBus? studentBus = _useSwitchStudentAndType.studentBusInfo.value;
     if (studentBus != null && studentBus.studentId == studentId) return; // 获取试卷详情数据 定位到对应学生的数据 无需再通知详情获取数据
 
     var thePageIndex = _useSwitchStudentAndType.currentTab.value?.pageIndex;
     if (thePageIndex != null) // 通知详情数据
-    {
-      int indexLocated = _useSwitchStudentAndType.tabs.value.indexWhere((element) => element.pageIndex == thePageIndex);
       _useSwitchStudentAndType.eventFire(
         model: MarkingTextQuestionJobTabParamsBus(taskId, thePageIndex,
             studentId: studentId,
-            nextPageIndex: _useSwitchStudentAndType.getNextPageIndex(indexLocated),
+            nextPageIndex: _useSwitchStudentAndType.getNextPageIndex(thePageIndex),
-            previousPageIndex: _useSwitchStudentAndType.getPreviousPageIndex(indexLocated)),
+            previousPageIndex: _useSwitchStudentAndType.getPreviousPageIndex(thePageIndex)),
       );
-    }
   });
 
   useEffect(() {
@@ -166,7 +162,7 @@ Widget $dropdownBoxSwitchStudentsOrTypeView(BuildContext context,
             print('是否是优先批阅1111：${_useSwitchStudentAndType.isFirst}');
             break;
           case JobCheckSwitchingQuestionTabBus:
-            // 检查切换试题体型
+            // 检查切换试题体型页码
             _useSwitchStudentAndType.refreshQuestionTypeData(context, taskId: taskId, exitCallback: exitCallback);
             break;
           case MarkingTextQuestionJobTabParams: // 切换试题通知

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

@@ -64,13 +64,11 @@ class UseSwitchStudentAndType with CommonMixin, EventBusMixin {
   }
 
   // 获取学生集合
-  getDataForStudents({required int taskId, int? pageIndex}) async {
+  getDataForStudents({required int taskId}) async {
     RestClient client = await getClient();
-    if (pageIndex == null) {
+    BaseStructureResult<List<JobConcernedWithStudent>> result = await client.getJobWithStudents(
-      pageIndex = currentTab.value?.pageIndex;
+      JobConcernedWithStudentParams([taskId], isCommit: true),
-    }
+    );
-    BaseStructureResult<List<JobConcernedWithStudent>> result =
-        await client.getJobWithStudents(JobConcernedWithStudentParams([taskId], isCommit: true, pageIndex: pageIndex));
     if (result.success && result.data != null) studentData.value = result.data!;
   }
 
@@ -151,8 +149,7 @@ class UseSwitchStudentAndType with CommonMixin, EventBusMixin {
         if (continueFlag == null || !continueFlag) return tabJob; // 不跳转
          */
         tabs.value = tabDatas;
-        if (tabJob != null) currentTab.value = tabJob;
+        currentTab.value = tabJob;
-        if (tabJob == null && exitPromptFlag.value) ToastUtils.showSuccess('最后一题提交成功');
         return tabJob;
       }
     }

marking_app/lib/pages/homework_correction/job_report.dart

@@ -5,13 +5,11 @@ import 'package:functional_widget_annotation/functional_widget_annotation.dart';
 import 'package:marking_app/common/mixin/common.dart';
 import 'package:marking_app/common/model/common/base_structure_result.dart';
 import 'package:marking_app/common/model/job/job_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/utils/index.dart';
 import 'package:marking_app/utils/my_text.dart';
 import 'package:marking_app/utils/request/rest_client.dart';
 import 'package:percent_indicator/linear_percent_indicator.dart';
-import 'package:photo_view/photo_view.dart';
 
 import '../../utils/flutter_wave_loading.dart';
 
@@ -32,7 +30,6 @@ class _JobReportState extends State<JobReport> with CommonMixin {
 
   List<JobReportJoinClass>? involveClasses = [];
   JobReportJoinClass? classData;
-  JobReportModel? jobReportModel;
 
   @override
   void initState() {
@@ -47,7 +44,7 @@ class _JobReportState extends State<JobReport> with CommonMixin {
       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), ...(result.data ?? [])];
         }, mounted);
       }
     } catch (e) {
@@ -71,153 +68,6 @@ class _JobReportState extends State<JobReport> with CommonMixin {
     return null;
   }
 
-  Future<void> detailKnowledgeCall(KnowledgeInfos knowledge) async {
-    ToastUtils.showLoading();
-    try {
-      if (knowledge.details == null) {
-        RestClient _client = await getClient();
-        BaseStructureResult<List<JobReportKnowledgeModel>> datas =
-            await _client.getDetailKnowledge(widget.id, knowledge.knowledgeId);
-        if (!datas.success) return ToastUtils.showInfo(datas.message ?? '获取知识点失败');
-        knowledge.details = datas.data;
-      }
-
-      showDialog(
-        context: context,
-        builder: (BuildContext context1) {
-          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(
-                    alignment: Alignment.center,
-                    child: Row(
-                      mainAxisSize: MainAxisSize.min,
-                      crossAxisAlignment: CrossAxisAlignment.end,
-                      children: [
-                        quickText(knowledge.knowledgeName, color: Theme.of(context1).primaryColor, size: 16.sp),
-                        quickText(
-                          '的掌握情况',
-                          color: Color.fromRGBO(60, 60, 60, 1),
-                          size: 15.sp,
-                          maxLines: 2,
-                        ),
-                      ],
-                    )),
-                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()
-                                                  ],
-                                                ),
-                                              ]),
-                                            )
-                                          ],
-                                        ),
-                                      );
-                                    },
-                                  );
-                                }),
-                              ]);
-                            }).toList() ??
-                            [],
-                      ],
-                    ),
-                  ]),
-                )
-              ],
-            ),
-          );
-        },
-      );
-    } catch (e) {
-    } finally {
-      ToastUtils.dismiss();
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -225,17 +75,11 @@ class _JobReportState extends State<JobReport> with CommonMixin {
       appBar: AppBar(
         backgroundColor: Colors.white,
         title: 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: [
           // 下拉框
           $DropdownSelection(involveClasses, classData, call: (JobReportJoinClass _classData) {
             classData = _classData;
-            if (_classData.gradeId == -1) classData = null;
+            toUpState(setState, () => _future = getReport(), mounted);
-            _future = getReport();
-            toUpState(setState, () {}, mounted);
           }),
         ],
       ),
@@ -252,16 +96,16 @@ class _JobReportState extends State<JobReport> with CommonMixin {
           );
 
         return ListView(
-          padding: EdgeInsets.symmetric(horizontal: 10.w),
+          padding: EdgeInsets.symmetric(vertical: 4.h, horizontal: 10.w),
           children: [
             // 顶部图形数据
             $TopGraphic(data),
             // 掌握知识点的情况
-            $MasterKnowledgePoint(data.knowledgeInfos, detailKnowledgeCall),
+            $MasterKnowledgePoint(data.knowledgeInfos),
             // 掌握知识点的情况
             $OverallPerformance(data.studentCount, data.overallTitles),
             // 单位时间答题情况
-            $UnitTimeAnsweringSituation(widget.id, data.questionAnswerInfos),
+            $UnitTimeAnsweringSituation(data.questionAnswerInfos),
             // 人员数据概况
             $PersonnelDataOverview(data.studentAnswerInfos),
           ],
@@ -275,108 +119,27 @@ class _JobReportState extends State<JobReport> with CommonMixin {
 @swidget
 Widget $dropdownSelection(List<JobReportJoinClass>? involveClasses, JobReportJoinClass? classData,
     {required Function(JobReportJoinClass) call}) {
+  print('有几条数据+${involveClasses?.length}');
   if (involveClasses == null) return Container(child: quickText('点击重试')); // 点击重试
   return DropdownButton(
-    value: classData?.uniqueId ?? '-1',
+    value: classData?.gradeId ?? -1,
     style: TextStyle(color: Color.fromRGBO(89, 89, 89, 1), fontSize: 12.sp),
     items: involveClasses.map((e) {
       return DropdownMenuItem(
-        value: e.uniqueId!,
+        value: e.gradeId,
-        child: quickText(e.graduationYear + e.className, size: 12.sp, color: Colors.black),
+        child: quickText(e.graduationYear, size: 12.sp, color: Colors.black),
       );
     }).toList(),
-    onChanged: (String? value) {
+    onChanged: (int? value) {
       if (value == null) return;
-      call(involveClasses.firstWhere((element) => element.uniqueId == value));
+      call(involveClasses.firstWhere((element) => element.gradeId == value));
     },
   );
 }
 
 /// 顶部图形数据
 @swidget
-Widget $topGraphic(BuildContext context, JobReportModel data) {
+Widget $topGraphic(JobReportModel data) {
-  void showDetail(String showType) async {
-    // 全对 及格 不及格 未做
-    List<StudentAnswerInfos> students = [];
-    List<Widget> dataColumns = [];
-    String title = '';
-    switch (showType) {
-      case '全对':
-        title = '全对';
-        students = data.allpairsStudents!;
-        break;
-      case '及格':
-        title = '及格';
-        students = data.passStudents!;
-        break;
-      case '不及格':
-        title = '不及格';
-        students = data.disqualifiedStudents!;
-        break;
-      case '未做':
-        title = '未做';
-        students = data.notdoneStudents!;
-        break;
-    }
-
-    if (students.isEmpty) return ToastUtils.showInfo('没有$title学生');
-    // 弹出框展示学生信息
-    showDialog(
-      context: context,
-      builder: (BuildContext context1) {
-        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('$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),
-                      ),
-                      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(),
-                    ],
-                  ),
-                ]),
-              )
-            ],
-          ),
-        );
-      },
-    );
-  }
-
   return Container(
     margin: EdgeInsets.only(top: 16.h, bottom: 10.h),
     padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 14.h),
@@ -456,9 +219,8 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                 children: [
                   Expanded(
                       flex: 2,
-                    child:
+                      child: quickText('${data.validCount}份',
-                        quickText('${data.validCount}份', color: Colors.white, size: 10.sp, fontWeight: FontWeight.bold),
+                          color: Colors.white, size: 10.sp, fontWeight: FontWeight.bold)),
-                  ),
                   SizedBox(width: 1.2.w),
                   Expanded(
                     flex: 7,
@@ -466,7 +228,8 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                       padding: EdgeInsets.all(12.r),
                       decoration: BoxDecoration(
                         shape: BoxShape.circle, // 设置为圆形
-                          color: Color.fromRGBO(76, 199, 147, 1)),
+                        color: Color.fromRGBO(76, 199, 147, 1),
+                      ),
                       child: Row(
                         children: [
                           Expanded(
@@ -633,7 +396,7 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                   ),
                   SizedBox(height: 8.h),
                   InkWell(
-                    onTap: () => showDetail('全对'),
+                    onTap: () {},
                     child: Container(
                       width: 77.w,
                       alignment: Alignment.center,
@@ -721,7 +484,7 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                   ),
                   SizedBox(height: 8.h),
                   InkWell(
-                    onTap: () => showDetail('及格'),
+                    onTap: () {},
                     child: Container(
                       width: 77.w,
                       alignment: Alignment.center,
@@ -809,7 +572,7 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                   ),
                   SizedBox(height: 8.h),
                   InkWell(
-                    onTap: () => showDetail('不及格'),
+                    onTap: () {},
                     child: Container(
                       width: 77.w,
                       alignment: Alignment.center,
@@ -898,7 +661,7 @@ Widget $topGraphic(BuildContext context, JobReportModel data) {
                   ),
                   SizedBox(height: 8.h),
                   InkWell(
-                    onTap: () => showDetail('未做'),
+                    onTap: () {},
                     child: Container(
                       width: 77.w,
                       alignment: Alignment.center,
@@ -930,8 +693,7 @@ 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),
         child: Column(
@@ -978,16 +740,13 @@ Widget $masterKnowledgePoint(BuildContext context, List<KnowledgeInfos> knowledg
                       barRadius: Radius.circular(10.r),
                     )),
                 SizedBox(width: 10.w),
-                InkWell(
+                Row(
-                  onTap: () => detailCall(knowItem),
-                  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)),
                   ],
-                  ),
+                )
-                ),
               ],
             )
           ],
@@ -1063,7 +822,7 @@ Widget $overallPerformance(int totalNumber, List<OverallTitles> overallTitles) {
 
 /// 单位时间答题情况
 @swidget
-Widget $unitTimeAnsweringSituation(BuildContext context, int jobid, List<QuestionAnswerInfos> questionAnswerInfos) {
+Widget $unitTimeAnsweringSituation(BuildContext context, List<QuestionAnswerInfos> questionAnswerInfos) {
   List<String> questionNos = []; // 题号
   List<String> questionTypes = []; // 题型
   List<String> completionStatusWithinThirtySeconds = []; // 30s内完成情况
@@ -1072,8 +831,8 @@ Widget $unitTimeAnsweringSituation(BuildContext context, int jobid, List<Questio
   List<String> accuracys = []; // 正确率
   List<String> errorRate = []; // 错误率
   List<String> notDone = []; // 未做
-  List<QuestionPictureModel> viewOriginalQuestion = []; // 查看原题
+  List<String> viewOriginalQuestion = []; // 查看原题
-  List<QuestionPictureModel> operate = [];
+  List<String> operate = [];
   Map<String, List<dynamic>> mapData = {
     '题号': questionNos,
     '题型': questionTypes,
@@ -1084,24 +843,18 @@ Widget $unitTimeAnsweringSituation(BuildContext context, int jobid, List<Questio
     '错误率': errorRate,
     '未做': notDone,
     '查看原题': viewOriginalQuestion,
-    // '操作': operate
+    '操作': operate
   };
 
   questionAnswerInfos.forEach((e) {
-    QuestionPictureModel _quinfoModel = QuestionPictureModel(
-      questionNo: e.questionNo,
-      jobid: jobid,
-      questionid: e.questionId,
-      questionPicture: e.questionPicture,
-    );
     questionNos.add(e.questionNo); // 题号
     questionTypes.add(e.questionType == 2 ? '主观题' : '客观题'); // 题型
 
     accuracys.add(doubleToStringAsFixed(e.correctRate) + '%');
     errorRate.add(doubleToStringAsFixed(e.errorRate) + '%');
     notDone.add(doubleToStringAsFixed(e.noAnswerRate) + '%');
-    viewOriginalQuestion.add(_quinfoModel);
+    viewOriginalQuestion.add(e.questionId.toString());
-    operate.add(_quinfoModel);
+    operate.add(e.questionId.toString());
 
     e.finishInfos.forEach((element) {
       if ('30s内完成情况' == element.title) {
@@ -1168,6 +921,7 @@ Widget $unitTimeAnsweringSituation(BuildContext context, int jobid, List<Questio
                       ),
                       ...entrie.value.map((e) {
                         bool noHasChineseCharacter = isQuestionNo && !containsChinese(e);
+
                         return Container(
                           width: 96.r,
                           alignment: Alignment.center,
@@ -1176,61 +930,7 @@ Widget $unitTimeAnsweringSituation(BuildContext context, int jobid, List<Questio
                           color: Color.fromRGBO(245, 245, 245, 1),
                           child: isViewButton
                               ? InkWell(
-                                  onTap: () {
+                                  onTap: () {},
-                                    // e
-                                    var _qpm = e as QuestionPictureModel;
-                                    // if (entrie.key == '操作') {
-                                    //   showDialog(
-                                    //     context: context,
-                                    //     builder: (BuildContext context1) {
-                                    //       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('${_qpm.questionNo}题',
-                                    //                     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),
-                                    //                         ),
-                                    //                       ],
-                                    //                       rows: [],
-                                    //                     ),
-                                    //                   ]),
-                                    //             )
-                                    //           ],
-                                    //         ),
-                                    //       );
-                                    //     },
-                                    //   );
-                                    //   return;
-                                    // }
-                                    if (_qpm.questionPicture == null) return ToastUtils.showInfo('当前试题没有原题');
-                                    Navigator.push(
-                                      context,
-                                      MaterialPageRoute(builder: (_) {
-                                        return Scaffold(
-                                          appBar: AppBar(),
-                                          body: PhotoView(imageProvider: NetworkImage(_qpm.questionPicture!)),
-                                        );
-                                      }),
-                                    );
-                                  },
                                   child: Row(
                                     mainAxisSize: MainAxisSize.min,
                                     crossAxisAlignment: CrossAxisAlignment.center,
@@ -1273,6 +973,119 @@ Widget $unitTimeAnsweringSituation(BuildContext context, int jobid, List<Questio
             ),
           ),
         ),
+
+        // ...mapData.entries.map((entrie) {
+        //   return Row(
+        //     children: [
+        //       Container(
+        //         width: 56.w,
+        //         alignment: Alignment.center,
+        //         margin: EdgeInsets.only(bottom: 1.h, right: 1.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),
+        //       ),
+        //       ...entrie.value.asMap().keys.map((e) {
+        //         String questionNo = questionNos[e];
+        //         return Container(
+        //           width: 56.w,
+        //           alignment: Alignment.center,
+        //           margin: EdgeInsets.only(bottom: 1.h),
+        //           padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w),
+        //           color: Color.fromRGBO(245, 245, 245, 1),
+        //           child: quickText(questionNo, color: Color.fromRGBO(82, 82, 82, 1), size: 12.sp),
+        //         );
+        //       }).toList(),
+        //     ],
+        //   );
+        // }).toList(),
+
+        // Stack(
+        //   children: [
+        //     if (false)
+        //       Container(
+        //         child: Column(
+        //           crossAxisAlignment: CrossAxisAlignment.start,
+        //           mainAxisSize: MainAxisSize.min,
+        //           children: [
+        //             Container(
+        //               width: 56.w,
+        //               alignment: Alignment.center,
+        //               margin: EdgeInsets.only(bottom: 1.h),
+        //               padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w),
+        //               color: Color.fromRGBO(230, 230, 230, 1),
+        //               child: quickText('题号', color: Color.fromRGBO(24, 35, 77, 1), size: 12.sp),
+        //             ),
+        //             Container(
+        //                 width: 56.w,
+        //                 alignment: Alignment.center,
+        //                 margin: EdgeInsets.only(bottom: 1.h),
+        //                 padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w),
+        //                 color: Color.fromRGBO(230, 230, 230, 1),
+        //                 child: quickText('题型', color: Color.fromRGBO(24, 35, 77, 1), size: 12.sp)),
+        //             Container(
+        //                 width: 56.w,
+        //                 alignment: Alignment.center,
+        //                 margin: EdgeInsets.only(bottom: 1.h),
+        //                 padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w),
+        //                 color: Color.fromRGBO(230, 230, 230, 1),
+        //                 child: quickText('30s内完成情况', maxLines: 2, color: Color.fromRGBO(24, 35, 77, 1), size: 12.sp)),
+        //             Container(
+        //                 width: 56.w,
+        //                 alignment: Alignment.center,
+        //                 margin: EdgeInsets.only(bottom: 1.h),
+        //                 padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w),
+        //                 color: Color.fromRGBO(230, 230, 230, 1),
+        //                 child:
+        //                     quickText('31s-60s内完成情况', maxLines: 2, color: Color.fromRGBO(24, 35, 77, 1), size: 12.sp)),
+        //             Container(
+        //                 width: 56.w,
+        //                 alignment: Alignment.center,
+        //                 margin: EdgeInsets.only(bottom: 1.h),
+        //                 padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w),
+        //                 color: Color.fromRGBO(230, 230, 230, 1),
+        //                 child:
+        //                     quickText('61s-120s内完成情况', maxLines: 2, color: Color.fromRGBO(24, 35, 77, 1), size: 12.sp)),
+        //             Container(
+        //                 width: 56.w,
+        //                 alignment: Alignment.center,
+        //                 margin: EdgeInsets.only(bottom: 1.h),
+        //                 padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w),
+        //                 color: Color.fromRGBO(230, 230, 230, 1),
+        //                 child: quickText('正确率', color: Color.fromRGBO(24, 35, 77, 1), size: 12.sp)),
+        //             Container(
+        //                 width: 56.w,
+        //                 alignment: Alignment.center,
+        //                 margin: EdgeInsets.only(bottom: 1.h),
+        //                 padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w),
+        //                 color: Color.fromRGBO(230, 230, 230, 1),
+        //                 child: quickText('错误率', color: Color.fromRGBO(24, 35, 77, 1), size: 12.sp)),
+        //             Container(
+        //                 width: 56.w,
+        //                 alignment: Alignment.center,
+        //                 margin: EdgeInsets.only(bottom: 1.h),
+        //                 padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w),
+        //                 color: Color.fromRGBO(230, 230, 230, 1),
+        //                 child: quickText('未做', color: Color.fromRGBO(24, 35, 77, 1), size: 12.sp)),
+        //             Container(
+        //                 width: 56.w,
+        //                 alignment: Alignment.center,
+        //                 margin: EdgeInsets.only(bottom: 1.h),
+        //                 padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w),
+        //                 color: Color.fromRGBO(230, 230, 230, 1),
+        //                 child: quickText('查看原题', color: Color.fromRGBO(24, 35, 77, 1), size: 12.sp)),
+        //             Container(
+        //                 width: 56.w,
+        //                 alignment: Alignment.center,
+        //                 margin: EdgeInsets.only(bottom: 1.h),
+        //                 padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w),
+        //                 color: Color.fromRGBO(230, 230, 230, 1),
+        //                 child: quickText('操作', color: Color.fromRGBO(24, 35, 77, 1), size: 12.sp)),
+        //           ],
+        //         ),
+        //       ),
+        //   ],
+        // ),
       ],
     ),
   );
@@ -1392,11 +1205,3 @@ TimeUnits convertMilliseconds(int totalSeconds) {
 
   return TimeUnits(hours, minutes, seconds);
 }
-
-class QuestionPictureModel extends Object {
-  String? questionPicture;
-  String questionNo;
-  int questionid;
-  int jobid;
-  QuestionPictureModel({required this.jobid, required this.questionid, required this.questionNo, this.questionPicture});
-}

marking_app/lib/pages/homework_correction/review_job.dart

@@ -118,7 +118,11 @@ class _ReviewJobState extends State<ReviewJob> with CommonMixin, SingleTickerPro
               appBar: PreferredSize(
                 preferredSize: Size.fromHeight(40.h),
                 child: AppBar(
-                  title: quickText('回评', size: 18.sp, color: Colors.white),
+                  title: quickText(
+                    '回评',
+                    size: 18.sp,
+                    color: Colors.white,
+                  ),
                   elevation: 0,
                   // actions: [
                   //   Container(

marking_app/lib/pages/report_detail/widgets/basic_table.dart

@@ -107,9 +107,9 @@ class BasicTable extends StatelessWidget {
                 child: Row(
                   children: [
                     Expanded(flex: 1, child: BasicTableCell('平均分排名', false)),
-                    Expanded(flex: 1, child: BasicTableCell(baseInfo!.totalRank != null?baseInfo!.totalRank.toString():'--', true)),
+                    Expanded(flex: 1, child: BasicTableCell(baseInfo!.totalRank.toString(), true)),
                     Expanded(flex: 1, child: BasicTableCell('参考班级总数', false)),
-                    Expanded(flex: 1, child: BasicTableCell(baseInfo!.joinCount != null?baseInfo!.joinCount.toString():'--', true)),
+                    Expanded(flex: 1, child: BasicTableCell(baseInfo!.joinCount.toString(), true)),
                   ],
                 ),
               ),

marking_app/lib/pages/report_detail/widgets/card_table.dart

@@ -114,7 +114,7 @@ class _CardListState extends State<CardList> {
         headingRowDecoration: BoxDecoration(color: Color(0xFFF0F3FF)),
         fixedColumnsColor: Color(0xFFF0F3FF),
         fixedCornerColor: Colors.grey[400],
-        minWidth: 70.r * widget.headList.length + 10.r,
+        minWidth: 70.r * widget.headList.length,
         fixedTopRows:  widget.fixedRows!,
         fixedLeftColumns: widget.fixedCols!,
         sortColumnIndex: _sortColumnIndex,

marking_app/lib/pages/report_detail/widgets/know_point_list.dart

@@ -81,7 +81,6 @@ class _KnowPointTableState extends State<KnowPointTable> {
         scrollController: _controller,
         columnSpacing: 0,
         horizontalMargin: 0,
-        dataRowHeight:50.r,
         bottomMargin: 0,
         border: TableBorder(
             horizontalInside: BorderSide(

marking_app/lib/pages/report_detail/widgets/report_card_dialog.dart

@@ -269,6 +269,7 @@ class _ReportCardDialogState extends ConsumerState<ReportCardDialog>
               Row(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
+                  if(examOrigin != null && examOrigin!.pageIndex > 1)
                   InkWell(
                       onTap: () {
                         var num = examOrigin!.pageIndex;
@@ -283,15 +284,15 @@ class _ReportCardDialogState extends ConsumerState<ReportCardDialog>
                             vertical: 2.r, horizontal: 5.r),
                         decoration: BoxDecoration(
                           border: Border.all(
-                              color: examOrigin != null && examOrigin!.pageIndex > 1?Color(0xFF6787FD): Color(0xFFB3B9B9),
+                              color: Color(0xFF6787FD),
                               width: 1.r),
                           borderRadius: BorderRadius.all(
                               Radius.circular(2.r)),
                         ),
                         child: Text(
-                          '上一页',
+                          '下一页',
                           style: TextStyle(
-                              color: examOrigin != null && examOrigin!.pageIndex > 1?Color(0xFF6787FD): Color(0xFFB3B9B9),
+                              color: Color(0xFF6787FD),
                         ),
                       ),
                       ),
@@ -302,8 +303,9 @@ class _ReportCardDialogState extends ConsumerState<ReportCardDialog>
                       )*/
                   ),
                   SizedBox(
-                    width: 15.r,
+                    width: 30.r,
                   ),
+                  if(examOrigin != null && examOrigin!.pageIndex < examOriginList.length)
                   InkWell(
                       onTap: () {
                         var num = examOrigin!.pageIndex;
@@ -319,15 +321,15 @@ class _ReportCardDialogState extends ConsumerState<ReportCardDialog>
                             vertical: 2.r, horizontal: 5.r),
                         decoration: BoxDecoration(
                           border: Border.all(
-                              color: examOrigin != null && examOrigin!.pageIndex < examOriginList.length?Color(0xFF6787FD): Color(0xFFB3B9B9),
+                              color: Color(0xFF6787FD),
                               width: 1.r),
                           borderRadius: BorderRadius.all(
                               Radius.circular(2.r)),
                         ),
                         child: Text(
-                          '下一页',
+                          '上一页',
                           style: TextStyle(
-                            color: examOrigin != null && examOrigin!.pageIndex < examOriginList.length?Color(0xFF6787FD): Color(0xFFB3B9B9),
+                            color: Color(0xFF6787FD),
                           ),
                         ),
                       ),

marking_app/lib/pages/reports/index.dart

@@ -297,7 +297,7 @@ class _TheReportState extends ConsumerState<TheReport>
                               padding: EdgeInsets.symmetric(
                                   vertical: 8.h, horizontal: 20.r),
                               width:
-                              (MediaQuery.of(context).size.width - 80.r) / 2,
+                                  MediaQuery.of(context).size.width / 2 - 50.r,
                               child: Row(
                                 children: [
                                   Text(
@@ -334,7 +334,7 @@ class _TheReportState extends ConsumerState<TheReport>
                               padding: EdgeInsets.symmetric(
                                   vertical: 8.h, horizontal: 20.r),
                               width:
-                              (MediaQuery.of(context).size.width - 80.r) / 2,
+                                  MediaQuery.of(context).size.width / 2 - 60.r,
                               child: Row(
                                 children: [
                                   Text(

marking_app/lib/routes/RouterManager.dart

@@ -13,7 +13,6 @@ import 'package:fluro/fluro.dart';
 import 'package:flutter/material.dart';
 import 'package:marking_app/common/model/enum/marking_list_type.dart';
 import 'package:marking_app/pages/common/startUpPage.dart';
-import 'package:marking_app/pages/homework_correction/job_report.dart';
 import 'package:marking_app/pages/homework_correction/review_job.dart';
 
 import 'package:marking_app/pages/login/index.dart';
@@ -48,9 +47,6 @@ class RouterManager {
   static const String agreementPath = 'other/agreement_page';
   static const String ohterMainPagePath = 'other/index';
 
-  // 作业
-  static const String jobReportPagePath = '/job/report/index';
-
   static const String reportClassTeacherPath = 'report/details/reportClassTeacher';
   static const String reportSubjectTeacherPath = 'report/details/reportSubjectTeacher';
   static const String reportPersonalSubjectPath = 'report/details/reportPersonalSubject';
@@ -165,12 +161,7 @@ class RouterManager {
       toPrint(val: '进入跳转报错啦，$e');
     }
   });
-  // 作业报告页面
+
-  static final _jobReportPageHandler = Handler(handlerFunc: (BuildContext? context, Map<String, List<String>> params) {
-    int id = int.parse(params['id']![0]);
-    String title = params['title']![0];
-    return JobReport(id: id, title: title);
-  });
   static final _agreementPageHandler = Handler(handlerFunc: (BuildContext? context, Map<String, List<String>> params) {
     AGREEMENT_KEY key = AGREEMENT_KEY.values.byName(params['type']![0]);
     return AgreementPage(type: key);
@@ -200,10 +191,10 @@ class RouterManager {
     handlerFunc: (BuildContext? context, Map<String, List<String>> params) => TheMine(),
   );
   static final _reportDetailPath = Handler(
-    handlerFunc: (BuildContext? context, Map<String, List<String>> params) {
+    handlerFunc: (BuildContext? context, Map<String, List<String>> params){
       int examId = int.parse(params['examId']![0]);
       bool showGrade = params['showGrade']![0] == 'true';
-      return ReportDetail(examId: examId, showGrade: showGrade);
+      return  ReportDetail(examId: examId,showGrade:showGrade);
     },
   );
 
@@ -257,7 +248,6 @@ class RouterManager {
         handler: _reportPersonalSubjectPageHandler, transitionType: TransitionType.material);
     router.define(userMinePath, handler: _userMinePageHandler, transitionType: TransitionType.material);
     router.define(reportDetailPath, handler: _reportDetailPath, transitionType: TransitionType.material);
-    router.define(jobReportPagePath, handler: _jobReportPageHandler, transitionType: TransitionType.material);
 
 // getTransition()
 

marking_app/lib/utils/request/rest_client.dart

@@ -18,9 +18,7 @@ import 'package:marking_app/common/model/job/job_concerned_with_student_params.d
 import 'package:marking_app/common/model/job/job_note_taking_trajectory.dart';
 import 'package:marking_app/common/model/job/job_page_tab.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/common/model/job/job_report_question_deatil_model.dart';
 import 'package:marking_app/common/model/job/job_review_submission.dart';
 import 'package:marking_app/common/model/job/job_task_item.dart';
 import 'package:marking_app/common/model/job/marking_text_question_job.dart';
@@ -259,14 +257,4 @@ abstract class RestClient {
   // 作业 => 获取作业报告
   @the_retrofit.GET("/api/jobs/student-job-for-class")
   Future<BaseStructureResult<List<JobReportJoinClass>>> getJobReportJoinClasses(@the_retrofit.Query("jobId") int jobId);
-
-  // 作业 => 报告 ==> 获取知识点详情
-  @the_retrofit.GET("/api/jobs/job-report-knowledge-detail")
-  Future<BaseStructureResult<List<JobReportKnowledgeModel>>> getDetailKnowledge(
-      @the_retrofit.Query("jobid") int jobId, @the_retrofit.Query("knowid") int knowid);
-
-  // 作业 => 报告 ==> 获取知识点详情
-  @the_retrofit.GET("/api/jobs/job-report-question-detail")
-  Future<BaseStructureResult<List<JobReportQuestionDeatilModel>>> getJobReportQuestionDetail(
-      @the_retrofit.Query("jobid") int jobId, @the_retrofit.Query("questionid") int questionid);
 }

marking_app/lib/utils/request/rest_dio.dart

@@ -160,7 +160,7 @@ class ResponseHandle extends Interceptor {
   void onResponse(Response response, ResponseInterceptorHandler handler) {
     const isProd = bool.fromEnvironment('dart.vm.product');
     if (!isProd && RequestConfig.requestDataPrinting) {
-      // printJson(response.data);
+      printJson(response.data);
     }
     super.onResponse(response, handler);
   }

marking_app/pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.0.95
+version: 1.0.93
 
 environment:
   sdk: ">=2.17.1 <3.0.0"

marking_app/windows/runner/CMakeLists.txt

@@ -20,13 +20,6 @@ add_executable(${BINARY_NAME} WIN32
 # that need different build settings.
 apply_standard_settings(${BINARY_NAME})
 
-# Add preprocessor definitions for the build version.
-target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"")
-target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}")
-target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}")
-target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}")
-target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}")
-
 # Disable Windows macros that collide with C++ standard library functions.
 target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX")
 

marking_app/windows/runner/Runner.rc

@@ -60,14 +60,14 @@ IDI_APP_ICON            ICON                    "resources\\app_icon.ico"
 // Version
 //
 
-#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD)
+#ifdef FLUTTER_BUILD_NUMBER
-#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD
+#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER
 #else
-#define VERSION_AS_NUMBER 1,0,0,0
+#define VERSION_AS_NUMBER 1,0,0
 #endif
 
-#if defined(FLUTTER_VERSION)
+#ifdef FLUTTER_BUILD_NAME
-#define VERSION_AS_STRING FLUTTER_VERSION
+#define VERSION_AS_STRING #FLUTTER_BUILD_NAME
 #else
 #define VERSION_AS_STRING "1.0.0"
 #endif