From cd9904ef0a68ef9f36ebee08fe20e34bd643f937 Mon Sep 17 00:00:00 2001 From: machuanyu <840649825@qq.com> Date: Fri, 14 Jun 2024 09:48:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../children/annotate_class/widget/item_btn.dart | 10 +++++----- .../answer_trajectory_view.dart | 6 ++++++ .../class_student/class_student_view.dart | 4 ++-- .../quick_data_check/quick_data_check_logic.dart | 3 ++- .../quick_data_check/quick_data_check_view.dart | 10 ++++------ .../read_over/widget/task_list_item.dart | 2 +- .../lib/page/home_page/home_logic.dart | 16 ++++++++++++---- .../lib/page/home_page/home_state.dart | 3 +++ .../lib/page/home_page/home_view.dart | 12 +++++++++++- 9 files changed, 46 insertions(+), 20 deletions(-) diff --git a/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/item_btn.dart b/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/item_btn.dart index fa50059..729ebb4 100644 --- a/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/item_btn.dart +++ b/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/item_btn.dart @@ -10,21 +10,21 @@ class ItemBtn extends StatelessWidget { @override Widget build(BuildContext context) { return SizedBox( - height:20.r, + height:25.r, child: ElevatedButton( style: ButtonStyle( - overlayColor:MaterialStateProperty.all( + overlayColor:WidgetStateProperty.all( const Color(0xFF6888FD)), backgroundColor: - MaterialStateProperty.all( + WidgetStateProperty.all( const Color(0xFFF4F4F4)), // foregroundColor: MaterialStateProperty.all(Colors.red.shade200),//文字颜色 - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(22), //设置圆角 )), - padding: MaterialStateProperty.all( + padding: WidgetStateProperty.all( EdgeInsets.zero, )), onPressed: () { diff --git a/making_school_asignment_app/lib/page/home_page/children/answer_trajectory/answer_trajectory_view.dart b/making_school_asignment_app/lib/page/home_page/children/answer_trajectory/answer_trajectory_view.dart index a905aa9..8efc09f 100644 --- a/making_school_asignment_app/lib/page/home_page/children/answer_trajectory/answer_trajectory_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/answer_trajectory/answer_trajectory_view.dart @@ -55,6 +55,12 @@ class _AnswerTrajectoryPageState extends State { child: TabBar( dividerHeight: 0, tabAlignment: TabAlignment.start, + indicator: const UnderlineTabIndicator( + borderSide: BorderSide( + color: const Color.fromRGBO(104, 136, 253, 1), + ), + + ), onTap: (int val) { state.tabIndex.value = val; // EasyLoading.show(status: 'loading...'); 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 2f7161d..dfac281 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 @@ -257,7 +257,7 @@ class _ClassStudentPageState extends State { ), ), Padding( - padding: EdgeInsets.only(top: 2.r, left: 4.r), + padding: EdgeInsets.only(top: 5.r, left: 4.r), child: Text( '优先批阅', style: TextStyle(fontSize: 10.sp, color: const Color(0xFF4CC793)), @@ -291,7 +291,7 @@ class _ClassStudentPageState extends State { ), ), Padding( - padding: EdgeInsets.only(top: 2.r, left: 4.r), + padding: EdgeInsets.only(top: 5.r, left: 4.r), child: Text( '优先批阅', style: TextStyle(fontSize: 10.sp, color: const Color(0xFF8A9691)), diff --git a/making_school_asignment_app/lib/page/home_page/children/quick_data_check/quick_data_check_logic.dart b/making_school_asignment_app/lib/page/home_page/children/quick_data_check/quick_data_check_logic.dart index 97d035e..d7dc38f 100644 --- a/making_school_asignment_app/lib/page/home_page/children/quick_data_check/quick_data_check_logic.dart +++ b/making_school_asignment_app/lib/page/home_page/children/quick_data_check/quick_data_check_logic.dart @@ -22,12 +22,13 @@ class QuickDataCheckLogic extends GetxController with RequestToolMixin { void getWorkData() async { HomeworkDetails data = await getClient().getHomeworkDetails(state.homeworkId.value, state.classId.value); + EasyLoading.dismiss(); state.dataCount = Utils.getHomeworkData(data); state.homeData = data; state.kgReport.value = data.questions.where((w) => w.questionType == 1).toList(); state.zgReport.value = data.questions.where((w) => w.questionType == 2).toList(); state.studentList.value = data.students; state.hasData.value = true; - EasyLoading.dismiss(); + } } diff --git a/making_school_asignment_app/lib/page/home_page/children/quick_data_check/quick_data_check_view.dart b/making_school_asignment_app/lib/page/home_page/children/quick_data_check/quick_data_check_view.dart index 69bfd6b..5f9d7ad 100644 --- a/making_school_asignment_app/lib/page/home_page/children/quick_data_check/quick_data_check_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/quick_data_check/quick_data_check_view.dart @@ -89,12 +89,10 @@ class _QuickDataCheckPageState extends State { SizedBox( width: 6.r, ), - Obx(() { - return Text( - '${EnumUtils.formatGrade(state.grade)}${state.className.value}', - style: TextStyle(fontSize: 14.r, color: Colors.white), - ); - }) + Text( + '${EnumUtils.formatGrade(state.grade)}${state.className.value}', + style: TextStyle(fontSize: 14.r, color: Colors.white), + ), ], ), ), diff --git a/making_school_asignment_app/lib/page/home_page/children/read_over/widget/task_list_item.dart b/making_school_asignment_app/lib/page/home_page/children/read_over/widget/task_list_item.dart index bed8f33..5bfd27f 100644 --- a/making_school_asignment_app/lib/page/home_page/children/read_over/widget/task_list_item.dart +++ b/making_school_asignment_app/lib/page/home_page/children/read_over/widget/task_list_item.dart @@ -230,7 +230,7 @@ class _TaskListItemState extends State { children: [ quickText('题量：', color: const Color.fromRGBO(130, 130, 130, 1), size: 11.sp), quickText( - '10', + '${widget.jobTaskItem.questionCount! - widget.jobTaskItem.annotateCount!}', color: const Color.fromRGBO(97, 97, 97, 1), size: 13.sp, ), diff --git a/making_school_asignment_app/lib/page/home_page/home_logic.dart b/making_school_asignment_app/lib/page/home_page/home_logic.dart index 3fe7569..f89f1aa 100644 --- a/making_school_asignment_app/lib/page/home_page/home_logic.dart +++ b/making_school_asignment_app/lib/page/home_page/home_logic.dart @@ -10,21 +10,29 @@ import 'home_state.dart'; class HomeLogic extends GetxController with RequestToolMixin, GetTickerProviderStateMixin { final HomeState state = HomeState(); late final EasyRefreshController refreshController; + WorkStudentParams params = WorkStudentParams( + assessType: 0, + ); @override void onInit() { super.onInit(); refreshController = EasyRefreshController(); + params.pageSize = state.pageSize; + getList(); } void getList() async { - WorkStudentParams params = WorkStudentParams( - assessType: 0, - ); + params.pageNumber = state.pageNumber; WorkStudent data = await getClient().getUnAnnotateList(params); + state.totalCount = data.totalCount; state.readOver.value = data.items.length; - state.workList.value = data.items; + if(params.pageNumber == 1){ + state.workList.value = data.items; + }else{ + state.workList.addAll(data.items); + } refreshController.finishRefresh(); } diff --git a/making_school_asignment_app/lib/page/home_page/home_state.dart b/making_school_asignment_app/lib/page/home_page/home_state.dart index 97620df..cd1a785 100644 --- a/making_school_asignment_app/lib/page/home_page/home_state.dart +++ b/making_school_asignment_app/lib/page/home_page/home_state.dart @@ -12,4 +12,7 @@ class HomeState { late RxInt readOver = 0.obs; late RxList workList = RxList(); late int type = 1; + late int pageSize = 10; + late int pageNumber = 1; + late int totalCount = 1; } 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 d86b4fb..244d1d6 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 @@ -53,6 +53,16 @@ class _HomePageState extends State controller: logic.refreshController, header: MaterialHeader(), footer: TaurusFooter(), + onRefresh: () async{ + state.pageNumber = 1; + return logic.getList(); + }, + onLoad: () async{ + if(state.workList.length 130, 130, 130, 1), size: 11.sp), quickText( - '10', + '${item.questionCount! - item.annotateCount!}', color: const Color.fromRGBO( 97, 97, 97, 1), size: 13.sp,