From bf219ecf1fdc520a370abdb023718ba7627a7a2c Mon Sep 17 00:00:00 2001 From: machuanyu <840649825@qq.com> Date: Fri, 13 Sep 2024 16:50:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E7=8F=AD=E7=BA=A7=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=A7=91=E7=9B=AE=E6=98=BE=E7=A4=BA=EF=BC=8C=E7=9F=A5?= =?UTF-8?q?=E8=AF=86=E7=82=B9=E6=96=B0=E5=A2=9E=E7=8F=AD=E7=BA=A7=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lib/common/api/retrofit_client.dart | 2 +- .../children/class_student/class_student_view.dart | 10 ++++++---- .../knowledge_points_grasp_logic.dart | 4 +++- .../knowledge_points_grasp_state.dart | 3 +++ .../student_history_work_logic.dart | 7 ++++++- .../student_work_detail/student_work_detail_logic.dart | 2 ++ .../student_work_detail/student_work_detail_state.dart | 1 + .../lib/page/home_page/home_view.dart | 8 +++++++- .../lib/page/home_page/widget/student_group_list.dart | 8 ++++++++ 9 files changed, 37 insertions(+), 8 deletions(-) diff --git a/making_school_asignment_app/lib/common/api/retrofit_client.dart b/making_school_asignment_app/lib/common/api/retrofit_client.dart index 5a2e6b9..3ca2282 100644 --- a/making_school_asignment_app/lib/common/api/retrofit_client.dart +++ b/making_school_asignment_app/lib/common/api/retrofit_client.dart @@ -97,7 +97,7 @@ abstract class RetrofitClient { //知识点掌握 @GET("/api/hms/HmsReport/GetKnowledgeReport") Future> 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") diff --git a/making_school_asignment_app/lib/page/home_page/children/class_student/class_student_view.dart b/making_school_asignment_app/lib/page/home_page/children/class_student/class_student_view.dart index 2f49a0c..acbca66 100644 --- a/making_school_asignment_app/lib/page/home_page/children/class_student/class_student_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/class_student/class_student_view.dart @@ -77,7 +77,8 @@ class _ClassStudentPageState extends State { 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 { 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 { 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 { decoration: BoxDecoration( border: Border.all( width: 1.r, - color: Color(0xFFFFA41E)), + color: const Color(0xFFFFA41E)), borderRadius: BorderRadius.all( Radius.circular(20.r)), ), diff --git a/making_school_asignment_app/lib/page/home_page/children/knowledge_points_grasp/knowledge_points_grasp_logic.dart b/making_school_asignment_app/lib/page/home_page/children/knowledge_points_grasp/knowledge_points_grasp_logic.dart index 22deb0f..29e08b7 100644 --- a/making_school_asignment_app/lib/page/home_page/children/knowledge_points_grasp/knowledge_points_grasp_logic.dart +++ b/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 data = await getClient().getKnowledgeReport(state.dateStart, state.dateEnd, textController.text); + List data = await getClient().getKnowledgeReport(state.dateStart, state.dateEnd, textController.text,state.classId,state.subject); state.dataList.value = data; EasyLoading.dismiss(); } diff --git a/making_school_asignment_app/lib/page/home_page/children/knowledge_points_grasp/knowledge_points_grasp_state.dart b/making_school_asignment_app/lib/page/home_page/children/knowledge_points_grasp/knowledge_points_grasp_state.dart index 7dc7c18..65404c0 100644 --- a/making_school_asignment_app/lib/page/home_page/children/knowledge_points_grasp/knowledge_points_grasp_state.dart +++ b/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; + } diff --git a/making_school_asignment_app/lib/page/home_page/children/student_history_work/student_history_work_logic.dart b/making_school_asignment_app/lib/page/home_page/children/student_history_work/student_history_work_logic.dart index c7928d0..3c1f983 100644 --- a/making_school_asignment_app/lib/page/home_page/children/student_history_work/student_history_work_logic.dart +++ b/making_school_asignment_app/lib/page/home_page/children/student_history_work/student_history_work_logic.dart @@ -29,7 +29,12 @@ class StudentHistoryWorkLogic extends GetxController with RequestToolMixin { } void goNextPage(String id, String title, int subject) { - Get.toNamed(Routes.classStudentPage, arguments: {'title': title, 'classId': id, 'page': nextPage, 'subject': 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 diff --git a/making_school_asignment_app/lib/page/home_page/children/student_work_detail/student_work_detail_logic.dart b/making_school_asignment_app/lib/page/home_page/children/student_work_detail/student_work_detail_logic.dart index 76d9f20..ce0d2fa 100644 --- a/making_school_asignment_app/lib/page/home_page/children/student_work_detail/student_work_detail_logic.dart +++ b/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, ); diff --git a/making_school_asignment_app/lib/page/home_page/children/student_work_detail/student_work_detail_state.dart b/making_school_asignment_app/lib/page/home_page/children/student_work_detail/student_work_detail_state.dart index 6e0cd30..86bf780 100644 --- a/making_school_asignment_app/lib/page/home_page/children/student_work_detail/student_work_detail_state.dart +++ b/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 studentData = Rx(StudentHistory(0, 0, Items([], 0), 0)); + late final int subject; } diff --git a/making_school_asignment_app/lib/page/home_page/home_view.dart b/making_school_asignment_app/lib/page/home_page/home_view.dart index da9f6a6..d6b3cf0 100644 --- a/making_school_asignment_app/lib/page/home_page/home_view.dart +++ b/making_school_asignment_app/lib/page/home_page/home_view.dart @@ -88,7 +88,13 @@ class _HomePageState extends State 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, diff --git a/making_school_asignment_app/lib/page/home_page/widget/student_group_list.dart b/making_school_asignment_app/lib/page/home_page/widget/student_group_list.dart index be329dc..fe0660f 100644 --- a/making_school_asignment_app/lib/page/home_page/widget/student_group_list.dart +++ b/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(