marking
/
Marking.Client.Moblie
19
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

This commit is contained in:
1147192855@qq.com 2024-03-22 09:57:00 +08:00
parent ad655b7cca
commit 2bf8ae88f6
2 changed files with 81 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
marking_app/lib/pages/homework_correction/pages/job_list_participate_in_class.dart
View File

@ -293,7 +293,8 @@ class _JobListParticipateInClassState extends State<JobListParticipateInClass> w
void quickDataCheck(MarkingTasks task) { void quickDataCheck(MarkingTasks task) {
RouterManager.router.navigateTo( RouterManager.router.navigateTo(
context, context,
RouterManager.quickDataCheckPath + '?className=${Uri.encodeComponent(task.className)}&jobId=${widget.jobId}', RouterManager.quickDataCheckPath +
'?gradeName=${Uri.encodeComponent(widget.genderName)}&className=${Uri.encodeComponent(task.className)}&jobId=${widget.jobId}',
transition: getTransition(), transition: getTransition(),
); );
} }
@ -602,7 +603,7 @@ class TabletEndCompleted extends StatelessWidget {
marginEdg: EdgeInsets.only(top: 5.h), marginEdg: EdgeInsets.only(top: 5.h),
), ),
$CompletedHomeworkProgressBar( $CompletedHomeworkProgressBar(
color: Color.fromRGBO(255, 190, 91, 1), color: Color.fromRGBO(76, 199, 147, 1),
percent: taskItem.subjectivePrecision, percent: taskItem.subjectivePrecision,
title: '主观题正确率：', title: '主观题正确率：',
fontSize: 8.sp, fontSize: 8.sp,
@ -611,7 +612,7 @@ class TabletEndCompleted extends StatelessWidget {
marginEdg: EdgeInsets.only(top: 5.h), marginEdg: EdgeInsets.only(top: 5.h),
), ),
$CompletedHomeworkProgressBar( $CompletedHomeworkProgressBar(
color: Color.fromRGBO(166, 139, 242, 1), color: Color.fromRGBO(76, 199, 147, 1),
percent: taskItem.precision, percent: taskItem.precision,
title: '总正确率：', title: '总正确率：',
fontSize: 8.sp, fontSize: 8.sp,
@ -715,7 +716,7 @@ class TabletEndCompleted extends StatelessWidget {
onTap: () => easyThrottle('go_to_review_homework', () => quickDataCheck(taskItem)), onTap: () => easyThrottle('go_to_review_homework', () => quickDataCheck(taskItem)),
child: Container( child: Container(
alignment: Alignment.center, alignment: Alignment.center,
child: quickText('数据快查', color: Color.fromRGBO(79, 79, 79, 1), size: 11.sp), child: quickText('数据快查', color: Color.fromRGBO(118, 118, 118, 1), size: 11.sp),
), ),
), ),
), ),
@ -798,7 +799,7 @@ class MobileEndCompleted extends StatelessWidget {
), ),
if (task.isFinish) if (task.isFinish)
$CompletedHomeworkProgressBar( $CompletedHomeworkProgressBar(
color: Color.fromRGBO(255, 190, 91, 1), color: Color.fromRGBO(76, 199, 147, 1),
percent: task.subjectivePrecision, percent: task.subjectivePrecision,
title: '主观题正确率：', title: '主观题正确率：',
padingEdg: padingEdg, padingEdg: padingEdg,
@ -806,7 +807,7 @@ class MobileEndCompleted extends StatelessWidget {
), ),
if (task.isFinish) if (task.isFinish)
$CompletedHomeworkProgressBar( $CompletedHomeworkProgressBar(
color: Color.fromRGBO(166, 139, 242, 1), color: Color.fromRGBO(76, 199, 147, 1),
percent: task.precision, percent: task.precision,
title: '总正确率：', title: '总正确率：',
padingEdg: padingEdg, padingEdg: padingEdg,
@ -904,7 +905,7 @@ class MobileEndCompleted extends StatelessWidget {
onTap: () => easyThrottle('go_to_review_homework', () => quickDataCheck(task)), onTap: () => easyThrottle('go_to_review_homework', () => quickDataCheck(task)),
child: Container( child: Container(
alignment: Alignment.center, alignment: Alignment.center,
child: quickText('数据快查', color: Color.fromRGBO(79, 79, 79, 1), size: 13.sp), child: quickText('数据快查', color: Color.fromRGBO(118, 118, 118, 1), size: 12.sp),
), ),
), ),
), ),
@ -1123,37 +1124,38 @@ Widget $itemDataViewOfPad(
), ),
), ),
SizedBox(height: 8.h), SizedBox(height: 8.h),
Padding( if (!task.isFinish)
padding: EdgeInsets.only(left: 10.w, right: 10.w), Padding(
child: Row( padding: EdgeInsets.only(left: 10.w, right: 10.w),
children: [ child: Row(
Expanded( children: [
child: LinearPercentIndicator( Expanded(
padding: EdgeInsets.zero, child: LinearPercentIndicator(
animation: true, padding: EdgeInsets.zero,
lineHeight: 5.h, animation: true,
animationDuration: 2500, lineHeight: 5.h,
percent: task.progressPercentage / 100, animationDuration: 2500,
linearGradient: LinearGradient( percent: task.progressPercentage / 100,
tileMode: TileMode.mirror, linearGradient: LinearGradient(
stops: [0.0, 1.0], tileMode: TileMode.mirror,
colors: task.progressPercentage / 100 != 1 stops: [0.0, 1.0],
? [Theme.of(context).primaryColor.withOpacity(0.1), Theme.of(context).primaryColor] colors: task.progressPercentage / 100 != 1
: [ ? [Theme.of(context).primaryColor.withOpacity(0.1), Theme.of(context).primaryColor]
Color.fromRGBO(144, 224, 190, 1).withOpacity(0.1), : [
Color.fromRGBO(144, 224, 190, 1), Color.fromRGBO(144, 224, 190, 1).withOpacity(0.1),
], Color.fromRGBO(144, 224, 190, 1),
],
),
backgroundColor: Color.fromRGBO(232, 232, 232, 1),
barRadius: Radius.circular(10.r),
), ),
backgroundColor: Color.fromRGBO(232, 232, 232, 1),
barRadius: Radius.circular(10.r),
), ),
), SizedBox(width: 7.w),
SizedBox(width: 7.w), quickText('${getDoubleRemoveZero(task.progressPercentage)}%',
quickText('${getDoubleRemoveZero(task.progressPercentage)}%', size: 8.sp, color: Color.fromRGBO(70, 70, 70, 1))
size: 8.sp, color: Color.fromRGBO(70, 70, 70, 1)) ],
], ),
), ),
),
if (task.isFinish) if (task.isFinish)
$CompletedHomeworkProgressBar( $CompletedHomeworkProgressBar(
fontSize: 8.sp, fontSize: 8.sp,
@ -1168,7 +1170,7 @@ Widget $itemDataViewOfPad(
$CompletedHomeworkProgressBar( $CompletedHomeworkProgressBar(
fontSize: 8.sp, fontSize: 8.sp,
lineHeight: 6.h, lineHeight: 6.h,
color: Color.fromRGBO(255, 190, 91, 1), color: Color.fromRGBO(76, 199, 147, 1),
percent: task.subjectivePrecision, percent: task.subjectivePrecision,
title: '主观题正确率：', title: '主观题正确率：',
padingEdg: edgins, padingEdg: edgins,
@ -1178,7 +1180,7 @@ Widget $itemDataViewOfPad(
$CompletedHomeworkProgressBar( $CompletedHomeworkProgressBar(
fontSize: 8.sp, fontSize: 8.sp,
lineHeight: 6.h, lineHeight: 6.h,
color: Color.fromRGBO(166, 139, 242, 1), color: Color.fromRGBO(76, 199, 147, 1),
percent: task.precision, percent: task.precision,
title: '总正确率：', title: '总正确率：',
padingEdg: edgins, padingEdg: edgins,
@ -1206,7 +1208,7 @@ Widget $itemDataViewOfPad(
onTap: () => easyThrottle('go_to_review_homework', () => quickDataCheck(task)), onTap: () => easyThrottle('go_to_review_homework', () => quickDataCheck(task)),
child: Container( child: Container(
alignment: Alignment.center, alignment: Alignment.center,
child: quickText('数据快查', color: Color.fromRGBO(79, 79, 79, 1), size: 13.sp), child: quickText('数据快查', color: Color.fromRGBO(118, 118, 118, 1), size: 12.sp),
), ),
), ),
), ),
@ -1397,45 +1399,46 @@ Widget $itemDataView(
], ],
), ),
), ),
SizedBox(height: 13.h), SizedBox(height: 10.h),
Padding( if (!task.isFinish)
padding: padingEdg, Padding(
child: Row( padding: padingEdg,
children: [ child: Row(
Expanded( children: [
child: LinearPercentIndicator( Expanded(
padding: EdgeInsets.zero, child: LinearPercentIndicator(
animation: true, padding: EdgeInsets.zero,
lineHeight: 8.h, animation: true,
animationDuration: 2500, lineHeight: 8.h,
animationDuration: 2500,
percent: task.progressPercentage / 100, percent: task.progressPercentage / 100,
// center: Text( // center: Text(
// '${getDoubleRemoveZero(jobTaskClassItem.progressPercentage)}%', // '${getDoubleRemoveZero(jobTaskClassItem.progressPercentage)}%',
// style: TextStyle(color: Colors.white, fontSize: 8.sp), // style: TextStyle(color: Colors.white, fontSize: 8.sp),
// ), // ),
linearGradient: LinearGradient( linearGradient: LinearGradient(
tileMode: TileMode.mirror, tileMode: TileMode.mirror,
stops: [0.0, 1.0], stops: [0.0, 1.0],
colors: task.progressPercentage / 100 != 1 colors: task.progressPercentage / 100 != 1
? [Theme.of(context).primaryColor.withOpacity(0.1), Theme.of(context).primaryColor] ? [Theme.of(context).primaryColor.withOpacity(0.1), Theme.of(context).primaryColor]
: [ : [
Color.fromRGBO(144, 224, 190, 1).withOpacity(0.1), Color.fromRGBO(144, 224, 190, 1).withOpacity(0.1),
Color.fromRGBO(144, 224, 190, 1), Color.fromRGBO(144, 224, 190, 1),
], ],
),
// linearStrokeCap: LinearStrokeCap.butt,
// progressColor: Theme.of(context).primaryColor,
backgroundColor: Color.fromRGBO(232, 232, 232, 1),
barRadius: Radius.circular(10.r),
), ),
// linearStrokeCap: LinearStrokeCap.butt,
// progressColor: Theme.of(context).primaryColor,
backgroundColor: Color.fromRGBO(232, 232, 232, 1),
barRadius: Radius.circular(10.r),
), ),
), SizedBox(width: 7.w),
SizedBox(width: 7.w), quickText('${getDoubleRemoveZero(task.progressPercentage)}%',
quickText('${getDoubleRemoveZero(task.progressPercentage)}%', size: 10.sp, color: Color.fromRGBO(70, 70, 70, 1))
size: 10.sp, color: Color.fromRGBO(70, 70, 70, 1)) ],
], ),
), ),
),
if (task.isFinish) if (task.isFinish)
$CompletedHomeworkProgressBar( $CompletedHomeworkProgressBar(
color: Color.fromRGBO(76, 199, 147, 1), color: Color.fromRGBO(76, 199, 147, 1),
@ -1446,7 +1449,7 @@ Widget $itemDataView(
), ),
if (task.isFinish) if (task.isFinish)
$CompletedHomeworkProgressBar( $CompletedHomeworkProgressBar(
color: Color.fromRGBO(255, 190, 91, 1), color: Color.fromRGBO(76, 199, 147, 1),
percent: task.subjectivePrecision, percent: task.subjectivePrecision,
title: '主观题正确率：', title: '主观题正确率：',
padingEdg: padingEdg, padingEdg: padingEdg,
@ -1454,7 +1457,7 @@ Widget $itemDataView(
), ),
if (task.isFinish) if (task.isFinish)
$CompletedHomeworkProgressBar( $CompletedHomeworkProgressBar(
color: Color.fromRGBO(166, 139, 242, 1), color: Color.fromRGBO(76, 199, 147, 1),
percent: task.precision, percent: task.precision,
title: '总正确率：', title: '总正确率：',
padingEdg: padingEdg, padingEdg: padingEdg,
@ -1485,7 +1488,7 @@ Widget $itemDataView(
onTap: () => easyThrottle('go_to_review_homework', () => quickDataCheck(task)), onTap: () => easyThrottle('go_to_review_homework', () => quickDataCheck(task)),
child: Container( child: Container(
alignment: Alignment.center, alignment: Alignment.center,
child: quickText('数据快查', color: Color.fromRGBO(79, 79, 79, 1), size: 13.sp), child: quickText('数据快查', color: Color.fromRGBO(118, 118, 118, 1), size: 12.sp),
), ),
), ),
), ),
@ -1505,7 +1508,7 @@ Widget $itemDataView(
onTap: () => easyThrottle('go_to_review_homework', () => goToReview(task)), onTap: () => easyThrottle('go_to_review_homework', () => goToReview(task)),
child: Container( child: Container(
alignment: Alignment.center, alignment: Alignment.center,
child: quickText('批阅', color: Color.fromRGBO(79, 79, 79, 1), size: 13.sp), child: quickText('批阅', color: Color.fromRGBO(79, 79, 79, 1), size: 12.sp),
), ),
), ),
), ),
@ -1537,7 +1540,6 @@ Widget $completedHomeworkProgressBar(
required EdgeInsets marginEdg, required EdgeInsets marginEdg,
}) { }) {
var percentStr = '${doubleToStringAsFixed(percent * 100)}%'; var percentStr = '${doubleToStringAsFixed(percent * 100)}%';
print(fontSize);
fontSize ??= 10.sp; fontSize ??= 10.sp;
lineHeight ??= 8.h; lineHeight ??= 8.h;
return Container( return Container(

2
marking_app/pubspec.yaml
View File

@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at # Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.0.98 version: 1.0.101
environment: environment:
sdk: ">=2.17.1 <3.0.0" sdk: ">=2.17.1 <3.0.0"