making_school_asignment_app/lib/page/home_page/children/read_over/widget/annotate_list.dart

@@ -22,17 +22,13 @@ part 'annotate_list.g.dart';
 class AnnotateList extends StatefulWidget{
   final int tabIndex;
   final int assessType;
-
+  const AnnotateList({Key? key,required this.tabIndex,required this.assessType}) : super(key: key);
-  const AnnotateList(
-      {Key? key, required this.tabIndex, required this.assessType})
-      : super(key: key);
 
   @override
   State<AnnotateList> createState() => _AnnotateListState();
 }
 
-class _AnnotateListState extends State<AnnotateList>
+class _AnnotateListState extends State<AnnotateList> with RequestToolMixin, SingleTickerProviderStateMixin{
-    with RequestToolMixin, SingleTickerProviderStateMixin {
   late RxString customTimeStr = '自定义'.obs;
   int active = 1;
   late RxList<Items> unAnnotateList = RxList();
@@ -51,8 +47,6 @@ class _AnnotateListState extends State<AnnotateList>
   WorkStudentParams params2 = WorkStudentParams(
     assessType: 0,
     pageSize: 10,
-    startDate: Utils.getWeekStartDate().toString().substring(0, 10),
-    endDate: Utils.getWeekEndDate().toString().substring(0, 10),
   );
 
   @override
@@ -106,6 +100,7 @@ class _AnnotateListState extends State<AnnotateList>
     }else{
       getAnnotateList();
     }
+
   }
 
   Future<void> getCollect(item) async {
@@ -133,36 +128,24 @@ class _AnnotateListState extends State<AnnotateList>
     return Column(
       children: [
         if(widget.tabIndex == 1)
-          Obx(() {
+        JobConditionFilter(
-            return JobConditionFilter(
             customTimeStr: customTimeStr.value,
             controller: tabController2,
             hasAll: true,
             jobType: 1,
-                customTime: tabController2.index != 2 ||
+            customTime: tabController2.index != 3 || (params2.startDate == null && params2.endDate == null)
-                    (params2.startDate == null && params2.endDate == null)
                 ? null
                 : PickerDateRange(
-                  params2.startDate == null ? null : DateTime.parse(
+              params2.startDate == null ? null : DateTime.parse(params2.startDate!),
-                      params2.startDate!),
+              params2.endDate == null ? null : DateTime.parse(params2.endDate!),
-                  params2.endDate == null ? null : DateTime.parse(
-                      params2.endDate!),
             ),
             onTimeFilter: (String? startTime, String? endTime) {
-                  if (startTime == null && endTime == null &&
+              if (startTime == null && endTime == null && tabController2.index == 3) {
-                      tabController2.index == 2) {
                 tabController2.animateTo(0);
-                    params2.endDate =
+              }
-                        Utils.getWeekEndDate().toString().substring(0, 10);
-                    params2.startDate =
-                        Utils.getWeekStartDate().toString().substring(0, 10);
-                    customTimeStr.value = '自定义';
-                  } else {
               params2.endDate = endTime;
               params2.startDate = startTime;
-                  }
               page = 1;
-                  EasyLoading.show(status: 'loading...');
               if(widget.tabIndex == 0){
                 getUnAnnotateList();
               }else{
@@ -172,23 +155,17 @@ class _AnnotateListState extends State<AnnotateList>
             },
             refreshTime: (value) {
               if (value != null && value.startDate != null) {
-                    customTimeStr.value =
+                customTimeStr.value = value.startDate?.toString().substring(0, 10) ?? '';
-                        value.startDate?.toString().substring(0, 10) ?? '';
 
                 if (value.endDate != null) {
-                      if (!Utils.isPad() &&
+                  if (!Utils.isPad() && value.startDate!.year == value.endDate!.year) {
-                          value.startDate!.year == value.endDate!.year) {
                     customTimeStr.value =
-                        '${value.startDate.toString().substring(5, 10)}~${value
+                    '${value.startDate.toString().substring(5, 10)}~${value.endDate.toString().substring(5, 10)}';
-                            .endDate.toString().substring(5, 10)}';
                   } else {
-                        customTimeStr.value =
+                    customTimeStr.value = '${customTimeStr.value}~${value.endDate?.toString().substring(0, 10)}';
-                        '${customTimeStr.value}~${value.endDate?.toString()
-                            .substring(0, 10)}';
                   }
                 }
               }
-                });
             }),
         Expanded(child: IndexedStack(
           index: widget.tabIndex,
@@ -222,10 +199,8 @@ class _AnnotateListState extends State<AnnotateList>
 @swidget
 Widget $easyRefresh({
   required EasyRefreshController controller,
-  required Future<
+  required Future<void> Function(EasyRefreshController controller, int tab) onRefresh,
-      void> Function(EasyRefreshController controller, int tab) onRefresh,
+  required Future<void> Function(EasyRefreshController controller, int tab) onLoad,
-  required Future<
-      void> Function(EasyRefreshController controller, int tab) onLoad,
   required List<Items> data,
   required int tab,
   required int type,
@@ -245,8 +220,7 @@ Widget $easyRefresh({
       footer: TaurusFooter(),
       child: completed && isPadFlag
           ? GridView(
-        padding: EdgeInsets.only(
+        padding: EdgeInsets.only(top: 11.h, bottom: 10.h, left: 12.w, right: 12.w),
-            top: 11.h, bottom: 10.h, left: 12.w, right: 12.w),
         gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
             crossAxisCount: 2, //横轴三个子widget
             mainAxisSpacing: 10.h,
@@ -256,16 +230,11 @@ Widget $easyRefresh({
         children: List.generate(data.length, (index) {
           Items item = data[index];
           String subjectName = EnumUtils.formatSubject(item.subject);
-          return $reviewedItem(jobTaskItem: item,
+          return $reviewedItem(jobTaskItem: item, type: type, subjectName: subjectName, collectFun: collectFun,tabIndex:tab - 1);
-              type: type,
-              subjectName: subjectName,
-              collectFun: collectFun,
-              tabIndex: tab - 1);
         }),
       )
           : ListView.builder(
-        padding: EdgeInsets.only(
+        padding: EdgeInsets.only(top: 11.h, bottom: 10.h, left: 12.w, right: 12.w),
-            top: 11.h, bottom: 10.h, left: 12.w, right: 12.w),
         itemBuilder: (context, index) {
           Items item = data[index];
           return TaskListItem(
@@ -297,17 +266,10 @@ Widget $reviewedItem({
   return InkWell(
     onTap: () {
       Get.toNamed(Routes.annotateClassPage,
-          arguments: {
+          arguments: {'id': jobTaskItem.id, 'name': jobTaskItem.name, 'grade': jobTaskItem.grade,'subject':jobTaskItem.subject, 'completed': true,'tabIndex':tabIndex});
-            'id': jobTaskItem.id,
-            'name': jobTaskItem.name,
-            'grade': jobTaskItem.grade,
-            'subject': jobTaskItem.subject,
-            'completed': true,
-            'tabIndex': tabIndex
-          });
     },
     child: Container(
-      padding: EdgeInsets.only(top: 10.h),
+      padding: EdgeInsets.only(right: 5.w),
       decoration: BoxDecoration(
         borderRadius: BorderRadius.circular(6.r),
         color: Colors.white,
@@ -324,9 +286,7 @@ Widget $reviewedItem({
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
           // 顶部任务名称
-          Padding(
+          Row(
-            padding: padEdg,
-            child: Row(
             crossAxisAlignment: CrossAxisAlignment.start,
 
             children: [
@@ -336,36 +296,30 @@ Widget $reviewedItem({
                 alignment: Alignment.center,
                 padding: EdgeInsets.only(left: 2.w),
                 decoration: BoxDecoration(
-                    color: type == 1 ? const Color(0xFF4CC793) : const Color
+                  color: type == 1 ? const Color(0xFFB2DA93) : const Color(0xFFEF8714),
-                        .fromRGBO(255, 175, 56, 1),
                   borderRadius: BorderRadius.only(
-                      topLeft: Radius.circular(14.r),
+                    topLeft: Radius.circular(6.r),
-                      topRight: Radius.circular(3.r),
+                    topRight: Radius.circular(0.r),
-                      bottomLeft: Radius.circular(4.r),
+                    bottomLeft: Radius.circular(0.r),
-                      bottomRight: Radius.circular(4.r),
+                    bottomRight: Radius.circular(12.r),
                   ),
                 ),
-                  margin: EdgeInsets.only(top: 3.h, right: 4.w),
+                margin: EdgeInsets.only(top:0.h,right: 4.w),
-                  child: quickText(type == 1 ? '作业' : '考试', color: Colors.white,
+                child: quickText(type == 1 ? '作业' : '考试', color: Colors.white, size: 10.sp),
-                      size: 10.sp),
               ),
               Expanded(
-                  child: quickText(jobTaskItem.name, size: 14.sp,
+                child: quickText(jobTaskItem.name, size: 14.sp, color: const Color.fromRGBO(70, 70, 70, 1), maxLines: 2),
-                      color: const Color.fromRGBO(70, 70, 70, 1),
-                      maxLines: 2),
               ),
               if (jobTaskItem.isFixed!)
                 Padding(
                   padding: EdgeInsets.only(top: 3.r),
                   child: Text(
                     '已订正',
-                      style: TextStyle(
+                    style: TextStyle(fontSize: 10.sp, color: const Color(0xFFF16262)),
-                          fontSize: 10.sp, color: const Color(0xFFF16262)),
                   ),
                 ),
             ],
           ),
-          ),
 
           Padding(
             padding: padEdg,
@@ -373,31 +327,26 @@ Widget $reviewedItem({
               crossAxisAlignment: CrossAxisAlignment.end,
               children: [
                 quickText(
-                  DateTime.parse(jobTaskItem.publishTime).toString().substring(
+                  DateTime.parse(jobTaskItem.publishTime).toString().substring(0, 10),
-                      0, 10),
                   color: const Color.fromRGBO(97, 97, 97, 1),
                   size: 10.sp,
                   fontWeight: FontWeight.w500,
                 ),
-                quickText(' / ', color: const Color.fromRGBO(76, 199, 147, 1),
+                quickText(' / ', color: const Color(0xFF8C68FF), size: 10.sp, fontWeight: FontWeight.w500),
-                    size: 10.sp,
-                    fontWeight: FontWeight.w500),
                 quickText(
                   '参与班级：',
-                  color: const Color.fromRGBO(76, 199, 147, 1),
+                  color: const Color(0xFF8C68FF),
                   size: 9.sp,
                 ),
                 quickText(
                   '${jobTaskItem.classCount}',
-                  color: const Color.fromRGBO(76, 199, 147, 1),
+                  color: const Color(0xFF8C68FF),
                   size: 10.sp,
                 ),
-                quickText(' / ', color: const Color.fromRGBO(116, 145, 253, 1),
+                quickText(' / ', color: const Color(0xFF8C68FF), size: 10.sp, fontWeight: FontWeight.w500),
-                    size: 10.sp,
-                    fontWeight: FontWeight.w500),
                 quickText(
                   '科目：$subjectName',
-                  color: const Color.fromRGBO(116, 145, 253, 1),
+                  color: const Color(0xFF8C68FF),
                   size: 9.sp,
                 ),
               ],
@@ -414,8 +363,7 @@ Widget $reviewedItem({
           Container(
             padding: EdgeInsets.symmetric(vertical: 6.h),
             decoration: BoxDecoration(
-              borderRadius: BorderRadius.only(bottomLeft: Radius.circular(6.r),
+              borderRadius: BorderRadius.only(bottomLeft: Radius.circular(6.r), bottomRight: Radius.circular(6.r)),
-                  bottomRight: Radius.circular(6.r)),
               color: Colors.white,
               boxShadow: const [
                 BoxShadow(
@@ -427,7 +375,7 @@ Widget $reviewedItem({
               ],
             ),
             child: Row(children: [
-              if (!jobTaskItem.isFixed!)
+              /*if (!jobTaskItem.isFixed!)
                 Expanded(
                   flex: 1,
                   child: GestureDetector(
@@ -441,31 +389,23 @@ Widget $reviewedItem({
                     child: Container(
                       alignment: Alignment.center,
                       decoration: BoxDecoration(
-                        border: Border(right: BorderSide(
+                        border: Border(right: BorderSide(width: 1.r, color: const Color(0xFFDCDCDC))),
-                            width: 1.r, color: const Color(0xFFDCDCDC))),
-                      ),
-                      child: quickText(
-                          '收集订正', color: const Color(0xFF4CC793), size: 11.sp),
                       ),
+                      child: quickText('收集订正', color: const Color(0xFF8C68FF), size: 11.sp),
                     ),
                   ),
+                ),*/
               Expanded(
                 flex: 1,
                 child: GestureDetector(
                   behavior: HitTestBehavior.opaque,
                   onTap: () {
                     Get.toNamed(Routes.jobReportPage,
-                        arguments: {
+                        arguments: {'title': jobTaskItem.name, 'homeworkId': jobTaskItem.id, 'grade': jobTaskItem.grade});
-                          'title': jobTaskItem.name,
-                          'homeworkId': jobTaskItem.id,
-                          'grade': jobTaskItem.grade
-                        });
                   },
                   child: Container(
                     alignment: Alignment.center,
-                    child: quickText(
+                    child: quickText('查看报告', color: const Color.fromRGBO(118, 118, 118, 1), size: 11.sp),
-                        '查看报告', color: const Color.fromRGBO(118, 118, 118, 1),
-                        size: 11.sp),
                   ),
                 ),
               ),

making_school_asignment_app/lib/page/home_page/children/student_work_detail/widget/job_condition_filter.dart

@@ -70,14 +70,14 @@ class _JobConditionFilterState extends State<JobConditionFilter> {
         customTimeStr: widget.customTimeStr,
         hasAll: widget.hasAll,
         onTap: (int val) async {
-          if (val == 3 && widget.hasAll == true) {
+          if (val == 0 && widget.hasAll == true) {
             widget.onTimeFilter(null, null);
-          } else if ((val == 0 && widget.hasAll == true) || (val == 0 && widget.hasAll == false)) {
+          } else if ((val == 1 && widget.hasAll == true) || (val == 0 && widget.hasAll == false)) {
             widget.onTimeFilter(
               Utils.getWeekStartDate().toString().substring(0, 10),
               Utils.getWeekEndDate().toString().substring(0, 10),
             );
-          } else if ((val == 1 && widget.hasAll == true) || (val == 1 && widget.hasAll == false)) {
+          } else if ((val == 2 && widget.hasAll == true) || (val == 1 && widget.hasAll == false)) {
             widget.onTimeFilter(
               getMonthStartDate().toString().substring(0, 10),
               getMonthEndDate().toString().substring(0, 10),

making_school_asignment_app/lib/page/home_page/children/student_work_detail/widget/personal_detail_topbar.dart

@@ -33,10 +33,10 @@ class _PersonalDetailTopBarState extends State<PersonalDetailTopBar> {
         labelStyle: TextStyle(
           fontSize: 12.sp,
           fontWeight: FontWeight.bold,
-          color: const Color(0xFF4CC793),
+          color: const Color(0xFF8C68FF),
         ),
         isScrollable: true,
-        labelColor: const Color(0xFF4CC793),
+        labelColor:const Color(0xFF8C68FF),
         unselectedLabelColor: const Color(0xFF505E6E),
         padding: EdgeInsets.symmetric(horizontal: 14.r),
         // indicatorSize: TabBarIndicatorSize.label, // 设置指示器高度和标签一样高
@@ -44,15 +44,15 @@ class _PersonalDetailTopBarState extends State<PersonalDetailTopBar> {
         indicator: UnderlineTabIndicator(
           borderSide: BorderSide(
             width: 2.r,
-              color:const Color(0xFF4CC793)
+              color:const Color(0xFF8C68FF)
           ),
         ),
         tabs: <Widget>[
+          if(widget.hasAll == true)
+          const Tab(text: '全部'),
           const Tab(text: '近一周'),
           const Tab(text: '近一月'),
           Tab(text: widget.customTimeStr),
-          if(widget.hasAll == true)
-            const Tab(text: '全部'),
         ],
       ),
     );