marking_app/lib/pages/homework_correction/index.dart

@@ -260,9 +260,7 @@ class _HomeworkCorrectionState extends ConsumerState<HomeworkCorrection>
                       Expanded(
                         flex: 1,
                         child: InkWell(
-                          onTap: () {
+                          onTap: () {},
-                            RouterManager.router.navigateTo(context, RouterManager.jobPriorityReviewSetPath,transition: getTransition());
-                          },
                           child: Icon(Icons.settings_outlined, color: Color.fromRGBO(44, 48, 63, 1), size: 24.sp),
                         ),
                       ),

marking_app/lib/pages/homework_correction/job_priority_review_set.dart

@@ -1,125 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-
-class JobPriorityReviewSet extends StatefulWidget {
-  const JobPriorityReviewSet({Key? key}) : super(key: key);
-
-  @override
-  State<JobPriorityReviewSet> createState() => _JobPriorityReviewSetState();
-}
-
-class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
-    with SingleTickerProviderStateMixin {
-  late final EasyRefreshController refreshController;
-  late TabController tabController;
-  int tabIndex = 0;
-
-  @override
-  void initState() {
-    super.initState();
-    refreshController = EasyRefreshController();
-    tabController =
-        TabController(initialIndex: tabIndex, length: 2, vsync: this);
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    refreshController.dispose();
-    tabController.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Color.fromRGBO(245, 245, 245, 1),
-      appBar: AppBar(
-        backgroundColor: Colors.white,
-        title: Text(
-          '优先批阅人配置',
-          style: TextStyle(fontSize: 16.sp, color: Color(0xFF333333)),
-        ),
-        centerTitle: true,
-        leading: IconButton(
-          icon: Icon(Icons.arrow_back_ios, color: Colors.black),
-          onPressed: () => Navigator.of(context).pop(),
-        ),
-      ),
-      body: EasyRefresh(
-        firstRefresh: true,
-        taskIndependence: true,
-        enableControlFinishLoad: true,
-        enableControlFinishRefresh: true,
-        // emptyWidget: data.isEmpty ? const MyEmptyWidget() : null,
-        controller: refreshController,
-        header: MaterialHeader(),
-        footer: TaurusFooter(),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Padding(
-              padding: EdgeInsets.symmetric(horizontal: 14.r),
-              child: TabBar(
-                onTap: (int val) {
-                  setState(() {
-                    tabIndex = val;
-                  });
-                },
-                tabs: [
-                  SizedBox(
-                    width: (MediaQuery.of(context).size.width - 28.r) /2,
-                    child: Tab(
-                      text: '优先批阅',
-                    ),
-                  ),
-                  SizedBox(
-                    width: (MediaQuery.of(context).size.width - 28.r) /2,
-                    child: Tab(
-                      text: '默认批阅',
-                    ),
-                  )
-                ],
-                controller: tabController,
-                unselectedLabelStyle: TextStyle(
-                    fontSize: 14.sp, color:Color(0xFF666666)),
-                labelStyle: TextStyle(
-                  fontSize: 14.sp,
-                  color: Color(0xFF6888FD),
-                ),
-                isScrollable: true,
-                labelColor: Color(0xFF6888FD),
-                unselectedLabelColor: Color(0xFF666666),
-                indicatorSize: TabBarIndicatorSize.label,
-                  labelPadding: const EdgeInsets.all(0),
-              ),
-            ),
-            Container(
-              padding: EdgeInsets.symmetric(horizontal: 15.r),
-             decoration: BoxDecoration(
-               borderRadius: BorderRadius.all(Radius.circular(10.r)),
-               color: Colors.white,
-             ),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  Text('张小凡',style: TextStyle(fontSize: 12.sp,color: Color(0xFF6888FD)),),
-                  Container(
-                    padding: EdgeInsets.symmetric(vertical: 2.r,horizontal: 10.r),
-                    decoration: BoxDecoration(
-                      borderRadius: BorderRadius.all(Radius.circular(20.r)),
-                      color: Color(0xFF6888FD),
-                    ),
-                    child: Center(
-                      child: Text('取消优先',style: TextStyle(fontSize: 10.sp,color: Colors.white),),
-                    ),
-                  )
-                ],
-              ),
-            )
-          ],
-        ),
-      ),
-    );
-  }
-}

marking_app/lib/pages/homework_correction/job_report.dart

@@ -23,10 +23,9 @@ part 'job_report.g.dart';
 /// 作业报告
 class JobReport extends StatefulWidget {
   final int id;
-  final String uniqueId;
   final String title;
 
-  const JobReport({required this.id, required this.title,required this.uniqueId, super.key});
+  const JobReport({required this.id, required this.title, super.key});
 
   @override
   State<JobReport> createState() => _JobReportState();

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

@@ -35,25 +35,21 @@ class _QuickStudentDataTableState extends State<QuickStudentDataTable> {
     StudentDetails item = widget.bodyList[index];
     int num = 0;
     item.kgDetails.forEach((element) {
-      if (element.state == 0) {
+      if(element.state == 0){
         num = num + 1;
       }
     });
     item.zgDetails.forEach((element) {
-      if (element.state == 0) {
+      if(element.state == 0){
         num = num + 1;
       }
     });
     return DataRow2.byIndex(
       index: index,
-      color: color != null
+      color: color != null ? num == 0?MaterialStateProperty.all(color):MaterialStateProperty.all(Color(0xFFFFD79C)): null,
-          ? num == 0
-              ? MaterialStateProperty.all(color)
-              : MaterialStateProperty.all(Color(0xFFFFD79C))
-          : null,
       cells: [
         DataCell(InkWell(
-          onTap: () {
+          onTap: (){
             RouterManager.router.navigateTo(
               context,
               RouterManager.quickCheckPersonalPath +
@@ -69,16 +65,9 @@ class _QuickStudentDataTableState extends State<QuickStudentDataTable> {
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
                   Text(item.studentName,
-                      style:
+                      style: TextStyle(fontSize: 12.sp, color: Color(0xFF6888FD))),
-                          TextStyle(fontSize: 12.sp, color: Color(0xFF6888FD))),
+                  SizedBox(width: 5.r,),
-                  SizedBox(
+                  Image.asset('assets/images/job_data_right_icon.png',width: 10.r,height: 10.r,)
-                    width: 5.r,
-                  ),
-                  Image.asset(
-                    'assets/images/job_data_right_icon.png',
-                    width: 10.r,
-                    height: 10.r,
-                  )
                 ],
               ),
             ),
@@ -102,74 +91,50 @@ class _QuickStudentDataTableState extends State<QuickStudentDataTable> {
         )),
         DataCell(
           Padding(
-            padding: EdgeInsets.symmetric(vertical: 2.r, horizontal: 5.r),
+            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) {
+    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: kgInfo.state == 0?Color(0xFFD9D9D9):kgInfo.state == 1?Color(0xFFFF7474):Color(0xFF4CC793),
-                              ? Color(0xFFD9D9D9)
+                        borderRadius: BorderRadius.all(Radius.circular(7.r))
-                              : kgInfo.state == 1
+                      ),
-                                  ? Color(0xFFFF7474)
+                      child: Center(child: Text(kgInfo.questionNo,style: TextStyle(fontSize:10.sp,color: kgInfo.state == 0?Color(0xFF525252):Colors.white),)),
-                                  : 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(
+        DataCell(  Padding(
-          Padding(
+          padding: EdgeInsets.symmetric(vertical:2.r,horizontal: 5.r),
-            padding: EdgeInsets.symmetric(vertical: 2.r, horizontal: 5.r),
+          child: SingleChildScrollView(
-            child: SingleChildScrollView(
+            child: Wrap(
-              child: Wrap(
+                direction: Axis.horizontal,
-                  direction: Axis.horizontal,
+                alignment: WrapAlignment.center,
-                  alignment: WrapAlignment.center,
+                spacing: 2,
-                  spacing: 2,
+                runSpacing: 2,
-                  runSpacing: 2,
+                children: List.generate(item.zgDetails.length, (index) {
-                  children: List.generate(item.zgDetails.length, (index) {
+                  KgDetails kgInfo = item.zgDetails[index];
-                    KgDetails kgInfo = item.zgDetails[index];
+                  return Container(
-                    return Container(
+                    width: 14.r,
-                      width: 14.r,
+                    height: 14.r,
-                      height: 14.r,
+                    decoration: BoxDecoration(
-                      decoration: BoxDecoration(
+                        color: kgInfo.state == 0?Color(0xFFD9D9D9):kgInfo.state == 1?Color(0xFFFF7474):Color(0xFF4CC793),
-                          color: kgInfo.state == 0
+                        borderRadius: BorderRadius.all(Radius.circular(7.r))
-                              ? Color(0xFFD9D9D9)
+                    ),
-                              : kgInfo.state == 1
+                    child: Center(child: Text(kgInfo.questionNo,style: TextStyle(fontSize:10.sp,color: kgInfo.state == 0?Color(0xFF525252):Colors.white),)),
-                                  ? 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),
-                      )),
-                    );
-                  })),
-            ),
           ),
-        ),
+        ),),
       ],
     );
   }
@@ -219,7 +184,7 @@ class _QuickStudentDataTableState extends State<QuickStudentDataTable> {
                   style: TextStyle(fontSize: 12.sp, color: Color(0xFF505767))),
             ),
             // size: ColumnSize.S,
-            fixedWidth: (MediaQuery.of(context).size.width - 20.r - 28.r) / 5,
+            fixedWidth: (MediaQuery.of(context).size.width - 20.r - 28.r)/5,
           );
         }),
         rows: List<DataRow>.generate(widget.bodyList.length,

marking_app/lib/routes/RouterManager.dart

@@ -14,7 +14,6 @@ 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/do_papers_job_exam.dart';
-import 'package:marking_app/pages/homework_correction/job_priority_review_set.dart';
 import 'package:marking_app/pages/homework_correction/job_report.dart';
 import 'package:marking_app/pages/homework_correction/pages/job_list_participate_in_class.dart';
 import 'package:marking_app/pages/homework_correction/review_job.dart';
@@ -66,7 +65,6 @@ class RouterManager {
   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';
-  static const String jobPriorityReviewSetPath = '/homework_correction/job_priority_review_set';
 
   // TheMine
 
@@ -182,8 +180,7 @@ class RouterManager {
   static final _jobReportPageHandler = Handler(handlerFunc: (BuildContext? context, Map<String, List<String>> params) {
     int id = int.parse(params['id']![0]);
     String title = params['title']![0];
-    String uniqueId = params['uniqueId']![0];
+    return JobReport(id: id, title: title);
-    return JobReport(id: id, title: title,uniqueId:uniqueId);
   });
 
   // 作业报告页面
@@ -277,14 +274,6 @@ class RouterManager {
       return QuickCheckPersonal(jobId: jobId, studentId: studentId);
     },
   );
-
-  //优先配置
-  static final _jobPriorityReviewSetPageHandler = Handler(
-    handlerFunc: (BuildContext? context, Map<String, List<String>> params){
-      return JobPriorityReviewSet();
-    },
-  );
-
   // 开始阅卷页面
   // static final _doMarkingPapers = Handler(handlerFunc: (BuildContext? context, Map<String, List<String>> params) => MarkingPapers());
 
@@ -324,7 +313,6 @@ class RouterManager {
     router.define(quickDataCheckPath, handler: _quickDataCheckPageHandler, transitionType: TransitionType.material);
     router.define(quickCheckPersonalPath,
         handler: _quickCheckPersonalPageHandler, transitionType: TransitionType.material);
-    router.define(jobPriorityReviewSetPath, handler: _jobPriorityReviewSetPageHandler, transitionType: TransitionType.material);
 
 // getTransition()