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

Compare commits

base: marking:597b758cf2251f22932d89bdcf5a76e62879ef39
Branches Tags
marking:master
marking:glassy_state
marking:the_windows
marking:mcy_new
marking:zoom_pic
..
compare: marking:71bf869443637f280b0baf2458fdb1f18c91d7ae
Branches Tags
marking:master
marking:glassy_state
marking:the_windows
marking:mcy_new
marking:zoom_pic

No commits in common. "597b758cf2251f22932d89bdcf5a76e62879ef39" and "71bf869443637f280b0baf2458fdb1f18c91d7ae" have entirely different histories.
597b758cf2 ... 71bf869443

13 changed files with 22 additions and 766 deletions
Show Stats Expand all files Collapse all files

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

@ -110,10 +110,4 @@ abstract class RetrofitClient {
// 批阅作业详情 // 批阅作业详情
@GET("/api/hms/Annotate/GetForAnnotate") @GET("/api/hms/Annotate/GetForAnnotate")
Future<DoPaperDetailsResult> getDoPaperDetails(@Queries() DoPaperDetailsParam param); Future<DoPaperDetailsResult> getDoPaperDetails(@Queries() DoPaperDetailsParam param);
//收藏夹列表
@GET("/api/hms/FavStudent/GetList")
Future<BasePageData<HomeworkFavs>> getFavList(
@Query('HomeworkName') String homeworkName, @Query('ClassId') String classId);
} }

29
making_school_asignment_app/lib/common/job/annotated_class.dart
View File

@ -114,45 +114,42 @@ class AnnotatedStudents extends Object {
class HomeworkFavs extends Object { class HomeworkFavs extends Object {
@JsonKey(name: 'id') @JsonKey(name: 'id')
String? id; String id;
@JsonKey(name: 'homeworkId') @JsonKey(name: 'homeworkId')
String? homeworkId; String homeworkId;
@JsonKey(name: 'homeworkName') @JsonKey(name: 'homeworkName')
String? homeworkName; String homeworkName;
@JsonKey(name: 'grade') @JsonKey(name: 'grade')
int? grade; int grade;
@JsonKey(name: 'subject') @JsonKey(name: 'subject')
int? subject; int subject;
@JsonKey(name: 'classId') @JsonKey(name: 'classId')
String? classId; String classId;
@JsonKey(name: 'className') @JsonKey(name: 'className')
String? className; String className;
@JsonKey(name: 'studentId') @JsonKey(name: 'studentId')
int? studentId; int studentId;
@JsonKey(name: 'studentName') @JsonKey(name: 'studentName')
String? studentName; String studentName;
@JsonKey(name: 'templateId') @JsonKey(name: 'templateId')
int templateId; String templateId;
@JsonKey(name: 'questionNo') @JsonKey(name: 'questionNo')
int? questionNo; int questionNo;
@JsonKey(name: 'subjectiveAnswer') @JsonKey(name: 'subjectiveAnswer')
String? subjectiveAnswer; String subjectiveAnswer;
@JsonKey(name: 'zgtAnswer') HomeworkFavs(this.id,this.homeworkId,this.homeworkName,this.grade,this.subject,this.classId,this.className,this.studentId,this.studentName,this.templateId,this.questionNo,this.subjectiveAnswer,);
String? zgtAnswer;
HomeworkFavs(this.id,this.homeworkId,this.homeworkName,this.grade,this.subject,this.classId,this.className,this.studentId,this.studentName,this.templateId,this.questionNo,this.subjectiveAnswer,this.zgtAnswer);
factory HomeworkFavs.fromJson(Map<String, dynamic> srcJson) => _$HomeworkFavsFromJson(srcJson); factory HomeworkFavs.fromJson(Map<String, dynamic> srcJson) => _$HomeworkFavsFromJson(srcJson);

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

@ -73,9 +73,7 @@ class _AnnotateItemState extends State<AnnotateItem> {
child: ItemBtn( child: ItemBtn(
title: "收藏夹", 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});
},
), ),
), ),
const Expanded(flex: 1, child: SizedBox()), const Expanded(flex: 1, child: SizedBox()),
@ -115,9 +113,7 @@ class _AnnotateItemState extends State<AnnotateItem> {
child: ItemBtn( child: ItemBtn(
title: "收藏夹", 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});
},
), ),
), ),
], ],

2
making_school_asignment_app/lib/page/home_page/children/answer_trajectory/answer_trajectory_view.dart
View File

@ -53,8 +53,6 @@ class _AnswerTrajectoryPageState extends State<AnswerTrajectoryPage> {
border: Border( border: Border(
bottom: BorderSide(width: 1.r, color: Color(0xFFCCCCCC)))), bottom: BorderSide(width: 1.r, color: Color(0xFFCCCCCC)))),
child: TabBar( child: TabBar(
dividerHeight: 0,
tabAlignment: TabAlignment.start,
onTap: (int val) { onTap: (int val) {
state.tabIndex.value = val; state.tabIndex.value = val;
// EasyLoading.show(status: 'loading...'); // EasyLoading.show(status: 'loading...');

3
making_school_asignment_app/lib/page/home_page/children/answer_trajectory/widget/answer_trajectory_job.dart
View File

@ -30,6 +30,9 @@ class AnswerTrajectoryJob extends StatelessWidget {
Items item = jobList[index]; Items item = jobList[index];
return InkWell( return InkWell(
onTap: () { onTap: () {
/* RouterManager.router.navigateTo(context,
'${RouterManager.answerTrajectoryJobDetailPath}?&jobId=${item.id}&jobName=${Uri.encodeComponent(item.title)}&genderName=${Uri.encodeComponent(item.genderName)}',
transition: getTransition());*/
Get.toNamed(Routes.answerTrajectoryDetailPage,arguments: {'homeworkId':item.id,'title':item.name,'grade':item.grade}); Get.toNamed(Routes.answerTrajectoryDetailPage,arguments: {'homeworkId':item.id,'title':item.name,'grade':item.grade});
}, },
child: Container( child: Container(

10
making_school_asignment_app/lib/page/home_page/children/fav_student/fav_student_binding.dart
View File

@ -1,10 +0,0 @@
import 'package:get/get.dart';
import 'fav_student_logic.dart';
class FavStudentBinding extends Bindings {
@override
void dependencies() {
Get.lazyPut(() => FavStudentLogic());
}
}

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

@ -1,69 +0,0 @@
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/mixins/request_tool_mixin.dart';
import 'fav_student_state.dart';
class FavStudentLogic extends GetxController with RequestToolMixin {
final FavStudentState state = FavStudentState();
@override
void onInit() {
super.onInit();
state.homeworkName.value = Get.arguments['homeworkName'];
state.homeworkId = Get.arguments['homeworkId'];
state.grade = Get.arguments['grade'];
state.classId = Get.arguments['classId'];
EasyLoading.show(status: 'loading...');
getClass();
}
void getClass() async {
List<AnnotatedClass> data = await getClient().getAnnotatedClassList(state.homeworkId);
state.involveClasses.value = data;
state.involveClasses.value = [state.classData.value, ...(data ?? [])];
for (var element in state.involveClasses) {
if (element.classId == state.classId && element.grade == state.grade) {
state.classData.value = element;
}
}
getList();
}
void getList() async {
BasePageData<HomeworkFavs> data =
await getClient().getFavList(state.homeworkName.value, state.classData.value.classId != '-1' ? state.classData.value.classId : '');
List arr = [];
List groupList = [];
if(data.items.isNotEmpty){
for(var item in data.items){
arr.add(item.questionNo);
}
state.pageList.value = arr.toSet().toList();
for(var page in state.pageList.value){
var printList = data.items
.where((element) => element.questionNo == page)
.toList();
groupList.add({"questionPage": page, "list": printList});
}
groupList
.sort((a, b) => a['questionPage'].compareTo(b['questionPage']));
}
state.favList.value = [...groupList];
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(() {});
}*/
}
}

18
making_school_asignment_app/lib/page/home_page/children/fav_student/fav_student_state.dart
View File

@ -1,18 +0,0 @@
import 'package:get/get.dart';
import 'package:making_school_asignment_app/common/job/annotated_class.dart';
class FavStudentState {
FavStudentState() {
///Initialize variables
}
late RxString homeworkName = ''.obs;
late String homeworkId = '';
late int grade;
late String classId = '';
late RxList favList = RxList();
late RxList pageList = RxList();
late RxList<AnnotatedClass> involveClasses = RxList();
late AnnotatedClass defaultClass = AnnotatedClass('', -1, '-1', '', '', -1, -1, -1, -1, -1, [], [], -1, -1, -1, -1, -1, [], []);
late Rx<AnnotatedClass> classData = defaultClass.obs;
}

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

@ -1,384 +0,0 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:making_school_asignment_app/common/job/annotated_class.dart';
import 'package:making_school_asignment_app/common/utils/utils.dart';
import 'package:making_school_asignment_app/page/global_widget/MyEmptyWidget.dart';
import 'package:making_school_asignment_app/page/global_widget/ReturnToHomepage.dart';
import 'package:making_school_asignment_app/page/global_widget/my_text.dart';
import 'package:making_school_asignment_app/page/home_page/children/fav_student/widget/favorite_student_dialog.dart';
import 'package:making_school_asignment_app/page/home_page/children/job_report/widget/dropdown_selection.dart';
import 'fav_student_logic.dart';
class FavStudentPage extends StatefulWidget {
const FavStudentPage({Key? key}) : super(key: key);
@override
State<FavStudentPage> createState() => _FavStudentPageState();
}
class _FavStudentPageState extends State<FavStudentPage> {
final logic = Get.find<FavStudentLogic>();
final state = Get
.find<FavStudentLogic>()
.state;
void showStudentDialog(BuildContext context, HomeworkFavs item, List groups) {
showDialog(
context: context,
builder: (BuildContext context) {
return AlertDialog(
insetPadding: EdgeInsets.all(25.r),
content: FavoriteStudentDialog(
item: item,
group: groups,
deleteFav: logic.getDelete,
confirmDialog: confirmDialog),
contentPadding: const EdgeInsets.all(0),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(15.r))));
},
);
}
Future<bool> confirmDialog() async {
return await showDialog(
context: context,
builder: (context) => AlertDialog(
actionsPadding: EdgeInsets.symmetric(vertical: 10.r, horizontal: 10.r),
content: Text(
'确定删除吗？',
style: TextStyle(fontSize: 14.sp, color: 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: Color(0xFF6888FD),
),
child: const Center(
child: Text(
'确定',
style: TextStyle(color: Colors.white),
))),
onTap: () {
// 执行操作
// Navigator.of(context).pop(true);
Get.back(result: true);
},
),
InkWell(
onTap: () {
// Navigator.of(context).pop(false);
Get.back(result: false);
},
child: Container(
width: 97.r,
height: 27.r,
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(20.r)),
color: Color(0xFFF4F4F4),
),
child: const Center(
child: Text(
'取消',
style: TextStyle(color: Color(0xFF666666)),
))),
),
],
),
);
}
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Color.fromRGBO(245, 245, 245, 1),
appBar: AppBar(
// titleSpacing: 0,
elevation: 0.0,
leading: IconButton(
icon: Icon(Icons.arrow_back_ios),
onPressed: () => Navigator.of(context).pop()),
iconTheme: IconThemeData(color: Colors.black),
title: quickText('收藏夹'),
centerTitle: true,
backgroundColor: Colors.white,
actions: const [
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,
);
}),
),
// 下拉框
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(
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,
),
],
),
);
},
itemCount: state.favList.length,
),
)
: Padding(
padding: EdgeInsets.only(
top: MediaQuery
.of(context)
.size
.height / 2 - 200.r),
child: const MyEmptyWidget(),
);
}),
],
)),
);
}
@override
void dispose() {
Get.delete<FavStudentLogic>();
super.dispose();
}
}

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

@ -1,245 +0,0 @@
import 'package:flutter/cupertino.dart';
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/job/annotated_class.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_gallery.dart';
class FavoriteStudentDialog extends StatefulWidget {
final HomeworkFavs item;
final List group;
final Function deleteFav;
final Future<bool> Function() confirmDialog;
const FavoriteStudentDialog({Key? key,
required this.item,
required this.group,
required this.deleteFav,
required this.confirmDialog})
: super(key: key);
@override
State<FavoriteStudentDialog> createState() => _FavoriteStudentDialogState();
}
class _FavoriteStudentDialogState extends State<FavoriteStudentDialog> {
RxInt defaultIndex = 0.obs;
RxList<HomeworkFavs> imageList = RxList();
late PageController pageController;
late Rx<HomeworkFavs> currentStudent = Rx(HomeworkFavs('','','',-1,-1,'','',-1,'',-1,-1,'',''));
@override
void initState() {
super.initState();
currentStudent.value = widget.item;
List<HomeworkFavs> list = [];
for (var element in widget.group) {
for (var item in element['list']) {
list.add(item);
}
}
imageList.value = list;
defaultIndex.value =
list.indexWhere((element) => element.id == widget.item.id);
pageController = PageController(initialPage: defaultIndex.value);
}
@override
void dispose() {
super.dispose();
pageController.dispose();
}
@override
Widget build(BuildContext context) {
return Container(
width: MediaQuery
.of(context)
.size
.width,
height: MediaQuery
.of(context)
.size
.height,
padding: EdgeInsets.symmetric(vertical: 10.r, horizontal: 14.r),
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Obx(() {
return Text(
'${currentStudent.value.className} ${currentStudent.value
.studentName}',
style: TextStyle(fontSize: 12.sp, color: Color(0xFF4E73FD)),
);
}),
Expanded(child: Container()),
Text(
'第${currentStudent.value.questionNo}页',
style: TextStyle(fontSize: 12.sp, color: Color(0xFF868686)),
),
InkWell(
onTap: () async {
bool confim = await widget.confirmDialog();
if (confim) {
widget.deleteFav(currentStudent);
imageList.removeAt(defaultIndex.value);
if (imageList.isNotEmpty) {
if (defaultIndex.value < imageList.length) {
currentStudent.value = imageList[defaultIndex.value];
} else {
currentStudent.value =
imageList[defaultIndex.value - 1];
defaultIndex = defaultIndex - 1;
}
} else {
currentStudent.value.className = '';
currentStudent.value.studentName = '';
}
}
},
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 8.r),
child: Image.asset(
'assets/images/favorite_delete_icon.png',
width: 22.r,
height: 22.r,
),
),
),
InkWell(
onTap: () {
Navigator.pop(context);
},
child: Image.asset(
'assets/images/favorite_dialog_close.png',
width: 22.r,
height: 22.r,
),
),
],
),
SizedBox(
height: 10.r,
),
Obx(() {
return imageList.isNotEmpty
? Expanded(
child: Container(
color: Colors.white,
width: MediaQuery
.of(context)
.size
.width,
child: PhotoViewGallery.builder(
scrollPhysics: const BouncingScrollPhysics(),
builder: (BuildContext context, int index) {
final HomeworkFavs item = imageList[index];
return PhotoViewGalleryPageOptions(
imageProvider: NetworkImage(item.zgtAnswer!),
heroAttributes: PhotoViewHeroAttributes(tag: item.id!),
);
},
itemCount: imageList.length,
pageController: pageController,
onPageChanged: (index) {
defaultIndex.value = index;
currentStudent.value = imageList[index];
},
scrollDirection: Axis.horizontal,
),
),
)
: Padding(
padding: EdgeInsets.only(
top: MediaQuery
.of(context)
.size
.height / 2 - 200.r),
child: const MyEmptyWidget(),
);
}),
Obx(() {
return imageList.isNotEmpty?Padding(
padding: EdgeInsets.symmetric(vertical: 15.r),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
InkWell(
onTap: () {
if (defaultIndex.value > 0) {
defaultIndex.value = defaultIndex.value - 1;
pageController.jumpToPage(defaultIndex.value);
}
},
child: Container(
width:
(MediaQuery
.of(context)
.size
.width - 78.r) / 2 - 10.r,
height: 28.r,
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(6.r)),
border: Border.all(
width: 1.r,
color: Color(0xFFCACACA),
style: BorderStyle.solid),
),
child: Center(
child: Text(
'上一页',
style: TextStyle(
fontSize: 10.r,
color: defaultIndex == 0
? Color(0xFFCACACA)
: Color(0xFF505E6E)),
)),
),
),
InkWell(
onTap: () {
if (defaultIndex.value < imageList.length - 1) {
defaultIndex.value = defaultIndex.value + 1;
pageController.jumpToPage(defaultIndex.value);
}
},
child: Container(
width:
(MediaQuery
.of(context)
.size
.width - 78.r) / 2 - 10.r,
height: 28.r,
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(6.r)),
border: Border.all(
width: 1.r,
color: Color(0xFFCACACA),
style: BorderStyle.solid),
),
child: Center(
child: Text(
'下一页',
style: TextStyle(
fontSize: 10.r,
color: defaultIndex == imageList.length - 1
? Color(0xFFCACACA)
: Color(0xFF505E6E)),
)),
),
),
],
),
):Container();
})
],
),
);
}
}

9
making_school_asignment_app/lib/page/home_page/children/job_report/widget/dropdown_selection.dart
View File

@ -8,8 +8,7 @@ class DropdownSelection extends StatefulWidget {
final List<AnnotatedClass>? involveClasses; final List<AnnotatedClass>? involveClasses;
final AnnotatedClass? classData; final AnnotatedClass? classData;
final Function(AnnotatedClass) call; final Function(AnnotatedClass) call;
final Color? bgColor; const DropdownSelection({Key? key, required this.involveClasses, required this.classData, required this.call}) : super(key: key);
const DropdownSelection({Key? key, required this.involveClasses, required this.classData, required this.call,this.bgColor}) : super(key: key);
@override @override
State<DropdownSelection> createState() => _DropdownSelectionState(); State<DropdownSelection> createState() => _DropdownSelectionState();
@ -21,9 +20,9 @@ class _DropdownSelectionState extends State<DropdownSelection> {
return Container( return Container(
// width: 200.r, // width: 200.r,
padding: EdgeInsets.symmetric(horizontal: 10.r), padding: EdgeInsets.symmetric(horizontal: 10.r),
decoration: BoxDecoration( decoration: const BoxDecoration(
color: widget.bgColor ?? const Color(0xFFF5F5F5), color: Color(0xFFF5F5F5),
borderRadius: const BorderRadius.vertical( borderRadius: BorderRadius.vertical(
top: Radius.elliptical(10, 10), top: Radius.elliptical(10, 10),
bottom: Radius.elliptical(10, 10), bottom: Radius.elliptical(10, 10),
)), )),

4
making_school_asignment_app/lib/routes/app_pages.dart
View File

@ -11,8 +11,6 @@ import 'package:making_school_asignment_app/page/home_page/children/answer_traje
import 'package:making_school_asignment_app/page/home_page/children/answer_trajectory_detail/answer_trajectory_detail_view.dart'; import 'package:making_school_asignment_app/page/home_page/children/answer_trajectory_detail/answer_trajectory_detail_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_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/class_student/class_student_view.dart';
import 'package:making_school_asignment_app/page/home_page/children/fav_student/fav_student_binding.dart';
import 'package:making_school_asignment_app/page/home_page/children/fav_student/fav_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/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/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_binding.dart';
@ -90,8 +88,6 @@ abstract class AppPages {
// 批阅主页（作业、考试） // 批阅主页（作业、考试）
GetPage(name: Routes.reviewHomework, page: () => const HomeworkReview(), binding: HomeworkReviewBinding(), transition: getTransition()), GetPage(name: Routes.reviewHomework, page: () => const HomeworkReview(), binding: HomeworkReviewBinding(), transition: getTransition()),
GetPage(name: Routes.reviewExam, page: () => const HomeworkReview(), binding: HomeworkReviewBinding(), transition: getTransition()), GetPage(name: Routes.reviewExam, page: () => const HomeworkReview(), binding: HomeworkReviewBinding(), transition: getTransition()),
GetPage(name: Routes.favStudentPage, page: () => const FavStudentPage(), binding: FavStudentBinding(), transition: Transition.noTransition),
]; ];
} }

1
making_school_asignment_app/lib/routes/app_routes.dart
View File

@ -23,6 +23,5 @@ abstract class Routes {
// 批阅主页 // 批阅主页
static const reviewHomework = '/review/reviewHomework'; // 作业批阅 static const reviewHomework = '/review/reviewHomework'; // 作业批阅
static const reviewExam = '/review/reviewExam'; // 考试批阅 static const reviewExam = '/review/reviewExam'; // 考试批阅
static const favStudentPage = '/favStudentPage'; // 收藏夹
} }