marking
/
Making.School.Asignment.app
19
1
Fork 0
Code Pull Requests Actions Releases Activity

Compare commits

base: marking:c790a37e83e4ddf88de59cc7d6ebcfebe184205a
Branches Tags
marking:master
marking:glassy_state
marking:the_windows
marking:mcy_new
marking:zoom_pic
..
compare: marking:d93a203ee68baa1905eae24828a0ac7b60c3f117
Branches Tags
marking:master
marking:glassy_state
marking:the_windows
marking:mcy_new
marking:zoom_pic

No commits in common. "c790a37e83e4ddf88de59cc7d6ebcfebe184205a" and "d93a203ee68baa1905eae24828a0ac7b60c3f117" have entirely different histories.
c790a37e83 ... d93a203ee6

11 changed files with 275 additions and 373 deletions
Show Stats Expand all files Collapse all files

3
making_school_asignment_app/lib/common/api/retrofit_client.dart
View File

@ -116,7 +116,4 @@ abstract class RetrofitClient {
Future<BasePageData<HomeworkFavs>> getFavList( Future<BasePageData<HomeworkFavs>> getFavList(
@Query('HomeworkName') String homeworkName, @Query('ClassId') String classId); @Query('HomeworkName') String homeworkName, @Query('ClassId') String classId);
//一键批阅 (默认未批阅的题目全部正确)
@POST("/api/hms/Annotate/AllCorrect")
Future getAllCorrect(@Field() String homeworkId,@Field() String classId);
} }

2
making_school_asignment_app/lib/common/store/user_store.dart
View File

@ -30,8 +30,6 @@ class UserStore extends GetxController with RequestToolMixin {
RxInt readOver = 0.obs; RxInt readOver = 0.obs;
RxInt assessType = 0.obs;
UserStore init() { UserStore init() {
token = StorageService.to.read(AppStorageKey.token.value); token = StorageService.to.read(AppStorageKey.token.value);
xToken = StorageService.to.read(AppStorageKey.xToken.value); xToken = StorageService.to.read(AppStorageKey.xToken.value);

12
making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_logic.dart
View File

@ -3,7 +3,6 @@ import 'package:get/get.dart';
import 'package:get_storage/get_storage.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/job/annotated_class.dart';
import 'package:making_school_asignment_app/common/mixins/request_tool_mixin.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 'package:making_school_asignment_app/routes/app_pages.dart';
import 'annotate_class_state.dart'; import 'annotate_class_state.dart';
@ -43,17 +42,6 @@ class AnnotateClassLogic extends GetxController with RequestToolMixin {
EasyLoading.dismiss(); 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) { void goQuickDataCheck(item) {
Get.toNamed(Routes.quickDataCheckPage, Get.toNamed(Routes.quickDataCheckPage,
arguments: {'homeworkId': state.homeworkId.value, 'classId': item.classId, 'grade': state.grade, 'className': item.className}); arguments: {'homeworkId': state.homeworkId.value, 'classId': item.classId, 'grade': state.grade, 'className': item.className});

2
making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_view.dart
View File

@ -59,7 +59,6 @@ class _AnnotateClassPageState extends State<AnnotateClassPage> {
return CompletedAnnotateItem( return CompletedAnnotateItem(
taskItem: taskItem, taskItem: taskItem,
logic: logic, logic: logic,
name: state.name.value,
); );
}).toList(), }).toList(),
) )
@ -70,7 +69,6 @@ class _AnnotateClassPageState extends State<AnnotateClassPage> {
return CompletedAnnotateItem( return CompletedAnnotateItem(
taskItem: taskItem, taskItem: taskItem,
logic: logic, logic: logic,
name: state.name.value,
); );
}) })
: Utils.isPad() : Utils.isPad()

71
making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/annotate_item.dart
View File

@ -23,64 +23,6 @@ class AnnotateItem extends StatefulWidget {
} }
class _AnnotateItemState extends State<AnnotateItem> { class _AnnotateItemState extends State<AnnotateItem> {
Future<bool> 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: <Widget>[
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 @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
AnnotatedClass itemData = widget.item; AnnotatedClass itemData = widget.item;
@ -129,7 +71,7 @@ class _AnnotateItemState extends State<AnnotateItem> {
Expanded( Expanded(
flex: 4, flex: 4,
child: ItemBtn( child: ItemBtn(
title: "收藏夹${widget.item.homeworkFavs.isNotEmpty?'(${ widget.item.homeworkFavs.length})':''}", title: "收藏夹",
font: widget.font - 2.sp, font: widget.font - 2.sp,
clickFunction: () { clickFunction: () {
Get.toNamed(Routes.favStudentPage,arguments: {'homeworkName':widget.name,'classId':widget.item.classId,'homeworkId':widget.logic.state.homeworkId.value,'grade':widget.item.grade}); Get.toNamed(Routes.favStudentPage,arguments: {'homeworkName':widget.name,'classId':widget.item.classId,'homeworkId':widget.logic.state.homeworkId.value,'grade':widget.item.grade});
@ -147,14 +89,7 @@ class _AnnotateItemState extends State<AnnotateItem> {
child: ItemBtn( child: ItemBtn(
title: "一键批阅", title: "一键批阅",
font: widget.font - 2.sp, font: widget.font - 2.sp,
clickFunction: () async{ clickFunction: () {},
var confim =
await confirmDialog();
if (confim) {
widget.logic.getAllCorrect(
widget.item.classId);
}
},
), ),
), ),
const Expanded( const Expanded(
@ -178,7 +113,7 @@ class _AnnotateItemState extends State<AnnotateItem> {
Expanded( Expanded(
flex: 4, flex: 4,
child: ItemBtn( child: ItemBtn(
title: "收藏夹${widget.item.homeworkFavs.isNotEmpty?'(${ widget.item.homeworkFavs.length})':''}", title: "收藏夹",
font: widget.font - 2.sp, font: widget.font - 2.sp,
clickFunction: () { clickFunction: () {
Get.toNamed(Routes.favStudentPage,arguments: {'homeworkName':widget.name,'classId':widget.item.classId,'homeworkId':widget.logic.state.homeworkId.value,'grade':widget.item.grade}); Get.toNamed(Routes.favStudentPage,arguments: {'homeworkName':widget.name,'classId':widget.item.classId,'homeworkId':widget.logic.state.homeworkId.value,'grade':widget.item.grade});

16
making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/completed_annotate_item.dart
View File

@ -8,13 +8,11 @@ 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/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/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/page/home_page/widget/progress_bar.dart';
import 'package:making_school_asignment_app/routes/app_pages.dart';
class CompletedAnnotateItem extends StatelessWidget { class CompletedAnnotateItem extends StatelessWidget {
final AnnotatedClass taskItem; final AnnotatedClass taskItem;
final AnnotateClassLogic logic; final AnnotateClassLogic logic;
final String name; const CompletedAnnotateItem({Key? key, required this.taskItem, required this.logic}) : super(key: key);
const CompletedAnnotateItem({Key? key, required this.taskItem, required this.logic,required this.name}) : super(key: key);
void showStudentList(context, List<AnnotatedStudents> students, [bool submitted = false]) async { void showStudentList(context, List<AnnotatedStudents> students, [bool submitted = false]) async {
showDialog( showDialog(
@ -49,7 +47,7 @@ class CompletedAnnotateItem extends StatelessWidget {
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
ProgressBar( ProgressBar(
color: const Color.fromRGBO(76, 199, 147, 1), color: Color.fromRGBO(76, 199, 147, 1),
percent: taskItem.kgtCorrectRate / 100, percent: taskItem.kgtCorrectRate / 100,
title: '客观题正确率：', title: '客观题正确率：',
padingEdg: EdgeInsets.only(left: 10.w, right: 10.w), padingEdg: EdgeInsets.only(left: 10.w, right: 10.w),
@ -58,7 +56,7 @@ class CompletedAnnotateItem extends StatelessWidget {
marginEdg: EdgeInsets.only(top: 5.h), marginEdg: EdgeInsets.only(top: 5.h),
), ),
ProgressBar( ProgressBar(
color: const Color.fromRGBO(76, 199, 147, 1), color: Color.fromRGBO(76, 199, 147, 1),
percent: taskItem.zgtCorrectRate / 100, percent: taskItem.zgtCorrectRate / 100,
title: '主观题正确率：', title: '主观题正确率：',
fontSize: 8.sp, fontSize: 8.sp,
@ -67,7 +65,7 @@ class CompletedAnnotateItem extends StatelessWidget {
marginEdg: EdgeInsets.only(top: 5.h), marginEdg: EdgeInsets.only(top: 5.h),
), ),
ProgressBar( ProgressBar(
color: const Color.fromRGBO(76, 199, 147, 1), color: Color.fromRGBO(76, 199, 147, 1),
percent: taskItem.correctRate / 100, percent: taskItem.correctRate / 100,
title: '总正确率：', title: '总正确率：',
fontSize: 8.sp, fontSize: 8.sp,
@ -135,16 +133,14 @@ class CompletedAnnotateItem extends StatelessWidget {
color: Color.fromRGBO(244, 244, 244, 1), color: Color.fromRGBO(244, 244, 244, 1),
borderRadius: BorderRadius.circular(20.r), borderRadius: BorderRadius.circular(20.r),
child: InkWell( 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, splashColor: Theme.of(context).primaryColor,
borderRadius: BorderRadius.circular(8.r), borderRadius: BorderRadius.circular(8.r),
child: Container( child: Container(
alignment: Alignment.center, alignment: Alignment.center,
padding: EdgeInsets.symmetric(vertical: 4.h), padding: EdgeInsets.symmetric(vertical: 4.h),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(20.r)), decoration: BoxDecoration(borderRadius: BorderRadius.circular(20.r)),
child: quickText('收藏夹${taskItem.homeworkFavs.isNotEmpty?'(${taskItem.homeworkFavs.length})':''}', size: 8.sp, color: Color.fromRGBO(102, 102, 102, 1)), child: quickText('收藏夹', size: 8.sp, color: Color.fromRGBO(102, 102, 102, 1)),
), ),
), ),
)), )),

25
making_school_asignment_app/lib/page/home_page/children/fav_student/fav_student_logic.dart
View File

@ -2,9 +2,7 @@ import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:get/get.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/annotated_class.dart';
import 'package:making_school_asignment_app/common/job/common/base_page_data.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/mixins/request_tool_mixin.dart';
import 'package:making_school_asignment_app/common/utils/toast_utils.dart';
import 'fav_student_state.dart'; import 'fav_student_state.dart';
@ -58,21 +56,14 @@ class FavStudentLogic extends GetxController with RequestToolMixin {
EasyLoading.dismiss(); EasyLoading.dismiss();
} }
void getDelete(student) async { getDelete(student) async {
EasyLoading.show(status: 'loading...'); /* RestClient _client = await getClient();
try { BaseStructureResult res = await _client.getJobDeFavorites(
await getClient().toFavStudent(FavorParam( widget.jobId, student.studentId, student.questionPage!);
homeworkId: state.homeworkId, if (res.success) {
studentId: student.studentId, _future = getData();
templateId: student.templateId, setState(() {});
questionNo: student.questionNo, }*/
isFav: false,
));
getList();
} catch (e) {
EasyLoading.dismiss();
ToastUtils.showError('操作失败，请重试');
}
} }
} }

509
making_school_asignment_app/lib/page/home_page/children/fav_student/fav_student_view.dart
View File

@ -48,7 +48,7 @@ class _FavStudentPageState extends State<FavStudentPage> {
actionsPadding: EdgeInsets.symmetric(vertical: 10.r, horizontal: 10.r), actionsPadding: EdgeInsets.symmetric(vertical: 10.r, horizontal: 10.r),
content: Text( content: Text(
'确定删除吗？', '确定删除吗？',
style: TextStyle(fontSize: 14.sp, color: const Color(0xFF505E6E)), style: TextStyle(fontSize: 14.sp, color: Color(0xFF505E6E)),
), ),
actionsAlignment: MainAxisAlignment.center, actionsAlignment: MainAxisAlignment.center,
actions: <Widget>[ actions: <Widget>[
@ -58,7 +58,7 @@ class _FavStudentPageState extends State<FavStudentPage> {
height: 27.r, height: 27.r,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(20.r)), borderRadius: BorderRadius.all(Radius.circular(20.r)),
color: const Color(0xFF6888FD), color: Color(0xFF6888FD),
), ),
child: const Center( child: const Center(
child: Text( child: Text(
@ -81,7 +81,7 @@ class _FavStudentPageState extends State<FavStudentPage> {
height: 27.r, height: 27.r,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(20.r)), borderRadius: BorderRadius.all(Radius.circular(20.r)),
color: const Color(0xFFF4F4F4), color: Color(0xFFF4F4F4),
), ),
child: const Center( child: const Center(
child: Text( child: Text(
@ -96,14 +96,14 @@ class _FavStudentPageState extends State<FavStudentPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: const Color.fromRGBO(245, 245, 245, 1), backgroundColor: Color.fromRGBO(245, 245, 245, 1),
appBar: AppBar( appBar: AppBar(
// titleSpacing: 0, // titleSpacing: 0,
elevation: 0.0, elevation: 0.0,
leading: IconButton( leading: IconButton(
icon: const Icon(Icons.arrow_back_ios), icon: Icon(Icons.arrow_back_ios),
onPressed: () => Navigator.of(context).pop()), onPressed: () => Navigator.of(context).pop()),
iconTheme: const IconThemeData(color: Colors.black), iconTheme: IconThemeData(color: Colors.black),
title: quickText('收藏夹'), title: quickText('收藏夹'),
centerTitle: true, centerTitle: true,
backgroundColor: Colors.white, backgroundColor: Colors.white,
@ -111,267 +111,268 @@ class _FavStudentPageState extends State<FavStudentPage> {
ReturnToHomepage(), ReturnToHomepage(),
], ],
), ),
body: Column( body: Container(
children: [ child: Column(
Padding( children: [
padding: EdgeInsets.symmetric(vertical: 0.r, horizontal: 14.r), Padding(
child: Row( padding: EdgeInsets.symmetric(vertical: 0.r, horizontal: 14.r),
mainAxisAlignment: MainAxisAlignment.spaceBetween, child: Row(
crossAxisAlignment: CrossAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ crossAxisAlignment: CrossAxisAlignment.center,
Expanded( children: [
child: Obx(() { Expanded(
return Text( child: Obx(() {
state.homeworkName.value, return Text(
style: state.homeworkName.value,
TextStyle(fontSize: 14.sp, color: const Color(0xFF3C3C3C),), style:
overflow: TextOverflow.ellipsis, TextStyle(fontSize: 14.sp, color: 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
Container( .of(context)
width: MediaQuery .size
.of(context) .width,
.size height: 1.r,
.width, decoration: const BoxDecoration(
height: 1.r, color: Color(0xFFCCCCCC),
decoration: const BoxDecoration( ),
color: Color(0xFFCCCCCC), ),
), Obx((){
), return state.favList.isNotEmpty
Obx((){ ? Expanded(
return state.favList.isNotEmpty child: Utils.isPad()
? Expanded( ? Padding(
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( padding: EdgeInsets.only(
top: 10.r, top: 10.r,
bottom: 8.r, bottom: 8.r,
left: 14.r, left: 14.r,
right: 14.r), right: 14.r),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start, children:
children: [ List.generate(state.favList.length, (index) {
Padding( var item = state.favList[index];
padding: EdgeInsets.only(bottom: 5.r), return Padding(
child: Text( padding: EdgeInsets.only(bottom: 8.r),
'第${item['questionPage']}页', child: Column(
style: TextStyle( crossAxisAlignment:
fontSize: 14.sp, CrossAxisAlignment.start,
color: const Color(0xFF2E5BFF)), children: [
), Padding(
), padding:
ListView.builder( EdgeInsets.only(bottom: 5.r),
itemBuilder: (context, i) { child: Text(
HomeworkFavs student = item['list'][i]; '第${item['questionPage']}页',
return InkWell( style: TextStyle(
onTap: () { fontSize: 12.sp,
showStudentDialog( color: Color(0xFF2E5BFF)),
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( GridView(
mainAxisAlignment: gridDelegate:
MainAxisAlignment SliverGridDelegateWithFixedCrossAxisCount(
.spaceBetween, crossAxisCount: 2,
children: [ mainAxisSpacing: 8.r,
quickText(student.studentName, crossAxisSpacing: 10.r,
color: const Color(0xFF333333), childAspectRatio: 556 / 112,
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( shrinkWrap: true,
onTap: () async { children: List.generate(
var confim = item['list'].length, (i) {
await confirmDialog(); HomeworkFavs student = item['list'][i];
if (confim) { return Container(
logic.getDelete(student); padding: EdgeInsets.symmetric(
} vertical: 5.r,
}, horizontal: 10.r),
child: Image.asset( decoration: BoxDecoration(
'assets/images/favorite_delete_icon.png', color: Colors.white,
width: 32.r, borderRadius:
height: 32.r, 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(
itemCount: item['list'].length, itemBuilder: (context, i) {
shrinkWrap: true, 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,
),
],
), ),
], );
), },
); itemCount: state.favList.length,
}, ),
itemCount: state.favList.length, )
), : Padding(
) padding: EdgeInsets.only(
: Padding( top: MediaQuery
padding: EdgeInsets.only( .of(context)
top: MediaQuery .size
.of(context) .height / 2 - 200.r),
.size child: const MyEmptyWidget(),
.height / 2 - 200.r), );
child: const MyEmptyWidget(), }),
);
}),
], ],
), )),
); );
} }

3
making_school_asignment_app/lib/page/home_page/children/fav_student/widget/favorite_student_dialog.dart
View File

@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:get/get_rx/get_rx.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/common/job/annotated_class.dart';
import 'package:making_school_asignment_app/page/global_widget/MyEmptyWidget.dart'; import 'package:making_school_asignment_app/page/global_widget/MyEmptyWidget.dart';
import 'package:photo_view/photo_view.dart'; import 'package:photo_view/photo_view.dart';
@ -142,7 +141,7 @@ class _FavoriteStudentDialogState extends State<FavoriteStudentDialog> {
builder: (BuildContext context, int index) { builder: (BuildContext context, int index) {
final HomeworkFavs item = imageList[index]; final HomeworkFavs item = imageList[index];
return PhotoViewGalleryPageOptions( return PhotoViewGalleryPageOptions(
imageProvider: NetworkImage(RequestConfig.imgUrl + item.zgtAnswer!), imageProvider: NetworkImage(item.zgtAnswer!),
heroAttributes: PhotoViewHeroAttributes(tag: item.id!), heroAttributes: PhotoViewHeroAttributes(tag: item.id!),
); );
}, },

4
making_school_asignment_app/lib/page/home_page/children/read_over/read_over_logic.dart
View File

@ -19,11 +19,11 @@ class ReadOverLogic extends GetxController with RequestToolMixin, GetTickerProvi
late final EasyRefreshController refreshController2; late final EasyRefreshController refreshController2;
WorkStudentParams params = WorkStudentParams( WorkStudentParams params = WorkStudentParams(
assessType: UserStore.to.assessType.value, assessType: 0,
pageSize: 10, pageSize: 10,
); );
WorkStudentParams params2 = WorkStudentParams( WorkStudentParams params2 = WorkStudentParams(
assessType: UserStore.to.assessType.value, assessType: 0,
pageSize: 10, pageSize: 10,
); );

1
making_school_asignment_app/lib/page/home_page/children/read_over/read_over_view.dart
View File

@ -60,7 +60,6 @@ class _ReadOverPageState extends State<ReadOverPage> {
padding: EdgeInsets.only(left: 10.w), padding: EdgeInsets.only(left: 10.w),
child: InkWell( child: InkWell(
onTap: () { onTap: () {
// SystemNavigator.pop();
Get.back(); Get.back();
}, },
child: Icon( child: Icon(