diff --git a/making_school_asignment_app/assets/images/2.0x/check_icon.png b/making_school_asignment_app/assets/images/2.0x/check_icon.png index f5f18fa..7555a73 100644 Binary files a/making_school_asignment_app/assets/images/2.0x/check_icon.png and b/making_school_asignment_app/assets/images/2.0x/check_icon.png differ diff --git a/making_school_asignment_app/assets/images/2.0x/no_check_icon.png b/making_school_asignment_app/assets/images/2.0x/no_check_icon.png new file mode 100644 index 0000000..51e36b3 Binary files /dev/null and b/making_school_asignment_app/assets/images/2.0x/no_check_icon.png differ diff --git a/making_school_asignment_app/assets/images/3.0x/check_icon.png b/making_school_asignment_app/assets/images/3.0x/check_icon.png index f5f18fa..7555a73 100644 Binary files a/making_school_asignment_app/assets/images/3.0x/check_icon.png and b/making_school_asignment_app/assets/images/3.0x/check_icon.png differ diff --git a/making_school_asignment_app/assets/images/3.0x/no_check_icon.png b/making_school_asignment_app/assets/images/3.0x/no_check_icon.png new file mode 100644 index 0000000..51e36b3 Binary files /dev/null and b/making_school_asignment_app/assets/images/3.0x/no_check_icon.png differ diff --git a/making_school_asignment_app/assets/images/check_icon.png b/making_school_asignment_app/assets/images/check_icon.png index f5f18fa..7555a73 100644 Binary files a/making_school_asignment_app/assets/images/check_icon.png and b/making_school_asignment_app/assets/images/check_icon.png differ diff --git a/making_school_asignment_app/assets/images/no_check_icon.png b/making_school_asignment_app/assets/images/no_check_icon.png index aa55131..51e36b3 100644 Binary files a/making_school_asignment_app/assets/images/no_check_icon.png and b/making_school_asignment_app/assets/images/no_check_icon.png differ 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 5370588..de8edfc 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 @@ -12,6 +12,7 @@ class ItemBtn extends StatelessWidget { return SizedBox( height:25.r, child: ElevatedButton( + style: ButtonStyle( overlayColor:WidgetStateProperty.all( const Color(0xFFE8E8E8)), @@ -26,7 +27,9 @@ class ItemBtn extends StatelessWidget { )), padding: WidgetStateProperty.all( EdgeInsets.zero, - )), + ), + elevation: WidgetStateProperty.all(0), + ), onPressed: () { clickFunction!(); }, diff --git a/making_school_asignment_app/lib/page/home_page/children/job_report/widget/personnel_data_overview.dart b/making_school_asignment_app/lib/page/home_page/children/job_report/widget/personnel_data_overview.dart index 133e050..e1874a6 100644 --- a/making_school_asignment_app/lib/page/home_page/children/job_report/widget/personnel_data_overview.dart +++ b/making_school_asignment_app/lib/page/home_page/children/job_report/widget/personnel_data_overview.dart @@ -18,6 +18,7 @@ class _PersonnelDataOverviewState extends State { List noAnswerCounts = []; List rankings = []; Map> mapData = {}; + final scrollController = ScrollController(); @override void initState() { @@ -64,12 +65,14 @@ class _PersonnelDataOverviewState extends State { Scrollbar( thickness: 8.w, thumbVisibility: true, - trackVisibility: true, + // trackVisibility: true, radius: Radius.circular(10.r), - controller: ScrollController(), //滑动条使用的控制器 + controller: scrollController, //滑动条使用的控制器 child: SingleChildScrollView( + controller: scrollController, scrollDirection: Axis.horizontal, - primary: true, + // primary: true, + // physics: const BouncingScrollPhysics(), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/making_school_asignment_app/lib/page/home_page/children/quick_data_check/widget/quick_data_check_bottom.dart b/making_school_asignment_app/lib/page/home_page/children/quick_data_check/widget/quick_data_check_bottom.dart index 61e8a63..a490d8f 100644 --- a/making_school_asignment_app/lib/page/home_page/children/quick_data_check/widget/quick_data_check_bottom.dart +++ b/making_school_asignment_app/lib/page/home_page/children/quick_data_check/widget/quick_data_check_bottom.dart @@ -25,7 +25,7 @@ class _QuickDataCheckBottomState extends State { @override void initState() { super.initState(); - showList.value = widget.jobData!; + showList.value = [...widget.jobData!]; for (var e in widget.jobData!) { if (e.priorityAnnotate!) { followList.add(e); @@ -47,18 +47,21 @@ class _QuickDataCheckBottomState extends State { children: [ InkWell( onTap: () { - sortType.value = !sortType.value; - sortLevel.value = false; if (widget.jobData == null) return; + showList.value = [...widget.jobData!]; if (!sortType.value) { - showList.sort((a, b) { - return a.state.compareTo(b.state); - }); - } else { showList.sort((a, b) { return b.state.compareTo(a.state); }); + + } else { + showList.sort((a, b) { + return a.state.compareTo(b.state); + }); } + + sortType.value = !sortType.value; + sortLevel.value = false; }, child: Obx(() { return Row( @@ -94,16 +97,16 @@ class _QuickDataCheckBottomState extends State { if (widget.jobData!.isEmpty) return; if (!sortLevel.value) { showList.value = followList.value; + sortType.value = false; } else { - widget.jobData!.sort((a, b) { - int num1 = a.state; - int num2 = b.state; - return num2.compareTo(num1); + showList.value = [...widget.jobData!]; + showList.sort((a, b) { + return b.state.compareTo(a.state); }); - showList.value = widget.jobData!; + + sortType.value = true; } sortLevel.value = !sortLevel.value; - sortType.value = false; }, child: Obx(() { return Row(