making_school_asignment_app/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json

@@ -1,23 +1,23 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   }
 }

making_school_asignment_app/ios/Runner/Info.plist

@@ -45,5 +45,9 @@
 		<true/>
 		<key>UIApplicationSupportsIndirectInputEvents</key>
 		<true/>
+		<key>UIStatusBarHidden</key>
+		<false/>
+		<key>UIViewControllerBasedStatusBarAppearance</key>
+		<false/>
 	</dict>
 </plist>

making_school_asignment_app/lib/common/config/request_config.dart

@@ -9,7 +9,9 @@
 import 'package:making_school_asignment_app/common/job/common/base_page.dart';
 
 class RequestConfig {
-  static const _devBaseUrl = "http://192.168.2.119:1091"; // 开发
+  // static const _devBaseUrl = "http://192.168.2.119:1091"; // 开发
+  static const _devBaseUrl = "https://dpc-teacher-api.23544.com"; // 开发
+  // static const _proBaseUrl = "http://192.168.2.119:1091"; // 生产
   static const _proBaseUrl = "https://dpc-teacher-api.23544.com"; // 生产
   static const imgUrl = 'https://dpc-job-oss.23544.com/';
 

making_school_asignment_app/lib/common/job/homework_details.dart

@@ -37,7 +37,7 @@ class Questions extends Object {
   int templateId;
 
   @JsonKey(name: 'questionNo')
-  int questionNo;
+  String questionNo;
 
   @JsonKey(name: 'questionType')
   int questionType;
@@ -213,7 +213,7 @@ class Dtls extends Object {
   int? templateId;
 
   @JsonKey(name: 'questionNo')
-  int questionNo;
+  String questionNo;
 
   @JsonKey(name: 'questionType')
   int questionType;

making_school_asignment_app/lib/common/job/knowledge_report_detail.dart

@@ -19,7 +19,7 @@ class KnowledgeReportDetail extends Object {
   int templateId;
 
   @JsonKey(name: 'questionNo')
-  int questionNo;
+  String questionNo;
 
   @JsonKey(name: 'questionType')
   int questionType;

making_school_asignment_app/lib/common/job/marking_models/original_manuscript_handwriting_params.dart

@@ -16,7 +16,7 @@ class OriginalManuscriptHandwritingParams extends Object {
   int? templateId;
 
   @JsonKey(name: 'questionNo')
-  int? questionNo;
+  String? questionNo;
 
   @JsonKey(name: 'pageNum')
   int? pageNum;

making_school_asignment_app/lib/common/job/student_history.dart

@@ -105,7 +105,7 @@ class KgtList extends Object {
   String id;
 
   @JsonKey(name: 'questionNo')
-  int questionNo;
+  String questionNo;
 
   @JsonKey(name: 'questionType')
   int questionType;
@@ -135,7 +135,7 @@ class ZgtList extends Object {
   String id;
 
   @JsonKey(name: 'questionNo')
-  int questionNo;
+  String questionNo;
 
   @JsonKey(name: 'questionType')
   int questionType;

making_school_asignment_app/lib/common/job/student_personal_info.dart

@@ -43,7 +43,7 @@ class KgtList extends Object {
   int templateId;
 
   @JsonKey(name: 'questionNo')
-  int questionNo;
+  String questionNo;
 
   @JsonKey(name: 'answer')
   String? answer;
@@ -76,7 +76,7 @@ class ZgtList extends Object {
   int templateId;
 
   @JsonKey(name: 'questionNo')
-  int questionNo;
+  String questionNo;
 
   @JsonKey(name: 'answer')
   String? answer;

making_school_asignment_app/lib/page/home_page/children/homework_review/components/original_manuscript_handwriting/answer_handwriting_view.dart

@@ -29,7 +29,7 @@ class AnswerHandwriting extends Dialog {
   final int studentId;
   final int? templateId;
   final int? pageNum;
-  final int? questionNo;
+  final String? questionNo;
   final Function closeCall;
   AnswerHandwriting(
       {super.key, required this.homeworkId, required this.studentId, required this.closeCall, this.templateId, this.pageNum, this.questionNo});
@@ -68,7 +68,7 @@ Future<void> showAnswerHandwriting(
   required int studentId,
   int? templateId,
   int? pageNum,
-  int? questionNo,
+  String? questionNo,
 }) async {
   backCall() {
     Navigator.of(context).pop();
@@ -118,7 +118,7 @@ class AnswerHandwritingMainBox extends HookWidget with EventBusMixin {
   final int? templateId;
   final int studentId;
   final int? pageNum;
-  final int? questionNo;
+  final String? questionNo;
   final Function closeCall;
 
   @override
@@ -184,7 +184,7 @@ class UseMainBoxState with RequestToolMixin {
   final String homeworkId;
   final int studentId;
   final int? templateId;
-  int? questionNo;
+  String? questionNo;
   final ValueNotifier<int?> pageNum;
   final ValueNotifier<int> pageCount;
   final ValueNotifier<JobHandwriting?> handwritingData;
@@ -210,7 +210,7 @@ class UseMainBoxState with RequestToolMixin {
   });
 
   // 工厂构造函数
-  factory UseMainBoxState.use(String homeworkId, int studentId, [int? pageNum, int? questionNo, int? templateId]) {
+  factory UseMainBoxState.use(String homeworkId, int studentId, [int? pageNum, String? questionNo, int? templateId]) {
     return UseMainBoxState._(
       homeworkId: homeworkId,
       templateId: templateId,

making_school_asignment_app/lib/page/home_page/children/job_report/widget/knowledge_point.dart

@@ -263,11 +263,11 @@ class _KnowledgePointState extends State<KnowledgePoint> {
                                 int okCount = stu.queDtls!.where((w) => w.state == 3).length;
                                 int ttlCount = stu.queDtls!.length;
                                 stu.okRate = Utils.calcRate(okCount, ttlCount);
-                                stu.queDtls!.sort((a, b) {
+                                /*stu.queDtls!.sort((a, b) {
                                   int num1 = a.questionNo;
                                   int num2 = b.questionNo;
                                   return num1.compareTo(num2);
-                                });
+                                });*/
                               }
 
                               showPeopleListDialog(

making_school_asignment_app/lib/page/home_page/children/quick_data_check/widget/report_table.dart

@@ -518,9 +518,9 @@ class _ReportTableState extends State<ReportTable> {
                       style: TextStyle(
                           fontSize: 10.sp, color: const Color(0xFF4CC793))),
                   Image.asset(
-                    'assets/images/job_data_right_icon.png',
+                    'assets/images/green_right_icon.png',
-                    width: 10.r,
+                    width: 12.r,
-                    height: 10.r,
+                    height: 12.r,
                   )
                 ],
               ),

making_school_asignment_app/lib/page/home_page/children/student_personal/widget/student_kg_table.dart

@@ -9,7 +9,7 @@ class StudentKgTable extends StatefulWidget {
   final List bodyList;
   final int? fixedRows;
   final int? fixedCols;
-  final Function(int, int)? questionNumCall;
+  final Function(String, int)? questionNumCall;
 
   const StudentKgTable({
     Key? key,

making_school_asignment_app/lib/page/home_page/children/student_personal/widget/student_zg_table.dart

@@ -11,7 +11,7 @@ class StudentZgTable extends StatefulWidget {
   final List bodyList;
   final int? fixedRows;
   final int? fixedCols;
-  final Function(int, int)? questionNumCall;
+  final Function(String, int)? questionNumCall;
 
   const StudentZgTable({
     Key? key,

making_school_asignment_app/web/index.html

@@ -1,6 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html><html><head>
-<html>
-<head>
   <!--
     If you are serving your web app in a path other than the root, change the
     href value below to reflect the base path you are serving from.
@@ -27,12 +25,154 @@
   <link rel="apple-touch-icon" href="icons/Icon-192.png">
 
   <!-- Favicon -->
-  <link rel="icon" type="image/png" href="favicon.png"/>
+  <link rel="icon" type="image/png" href="favicon.png">
 
   <title>making_school_asignment_app</title>
   <link rel="manifest" href="manifest.json">
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  <style id="splash-screen-style">
+    html {
+      height: 100%
+    }
+
+    body {
+      margin: 0;
+      min-height: 100%;
+      background-color: #ffffff;
+      background-image: url("splash/img/light-background.png");
+      background-size: 100% 100%;
+    }
+
+    .center {
+      margin: 0;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      -ms-transform: translate(-50%, -50%);
+      transform: translate(-50%, -50%);
+    }
+
+    .contain {
+      display:block;
+      width:100%; height:100%;
+      object-fit: contain;
+    }
+
+    .stretch {
+      display:block;
+      width:100%; height:100%;
+    }
+
+    .cover {
+      display:block;
+      width:100%; height:100%;
+      object-fit: cover;
+    }
+
+    .bottom {
+      position: absolute;
+      bottom: 0;
+      left: 50%;
+      -ms-transform: translate(-50%, 0);
+      transform: translate(-50%, 0);
+    }
+
+    .bottomLeft {
+      position: absolute;
+      bottom: 0;
+      left: 0;
+    }
+
+    .bottomRight {
+      position: absolute;
+      bottom: 0;
+      right: 0;
+    }
+  </style>
+  <script id="splash-screen-script">
+    function removeSplashFromWeb() {
+      document.getElementById("splash")?.remove();
+      document.getElementById("splash-branding")?.remove();
+      document.body.style.background = "transparent";
+    }
+  </script>
+  <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport">
+  <link rel="stylesheet" type="text/css" href="splash/style.css">
+  <script src="splash/splash.js"></script>
 </head>
 <body>
-  <script src="flutter_bootstrap.js" async></script>
+  
-</body>
+  
-</html>
+  
+  
+  <script src="flutter_bootstrap.js" async=""></script>
+
+
+</body></html>