diff --git a/marking_app/lib/common/model/report/detail_base_info.dart b/marking_app/lib/common/model/report/detail_base_info.dart
index 3fe2a91..ee0d99d 100644
--- a/marking_app/lib/common/model/report/detail_base_info.dart
+++ b/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,);
 
diff --git a/marking_app/lib/pages/report_detail/widgets/basic_table.dart b/marking_app/lib/pages/report_detail/widgets/basic_table.dart
index 5bbed2f..8e901a3 100644
--- a/marking_app/lib/pages/report_detail/widgets/basic_table.dart
+++ b/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.toString(), true)),
+                    Expanded(flex: 1, child: BasicTableCell(baseInfo!.totalRank != null?baseInfo!.totalRank.toString():'--', true)),
                     Expanded(flex: 1, child: BasicTableCell('参考班级总数', false)),
-                    Expanded(flex: 1, child: BasicTableCell(baseInfo!.joinCount.toString(), true)),
+                    Expanded(flex: 1, child: BasicTableCell(baseInfo!.joinCount != null?baseInfo!.joinCount.toString():'--', true)),
                   ],
                 ),
               ),
diff --git a/marking_app/lib/pages/report_detail/widgets/card_table.dart b/marking_app/lib/pages/report_detail/widgets/card_table.dart
index 6d512d7..d362e61 100644
--- a/marking_app/lib/pages/report_detail/widgets/card_table.dart
+++ b/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,
+        minWidth: 70.r * widget.headList.length + 10.r,
         fixedTopRows:  widget.fixedRows!,
         fixedLeftColumns: widget.fixedCols!,
         sortColumnIndex: _sortColumnIndex,
diff --git a/marking_app/lib/pages/report_detail/widgets/know_point_list.dart b/marking_app/lib/pages/report_detail/widgets/know_point_list.dart
index 2514251..0300a2a 100644
--- a/marking_app/lib/pages/report_detail/widgets/know_point_list.dart
+++ b/marking_app/lib/pages/report_detail/widgets/know_point_list.dart
@@ -81,6 +81,7 @@ class _KnowPointTableState extends State<KnowPointTable> {
         scrollController: _controller,
         columnSpacing: 0,
         horizontalMargin: 0,
+        dataRowHeight:50.r,
         bottomMargin: 0,
         border: TableBorder(
             horizontalInside: BorderSide(
diff --git a/marking_app/lib/pages/report_detail/widgets/report_card_dialog.dart b/marking_app/lib/pages/report_detail/widgets/report_card_dialog.dart
index 10bd671..57239fa 100644
--- a/marking_app/lib/pages/report_detail/widgets/report_card_dialog.dart
+++ b/marking_app/lib/pages/report_detail/widgets/report_card_dialog.dart
@@ -269,7 +269,6 @@ class _ReportCardDialogState extends ConsumerState<ReportCardDialog>
               Row(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
-                  if(examOrigin != null && examOrigin!.pageIndex > 1)
                   InkWell(
                       onTap: () {
                         var num = examOrigin!.pageIndex;
@@ -284,15 +283,15 @@ class _ReportCardDialogState extends ConsumerState<ReportCardDialog>
                             vertical: 2.r, horizontal: 5.r),
                         decoration: BoxDecoration(
                           border: Border.all(
-                              color: Color(0xFF6787FD),
+                              color: examOrigin != null && examOrigin!.pageIndex > 1?Color(0xFF6787FD): Color(0xFFB3B9B9),
                               width: 1.r),
                           borderRadius: BorderRadius.all(
                               Radius.circular(2.r)),
                         ),
                         child: Text(
-                          '下一页',
+                          '上一页',
                           style: TextStyle(
-                              color: Color(0xFF6787FD),
+                              color: examOrigin != null && examOrigin!.pageIndex > 1?Color(0xFF6787FD): Color(0xFFB3B9B9),
                         ),
                       ),
                       ),
@@ -303,9 +302,8 @@ class _ReportCardDialogState extends ConsumerState<ReportCardDialog>
                       )*/
                   ),
                   SizedBox(
-                    width: 30.r,
+                    width: 15.r,
                   ),
-                  if(examOrigin != null && examOrigin!.pageIndex < examOriginList.length)
                   InkWell(
                       onTap: () {
                         var num = examOrigin!.pageIndex;
@@ -321,15 +319,15 @@ class _ReportCardDialogState extends ConsumerState<ReportCardDialog>
                             vertical: 2.r, horizontal: 5.r),
                         decoration: BoxDecoration(
                           border: Border.all(
-                              color: Color(0xFF6787FD),
+                              color: examOrigin != null && examOrigin!.pageIndex < examOriginList.length?Color(0xFF6787FD): Color(0xFFB3B9B9),
                               width: 1.r),
                           borderRadius: BorderRadius.all(
                               Radius.circular(2.r)),
                         ),
                         child: Text(
-                          '上一页',
+                          '下一页',
                           style: TextStyle(
-                            color: Color(0xFF6787FD),
+                            color: examOrigin != null && examOrigin!.pageIndex < examOriginList.length?Color(0xFF6787FD): Color(0xFFB3B9B9),
                           ),
                         ),
                       ),
diff --git a/marking_app/lib/pages/reports/index.dart b/marking_app/lib/pages/reports/index.dart
index 24920d2..0f0f1fc 100644
--- a/marking_app/lib/pages/reports/index.dart
+++ b/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 / 2 - 50.r,
+                              (MediaQuery.of(context).size.width - 80.r) / 2,
                               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 / 2 - 60.r,
+                              (MediaQuery.of(context).size.width - 80.r) / 2,
                               child: Row(
                                 children: [
                                   Text(