mcy_new #1

Merged
wangyang merged 179 commits from mcy_new into master 2025-08-28 10:10:45 +08:00
83 changed files with 76 additions and 74 deletions
Showing only changes of commit 04315a197b - Show all commits

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 917 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 839 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 948 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 722 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 803 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 891 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 997 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 381 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 534 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 107 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 917 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 839 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 948 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 722 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 803 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 891 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 997 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 381 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 534 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 107 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 297 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 917 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 839 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 948 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 722 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 803 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 891 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 997 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 381 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 534 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 107 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 338 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 917 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 839 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 948 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 722 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 803 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 891 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 997 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 381 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 534 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 107 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 KiB

View File

@ -45,8 +45,8 @@ class MyApp extends StatelessWidget {
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
theme: ThemeData( theme: ThemeData(
brightness: Brightness.light, brightness: Brightness.light,
primarySwatch: createMaterialColor(const Color.fromRGBO(46, 91, 255, 1)), primarySwatch: createMaterialColor(const Color.fromRGBO(76, 199, 147, 1)),
primaryColor: const Color.fromRGBO(46, 91, 255, 1), primaryColor: const Color.fromRGBO(76, 199, 147, 1),
// textTheme: Typography.englishLike2018.apply(fontSizeFactor: 1.sp,), // textTheme: Typography.englishLike2018.apply(fontSizeFactor: 1.sp,),
primaryTextTheme: TextTheme( primaryTextTheme: TextTheme(
bodyLarge: TextStyle(fontSize: 14.sp, color: Colors.black87), bodyLarge: TextStyle(fontSize: 14.sp, color: Colors.black87),
@ -54,7 +54,7 @@ class MyApp extends StatelessWidget {
useMaterial3: false, useMaterial3: false,
colorScheme: const ColorScheme.light( colorScheme: const ColorScheme.light(
// //
primary: Color.fromRGBO(46, 91, 255, 1), primary: Color.fromRGBO(76, 199, 147, 1),
)), )),
enableLog: true, enableLog: true,
logWriterCallback: (text, {bool isError = false}) { logWriterCallback: (text, {bool isError = false}) {

View File

@ -73,7 +73,7 @@ class MyBottomNavigationBar extends StatelessWidget {
Text( Text(
e['title'] as String, e['title'] as String,
style: TextStyle( style: TextStyle(
color: active == (e['id'] as int) ? const Color(0xFF6888FD) : const Color(0xFF767676), color: active == (e['id'] as int) ? const Color(0xFFE8E8E8) : const Color(0xFF767676),
fontSize: 11.sp, fontSize: 11.sp,
), ),
strutStyle: StrutStyle(fontSize: 16.sp), strutStyle: StrutStyle(fontSize: 16.sp),

View File

@ -21,7 +21,7 @@ class AnnotateClassLogic extends GetxController with RequestToolMixin {
super.onInit(); super.onInit();
state.preIndex = Get.arguments['tabIndex'] ?? 3; state.preIndex = Get.arguments['tabIndex'] ?? 3;
if(state.preIndex != 3){ if(state.preIndex != 3){
readOverController = Get.find(); // readOverController = Get.find();
} }
refreshController = EasyRefreshController(); refreshController = EasyRefreshController();
state.homeworkId.value = Get.arguments['id'] ?? ''; state.homeworkId.value = Get.arguments['id'] ?? '';

View File

@ -124,9 +124,9 @@ class _AnnotateClassPageState extends State<AnnotateClassPage> {
Get.delete<AnnotateClassLogic>(); Get.delete<AnnotateClassLogic>();
super.dispose(); super.dispose();
if(state.preIndex != 3){ if(state.preIndex != 3){
logic.readOverController.state.tabIndex.value = state.preIndex; // logic.readOverController.state.tabIndex.value = state.preIndex;
}else{ }else{
logic.homeController.getList(); // logic.homeController.getList();
} }
} }

View File

@ -46,7 +46,7 @@ class _AnnotateItemState extends State<AnnotateItem> {
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: const Color(0xFF4CC793),
), ),
child: const Center( child: const Center(
child: Text( child: Text(
@ -104,7 +104,7 @@ class _AnnotateItemState extends State<AnnotateItem> {
const Spacer(), const Spacer(),
Text( Text(
'已交:${widget.item.commitStudentCount}', '已交:${widget.item.commitStudentCount}',
style: TextStyle(fontSize: widget.font - 2.sp, color: const Color(0xFF6888FD)), style: TextStyle(fontSize: widget.font - 2.sp, color: const Color(0xFF4CC793)),
), ),
SizedBox( SizedBox(
width: 20.r, width: 20.r,
@ -230,21 +230,21 @@ class _AnnotateItemState extends State<AnnotateItem> {
), ),
ProgressBar( ProgressBar(
title: '客观题正确率:', title: '客观题正确率:',
color: const Color(0xFFB8C7FF), color: const Color(0xFF4CC793),
percent: widget.item.kgtCorrectRate / 100, percent: widget.item.kgtCorrectRate / 100,
marginEdg: EdgeInsets.zero, marginEdg: EdgeInsets.zero,
padingEdg: EdgeInsets.only(top: 8.h, left: 14.r, right: 14.r), padingEdg: EdgeInsets.only(top: 8.h, left: 14.r, right: 14.r),
fontSize: widget.font - 2.sp), fontSize: widget.font - 2.sp),
ProgressBar( ProgressBar(
title: '主观题正确率:', title: '主观题正确率:',
color: const Color(0xFFB8C7FF), color: const Color(0xFF4CC793),
percent: widget.item.zgtCorrectRate / 100, percent: widget.item.zgtCorrectRate / 100,
padingEdg: EdgeInsets.symmetric(horizontal: 10.r), padingEdg: EdgeInsets.symmetric(horizontal: 10.r),
marginEdg: EdgeInsets.only(top: 8.h), marginEdg: EdgeInsets.only(top: 8.h),
fontSize: widget.font - 2.sp), fontSize: widget.font - 2.sp),
ProgressBar( ProgressBar(
title: '总正确率:', title: '总正确率:',
color: const Color(0xFFB8C7FF), color: const Color(0xFF4CC793),
percent: widget.item.correctRate / 100, percent: widget.item.correctRate / 100,
padingEdg: EdgeInsets.symmetric(horizontal: 10.r), padingEdg: EdgeInsets.symmetric(horizontal: 10.r),
marginEdg: EdgeInsets.only(top: 8.h), marginEdg: EdgeInsets.only(top: 8.h),

View File

@ -43,7 +43,7 @@ class CompletedAnnotateItem extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border(bottom: BorderSide(color: Color.fromRGBO(238, 238, 238, 1), width: 0.5.r)), border: Border(bottom: BorderSide(color: Color.fromRGBO(238, 238, 238, 1), width: 0.5.r)),
), ),
child: quickText(taskItem.className, color: Color.fromRGBO(104, 136, 253, 1), size: 12.sp), child: quickText(taskItem.className, color: Color(0xFF4CC793), size: 12.sp),
), ),
Column( Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,

View File

@ -14,7 +14,7 @@ class ItemBtn extends StatelessWidget {
child: ElevatedButton( child: ElevatedButton(
style: ButtonStyle( style: ButtonStyle(
overlayColor:WidgetStateProperty.all( overlayColor:WidgetStateProperty.all(
const Color(0xFF6888FD)), const Color(0xFFE8E8E8)),
backgroundColor: backgroundColor:
WidgetStateProperty.all( WidgetStateProperty.all(
const Color(0xFFF4F4F4)), const Color(0xFFF4F4F4)),

View File

@ -59,7 +59,7 @@ class _AnswerTrajectoryPageState extends State<AnswerTrajectoryPage> {
tabAlignment: TabAlignment.start, tabAlignment: TabAlignment.start,
indicator: const UnderlineTabIndicator( indicator: const UnderlineTabIndicator(
borderSide: BorderSide( borderSide: BorderSide(
color: const Color.fromRGBO(104, 136, 253, 1), color: const Color(0xFF4CC793),
), ),
), ),
@ -97,10 +97,10 @@ class _AnswerTrajectoryPageState extends State<AnswerTrajectoryPage> {
TextStyle(fontSize: 14.sp, color: Color(0xFF666666)), TextStyle(fontSize: 14.sp, color: Color(0xFF666666)),
labelStyle: TextStyle( labelStyle: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
color: Color(0xFF6888FD), color: Color(0xFF4CC793),
), ),
isScrollable: true, isScrollable: true,
labelColor: Color(0xFF6888FD), labelColor: Color(0xFF4CC793),
unselectedLabelColor: Color(0xFF666666), unselectedLabelColor: Color(0xFF666666),
indicatorSize: TabBarIndicatorSize.label, indicatorSize: TabBarIndicatorSize.label,
labelPadding: const EdgeInsets.all(0), labelPadding: const EdgeInsets.all(0),

View File

@ -63,7 +63,7 @@ class AnswerTrajectoryJob extends StatelessWidget {
padding: EdgeInsets.only(left: 2.w), padding: EdgeInsets.only(left: 2.w),
decoration: BoxDecoration( decoration: BoxDecoration(
color: color:
const Color.fromRGBO(104, 136, 253, 1), const Color(0xFF4CC793),
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),
@ -195,7 +195,7 @@ class AnswerTrajectoryJob extends StatelessWidget {
padding: EdgeInsets.only(left: 2.w), padding: EdgeInsets.only(left: 2.w),
decoration: BoxDecoration( decoration: BoxDecoration(
color: color:
const Color.fromRGBO(104, 136, 253, 1), const Color(0xFF4CC793),
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),

View File

@ -94,7 +94,7 @@ class _AnswerTrajectoryDetailPageState
fontSize: 10.sp, fontSize: 10.sp,
color: state.currentClass.value color: state.currentClass.value
.classId == item.classId .classId == item.classId
? Color(0xFF6888FD) ? Color(0xFF4CC793)
: Color(0xFF686868)), : Color(0xFF686868)),
), ),
), ),
@ -159,7 +159,7 @@ class _AnswerTrajectoryDetailPageState
item.studentName, item.studentName,
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
color: Color(0xFF6888FD)), color: Color(0xFF4CC793)),
)), )),
Container( Container(
@ -208,7 +208,7 @@ class _AnswerTrajectoryDetailPageState
item.studentName, item.studentName,
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
color: Color(0xFF6888FD)), color: Color(0xFF4CC793)),
)), )),
Container( Container(
height: 24.r, height: 24.r,

View File

@ -96,7 +96,7 @@ class _ClassStudentPageState extends State<ClassStudentPage> {
item.name, item.name,
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
color: const Color(0xFF6888FD)), color: const Color(0xFF4CC793)),
)), )),
state.page == 'answerTrajectory' state.page == 'answerTrajectory'
? Container( ? Container(
@ -121,7 +121,7 @@ class _ClassStudentPageState extends State<ClassStudentPage> {
width: 70.r, width: 70.r,
decoration: BoxDecoration( decoration: BoxDecoration(
color: color:
const Color(0xFF6888FD), const Color(0xFF4CC793),
borderRadius: borderRadius:
BorderRadius.all( BorderRadius.all(
Radius.circular( Radius.circular(
@ -272,7 +272,7 @@ class _ClassStudentPageState extends State<ClassStudentPage> {
item.name, item.name,
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
color: Color(0xFF6888FD)), color: Color(0xFF4CC793)),
)), )),
state.page == 'answerTrajectory' state.page == 'answerTrajectory'
? Container( ? Container(
@ -296,7 +296,7 @@ class _ClassStudentPageState extends State<ClassStudentPage> {
height: 24.r, height: 24.r,
width: 82.r, width: 82.r,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xFF6888FD), color: Color(0xFF4CC793),
borderRadius: borderRadius:
BorderRadius.all( BorderRadius.all(
Radius.circular( Radius.circular(

View File

@ -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: const Color(0xFF4CC793),
), ),
child: const Center( child: const Center(
child: Text( child: Text(

View File

@ -88,7 +88,7 @@ class _KnowledgePointsGraspPageState extends State<KnowledgePointsGraspPage> {
height: 30.r, height: 30.r,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(4.r), borderRadius: BorderRadius.circular(4.r),
color: Color(0xFF6888FD), color: Color(0xFF4CC793),
), ),
child: Center( child: Center(
child: Text( child: Text(
@ -200,19 +200,20 @@ class _KnowledgePointsGraspPageState extends State<KnowledgePointsGraspPage> {
height: 22.r, height: 22.r,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(20.r)), borderRadius: BorderRadius.all(Radius.circular(20.r)),
border: Border.all(width: 1.r, color: Color(0xFF6888FD)), border: Border.all(width: 1.r, color: Color(0xFF4CC793)),
), ),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Text( Text(
'${item.count}', '${item.count}',
style: TextStyle(fontSize: 10.sp, color: Color(0xFF6888FD)), style: TextStyle(fontSize: 10.sp, color: Color(0xFF4CC793)),
), ),
Image.asset( Image.asset(
'assets/images/right_icon_blue.png', 'assets/images/job_data_right_icon.png',
width: 8.r, width: 10.r,
height: 8.r, height: 10.r,
), ),
], ],
), ),

View File

@ -3,6 +3,7 @@ import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_easyrefresh/easy_refresh.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:making_school_asignment_app/common/config/request_config.dart';
import 'package:percent_indicator/percent_indicator.dart'; import 'package:percent_indicator/percent_indicator.dart';
import 'package:making_school_asignment_app/common/job/knowledge_report_detail.dart'; import 'package:making_school_asignment_app/common/job/knowledge_report_detail.dart';
import 'package:making_school_asignment_app/common/utils/toast_utils.dart'; import 'package:making_school_asignment_app/common/utils/toast_utils.dart';
@ -38,7 +39,7 @@ class _KnowledgePointsGraspDetailPageState extends State<KnowledgePointsGraspDet
content: Container( content: Container(
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
// height: MediaQuery.of(context).size.height, // height: MediaQuery.of(context).size.height,
child: Image.network(imgUrl), child: Image.network(RequestConfig.imgUrl + imgUrl),
), ),
); );
}, },
@ -190,7 +191,7 @@ class _KnowledgePointsGraspDetailPageState extends State<KnowledgePointsGraspDet
children: [ children: [
quickText('正确率', color: Color(0xFF4CC793), size: 10.sp), quickText('正确率', color: Color(0xFF4CC793), size: 10.sp),
Image.asset( Image.asset(
'assets/images/icon_back_green.png', 'assets/images/job_data_right_icon.png',
width: 8.r, width: 8.r,
height: 8.r, height: 8.r,
) )

View File

@ -40,7 +40,7 @@ class _QuickDataCheckPageState extends State<QuickDataCheckPage> {
height: MediaQuery.of(context).size.height, height: MediaQuery.of(context).size.height,
decoration: const BoxDecoration( decoration: const BoxDecoration(
gradient: LinearGradient(begin: Alignment.topCenter, end: Alignment.bottomCenter, colors: [ gradient: LinearGradient(begin: Alignment.topCenter, end: Alignment.bottomCenter, colors: [
Color(0xFF6889FD), Color(0xFF4CC793),
Color(0xFFF5F5F5), Color(0xFFF5F5F5),
], stops: [ ], stops: [
0.09, 0.09,

View File

@ -61,7 +61,7 @@ class _KgtZgtTableState extends State<KgtZgtTable> {
), ),
Text( Text(
'${widget.kgtOkRate}%', '${widget.kgtOkRate}%',
style: TextStyle(fontSize: 14.sp, color: Color(0xFF6888FD), fontWeight: FontWeight.w600), style: TextStyle(fontSize: 14.sp, color: Color(0xFF4CC793), fontWeight: FontWeight.w600),
), ),
], ],
), ),
@ -106,7 +106,7 @@ class _KgtZgtTableState extends State<KgtZgtTable> {
), ),
Text( Text(
'${widget.zgtOkRate}%', '${widget.zgtOkRate}%',
style: TextStyle(fontSize: 14.sp, color: const Color(0xFF6888FD), fontWeight: FontWeight.w600), style: TextStyle(fontSize: 14.sp, color: const Color(0xFF4CC793), fontWeight: FontWeight.w600),
), ),
], ],
), ),

View File

@ -58,7 +58,7 @@ class _QuickStudentDataTableState extends State<QuickStudentDataTable> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Text(item.studentName!, style: TextStyle(fontSize: 10.sp, color: const Color(0xFF6888FD), overflow: TextOverflow.ellipsis)), Text(item.studentName!, style: TextStyle(fontSize: 10.sp, color: const Color(0xFF4CC793), overflow: TextOverflow.ellipsis)),
SizedBox( SizedBox(
width: 5.r, width: 5.r,
), ),
@ -168,7 +168,7 @@ class _QuickStudentDataTableState extends State<QuickStudentDataTable> {
DataCell(Center( DataCell(Center(
child: Padding( child: Padding(
padding: EdgeInsets.symmetric(horizontal: 5.r), padding: EdgeInsets.symmetric(horizontal: 5.r),
child: Text('${item.zgtUnrated}', style: TextStyle(fontSize: 10.sp, color: const Color(0xFF6888FD))), child: Text('${item.zgtUnrated}', style: TextStyle(fontSize: 10.sp, color: const Color(0xFFE8E8E8))),
), ),
)), )),
], ],

View File

@ -185,17 +185,17 @@ class _ReportTableState extends State<ReportTable> {
Text( Text(
widget.isZG == true ? '主观题' : '客观题', widget.isZG == true ? '主观题' : '客观题',
style: TextStyle( style: TextStyle(
fontSize: 14.sp, color: const Color(0xFF436CFF)), fontSize: 14.sp, color: const Color(0xFF4CC793)),
), ),
Text( Text(
'', '',
style: TextStyle( style: TextStyle(
fontSize: 14.sp, color: const Color(0xFF436CFF)), fontSize: 14.sp, color: const Color(0xFF4CC793)),
), ),
Text( Text(
'$questionNo题', '$questionNo题',
style: TextStyle( style: TextStyle(
fontSize: 14.sp, color: Color(0xFF436CFF)), fontSize: 14.sp, color: Color(0xFF4CC793)),
), ),
], ],
), ),
@ -516,7 +516,7 @@ class _ReportTableState extends State<ReportTable> {
children: [ children: [
Text('${item.priorityInfo.length}人答错', Text('${item.priorityInfo.length}人答错',
style: TextStyle( style: TextStyle(
fontSize: 10.sp, color: const Color(0xFF6888FD))), fontSize: 10.sp, color: const Color(0xFF4CC793))),
Image.asset( Image.asset(
'assets/images/job_data_right_icon.png', 'assets/images/job_data_right_icon.png',
width: 10.r, width: 10.r,

View File

@ -95,7 +95,7 @@ class _ReadOverPageState extends State<ReadOverPage> {
), ),
labelStyle: TextStyle( labelStyle: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
color: const Color.fromRGBO(104, 136, 253, 1), color: const Color(0xFF4CC793),
), ),
// labelColor: const Color.fromRGBO(45, 56, 76, 1), // labelColor: const Color.fromRGBO(45, 56, 76, 1),
indicator: const UnderlineTabIndicator( indicator: const UnderlineTabIndicator(

View File

@ -298,7 +298,7 @@ Widget $reviewedItem({
alignment: Alignment.center, alignment: Alignment.center,
padding: EdgeInsets.only(left: 2.w), padding: EdgeInsets.only(left: 2.w),
decoration: BoxDecoration( decoration: BoxDecoration(
color: type == 1 ? const Color.fromRGBO(104, 136, 253, 1) : const Color.fromRGBO(255, 175, 56, 1), color: type == 1 ? const Color(0xFF4CC793) : const Color.fromRGBO(255, 175, 56, 1),
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),

View File

@ -64,7 +64,7 @@ class _TaskListItemState extends State<TaskListItem> {
alignment: Alignment.center, alignment: Alignment.center,
padding: EdgeInsets.only(left: Utils.isPad() ? 2.w : 3.w), padding: EdgeInsets.only(left: Utils.isPad() ? 2.w : 3.w),
decoration: BoxDecoration( decoration: BoxDecoration(
color: const Color.fromRGBO(104, 136, 253, 1), color: const Color(0xFF4CC793),
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),
@ -73,7 +73,7 @@ class _TaskListItemState extends State<TaskListItem> {
), ),
), ),
margin: EdgeInsets.only(right: 4.w), margin: EdgeInsets.only(right: 4.w),
child: quickText('作业', color: Colors.white, size: 10.sp), child: quickText( widget.jobTaskItem.assessType == 0?'作业':'考试', color: Colors.white, size: 10.sp),
), ),
Expanded( Expanded(
child: quickText( child: quickText(
@ -199,7 +199,7 @@ class _TaskListItemState extends State<TaskListItem> {
alignment: Alignment.center, alignment: Alignment.center,
padding: EdgeInsets.only(left: Utils.isPad() ? 2.w : 3.w), padding: EdgeInsets.only(left: Utils.isPad() ? 2.w : 3.w),
decoration: BoxDecoration( decoration: BoxDecoration(
color: widget.type == 1 ? const Color.fromRGBO(104, 136, 253, 1) : const Color.fromRGBO(255, 175, 56, 1), color: widget.type == 1 ? const Color(0xFF4CC793) : const Color.fromRGBO(255, 175, 56, 1),
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),
@ -208,7 +208,7 @@ class _TaskListItemState extends State<TaskListItem> {
), ),
), ),
margin: EdgeInsets.only(top:3.h,right: 4.w), margin: EdgeInsets.only(top:3.h,right: 4.w),
child: quickText(widget.type == 1 ? '作业' : '考试', color: Colors.white, size: 10.sp), child: quickText(widget.jobTaskItem.assessType == 0?'作业':'考试', color: Colors.white, size: 10.sp),
), ),
Expanded( Expanded(
child: quickText( child: quickText(

View File

@ -133,7 +133,7 @@ class _StudentPersonalPageState extends State<StudentPersonalPage> {
'${state.studentInfo.value.kgtCorrectRate}%', '${state.studentInfo.value.kgtCorrectRate}%',
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
color: const Color(0xFF6888FD), color: const Color(0xFF4CC793),
fontWeight: FontWeight.w600), fontWeight: FontWeight.w600),
); );
}), }),
@ -200,7 +200,7 @@ class _StudentPersonalPageState extends State<StudentPersonalPage> {
'${state.studentInfo.value.zgtCorrectRate}%', '${state.studentInfo.value.zgtCorrectRate}%',
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
color: const Color(0xFF6888FD), color: const Color(0xFF4CC793),
fontWeight: FontWeight.w600), fontWeight: FontWeight.w600),
); );
}), }),

View File

@ -50,7 +50,7 @@ class _StudentKgTableState extends State<StudentKgTable> {
child: Center( child: Center(
child: Padding( child: Padding(
padding: EdgeInsets.symmetric(horizontal: 5.r), padding: EdgeInsets.symmetric(horizontal: 5.r),
child: Text(item.questionNo.toString(), style: TextStyle(fontSize: 12.sp, color: Color(0xFF6888FD))), child: Text(item.questionNo.toString(), style: TextStyle(fontSize: 12.sp, color: Color(0xFF4CC793))),
), ),
), ),
), ),

View File

@ -47,7 +47,7 @@ class _StudentZgTableState extends State<StudentZgTable> {
child: Center( child: Center(
child: Padding( child: Padding(
padding: EdgeInsets.symmetric(horizontal: 5.r), padding: EdgeInsets.symmetric(horizontal: 5.r),
child: Text(item.questionNo.toString(), style: TextStyle(fontSize: 12.sp, color: Color(0xFF6888FD))), child: Text(item.questionNo.toString(), style: TextStyle(fontSize: 12.sp, color: Color(0xFF4CC793))),
), ),
), ),
)), )),

View File

@ -76,7 +76,7 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
color: state.isJob.value color: state.isJob.value
? Color(0xFF7491FD) ? Color(0xFF4CC793)
: Color(0xFF505E6E)), : Color(0xFF505E6E)),
)); ));
}), }),
@ -104,7 +104,7 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
color: !state.isJob.value color: !state.isJob.value
? Color(0xFF7491FD) ? Color(0xFF4CC793)
: Color(0xFF505E6E)), : Color(0xFF505E6E)),
); );
})), })),
@ -128,24 +128,24 @@ class _StudentWorkDetailPageState extends State<StudentWorkDetailPage> {
'总览:', '总览:',
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
color: Color(0xFF7491FD), color: Color(0xFF4CC793),
fontWeight: FontWeight.w600), fontWeight: FontWeight.w600),
), ),
ProgressBar( ProgressBar(
title: '客观题正确率:', title: '客观题正确率:',
color: Color(0xFFB8C7FF), color: Color.fromRGBO(76, 199, 147, 0.36),
percent: state.studentData.value.kgtCorrectRate / 100, percent: state.studentData.value.kgtCorrectRate / 100,
padingEdg: EdgeInsets.zero, padingEdg: EdgeInsets.zero,
marginEdg: EdgeInsets.only(top: 8.h)), marginEdg: EdgeInsets.only(top: 8.h)),
ProgressBar( ProgressBar(
title: '主观题正确率:', title: '主观题正确率:',
color: Color(0xFFB8C7FF), color: Color.fromRGBO(76, 199, 147, 0.36),
percent: state.studentData.value.zgtCorrectRate / 100, percent: state.studentData.value.zgtCorrectRate / 100,
padingEdg: EdgeInsets.zero, padingEdg: EdgeInsets.zero,
marginEdg: EdgeInsets.only(top: 8.h)), marginEdg: EdgeInsets.only(top: 8.h)),
ProgressBar( ProgressBar(
title: '总正确率:', title: '总正确率:',
color: Color(0xFFB8C7FF), color: Color.fromRGBO(76, 199, 147, 0.36),
percent: state.studentData.value.correctRate / 100, percent: state.studentData.value.correctRate / 100,
padingEdg: EdgeInsets.zero, padingEdg: EdgeInsets.zero,
marginEdg: EdgeInsets.only(top: 8.h)), marginEdg: EdgeInsets.only(top: 8.h)),

View File

@ -33,10 +33,10 @@ class _PersonalDetailTopBarState extends State<PersonalDetailTopBar> {
labelStyle: TextStyle( labelStyle: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: const Color.fromRGBO(116, 145, 253, 1), color: const Color(0xFF4CC793),
), ),
isScrollable: true, isScrollable: true,
labelColor: const Color(0xFF7491FD), labelColor: const Color(0xFF4CC793),
unselectedLabelColor: const Color(0xFF505E6E), unselectedLabelColor: const Color(0xFF505E6E),
padding: EdgeInsets.symmetric(horizontal: 14.r), padding: EdgeInsets.symmetric(horizontal: 14.r),
// indicatorSize: TabBarIndicatorSize.label, // // indicatorSize: TabBarIndicatorSize.label, //
@ -44,7 +44,7 @@ class _PersonalDetailTopBarState extends State<PersonalDetailTopBar> {
indicator: UnderlineTabIndicator( indicator: UnderlineTabIndicator(
borderSide: BorderSide( borderSide: BorderSide(
width: 2.r, width: 2.r,
color:const Color(0xFF7491FD) color:const Color(0xFF4CC793)
), ),
), ),
tabs: <Widget>[ tabs: <Widget>[

View File

@ -159,7 +159,7 @@ class _HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin
alignment: Alignment.center, alignment: Alignment.center,
padding: EdgeInsets.only(left: Utils.isPad() ? 2.w : 3.w), padding: EdgeInsets.only(left: Utils.isPad() ? 2.w : 3.w),
decoration: BoxDecoration( decoration: BoxDecoration(
color: state.type == 1 ? const Color.fromRGBO(104, 136, 253, 1) : const Color.fromRGBO(255, 175, 56, 1), color: state.type == 1 ? const Color(0xFF4CC793) : const Color.fromRGBO(255, 175, 56, 1),
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),
@ -221,7 +221,7 @@ class _HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin
lineHeight: 8.h, lineHeight: 8.h,
animationDuration: 2500, animationDuration: 2500,
percent: item.annotateRate == null ? 0 : item.annotateRate! / 100, percent: item.annotateRate == null ? 0 : item.annotateRate! / 100,
progressColor: const Color(0xFF6888FD), progressColor: const Color(0xFF4CC793),
backgroundColor: const Color(0xFFE8E8E8), backgroundColor: const Color(0xFFE8E8E8),
barRadius: Radius.circular(10.r), barRadius: Radius.circular(10.r),
), ),

View File

@ -45,7 +45,7 @@ class StudentGroupList extends StatelessWidget {
padding: EdgeInsets.only(right: 8.r), padding: EdgeInsets.only(right: 8.r),
child: Text( child: Text(
'${EnumUtils.formatGrade(item.grade)}${item.className}', '${EnumUtils.formatGrade(item.grade)}${item.className}',
style: TextStyle(fontSize: 10.sp, color: Color(0xFF6888FD)), style: TextStyle(fontSize: 10.sp, color: Color(0xFF4CC793)),
), ),
), ),
const Spacer(), const Spacer(),
@ -68,7 +68,7 @@ class StudentGroupList extends StatelessWidget {
width: 55.r, width: 55.r,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(20.r)), borderRadius: BorderRadius.all(Radius.circular(20.r)),
color: const Color(0xFF6888FD), color: const Color(0xFF4CC793),
), ),
child: Center( child: Center(
child: Text( child: Text(
@ -105,7 +105,7 @@ class StudentGroupList extends StatelessWidget {
padding: EdgeInsets.only(right: 8.r), padding: EdgeInsets.only(right: 8.r),
child: Text( child: Text(
'${EnumUtils.formatGrade(item.grade)}${item.className}', '${EnumUtils.formatGrade(item.grade)}${item.className}',
style: TextStyle(fontSize: 14.sp, color: Color(0xFF6888FD)), style: TextStyle(fontSize: 14.sp, color: Color(0xFF4CC793)),
), ),
), ),
const Spacer(), const Spacer(),
@ -128,7 +128,7 @@ class StudentGroupList extends StatelessWidget {
width: 55.r, width: 55.r,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(20.r)), borderRadius: BorderRadius.all(Radius.circular(20.r)),
color: const Color(0xFF6888FD), color: const Color(0xFF4CC793),
), ),
child: Center( child: Center(
child: Text( child: Text(

View File

@ -83,7 +83,7 @@ class _LoginPageState extends State<LoginPage> {
padding: EdgeInsets.symmetric(horizontal: 20.r), padding: EdgeInsets.symmetric(horizontal: 20.r),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.transparent, color: Colors.transparent,
border: Border.all(width: 1.w, color: const Color(0xFFAECBFF)), border: Border.all(width: 1.w, color: const Color(0xFFFFFFFF)),
borderRadius: BorderRadius.all(Radius.circular(17.w)), borderRadius: BorderRadius.all(Radius.circular(17.w)),
), ),
child: Center( child: Center(
@ -132,7 +132,7 @@ class _LoginPageState extends State<LoginPage> {
padding: EdgeInsets.symmetric(horizontal: 20.r), padding: EdgeInsets.symmetric(horizontal: 20.r),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.transparent, color: Colors.transparent,
border: Border.all(width: 1.w, color: const Color(0xFFAECBFF)), border: Border.all(width: 1.w, color: const Color(0xFFFFFFFF)),
borderRadius: BorderRadius.all(Radius.circular(17.w)), borderRadius: BorderRadius.all(Radius.circular(17.w)),
), ),
child: TextField( child: TextField(
@ -228,10 +228,10 @@ class _LoginPageState extends State<LoginPage> {
return Container( return Container(
margin: EdgeInsets.symmetric(vertical: 10.h), margin: EdgeInsets.symmetric(vertical: 10.h),
decoration: BoxDecoration( decoration: BoxDecoration(
color: state.canLogin.value ? const Color.fromRGBO(107, 104, 252, 1) : const Color(0xFFdddddd), color: state.canLogin.value ? const Color(0xFF4CC793) : const Color(0xFFdddddd),
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: const Color.fromRGBO(46, 91, 255, 0.5), color: const Color.fromRGBO(76, 199, 147, 0.5),
offset: Offset(6.w, 10.h), //y轴偏移量 offset: Offset(6.w, 10.h), //y轴偏移量
blurRadius: 14, // blurRadius: 14, //
spreadRadius: 0.5, // spreadRadius: 0.5, //

View File

@ -79,7 +79,7 @@ class _WorkPageState extends State<WorkPage> with AutomaticKeepAliveClientMixin
), ),
labelStyle: TextStyle( labelStyle: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
color: const Color.fromRGBO(104, 136, 253, 1), color: const Color(0xFF4CC793),
), ),
// labelColor: const Color.fromRGBO(45, 56, 76, 1), // labelColor: const Color.fromRGBO(45, 56, 76, 1),
indicator: const BoxDecoration(), indicator: const BoxDecoration(),