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 a4ee37a..1858341 100644 --- a/making_school_asignment_app/lib/common/api/retrofit_client.dart +++ b/making_school_asignment_app/lib/common/api/retrofit_client.dart @@ -116,4 +116,7 @@ abstract class RetrofitClient { Future> getFavList( @Query('HomeworkName') String homeworkName, @Query('ClassId') String classId); + //一键批阅 (默认未批阅的题目全部正确) + @POST("/api/hms/Annotate/AllCorrect") + Future getAllCorrect(@Field() String homeworkId,@Field() String classId); } diff --git a/making_school_asignment_app/lib/common/store/user_store.dart b/making_school_asignment_app/lib/common/store/user_store.dart index f422a5f..7dc6ccf 100644 --- a/making_school_asignment_app/lib/common/store/user_store.dart +++ b/making_school_asignment_app/lib/common/store/user_store.dart @@ -30,6 +30,8 @@ class UserStore extends GetxController with RequestToolMixin { RxInt readOver = 0.obs; + RxInt assessType = 0.obs; + UserStore init() { token = StorageService.to.read(AppStorageKey.token.value); xToken = StorageService.to.read(AppStorageKey.xToken.value); diff --git a/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_logic.dart b/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_logic.dart index 29903b2..73c5702 100644 --- a/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_logic.dart +++ b/making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_logic.dart @@ -3,6 +3,7 @@ import 'package:get/get.dart'; import 'package:get_storage/get_storage.dart'; import 'package:making_school_asignment_app/common/job/annotated_class.dart'; import 'package:making_school_asignment_app/common/mixins/request_tool_mixin.dart'; +import 'package:making_school_asignment_app/common/utils/toast_utils.dart'; import 'package:making_school_asignment_app/routes/app_pages.dart'; import 'annotate_class_state.dart'; @@ -42,6 +43,17 @@ class AnnotateClassLogic extends GetxController with RequestToolMixin { EasyLoading.dismiss(); } + void getAllCorrect(classId) async{ + EasyLoading.show(status: 'loading...'); + try { + await getClient().getAllCorrect(state.homeworkId.value,classId); + getList(); + } catch (e) { + EasyLoading.dismiss(); + ToastUtils.showError('操作失败，请重试'); + } + } + void goQuickDataCheck(item) { Get.toNamed(Routes.quickDataCheckPage, arguments: {'homeworkId': state.homeworkId.value, 'classId': item.classId, 'grade': state.grade, 'className': item.className}); 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 370216a..4d8dcc6 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 @@ -59,6 +59,7 @@ class _AnnotateClassPageState extends State { return CompletedAnnotateItem( taskItem: taskItem, logic: logic, + name: state.name.value, ); }).toList(), ) @@ -69,6 +70,7 @@ class _AnnotateClassPageState extends State { return CompletedAnnotateItem( taskItem: taskItem, logic: logic, + name: state.name.value, ); }) : Utils.isPad() 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 432b2c9..afe1712 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 @@ -23,6 +23,64 @@ class AnnotateItem extends StatefulWidget { } class _AnnotateItemState extends State { + + Future confirmDialog() async { + return await showDialog( + context: context, + builder: (context) => AlertDialog( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10.0), // 设置圆角大小 + ), + actionsPadding: EdgeInsets.symmetric(vertical: 10.r, horizontal: 10.r), + content: SizedBox( + width: 200.r, + child: Text( + '一键批阅后，默认学生答题结果全部正确， 是否进行此操作？', + style: TextStyle(fontSize: 14.sp, color: const Color(0xFF505E6E)), + ), + ), + actionsAlignment: MainAxisAlignment.center, + actions: [ + InkWell( + child: Container( + width: 97.r, + height: 27.r, + decoration: BoxDecoration( + borderRadius: BorderRadius.all(Radius.circular(20.r)), + color: const Color(0xFF6888FD), + ), + child: const Center( + child: Text( + '确定', + style: TextStyle(color: Colors.white), + ))), + onTap: () { + // 执行操作 + Get.back(result: true); + }, + ), + InkWell( + onTap: () { + Get.back(result: false); + }, + child: Container( + width: 97.r, + height: 27.r, + decoration: BoxDecoration( + borderRadius: BorderRadius.all(Radius.circular(20.r)), + color: const Color(0xFFF4F4F4), + ), + child: const Center( + child: Text( + '取消', + style: TextStyle(color: Color(0xFF666666)), + ))), + ), + ], + ), + ); + } + @override Widget build(BuildContext context) { AnnotatedClass itemData = widget.item; @@ -71,7 +129,7 @@ class _AnnotateItemState extends State { Expanded( flex: 4, child: ItemBtn( - title: "收藏夹", + title: "收藏夹${widget.item.homeworkFavs.isNotEmpty?'(${ widget.item.homeworkFavs.length})':''}", font: widget.font - 2.sp, clickFunction: () { Get.toNamed(Routes.favStudentPage,arguments: {'homeworkName':widget.name,'classId':widget.item.classId,'homeworkId':widget.logic.state.homeworkId.value,'grade':widget.item.grade}); @@ -89,7 +147,14 @@ class _AnnotateItemState extends State { child: ItemBtn( title: "一键批阅", font: widget.font - 2.sp, - clickFunction: () {}, + clickFunction: () async{ + var confim = + await confirmDialog(); + if (confim) { + widget.logic.getAllCorrect( + widget.item.classId); + } + }, ), ), const Expanded( @@ -113,7 +178,7 @@ class _AnnotateItemState extends State { Expanded( flex: 4, child: ItemBtn( - title: "收藏夹", + title: "收藏夹${widget.item.homeworkFavs.isNotEmpty?'(${ widget.item.homeworkFavs.length})':''}", font: widget.font - 2.sp, clickFunction: () { Get.toNamed(Routes.favStudentPage,arguments: {'homeworkName':widget.name,'classId':widget.item.classId,'homeworkId':widget.logic.state.homeworkId.value,'grade':widget.item.grade}); diff --git a/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/completed_annotate_item.dart b/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/completed_annotate_item.dart index afdcd56..97a4f0d 100644 --- a/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/completed_annotate_item.dart +++ b/making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/completed_annotate_item.dart @@ -8,11 +8,13 @@ import 'package:making_school_asignment_app/page/global_widget/my_text.dart'; import 'package:making_school_asignment_app/page/global_widget/show_student_list.dart'; import 'package:making_school_asignment_app/page/home_page/children/annotate_class/annotate_class_logic.dart'; import 'package:making_school_asignment_app/page/home_page/widget/progress_bar.dart'; +import 'package:making_school_asignment_app/routes/app_pages.dart'; class CompletedAnnotateItem extends StatelessWidget { final AnnotatedClass taskItem; final AnnotateClassLogic logic; - const CompletedAnnotateItem({Key? key, required this.taskItem, required this.logic}) : super(key: key); + final String name; + const CompletedAnnotateItem({Key? key, required this.taskItem, required this.logic,required this.name}) : super(key: key); void showStudentList(context, List students, [bool submitted = false]) async { showDialog( @@ -47,7 +49,7 @@ class CompletedAnnotateItem extends StatelessWidget { mainAxisSize: MainAxisSize.min, children: [ ProgressBar( - color: Color.fromRGBO(76, 199, 147, 1), + color: const Color.fromRGBO(76, 199, 147, 1), percent: taskItem.kgtCorrectRate / 100, title: '客观题正确率：', padingEdg: EdgeInsets.only(left: 10.w, right: 10.w), @@ -56,7 +58,7 @@ class CompletedAnnotateItem extends StatelessWidget { marginEdg: EdgeInsets.only(top: 5.h), ), ProgressBar( - color: Color.fromRGBO(76, 199, 147, 1), + color: const Color.fromRGBO(76, 199, 147, 1), percent: taskItem.zgtCorrectRate / 100, title: '主观题正确率：', fontSize: 8.sp, @@ -65,7 +67,7 @@ class CompletedAnnotateItem extends StatelessWidget { marginEdg: EdgeInsets.only(top: 5.h), ), ProgressBar( - color: Color.fromRGBO(76, 199, 147, 1), + color: const Color.fromRGBO(76, 199, 147, 1), percent: taskItem.correctRate / 100, title: '总正确率：', fontSize: 8.sp, @@ -133,14 +135,16 @@ class CompletedAnnotateItem extends StatelessWidget { color: Color.fromRGBO(244, 244, 244, 1), borderRadius: BorderRadius.circular(20.r), child: InkWell( - onTap: () {}, + onTap: () { + Get.toNamed(Routes.favStudentPage,arguments: {'homeworkName':name,'classId':taskItem.classId,'homeworkId':logic.state.homeworkId.value,'grade':taskItem.grade}); + }, splashColor: Theme.of(context).primaryColor, borderRadius: BorderRadius.circular(8.r), child: Container( alignment: Alignment.center, padding: EdgeInsets.symmetric(vertical: 4.h), decoration: BoxDecoration(borderRadius: BorderRadius.circular(20.r)), - child: quickText('收藏夹', size: 8.sp, color: Color.fromRGBO(102, 102, 102, 1)), + child: quickText('收藏夹${taskItem.homeworkFavs.isNotEmpty?'(${taskItem.homeworkFavs.length})':''}', size: 8.sp, color: Color.fromRGBO(102, 102, 102, 1)), ), ), )), diff --git a/making_school_asignment_app/lib/page/home_page/children/fav_student/fav_student_logic.dart b/making_school_asignment_app/lib/page/home_page/children/fav_student/fav_student_logic.dart index f3e5bdd..131ec1a 100644 --- a/making_school_asignment_app/lib/page/home_page/children/fav_student/fav_student_logic.dart +++ b/making_school_asignment_app/lib/page/home_page/children/fav_student/fav_student_logic.dart @@ -2,7 +2,9 @@ import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; import 'package:making_school_asignment_app/common/job/annotated_class.dart'; import 'package:making_school_asignment_app/common/job/common/base_page_data.dart'; +import 'package:making_school_asignment_app/common/job/marking_models/favor_param.dart'; import 'package:making_school_asignment_app/common/mixins/request_tool_mixin.dart'; +import 'package:making_school_asignment_app/common/utils/toast_utils.dart'; import 'fav_student_state.dart'; @@ -56,14 +58,21 @@ class FavStudentLogic extends GetxController with RequestToolMixin { EasyLoading.dismiss(); } - getDelete(student) async { - /* RestClient _client = await getClient(); - BaseStructureResult res = await _client.getJobDeFavorites( - widget.jobId, student.studentId, student.questionPage!); - if (res.success) { - _future = getData(); - setState(() {}); - }*/ + void getDelete(student) async { + EasyLoading.show(status: 'loading...'); + try { + await getClient().toFavStudent(FavorParam( + homeworkId: state.homeworkId, + studentId: student.studentId, + templateId: student.templateId, + questionNo: student.questionNo, + isFav: false, + )); + getList(); + } catch (e) { + EasyLoading.dismiss(); + ToastUtils.showError('操作失败，请重试'); + } } } diff --git a/making_school_asignment_app/lib/page/home_page/children/fav_student/fav_student_view.dart b/making_school_asignment_app/lib/page/home_page/children/fav_student/fav_student_view.dart index 4cb33f2..fbd551d 100644 --- a/making_school_asignment_app/lib/page/home_page/children/fav_student/fav_student_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/fav_student/fav_student_view.dart @@ -48,7 +48,7 @@ class _FavStudentPageState extends State { actionsPadding: EdgeInsets.symmetric(vertical: 10.r, horizontal: 10.r), content: Text( '确定删除吗？', - style: TextStyle(fontSize: 14.sp, color: Color(0xFF505E6E)), + style: TextStyle(fontSize: 14.sp, color: const Color(0xFF505E6E)), ), actionsAlignment: MainAxisAlignment.center, actions: [ @@ -58,7 +58,7 @@ class _FavStudentPageState extends State { height: 27.r, decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(20.r)), - color: Color(0xFF6888FD), + color: const Color(0xFF6888FD), ), child: const Center( child: Text( @@ -81,7 +81,7 @@ class _FavStudentPageState extends State { height: 27.r, decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(20.r)), - color: Color(0xFFF4F4F4), + color: const Color(0xFFF4F4F4), ), child: const Center( child: Text( @@ -96,14 +96,14 @@ class _FavStudentPageState extends State { @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: Color.fromRGBO(245, 245, 245, 1), + backgroundColor: const Color.fromRGBO(245, 245, 245, 1), appBar: AppBar( // titleSpacing: 0, elevation: 0.0, leading: IconButton( - icon: Icon(Icons.arrow_back_ios), + icon: const Icon(Icons.arrow_back_ios), onPressed: () => Navigator.of(context).pop()), - iconTheme: IconThemeData(color: Colors.black), + iconTheme: const IconThemeData(color: Colors.black), title: quickText('收藏夹'), centerTitle: true, backgroundColor: Colors.white, @@ -111,268 +111,267 @@ class _FavStudentPageState extends State { ReturnToHomepage(), ], ), - body: Container( - child: Column( - children: [ - Padding( - padding: EdgeInsets.symmetric(vertical: 0.r, horizontal: 14.r), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Expanded( - child: Obx(() { - return Text( - state.homeworkName.value, - style: - TextStyle(fontSize: 14.sp, color: Color(0xFF3C3C3C),), - overflow: TextOverflow.ellipsis, - ); + body: Column( + children: [ + Padding( + padding: EdgeInsets.symmetric(vertical: 0.r, horizontal: 14.r), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Expanded( + child: Obx(() { + return Text( + state.homeworkName.value, + style: + TextStyle(fontSize: 14.sp, color: const Color(0xFF3C3C3C),), + overflow: TextOverflow.ellipsis, + ); + }), + ), + // 下拉框 + Container( + padding: EdgeInsets.symmetric( + vertical: 10.h, horizontal: 10.w), + child: Row( + children: [ + Obx(() { + return DropdownSelection( + bgColor: Colors.white, + involveClasses: state.involveClasses.value, + classData: state.classData.value, + call: (AnnotatedClass item) { + state.classData.value = item; + if (item.grade == -1) state.classData.value = state.defaultClass; + logic.getList(); + }); }), - ), - // 下拉框 - Container( - padding: EdgeInsets.symmetric( - vertical: 10.h, horizontal: 10.w), - child: Row( - children: [ - Obx(() { - return DropdownSelection( - bgColor: Colors.white, - involveClasses: state.involveClasses.value, - classData: state.classData.value, - call: (AnnotatedClass item) { - state.classData.value = item; - if (item.grade == -1) state.classData.value = state.defaultClass; - logic.getList(); - }); - }), - ], - ), - ), - ], + ], + ), ), - ), - Container( - width: MediaQuery - .of(context) - .size - .width, - height: 1.r, - decoration: const BoxDecoration( - color: Color(0xFFCCCCCC), - ), - ), - Obx((){ - return state.favList.isNotEmpty - ? Expanded( - child: Utils.isPad() - ? Padding( + ], + ), + ), + Container( + width: MediaQuery + .of(context) + .size + .width, + height: 1.r, + decoration: const BoxDecoration( + color: Color(0xFFCCCCCC), + ), + ), + Obx((){ + return state.favList.isNotEmpty + ? Expanded( + child: Utils.isPad() + ? Padding( + padding: EdgeInsets.only( + top: 10.r, + bottom: 8.r, + left: 14.r, + right: 14.r), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: + List.generate(state.favList.length, (index) { + var item = state.favList[index]; + return Padding( + padding: EdgeInsets.only(bottom: 8.r), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Padding( + padding: + EdgeInsets.only(bottom: 5.r), + child: Text( + '第${item['questionPage']}页', + style: TextStyle( + fontSize: 12.sp, + color: const Color(0xFF2E5BFF)), + ), + ), + GridView( + gridDelegate: + SliverGridDelegateWithFixedCrossAxisCount( + crossAxisCount: 2, + mainAxisSpacing: 8.r, + crossAxisSpacing: 10.r, + childAspectRatio: 556 / 112, + ), + shrinkWrap: true, + children: List.generate( + item['list'].length, (i) { + HomeworkFavs student = item['list'][i]; + return Container( + padding: EdgeInsets.symmetric( + vertical: 5.r, + horizontal: 10.r), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: + BorderRadius.all( + Radius.circular( + 6.r)), + ), + child: InkWell( + onTap: () { + showStudentDialog(context, + student, state.favList); + }, + child: Row( + mainAxisAlignment: + MainAxisAlignment + .spaceBetween, + children: [ + quickText( + student.studentName, + color: const Color( + 0xFF333333), + size: 12.sp), + Expanded( + child: Container()), + Padding( + padding: + EdgeInsets.only( + right: 8.r), + child: Text( + student.className!, + style: TextStyle( + fontSize: 12.sp, + color: const Color( + 0xFF666666)), + ), + ), + InkWell( + onTap: () async { + var confim = + await confirmDialog(); + if (confim) { + logic.getDelete( + student); + } + }, + child: Image.asset( + 'assets/images/favorite_delete_icon.png', + width: 24.r, + height: 24.r, + ), + ), + ], + ), + ), + ); + })), + ], + ), + ); + })), + ) + : ListView.builder( + shrinkWrap: true, + itemBuilder: (context, index) { + var item = state.favList[index]; + return Padding( padding: EdgeInsets.only( top: 10.r, bottom: 8.r, left: 14.r, right: 14.r), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: - List.generate(state.favList.length, (index) { - var item = state.favList[index]; - return Padding( - padding: EdgeInsets.only(bottom: 8.r), - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Padding( - padding: - EdgeInsets.only(bottom: 5.r), - child: Text( - '第${item['questionPage']}页', - style: TextStyle( - fontSize: 12.sp, - color: Color(0xFF2E5BFF)), - ), - ), - GridView( - gridDelegate: - SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: 2, - mainAxisSpacing: 8.r, - crossAxisSpacing: 10.r, - childAspectRatio: 556 / 112, - ), - shrinkWrap: true, - children: List.generate( - item['list'].length, (i) { - HomeworkFavs student = item['list'][i]; - return Container( - padding: EdgeInsets.symmetric( - vertical: 5.r, - horizontal: 10.r), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: - BorderRadius.all( - Radius.circular( - 6.r)), - ), - child: InkWell( - onTap: () { - showStudentDialog(context, - student, state.favList); - }, - child: Row( - mainAxisAlignment: - MainAxisAlignment - .spaceBetween, - children: [ - quickText( - student.studentName, - color: const Color( - 0xFF333333), - size: 12.sp), - Expanded( - child: Container()), - Padding( - padding: - EdgeInsets.only( - right: 8.r), - child: Text( - student.className!, - style: TextStyle( - fontSize: 12.sp, - color: const Color( - 0xFF666666)), - ), - ), - InkWell( - onTap: () async { - /* var confim = - await confirmDialog(); - if (confim) { - getDelete( - student); - }*/ - }, - child: Image.asset( - 'assets/images/favorite_delete_icon.png', - width: 24.r, - height: 24.r, - ), - ), - ], - ), - ), - ); - })), - ], - ), - ); - })), - ) - : ListView.builder( - shrinkWrap: true, - itemBuilder: (context, index) { - var item = state.favList[index]; - return Padding( - padding: EdgeInsets.only( - top: 10.r, - bottom: 8.r, - left: 14.r, - right: 14.r), - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Padding( - padding: EdgeInsets.only(bottom: 5.r), - child: Text( - '第${item['questionPage']}页', - style: TextStyle( - fontSize: 14.sp, - color: Color(0xFF2E5BFF)), - ), - ), - ListView.builder( - itemBuilder: (context, i) { - HomeworkFavs student = item['list'][i]; - return InkWell( - onTap: () { - /* showStudentDialog( - context, student, groupList);*/ - }, - child: Container( - padding: EdgeInsets.symmetric( - vertical: 5.r, - horizontal: 10.r), - margin: EdgeInsets.only(top: 5.r), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.all( - Radius.circular(6.r)), - ), - child: Row( - mainAxisAlignment: - MainAxisAlignment - .spaceBetween, - children: [ - quickText(student.studentName, - color: Color(0xFF333333), - size: 14.sp), - Expanded(child: Container()), - Padding( - padding: EdgeInsets.only( - right: 8.r), - child: Text( - student.className!, - style: TextStyle( - fontSize: 14.sp, - color: Color( - 0xFF666666)), - ), - ), - InkWell( - onTap: () async { - /*var confim = - await confirmDialog(); - if (confim) { - getDelete(student); - }*/ - }, - child: Image.asset( - 'assets/images/favorite_delete_icon.png', - width: 32.r, - height: 32.r, - ), - ), - ], - ), - ), - ); - }, - itemCount: item['list'].length, - shrinkWrap: true, - ), - ], + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Padding( + padding: EdgeInsets.only(bottom: 5.r), + child: Text( + '第${item['questionPage']}页', + style: TextStyle( + fontSize: 14.sp, + color: const Color(0xFF2E5BFF)), + ), ), - ); - }, - itemCount: state.favList.length, - ), - ) - : Padding( - padding: EdgeInsets.only( - top: MediaQuery - .of(context) - .size - .height / 2 - 200.r), - child: const MyEmptyWidget(), - ); - }), + ListView.builder( + itemBuilder: (context, i) { + HomeworkFavs student = item['list'][i]; + return InkWell( + onTap: () { + showStudentDialog( + context, student, state.favList); + }, + child: Container( + padding: EdgeInsets.symmetric( + vertical: 5.r, + horizontal: 10.r), + margin: EdgeInsets.only(top: 5.r), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.all( + Radius.circular(6.r)), + ), + child: Row( + mainAxisAlignment: + MainAxisAlignment + .spaceBetween, + children: [ + quickText(student.studentName, + color: const Color(0xFF333333), + size: 14.sp), + Expanded(child: Container()), + Padding( + padding: EdgeInsets.only( + right: 8.r), + child: Text( + student.className!, + style: TextStyle( + fontSize: 14.sp, + color: const Color( + 0xFF666666)), + ), + ), + InkWell( + onTap: () async { + var confim = + await confirmDialog(); + if (confim) { + logic.getDelete(student); + } + }, + child: Image.asset( + 'assets/images/favorite_delete_icon.png', + width: 32.r, + height: 32.r, + ), + ), + ], + ), + ), + ); + }, + itemCount: item['list'].length, + shrinkWrap: true, + ), + ], + ), + ); + }, + itemCount: state.favList.length, + ), + ) + : Padding( + padding: EdgeInsets.only( + top: MediaQuery + .of(context) + .size + .height / 2 - 200.r), + child: const MyEmptyWidget(), + ); + }), - ], - )), + ], + ), ); } diff --git a/making_school_asignment_app/lib/page/home_page/children/fav_student/widget/favorite_student_dialog.dart b/making_school_asignment_app/lib/page/home_page/children/fav_student/widget/favorite_student_dialog.dart index b89ffad..dd138aa 100644 --- a/making_school_asignment_app/lib/page/home_page/children/fav_student/widget/favorite_student_dialog.dart +++ b/making_school_asignment_app/lib/page/home_page/children/fav_student/widget/favorite_student_dialog.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:get/get_rx/get_rx.dart'; +import 'package:making_school_asignment_app/common/config/request_config.dart'; import 'package:making_school_asignment_app/common/job/annotated_class.dart'; import 'package:making_school_asignment_app/page/global_widget/MyEmptyWidget.dart'; import 'package:photo_view/photo_view.dart'; @@ -141,7 +142,7 @@ class _FavoriteStudentDialogState extends State { builder: (BuildContext context, int index) { final HomeworkFavs item = imageList[index]; return PhotoViewGalleryPageOptions( - imageProvider: NetworkImage(item.zgtAnswer!), + imageProvider: NetworkImage(RequestConfig.imgUrl + item.zgtAnswer!), heroAttributes: PhotoViewHeroAttributes(tag: item.id!), ); }, diff --git a/making_school_asignment_app/lib/page/home_page/children/read_over/read_over_logic.dart b/making_school_asignment_app/lib/page/home_page/children/read_over/read_over_logic.dart index 5c09c9a..601a064 100644 --- a/making_school_asignment_app/lib/page/home_page/children/read_over/read_over_logic.dart +++ b/making_school_asignment_app/lib/page/home_page/children/read_over/read_over_logic.dart @@ -19,11 +19,11 @@ class ReadOverLogic extends GetxController with RequestToolMixin, GetTickerProvi late final EasyRefreshController refreshController2; WorkStudentParams params = WorkStudentParams( - assessType: 0, + assessType: UserStore.to.assessType.value, pageSize: 10, ); WorkStudentParams params2 = WorkStudentParams( - assessType: 0, + assessType: UserStore.to.assessType.value, pageSize: 10, ); diff --git a/making_school_asignment_app/lib/page/home_page/children/read_over/read_over_view.dart b/making_school_asignment_app/lib/page/home_page/children/read_over/read_over_view.dart index 1698c93..6e0b03e 100644 --- a/making_school_asignment_app/lib/page/home_page/children/read_over/read_over_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/read_over/read_over_view.dart @@ -60,6 +60,7 @@ class _ReadOverPageState extends State { padding: EdgeInsets.only(left: 10.w), child: InkWell( onTap: () { + // SystemNavigator.pop(); Get.back(); }, child: Icon(