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

Compare commits

base: marking:a3fd75efb5b146daf041fba5d3d82fa57122a65e
Branches Tags
marking:master
marking:glassy_state
marking:the_windows
marking:mcy_new
marking:zoom_pic
..
compare: marking:bcaf5c77b7b4d36749e1872cf07d596e58e34de1
Branches Tags
marking:master
marking:glassy_state
marking:the_windows
marking:mcy_new
marking:zoom_pic

No commits in common. "a3fd75efb5b146daf041fba5d3d82fa57122a65e" and "bcaf5c77b7b4d36749e1872cf07d596e58e34de1" have entirely different histories.
a3fd75efb5 ... bcaf5c77b7

17 changed files with 1894 additions and 2058 deletions
Show Stats Expand all files Collapse all files

BIN
making_school_asignment_app/assets/images/right_icon_blue.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 293 B

2
making_school_asignment_app/lib/common/config/app_config.dart
View File

@ -13,7 +13,7 @@ class AppConfig {
static const UI_WIDTH = 375.0; static const UI_WIDTH = 375.0;
/// ui width /// ui width
static const UI_HEIGHT = 867.0; static const UI_HEIGHT = 812.0;
static const SKIP_UPDATING_USER = '18888888888'; static const SKIP_UPDATING_USER = '18888888888';
static const APP_NAME = '18888888888'; static const APP_NAME = '18888888888';

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

@ -24,8 +24,6 @@ class _AnnotateClassPageState extends State<AnnotateClassPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
String homeworkId = state.homeworkId.value; String homeworkId = state.homeworkId.value;
return OrientationBuilder(
builder: (BuildContext context, Orientation orientation){
return Scaffold( return Scaffold(
backgroundColor: const Color.fromRGBO(245, 245, 245, 1), backgroundColor: const Color.fromRGBO(245, 245, 245, 1),
appBar: AppBar( appBar: AppBar(
@ -116,8 +114,6 @@ class _AnnotateClassPageState extends State<AnnotateClassPage> {
), ),
); );
} }
);
}
@override @override
void dispose() { void dispose() {

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

@ -24,8 +24,6 @@ class _AnswerTrajectoryPageState extends State<AnswerTrajectoryPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return OrientationBuilder(
builder: (BuildContext context, Orientation orientation){
return Scaffold( return Scaffold(
backgroundColor: Color.fromRGBO(245, 245, 245, 1), backgroundColor: Color.fromRGBO(245, 245, 245, 1),
appBar: AppBar( appBar: AppBar(
@ -168,10 +166,6 @@ class _AnswerTrajectoryPageState extends State<AnswerTrajectoryPage> {
), ),
); );
} }
);
}
@override @override
void dispose() { void dispose() {

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

@ -71,7 +71,7 @@ class AnswerTrajectoryJob extends StatelessWidget {
bottomRight: Radius.circular(4.r), bottomRight: Radius.circular(4.r),
), ),
), ),
margin: EdgeInsets.only(top:3.h,right: 4.w), margin: EdgeInsets.only(right: 4.w),
child: quickText( child: quickText(
item.assessType == 0 ? '作业' : '考试', item.assessType == 0 ? '作业' : '考试',
color: Colors.white, color: Colors.white,
@ -203,7 +203,7 @@ class AnswerTrajectoryJob extends StatelessWidget {
bottomRight: Radius.circular(4.r), bottomRight: Radius.circular(4.r),
), ),
), ),
margin: EdgeInsets.only(top:3.h,right: 4.w), margin: EdgeInsets.only(right: 4.w),
child: quickText( child: quickText(
item.assessType == 0 ? '作业' : '考试', item.assessType == 0 ? '作业' : '考试',
color: Colors.white, color: Colors.white,

4
making_school_asignment_app/lib/page/home_page/children/answer_trajectory_detail/answer_trajectory_detail_view.dart
View File

@ -29,8 +29,6 @@ class _AnswerTrajectoryDetailPageState
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return OrientationBuilder(
builder: (BuildContext context, Orientation orientation){
return Scaffold( return Scaffold(
backgroundColor: Color(0xFFF5F5F5), backgroundColor: Color(0xFFF5F5F5),
appBar: AppBar( appBar: AppBar(
@ -240,8 +238,6 @@ class _AnswerTrajectoryDetailPageState
), ),
); );
} }
);
}
@override @override
void dispose() { void dispose() {

4
making_school_asignment_app/lib/page/home_page/children/class_student/class_student_view.dart
View File

@ -24,8 +24,6 @@ class _ClassStudentPageState extends State<ClassStudentPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return OrientationBuilder(
builder: (BuildContext context, Orientation orientation){
return Scaffold( return Scaffold(
backgroundColor: const Color.fromRGBO(245, 245, 245, 1), backgroundColor: const Color.fromRGBO(245, 245, 245, 1),
appBar: AppBar( appBar: AppBar(
@ -422,8 +420,6 @@ class _ClassStudentPageState extends State<ClassStudentPage> {
), ),
); );
} }
);
}
@override @override
void dispose() { void dispose() {

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

@ -113,9 +113,7 @@ class _FavStudentPageState extends State<FavStudentPage> {
ReturnToHomepage(), ReturnToHomepage(),
], ],
), ),
body:OrientationBuilder( body: Column(
builder: (BuildContext context, Orientation orientation){
return Column(
children: [ children: [
Padding( Padding(
padding: EdgeInsets.symmetric(vertical: 0.r, horizontal: 14.r), padding: EdgeInsets.symmetric(vertical: 0.r, horizontal: 14.r),
@ -375,9 +373,7 @@ class _FavStudentPageState extends State<FavStudentPage> {
}), }),
], ],
); ),
}
)
); );
} }

4
making_school_asignment_app/lib/page/home_page/children/job_report/job_report_view.dart
View File

@ -25,8 +25,6 @@ class _JobReportPageState extends State<JobReportPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return OrientationBuilder(
builder: (BuildContext context, Orientation orientation){
return Scaffold( return Scaffold(
backgroundColor: Color.fromRGBO(245, 245, 245, 1), backgroundColor: Color.fromRGBO(245, 245, 245, 1),
appBar: AppBar( appBar: AppBar(
@ -116,8 +114,6 @@ class _JobReportPageState extends State<JobReportPage> {
}), }),
); );
} }
);
}
@override @override
void dispose() { void dispose() {

5
making_school_asignment_app/lib/page/home_page/children/knowledge_points_grasp/knowledge_points_grasp_view.dart
View File

@ -27,8 +27,6 @@ class _KnowledgePointsGraspPageState extends State<KnowledgePointsGraspPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return OrientationBuilder(
builder: (BuildContext context, Orientation orientation){
return Scaffold( return Scaffold(
backgroundColor: Color.fromRGBO(245, 245, 245, 1), backgroundColor: Color.fromRGBO(245, 245, 245, 1),
appBar: AppBar( appBar: AppBar(
@ -48,7 +46,7 @@ class _KnowledgePointsGraspPageState extends State<KnowledgePointsGraspPage> {
children: [ children: [
Container( Container(
margin: EdgeInsets.all(15.r), margin: EdgeInsets.all(15.r),
// height: 30.r, height: 30.r,
child: Row( child: Row(
children: [ children: [
Expanded( Expanded(
@ -241,7 +239,6 @@ class _KnowledgePointsGraspPageState extends State<KnowledgePointsGraspPage> {
], ],
), ),
); );
});
} }
@override @override

3
making_school_asignment_app/lib/page/home_page/children/knowledge_points_grasp_detail/knowledge_points_grasp_detail_view.dart
View File

@ -68,8 +68,6 @@ class _KnowledgePointsGraspDetailPageState extends State<KnowledgePointsGraspDet
EasyLoading.dismiss(); EasyLoading.dismiss();
} }
return OrientationBuilder(
builder: (BuildContext context, Orientation orientation){
return Scaffold( return Scaffold(
backgroundColor: Color.fromRGBO(245, 245, 245, 1), backgroundColor: Color.fromRGBO(245, 245, 245, 1),
appBar: AppBar( appBar: AppBar(
@ -246,7 +244,6 @@ class _KnowledgePointsGraspDetailPageState extends State<KnowledgePointsGraspDet
}), }),
), ),
); );
});
} }
@override @override

2
making_school_asignment_app/lib/page/home_page/children/read_over/widget/annotate_list.dart
View File

@ -306,7 +306,7 @@ Widget $reviewedItem({
bottomRight: Radius.circular(4.r), bottomRight: Radius.circular(4.r),
), ),
), ),
margin: EdgeInsets.only(top:3.h,right: 4.w), margin: EdgeInsets.only(right: 4.w),
child: quickText(type == 1 ? '作业' : '考试', color: Colors.white, size: 10.sp), child: quickText(type == 1 ? '作业' : '考试', color: Colors.white, size: 10.sp),
), ),
Expanded( Expanded(

2
making_school_asignment_app/lib/page/home_page/children/read_over/widget/task_list_item.dart
View File

@ -207,7 +207,7 @@ class _TaskListItemState extends State<TaskListItem> {
bottomRight: Radius.circular(4.r), bottomRight: Radius.circular(4.r),
), ),
), ),
margin: EdgeInsets.only(top:3.h,right: 4.w), margin: EdgeInsets.only(right: 4.w),
child: quickText(widget.type == 1 ? '作业' : '考试', color: Colors.white, size: 10.sp), child: quickText(widget.type == 1 ? '作业' : '考试', color: Colors.white, size: 10.sp),
), ),
Expanded( Expanded(

4
making_school_asignment_app/lib/page/home_page/children/student_history_work/student_history_work_view.dart
View File

@ -20,8 +20,6 @@ class _StudentHistoryWorkPageState extends State<StudentHistoryWorkPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return OrientationBuilder(
builder: (BuildContext context, Orientation orientation){
return Scaffold( return Scaffold(
backgroundColor: const Color.fromRGBO(245, 245, 245, 1), backgroundColor: const Color.fromRGBO(245, 245, 245, 1),
appBar: AppBar( appBar: AppBar(
@ -54,8 +52,6 @@ class _StudentHistoryWorkPageState extends State<StudentHistoryWorkPage> {
), ),
), ),
); );
});
} }
@override @override

61
making_school_asignment_app/lib/page/home_page/children/student_personal/student_personal_view.dart
View File

@ -24,8 +24,6 @@ class _StudentPersonalPageState extends State<StudentPersonalPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return OrientationBuilder(
builder: (BuildContext context, Orientation orientation) {
return Scaffold( return Scaffold(
backgroundColor: const Color.fromRGBO(245, 245, 245, 1), backgroundColor: const Color.fromRGBO(245, 245, 245, 1),
appBar: AppBar( appBar: AppBar(
@ -56,10 +54,8 @@ class _StudentPersonalPageState extends State<StudentPersonalPage> {
onTap: () { onTap: () {
// RouterManager.router.navigateTo(context, // RouterManager.router.navigateTo(context,
// '${RouterManager.jobPersonalDetailPath}?studentId=${widget.studentId}&studentName=${Uri.encodeComponent(state.studentInfo.studentName!)}'); // '${RouterManager.jobPersonalDetailPath}?studentId=${widget.studentId}&studentName=${Uri.encodeComponent(state.studentInfo.studentName!)}');
Get.toNamed(Routes.studentWorkDetailPage, arguments: { Get.toNamed(Routes.studentWorkDetailPage,
'studentId': state.studentInfo.value.studentId, arguments: {'studentId': state.studentInfo.value.studentId, 'studentName': state.studentInfo.value.studentName});
'studentName': state.studentInfo.value.studentName
});
}, },
child: Container( child: Container(
width: 93.r, width: 93.r,
@ -71,8 +67,7 @@ class _StudentPersonalPageState extends State<StudentPersonalPage> {
child: Center( child: Center(
child: Text( child: Text(
'历史作业', '历史作业',
style: TextStyle( style: TextStyle(fontSize: 10.r, color: const Color(0xFF2080F7)),
fontSize: 10.r, color: const Color(0xFF2080F7)),
), ),
), ),
), ),
@ -81,10 +76,8 @@ class _StudentPersonalPageState extends State<StudentPersonalPage> {
width: 10.r, width: 10.r,
), ),
InkWell( InkWell(
onTap: () => showAnswerHandwriting(context, onTap: () =>
homeworkId: state.homeworkId, showAnswerHandwriting(context, homeworkId: state.homeworkId, studentId: state.studentId).then((e) => ToastUtils.dismiss()),
studentId: state.studentId)
.then((e) => ToastUtils.dismiss()),
child: Container( child: Container(
width: 93.r, width: 93.r,
height: 28.r, height: 28.r,
@ -95,8 +88,7 @@ class _StudentPersonalPageState extends State<StudentPersonalPage> {
child: Center( child: Center(
child: Text( child: Text(
'原稿笔迹', '原稿笔迹',
style: TextStyle( style: TextStyle(fontSize: 10.r, color: const Color(0xFF4CC793)),
fontSize: 10.r, color: const Color(0xFF4CC793)),
), ),
), ),
), ),
@ -120,10 +112,7 @@ class _StudentPersonalPageState extends State<StudentPersonalPage> {
children: [ children: [
Text( Text(
'客观题', '客观题',
style: TextStyle( style: TextStyle(fontSize: 14.sp, color: const Color(0xFF5C5C5C), fontWeight: FontWeight.w600),
fontSize: 14.sp,
color: const Color(0xFF5C5C5C),
fontWeight: FontWeight.w600),
), ),
SizedBox( SizedBox(
width: 10.r, width: 10.r,
@ -131,10 +120,7 @@ class _StudentPersonalPageState extends State<StudentPersonalPage> {
Obx(() { Obx(() {
return Text( return Text(
'${state.studentInfo.value.kgtCorrectRate}%', '${state.studentInfo.value.kgtCorrectRate}%',
style: TextStyle( style: TextStyle(fontSize: 14.sp, color: const Color(0xFF6888FD), fontWeight: FontWeight.w600),
fontSize: 14.sp,
color: const Color(0xFF6888FD),
fontWeight: FontWeight.w600),
); );
}), }),
], ],
@ -144,19 +130,13 @@ class _StudentPersonalPageState extends State<StudentPersonalPage> {
), ),
Obx(() { Obx(() {
return SizedBox( return SizedBox(
height: state.studentInfo.value.kgtList.length > 8 height: state.studentInfo.value.kgtList.length > 8 ? 300.r : state.studentInfo.value.kgtList.length * 40.r + 40.r,
? 300.r
: state.studentInfo.value.kgtList.length * 40.r +
40.r,
child: StudentKgTable( child: StudentKgTable(
headList: const ['题号', '学生答案', '标准答案'], headList: const ['题号', '学生答案', '标准答案'],
bodyList: state.studentInfo.value.kgtList, bodyList: state.studentInfo.value.kgtList,
questionNumCall: (questionNo, templateId) { questionNumCall: (questionNo, templateId) {
showAnswerHandwriting(context, showAnswerHandwriting(context,
homeworkId: state.homeworkId, homeworkId: state.homeworkId, studentId: state.studentId, questionNo: questionNo, templateId: templateId)
studentId: state.studentId,
questionNo: questionNo,
templateId: templateId)
.then((e) => ToastUtils.dismiss()); .then((e) => ToastUtils.dismiss());
// showAnswerHandwriting(context, jobId: widget.jobId, studentId: widget.studentId, questionNo: int.parse(no)).then((value) { // showAnswerHandwriting(context, jobId: widget.jobId, studentId: widget.studentId, questionNo: int.parse(no)).then((value) {
// ref.read(jobHandwritingDrawingTrajectoryProvider.notifier).setVal([]); // ref.read(jobHandwritingDrawingTrajectoryProvider.notifier).setVal([]);
@ -187,10 +167,7 @@ class _StudentPersonalPageState extends State<StudentPersonalPage> {
children: [ children: [
Text( Text(
'主观题', '主观题',
style: TextStyle( style: TextStyle(fontSize: 14.sp, color: const Color(0xFF5C5C5C), fontWeight: FontWeight.w600),
fontSize: 14.sp,
color: const Color(0xFF5C5C5C),
fontWeight: FontWeight.w600),
), ),
SizedBox( SizedBox(
width: 10.r, width: 10.r,
@ -198,10 +175,7 @@ class _StudentPersonalPageState extends State<StudentPersonalPage> {
Obx(() { Obx(() {
return Text( return Text(
'${state.studentInfo.value.zgtCorrectRate}%', '${state.studentInfo.value.zgtCorrectRate}%',
style: TextStyle( style: TextStyle(fontSize: 14.sp, color: const Color(0xFF6888FD), fontWeight: FontWeight.w600),
fontSize: 14.sp,
color: const Color(0xFF6888FD),
fontWeight: FontWeight.w600),
); );
}), }),
], ],
@ -211,10 +185,7 @@ class _StudentPersonalPageState extends State<StudentPersonalPage> {
), ),
Obx(() { Obx(() {
return SizedBox( return SizedBox(
height: state.studentInfo.value.zgtList.length > 8 height: state.studentInfo.value.zgtList.length > 8 ? 300.r : state.studentInfo.value.zgtList.length * 40.r + 40.r,
? 300.r
: state.studentInfo.value.zgtList.length * 40.r +
40.r,
child: StudentZgTable( child: StudentZgTable(
headList: const ['题号', '用时', '批注结果', '答案'], headList: const ['题号', '用时', '批注结果', '答案'],
bodyList: state.studentInfo.value.zgtList, bodyList: state.studentInfo.value.zgtList,
@ -223,10 +194,7 @@ class _StudentPersonalPageState extends State<StudentPersonalPage> {
ref.read(jobHandwritingDrawingTrajectoryProvider.notifier).setVal([]); ref.read(jobHandwritingDrawingTrajectoryProvider.notifier).setVal([]);
});*/ });*/
showAnswerHandwriting(context, showAnswerHandwriting(context,
homeworkId: state.homeworkId, homeworkId: state.homeworkId, studentId: state.studentId, questionNo: questionNo, templateId: templateId)
studentId: state.studentId,
questionNo: questionNo,
templateId: templateId)
.then((e) => ToastUtils.dismiss()); .then((e) => ToastUtils.dismiss());
}, },
), ),
@ -239,7 +207,6 @@ class _StudentPersonalPageState extends State<StudentPersonalPage> {
), ),
), ),
); );
});
} }
@override @override

219
making_school_asignment_app/lib/page/home_page/children/student_work_detail/student_work_detail_view.dart
View File

@ -28,14 +28,11 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return OrientationBuilder(
builder: (BuildContext context, Orientation orientation) {
return Scaffold( return Scaffold(
backgroundColor: Color.fromRGBO(245, 245, 245, 1), backgroundColor: Color.fromRGBO(245, 245, 245, 1),
appBar: AppBar( appBar: AppBar(
backgroundColor: Colors.white, backgroundColor: Colors.white,
title: Text('${state.studentName}作业详情', title: Text('${state.studentName}作业详情', style: TextStyle(fontSize: 14.sp, color: Color(0xFF333333))),
style: TextStyle(fontSize: 14.sp, color: Color(0xFF333333))),
centerTitle: true, centerTitle: true,
leading: IconButton( leading: IconButton(
icon: Icon(Icons.arrow_back_ios, color: Colors.black), icon: Icon(Icons.arrow_back_ios, color: Colors.black),
@ -73,11 +70,7 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
return Center( return Center(
child: Text( child: Text(
'作业', '作业',
style: TextStyle( style: TextStyle(fontSize: 14.sp, color: state.isJob.value ? Color(0xFF7491FD) : Color(0xFF505E6E)),
fontSize: 14.sp,
color: state.isJob.value
? Color(0xFF7491FD)
: Color(0xFF505E6E)),
)); ));
}), }),
), ),
@ -101,11 +94,7 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
child: Center(child: Obx(() { child: Center(child: Obx(() {
return Text( return Text(
'考试', '考试',
style: TextStyle( style: TextStyle(fontSize: 14.sp, color: !state.isJob.value ? Color(0xFF7491FD) : Color(0xFF505E6E)),
fontSize: 14.sp,
color: !state.isJob.value
? Color(0xFF7491FD)
: Color(0xFF505E6E)),
); );
})), })),
), ),
@ -116,20 +105,14 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
Obx(() { Obx(() {
return Container( return Container(
margin: EdgeInsets.symmetric(vertical: 10.r, horizontal: 14.r), margin: EdgeInsets.symmetric(vertical: 10.r, horizontal: 14.r),
padding: EdgeInsets.only( padding: EdgeInsets.only(top: 10.r, left: 10.r, right: 10.r, bottom: 10.r),
top: 10.r, left: 10.r, right: 10.r, bottom: 10.r), decoration: BoxDecoration(borderRadius: BorderRadius.all(Radius.circular(10.r)), color: Colors.white),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(10.r)),
color: Colors.white),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
'总览：', '总览：',
style: TextStyle( style: TextStyle(fontSize: 12.sp, color: Color(0xFF7491FD), fontWeight: FontWeight.w600),
fontSize: 12.sp,
color: Color(0xFF7491FD),
fontWeight: FontWeight.w600),
), ),
ProgressBar( ProgressBar(
title: '客观题正确率：', title: '客观题正确率：',
@ -159,17 +142,11 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
jobType: state.isJob.value ? 1 : 2, jobType: state.isJob.value ? 1 : 2,
customTimeStr: state.customTimeStr.value, customTimeStr: state.customTimeStr.value,
customTime: logic.tabController.index != 2 || customTime: logic.tabController.index != 2 ||
((state.dateEnd == null || state.dateEnd == '') && ((state.dateEnd == null || state.dateEnd == '') && (state.dateStart == null || state.dateStart == ''))
(state.dateStart == null ||
state.dateStart == ''))
? null ? null
: PickerDateRange( : PickerDateRange(
state.dateStart == null || state.dateStart == '' state.dateStart == null || state.dateStart == '' ? null : DateTime.parse(state.dateStart!),
? null state.dateEnd == null || state.dateEnd == '' ? null : DateTime.parse(state.dateEnd!),
: DateTime.parse(state.dateStart!),
state.dateEnd == null || state.dateEnd == ''
? null
: DateTime.parse(state.dateEnd!),
), ),
onTimeFilter: (String? startTime, String? endTime) { onTimeFilter: (String? startTime, String? endTime) {
EasyLoading.show(status: 'loading...'); EasyLoading.show(status: 'loading...');
@ -177,10 +154,8 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
if (logic.tabController.index == 2) { if (logic.tabController.index == 2) {
logic.tabController.animateTo(0); logic.tabController.animateTo(0);
} }
state.dateStart = state.dateStart = Utils.getWeekStartDate().toString().substring(0, 10);
Utils.getWeekStartDate().toString().substring(0, 10); state.dateEnd = Utils.getWeekEndDate().toString().substring(0, 10);
state.dateEnd =
Utils.getWeekEndDate().toString().substring(0, 10);
state.customTimeStr.value = '自定义'; state.customTimeStr.value = '自定义';
} else { } else {
state.dateStart = startTime ?? ''; state.dateStart = startTime ?? '';
@ -191,17 +166,13 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
}, },
refreshTime: (value) { refreshTime: (value) {
if (value != null && value.startDate != null) { if (value != null && value.startDate != null) {
state.customTimeStr.value = state.customTimeStr.value = value.startDate?.toString().substring(0, 10) ?? '';
value.startDate?.toString().substring(0, 10) ?? '';
if (value.endDate != null) { if (value.endDate != null) {
if (!Utils.isPad() && if (!Utils.isPad() && value.startDate!.year == value.endDate!.year) {
value.startDate!.year == value.endDate!.year) { state.customTimeStr.value = '${value.startDate.toString().substring(5, 10)}~${value.endDate.toString().substring(5, 10)}';
state.customTimeStr.value =
'${value.startDate.toString().substring(5, 10)}~${value.endDate.toString().substring(5, 10)}';
} else { } else {
state.customTimeStr.value = state.customTimeStr.value = '${state.customTimeStr.value}~${value.endDate?.toString().substring(0, 10)}';
'${state.customTimeStr.value}~${value.endDate?.toString().substring(0, 10)}';
} }
} }
} }
@ -323,40 +294,26 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
}, },
child: state.studentData.value.items.items.isNotEmpty child: state.studentData.value.items.items.isNotEmpty
? ListView.builder( ? ListView.builder(
itemCount: itemCount: state.studentData.value.items.items.length,
state.studentData.value.items.items.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
StudentItems item = StudentItems item = state.studentData.value.items.items[index];
state.studentData.value.items.items[index];
return InkWell( return InkWell(
onTap: () { onTap: () {
Get.toNamed(Routes.studentPersonalPage, Get.toNamed(Routes.studentPersonalPage, arguments: {'homeworkId': item.id, 'studentId': state.studentId});
arguments: {
'homeworkId': item.id,
'studentId': state.studentId
});
}, },
child: Container( child: Container(
margin: EdgeInsets.symmetric( margin: EdgeInsets.symmetric(vertical: 5.r, horizontal: 14.r),
vertical: 5.r, horizontal: 14.r), padding: EdgeInsets.symmetric(vertical: 14.r, horizontal: 10.r),
padding: EdgeInsets.symmetric(
vertical: 14.r, horizontal: 10.r),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(Radius.circular(10.r)),
Radius.circular(10.r)), color: item.allNotDone ? const Color(0xFFFFEDD3) : Colors.white),
color: item.allNotDone
? const Color(0xFFFFEDD3)
: Colors.white),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: [ children: [
Row( Row(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.start,
MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.end,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Container( Container(
width: 32.w, width: 32.w,
@ -364,33 +321,24 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
alignment: Alignment.center, alignment: Alignment.center,
padding: EdgeInsets.only(left: 2.w), padding: EdgeInsets.only(left: 2.w),
decoration: BoxDecoration( decoration: BoxDecoration(
color: state.isJob.value color: state.isJob.value ? const Color.fromRGBO(104, 136, 253, 1) : const Color(0xFFFFA116),
? const Color.fromRGBO(
104, 136, 253, 1)
: const Color(0xFFFFA116),
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
topLeft: Radius.circular(14.r), topLeft: Radius.circular(14.r),
topRight: Radius.circular(3.r), topRight: Radius.circular(3.r),
bottomLeft: bottomLeft: Radius.circular(4.r),
Radius.circular(4.r), bottomRight: Radius.circular(4.r),
bottomRight:
Radius.circular(4.r),
), ),
), ),
margin: EdgeInsets.only(right: 4.w), margin: EdgeInsets.only(right: 4.w),
child: Text( child: Text(
state.isJob.value ? '作业' : '考试', state.isJob.value ? '作业' : '考试',
style: TextStyle( style: TextStyle(fontSize: 10.sp, color: Colors.white),
fontSize: 10.sp,
color: Colors.white),
), ),
), ),
Expanded( Expanded(
child: Text( child: Text(
item.name, item.name,
style: TextStyle( style: TextStyle(fontSize: 12.sp, color: Color(0xFF464646)),
fontSize: 12.sp,
color: Color(0xFF464646)),
)), )),
// SizedBox(width: 5.r,), // SizedBox(width: 5.r,),
// Text('2024.1',style: TextStyle(fontSize: 12.sp,color: Color(0xFF5B5B5B)),), // Text('2024.1',style: TextStyle(fontSize: 12.sp,color: Color(0xFF5B5B5B)),),
@ -399,19 +347,13 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
width: 40.r, width: 40.r,
height: 20.r, height: 20.r,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(Radius.circular(4.r)),
Radius.circular(4.r)), border: Border.all(width: 1.r, color: Color(0xFF4CC793)),
border: Border.all(
width: 1.r,
color: Color(0xFF4CC793)),
), ),
child: Center( child: Center(
child: Text( child: Text(
EnumUtils.formatSubject( EnumUtils.formatSubject(item.subject),
item.subject), style: TextStyle(fontSize: 10.sp, color: Color(0xFF4CC793)),
style: TextStyle(
fontSize: 10.sp,
color: Color(0xFF4CC793)),
)), )),
), ),
], ],
@ -420,14 +362,11 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
height: 10.r, height: 10.r,
), ),
Row( Row(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: [ children: [
Text( Text(
'客：', '客：',
style: TextStyle( style: TextStyle(fontSize: 12.sp, color: Color(0xFF5B5B5B)),
fontSize: 12.sp,
color: Color(0xFF5B5B5B)),
), ),
SizedBox( SizedBox(
width: 5.r, width: 5.r,
@ -436,15 +375,11 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
? Expanded( ? Expanded(
child: Wrap( child: Wrap(
direction: Axis.horizontal, direction: Axis.horizontal,
alignment: alignment: WrapAlignment.start,
WrapAlignment.start,
spacing: 8, spacing: 8,
runSpacing: 5, runSpacing: 5,
children: List.generate( children: List.generate(item.kgtList.length, (i) {
item.kgtList.length, KgtList subjective = item.kgtList[i];
(i) {
KgtList subjective =
item.kgtList[i];
return Container( return Container(
width: 20.r, width: 20.r,
height: 20.r, height: 20.r,
@ -462,25 +397,16 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
borderRadius: BorderRadius.all(Radius.circular(10.r))), borderRadius: BorderRadius.all(Radius.circular(10.r))),
child: Center( child: Center(
child: Text( child: Text(
subjective.questionNo subjective.questionNo.toString(),
.toString(),
style: TextStyle( style: TextStyle(
fontSize: 10.r, fontSize: 10.r,
color: subjective color: subjective.state == 0
.state == ? Color(0xFFDDDDDD)
0 : subjective.state == 3
? Color( ? Color(0xFF4CC793)
0xFFDDDDDD) : subjective.state == 2
: subjective.state == ? Color(0xFFFF7474)
3 : Color(0xFF666666)),
? Color(
0xFF4CC793)
: subjective.state ==
2
? Color(
0xFFFF7474)
: Color(
0xFF666666)),
)), )),
); );
}), }),
@ -488,9 +414,7 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
) )
: Text( : Text(
'无', '无',
style: TextStyle( style: TextStyle(fontSize: 12.sp, color: Color(0xFF5B5B5B)),
fontSize: 12.sp,
color: Color(0xFF5B5B5B)),
), ),
], ],
), ),
@ -498,14 +422,11 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
height: 10.r, height: 10.r,
), ),
Row( Row(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: [ children: [
Text( Text(
'主：', '主：',
style: TextStyle( style: TextStyle(fontSize: 12.sp, color: Color(0xFF5B5B5B)),
fontSize: 12.sp,
color: Color(0xFF5B5B5B)),
), ),
SizedBox( SizedBox(
width: 5.r, width: 5.r,
@ -514,15 +435,11 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
? Expanded( ? Expanded(
child: Wrap( child: Wrap(
direction: Axis.horizontal, direction: Axis.horizontal,
alignment: alignment: WrapAlignment.start,
WrapAlignment.start,
spacing: 8, spacing: 8,
runSpacing: 5, runSpacing: 5,
children: List.generate( children: List.generate(item.zgtList.length, (i) {
item.zgtList.length, ZgtList subjective = item.zgtList[i];
(i) {
ZgtList subjective =
item.zgtList[i];
return Container( return Container(
width: 20.r, width: 20.r,
height: 20.r, height: 20.r,
@ -540,25 +457,16 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
borderRadius: BorderRadius.all(Radius.circular(10.r))), borderRadius: BorderRadius.all(Radius.circular(10.r))),
child: Center( child: Center(
child: Text( child: Text(
subjective.questionNo subjective.questionNo.toString(),
.toString(),
style: TextStyle( style: TextStyle(
fontSize: 10.r, fontSize: 10.r,
color: subjective color: subjective.state == 0
.state == ? Color(0xFFDDDDDD)
0 : subjective.state == 3
? Color( ? Color(0xFF4CC793)
0xFFDDDDDD) : subjective.state == 2
: subjective.state == ? Color(0xFFFF7474)
3 : Color(0xFF666666)),
? Color(
0xFF4CC793)
: subjective.state ==
2
? Color(
0xFFFF7474)
: Color(
0xFF666666)),
)), )),
); );
}), }),
@ -566,9 +474,7 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
) )
: Text( : Text(
'无', '无',
style: TextStyle( style: TextStyle(fontSize: 12.sp, color: Color(0xFF5B5B5B)),
fontSize: 12.sp,
color: Color(0xFF5B5B5B)),
), ),
], ],
), ),
@ -603,7 +509,6 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
], ],
), ),
); );
});
} }
@override @override

2
making_school_asignment_app/lib/page/home_page/home_view.dart
View File

@ -167,7 +167,7 @@ class _HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin
bottomRight: Radius.circular(4.r), bottomRight: Radius.circular(4.r),
), ),
), ),
margin: EdgeInsets.only(top:3.h,right: 4.w), margin: EdgeInsets.only(right: 4.w),
child: quickText(state.type == 1 ? '作业' : '考试', color: Colors.white, size: 10.sp), child: quickText(state.type == 1 ? '作业' : '考试', color: Colors.white, size: 10.sp),
), ),
Expanded( Expanded(