diff --git a/marking_app/lib/pages/homework_correction/pages/job_list_participate_in_class.dart b/marking_app/lib/pages/homework_correction/pages/job_list_participate_in_class.dart index 92ba990..5cee9ee 100644 --- a/marking_app/lib/pages/homework_correction/pages/job_list_participate_in_class.dart +++ b/marking_app/lib/pages/homework_correction/pages/job_list_participate_in_class.dart @@ -293,7 +293,8 @@ class _JobListParticipateInClassState extends State w void quickDataCheck(MarkingTasks task) { RouterManager.router.navigateTo( 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(), ); } @@ -602,7 +603,7 @@ class TabletEndCompleted extends StatelessWidget { marginEdg: EdgeInsets.only(top: 5.h), ), $CompletedHomeworkProgressBar( - color: Color.fromRGBO(255, 190, 91, 1), + color: Color.fromRGBO(76, 199, 147, 1), percent: taskItem.subjectivePrecision, title: '主观题正确率：', fontSize: 8.sp, @@ -611,7 +612,7 @@ class TabletEndCompleted extends StatelessWidget { marginEdg: EdgeInsets.only(top: 5.h), ), $CompletedHomeworkProgressBar( - color: Color.fromRGBO(166, 139, 242, 1), + color: Color.fromRGBO(76, 199, 147, 1), percent: taskItem.precision, title: '总正确率：', fontSize: 8.sp, @@ -715,7 +716,7 @@ class TabletEndCompleted extends StatelessWidget { onTap: () => easyThrottle('go_to_review_homework', () => quickDataCheck(taskItem)), child: Container( 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) $CompletedHomeworkProgressBar( - color: Color.fromRGBO(255, 190, 91, 1), + color: Color.fromRGBO(76, 199, 147, 1), percent: task.subjectivePrecision, title: '主观题正确率：', padingEdg: padingEdg, @@ -806,7 +807,7 @@ class MobileEndCompleted extends StatelessWidget { ), if (task.isFinish) $CompletedHomeworkProgressBar( - color: Color.fromRGBO(166, 139, 242, 1), + color: Color.fromRGBO(76, 199, 147, 1), percent: task.precision, title: '总正确率：', padingEdg: padingEdg, @@ -904,7 +905,7 @@ class MobileEndCompleted extends StatelessWidget { onTap: () => easyThrottle('go_to_review_homework', () => quickDataCheck(task)), child: Container( 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), - Padding( - padding: EdgeInsets.only(left: 10.w, right: 10.w), - child: Row( - children: [ - Expanded( - child: LinearPercentIndicator( - padding: EdgeInsets.zero, - animation: true, - lineHeight: 5.h, - animationDuration: 2500, - percent: task.progressPercentage / 100, - linearGradient: LinearGradient( - tileMode: TileMode.mirror, - stops: [0.0, 1.0], - 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), - ], + if (!task.isFinish) + Padding( + padding: EdgeInsets.only(left: 10.w, right: 10.w), + child: Row( + children: [ + Expanded( + child: LinearPercentIndicator( + padding: EdgeInsets.zero, + animation: true, + lineHeight: 5.h, + animationDuration: 2500, + percent: task.progressPercentage / 100, + linearGradient: LinearGradient( + tileMode: TileMode.mirror, + stops: [0.0, 1.0], + 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), + ], + ), + 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), - quickText('${getDoubleRemoveZero(task.progressPercentage)}%', - size: 8.sp, color: Color.fromRGBO(70, 70, 70, 1)) - ], + SizedBox(width: 7.w), + quickText('${getDoubleRemoveZero(task.progressPercentage)}%', + size: 8.sp, color: Color.fromRGBO(70, 70, 70, 1)) + ], + ), ), - ), if (task.isFinish) $CompletedHomeworkProgressBar( fontSize: 8.sp, @@ -1168,7 +1170,7 @@ Widget $itemDataViewOfPad( $CompletedHomeworkProgressBar( fontSize: 8.sp, lineHeight: 6.h, - color: Color.fromRGBO(255, 190, 91, 1), + color: Color.fromRGBO(76, 199, 147, 1), percent: task.subjectivePrecision, title: '主观题正确率：', padingEdg: edgins, @@ -1178,7 +1180,7 @@ Widget $itemDataViewOfPad( $CompletedHomeworkProgressBar( fontSize: 8.sp, lineHeight: 6.h, - color: Color.fromRGBO(166, 139, 242, 1), + color: Color.fromRGBO(76, 199, 147, 1), percent: task.precision, title: '总正确率：', padingEdg: edgins, @@ -1206,7 +1208,7 @@ Widget $itemDataViewOfPad( onTap: () => easyThrottle('go_to_review_homework', () => quickDataCheck(task)), child: Container( 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), - Padding( - padding: padingEdg, - child: Row( - children: [ - Expanded( - child: LinearPercentIndicator( - padding: EdgeInsets.zero, - animation: true, - lineHeight: 8.h, - animationDuration: 2500, + SizedBox(height: 10.h), + if (!task.isFinish) + Padding( + padding: padingEdg, + child: Row( + children: [ + Expanded( + child: LinearPercentIndicator( + padding: EdgeInsets.zero, + animation: true, + lineHeight: 8.h, + animationDuration: 2500, - percent: task.progressPercentage / 100, - // center: Text( - // '${getDoubleRemoveZero(jobTaskClassItem.progressPercentage)}%', - // style: TextStyle(color: Colors.white, fontSize: 8.sp), - // ), - linearGradient: LinearGradient( - tileMode: TileMode.mirror, - stops: [0.0, 1.0], - 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), - ], + percent: task.progressPercentage / 100, + // center: Text( + // '${getDoubleRemoveZero(jobTaskClassItem.progressPercentage)}%', + // style: TextStyle(color: Colors.white, fontSize: 8.sp), + // ), + linearGradient: LinearGradient( + tileMode: TileMode.mirror, + stops: [0.0, 1.0], + 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), + ], + ), + // 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), - quickText('${getDoubleRemoveZero(task.progressPercentage)}%', - size: 10.sp, color: Color.fromRGBO(70, 70, 70, 1)) - ], + SizedBox(width: 7.w), + quickText('${getDoubleRemoveZero(task.progressPercentage)}%', + size: 10.sp, color: Color.fromRGBO(70, 70, 70, 1)) + ], + ), ), - ), if (task.isFinish) $CompletedHomeworkProgressBar( color: Color.fromRGBO(76, 199, 147, 1), @@ -1446,7 +1449,7 @@ Widget $itemDataView( ), if (task.isFinish) $CompletedHomeworkProgressBar( - color: Color.fromRGBO(255, 190, 91, 1), + color: Color.fromRGBO(76, 199, 147, 1), percent: task.subjectivePrecision, title: '主观题正确率：', padingEdg: padingEdg, @@ -1454,7 +1457,7 @@ Widget $itemDataView( ), if (task.isFinish) $CompletedHomeworkProgressBar( - color: Color.fromRGBO(166, 139, 242, 1), + color: Color.fromRGBO(76, 199, 147, 1), percent: task.precision, title: '总正确率：', padingEdg: padingEdg, @@ -1485,7 +1488,7 @@ Widget $itemDataView( onTap: () => easyThrottle('go_to_review_homework', () => quickDataCheck(task)), child: Container( 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)), child: Container( 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, }) { var percentStr = '${doubleToStringAsFixed(percent * 100)}%'; - print(fontSize); fontSize ??= 10.sp; lineHeight ??= 8.h; return Container( diff --git a/marking_app/pubspec.yaml b/marking_app/pubspec.yaml index 7ce9aeb..2c078b5 100644 --- a/marking_app/pubspec.yaml +++ b/marking_app/pubspec.yaml @@ -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. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.0.98 +version: 1.0.101 environment: sdk: ">=2.17.1 <3.0.0"