diff --git a/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_view.dart b/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_view.dart index a68d5dd..370216a 100644 --- a/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_view.dart @@ -26,6 +26,7 @@ class _AnnotateClassPageState extends State { @override Widget build(BuildContext context) { + String homeworkId = state.homeworkId.value; return Scaffold( backgroundColor: const Color.fromRGBO(245, 245, 245, 1), appBar: AppBar( @@ -79,6 +80,7 @@ class _AnnotateClassPageState extends State { itemBuilder: (context, index) { AnnotatedClass item = state.classList[index]; return AnnotateItem( + homeworkId: homeworkId, item: item, font: 8.sp, name: state.name.value, @@ -91,6 +93,7 @@ class _AnnotateClassPageState extends State { itemBuilder: (context, index) { AnnotatedClass item = state.classList[index]; return AnnotateItem( + homeworkId: homeworkId, item: item, font: 12.sp, name: state.name.value, diff --git a/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/annotate_item.dart b/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/annotate_item.dart index c618c81..a15fb5d 100644 --- a/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/annotate_item.dart +++ b/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/annotate_item.dart @@ -12,11 +12,12 @@ import 'package:making_school_asignment_app/page/home_page/widget/progress_bar.d import 'package:making_school_asignment_app/routes/app_pages.dart'; class AnnotateItem extends StatefulWidget { + final String homeworkId; final AnnotatedClass item; final double font; final String name; final AnnotateClassLogic logic; - const AnnotateItem({Key? key, required this.item, required this.font, required this.name, required this.logic}) : super(key: key); + const AnnotateItem({super.key, required this.homeworkId, required this.item, required this.font, required this.name, required this.logic}); @override State createState() => _AnnotateItemState(); @@ -197,7 +198,7 @@ class _AnnotateItemState extends State { }, child: Container( alignment: Alignment.center, - child: quickText('数据快查', color: Color.fromRGBO(118, 118, 118, 1), size: widget.font), + child: quickText('数据快查', color: const Color.fromRGBO(118, 118, 118, 1), size: widget.font), ), ), ), @@ -209,14 +210,16 @@ class _AnnotateItemState extends State { }, child: Container( alignment: Alignment.center, - child: quickText('查看报告', color: Color.fromRGBO(118, 118, 118, 1), size: widget.font), + child: quickText('查看报告', color: const Color.fromRGBO(118, 118, 118, 1), size: widget.font), ), )), ] : [ Expanded( child: InkWell( - onTap: () {}, + onTap: () { + Get.toNamed(Routes.reviewHomework, arguments: {'homeworkId': widget.homeworkId, 'homeworkName': widget.name}); + }, child: Container( alignment: Alignment.center, child: quickText('批阅', color: const Color.fromRGBO(118, 118, 118, 1), size: widget.font), diff --git a/making_school_asignment_app/lib/page/home_page/children/homework_review/configuration_files/index.dart b/making_school_asignment_app/lib/page/home_page/children/homework_review/configuration_files/index.dart new file mode 100644 index 0000000..6a23557 --- /dev/null +++ b/making_school_asignment_app/lib/page/home_page/children/homework_review/configuration_files/index.dart @@ -0,0 +1,37 @@ +import 'package:get/get.dart'; +import 'package:making_school_asignment_app/common/mixins/request_tool_mixin.dart'; + +class HomeworkReviewState { + HomeworkReviewState(); + + late String homeworkId; + late String homeworkName; + // late String dateEnd = ''; + // late int knowledgeId = 0; + // late RxList dataList = RxList(); + // late RxList studentList = RxList(); + // late RxString knowledgeName = ''.obs; +} + +class HomeworkReviewBinding extends Bindings { + @override + void dependencies() => Get.lazyPut(() => HomeworkReviewLogic()); +} + +class HomeworkReviewLogic extends GetxController with RequestToolMixin { + final HomeworkReviewState state = HomeworkReviewState(); + + @override + void onInit() { + super.onInit(); + state.homeworkId = Get.arguments['homeworkId']; + state.homeworkName = Get.arguments['homeworkName']; + getList(); + } + + void getList() async { + // List data = await getClient().getKnowledgeReportDetail(state.dateStart, state.dateEnd, state.knowledgeId); + // state.dataList.value = data; + // EasyLoading.dismiss(); + } +} diff --git a/making_school_asignment_app/lib/page/home_page/children/homework_review/index.dart b/making_school_asignment_app/lib/page/home_page/children/homework_review/index.dart new file mode 100644 index 0000000..0c895ae --- /dev/null +++ b/making_school_asignment_app/lib/page/home_page/children/homework_review/index.dart @@ -0,0 +1,27 @@ +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; +import 'package:making_school_asignment_app/page/global_widget/my_text.dart'; + +import 'configuration_files/index.dart'; + +class HomeworkReview extends StatefulWidget { + const HomeworkReview({super.key}); + + @override + State createState() => _HomeworkReviewState(); +} + +class _HomeworkReviewState extends State { + final logic = Get.find(); + final sateData = Get.find().state; + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: quickText(sateData.homeworkName), + ), + body: Container(), + ); + } +} diff --git a/making_school_asignment_app/lib/routes/app_pages.dart b/making_school_asignment_app/lib/routes/app_pages.dart index bc12ce3..a81dbca 100644 --- a/making_school_asignment_app/lib/routes/app_pages.dart +++ b/making_school_asignment_app/lib/routes/app_pages.dart @@ -1,3 +1,5 @@ +import 'dart:math'; + import 'package:get/get.dart'; import 'package:making_school_asignment_app/page/global_widget/other_page.dart'; import 'package:making_school_asignment_app/page/global_widget/start_page.dart'; @@ -5,6 +7,8 @@ import 'package:making_school_asignment_app/page/home_page/children/annotate_cla import 'package:making_school_asignment_app/page/home_page/children/annotate_class/annotate_class_view.dart'; import 'package:making_school_asignment_app/page/home_page/children/class_student/class_student_binding.dart'; import 'package:making_school_asignment_app/page/home_page/children/class_student/class_student_view.dart'; +import 'package:making_school_asignment_app/page/home_page/children/homework_review/configuration_files/index.dart'; +import 'package:making_school_asignment_app/page/home_page/children/homework_review/index.dart'; import 'package:making_school_asignment_app/page/home_page/children/job_report/job_report_binding.dart'; import 'package:making_school_asignment_app/page/home_page/children/job_report/job_report_view.dart'; import 'package:making_school_asignment_app/page/home_page/children/knowledge_points_grasp/knowledge_points_grasp_binding.dart'; @@ -75,5 +79,24 @@ abstract class AppPages { page: () => const KnowledgePointsGraspDetailPage(), binding: KnowledgePointsGraspDetailBinding(), transition: Transition.noTransition), + // 批阅主页（作业、考试） + GetPage(name: Routes.reviewHomework, page: () => const HomeworkReview(), binding: HomeworkReviewBinding(), transition: getTransition()), + GetPage(name: Routes.reviewExam, page: () => const HomeworkReview(), binding: HomeworkReviewBinding(), transition: getTransition()), ]; } + +/// 获取页面随机跳转 +Transition getTransition() { + try { + List transitions = Transition.values; + return transitions[getRandomNumbers(0, transitions.length - 1)]; + } catch (e) { + return getTransition(); + } +} + +/// 获取指定范围的随机数 +int getRandomNumbers(int minNumber, int maxNumber) { + int next(int min, int max) => min + Random().nextInt(max - min); + return next(minNumber, maxNumber); +} diff --git a/making_school_asignment_app/lib/routes/app_routes.dart b/making_school_asignment_app/lib/routes/app_routes.dart index d83db38..e0b1617 100644 --- a/making_school_asignment_app/lib/routes/app_routes.dart +++ b/making_school_asignment_app/lib/routes/app_routes.dart @@ -18,4 +18,8 @@ abstract class Routes { static const studentWorkDetailPage = '/studentWorkDetailPage'; static const knowledgePointsGraspPage = '/knowledgePointsGraspPage'; static const knowledgePointsGraspDetailPage = '/knowledgePointsGraspDetailPage'; -} \ No newline at end of file + + // 批阅主页 + static const reviewHomework = '/review/reviewHomework'; // 作业批阅 + static const reviewExam = '/review/reviewExam'; // 考试批阅 +}