making_school_asignment_app/lib/common/api/retrofit_client.dart

@@ -97,7 +97,7 @@ abstract class RetrofitClient {
   //知识点掌握
   @GET("/api/hms/HmsReport/GetKnowledgeReport")
   Future<List<KnowledgePointsGrasp>> getKnowledgeReport(
-      @Query('DateStart') String dateStart, @Query('DateEnd') String dateEnd, @Query('KnowledgeName') String knowledgeName);
+      @Query('DateStart') String dateStart, @Query('DateEnd') String dateEnd, @Query('KnowledgeName') String knowledgeName,@Query('ClassId') String classId,@Query('Subject') int subject);
 
   //知识点掌握详情
   @GET("/api/hms/HmsReport/GetKnowledgeReportDetail")

making_school_asignment_app/lib/page/home_page/children/class_student/class_student_view.dart

@@ -77,7 +77,8 @@ class _ClassStudentPageState extends State<ClassStudentPage> {
                           Get.toNamed(Routes.studentWorkDetailPage,
                               arguments: {
                                 'studentName': item.name,
-                                'studentId': item.id
+                                'studentId': item.id,
+                                'subject':state.subject,
                               });
                         },
                         child: Container(
@@ -251,7 +252,8 @@ class _ClassStudentPageState extends State<ClassStudentPage> {
                           Get.toNamed(Routes.studentWorkDetailPage,
                               arguments: {
                                 'studentName': item.name,
-                                'studentId': item.id
+                                'studentId': item.id,
+                                'subject':state.subject,
                               });
                         },
                         child: Container(
@@ -272,7 +274,7 @@ class _ClassStudentPageState extends State<ClassStudentPage> {
                                     item.name,
                                     style: TextStyle(
                                         fontSize: 12.sp,
-                                        color: Color(0xFF4CC793)),
+                                        color: const Color(0xFF4CC793)),
                                   )),
                               state.page == 'answerTrajectory'
                                   ? Container(
@@ -281,7 +283,7 @@ class _ClassStudentPageState extends State<ClassStudentPage> {
                                   decoration: BoxDecoration(
                                     border: Border.all(
                                         width: 1.r,
-                                        color: Color(0xFFFFA41E)),
+                                        color: const Color(0xFFFFA41E)),
                                     borderRadius: BorderRadius.all(
                                         Radius.circular(20.r)),
                                   ),

making_school_asignment_app/lib/page/home_page/children/knowledge_points_grasp/knowledge_points_grasp_logic.dart

@@ -17,6 +17,8 @@ class KnowledgePointsGraspLogic extends GetxController with RequestToolMixin, Ge
   @override
   void onInit() {
     super.onInit();
+    state.subject = Get.arguments['subject'] ?? -1;
+    state.classId = Get.arguments['classId'] ?? '';
     textController = TextEditingController();
     refreshController = EasyRefreshController();
     tabController = TabController(length: 3, vsync: this);
@@ -25,7 +27,7 @@ class KnowledgePointsGraspLogic extends GetxController with RequestToolMixin, Ge
   }
 
   void getList() async {
-    List<KnowledgePointsGrasp> data = await getClient().getKnowledgeReport(state.dateStart, state.dateEnd, textController.text);
+    List<KnowledgePointsGrasp> data = await getClient().getKnowledgeReport(state.dateStart, state.dateEnd, textController.text,state.classId,state.subject);
     state.dataList.value = data;
     EasyLoading.dismiss();
   }

making_school_asignment_app/lib/page/home_page/children/knowledge_points_grasp/knowledge_points_grasp_state.dart

@@ -13,4 +13,7 @@ class KnowledgePointsGraspState {
   late String dateStart = Utils.getWeekStartDate().toString().substring(0, 10);
   late String dateEnd = Utils.getWeekEndDate().toString().substring(0, 10);
   late RxString customTimeStr = '自定义'.obs;
+  late final int subject;
+  late final String classId;
+
 }

making_school_asignment_app/lib/page/home_page/children/student_history_work/student_history_work_logic.dart

@@ -29,9 +29,14 @@ class StudentHistoryWorkLogic extends GetxController with RequestToolMixin {
   }
 
   void goNextPage(String id, String title, int subject) {
+    if(nextPage == 'points'){
+      Get.toNamed(Routes.knowledgePointsGraspPage, arguments: {'classId': id, 'page': nextPage, 'subject': subject});
+    }else{
       Get.toNamed(Routes.classStudentPage, arguments: {'title': title, 'classId': id, 'page': nextPage, 'subject': subject});
     }
 
+  }
+
   @override
   void dispose() {
     super.dispose();

making_school_asignment_app/lib/page/home_page/children/student_work_detail/student_work_detail_logic.dart

@@ -18,6 +18,7 @@ class StudentWorkDetailLogic extends GetxController with RequestToolMixin, GetSi
     super.onInit();
     state.studentName.value = Get.arguments['studentName'] ?? '';
     state.studentId = Get.arguments['studentId'] ?? -1;
+    state.subject = Get.arguments['subject'] ?? -1;
     tabController = TabController(length: 3, vsync: this);
     refreshController = EasyRefreshController();
     EasyLoading.show(status: 'loading...');
@@ -30,6 +31,7 @@ class StudentWorkDetailLogic extends GetxController with RequestToolMixin, GetSi
       studentId: state.studentId,
       dateStart: state.dateStart,
       dateEnd: state.dateEnd,
+      subject:state.subject,
       pageNumber: state.page,
       pageSize: 10,
     );

making_school_asignment_app/lib/page/home_page/children/student_work_detail/student_work_detail_state.dart

@@ -16,4 +16,5 @@ class StudentWorkDetailState {
   late String dateEnd = Utils.getWeekEndDate().toString().substring(0, 10);
   late RxString customTimeStr = '自定义'.obs;
   late Rx<StudentHistory> studentData = Rx(StudentHistory(0, 0, Items([], 0), 0));
+  late final int subject;
 }

making_school_asignment_app/lib/page/home_page/home_view.dart

@@ -88,7 +88,13 @@ class _HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin
                       navigationUrl: Routes.studentHistoryWorkPage,
                       page: 'history',
                     ),
-                    EntranceModel(title: '知识点点掌握', image: 'assets/images/job_home_knowledge.png', navigationUrl: Routes.knowledgePointsGraspPage)
+                    // EntranceModel(title: '知识点点掌握', image: 'assets/images/job_home_knowledge.png', navigationUrl: Routes.knowledgePointsGraspPage)
+                    EntranceModel(
+                        title: '知识点点掌握',
+                        image: 'assets/images/job_home_knowledge.png',
+                        navigationUrl: Routes.studentHistoryWorkPage,
+                        page: 'points',
+                    )
                   ], state.totalCount.value);
                 }),
                 spaceWidth,

making_school_asignment_app/lib/page/home_page/widget/student_group_list.dart

@@ -48,6 +48,10 @@ class StudentGroupList extends StatelessWidget {
                                 style: TextStyle(fontSize: 10.sp, color: Color(0xFF4CC793)),
                               ),
                             ),
+                            Text(
+                              EnumUtils.formatSubject(item.subject!),
+                              style: TextStyle(fontSize: 10.sp, color: Color(0xFF8B8B8B)),
+                            ),
                             const Spacer(),
                             /*Expanded(
                             child: Text(
@@ -108,6 +112,10 @@ class StudentGroupList extends StatelessWidget {
                                 style: TextStyle(fontSize: 14.sp, color: Color(0xFF4CC793)),
                               ),
                             ),
+                            Text(
+                              EnumUtils.formatSubject(item.subject!),
+                              style: TextStyle(fontSize: 10.sp, color: Color(0xFF8B8B8B)),
+                            ),
                             const Spacer(),
                             /*   Expanded(
                             child: Text(