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

Compare commits

base: marking:84ece07e298543aa97ce1ca26ab1d339bacb23a3
Branches Tags
marking:main
marking:login_school_choice
marking:update_scoring_method_0521
marking:marking_annotations_04_29
marking:mcy
marking:t
..
compare: marking:a9a9b03deb4d0ff853e0d1f330183e8776ce2dab
Branches Tags
marking:main
marking:login_school_choice
marking:update_scoring_method_0521
marking:marking_annotations_04_29
marking:mcy
marking:t

No commits in common. "84ece07e298543aa97ce1ca26ab1d339bacb23a3" and "a9a9b03deb4d0ff853e0d1f330183e8776ce2dab" have entirely different histories.
84ece07e29 ... a9a9b03deb

12 changed files with 166 additions and 227 deletions
Show Stats Expand all files Collapse all files

BIN
marking_app/assets/images/not_data_bgm.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
marking_app/assets/images/not_data_bgm2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 47 KiB

32
marking_app/lib/pages/homework_correction/job_priority_review_set.dart
View File

@ -25,7 +25,6 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
late TabController tabController; late TabController tabController;
int tabIndex = 0; int tabIndex = 0;
List levelList = []; List levelList = [];
bool isClicking = false;
@override @override
void initState() { void initState() {
@ -43,7 +42,7 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
setState(() { setState(() {
if(res.success){ if(res.success){
levelList = res.data!; levelList = res.data!;
isClicking = false; print(levelList.length);
}else{ }else{
levelList = []; levelList = [];
} }
@ -58,7 +57,6 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
BaseStructureResult res = await _client.getSetJobReadLevel(params); BaseStructureResult res = await _client.getSetJobReadLevel(params);
if(res.code == 200){ if(res.code == 200){
getReadLevel(); getReadLevel();
} }
} }
@ -78,7 +76,7 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
backgroundColor: Colors.white, backgroundColor: Colors.white,
title: Text( title: Text(
'优先批阅人配置', '优先批阅人配置',
style: TextStyle(fontSize: 14.sp, color: Color(0xFF333333)), style: TextStyle(fontSize: 16.sp, color: Color(0xFF333333)),
), ),
centerTitle: true, centerTitle: true,
leading: IconButton( leading: IconButton(
@ -89,12 +87,8 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
body: Column( body: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
SizedBox(height: 10.r,), Padding(
Container(
padding: EdgeInsets.symmetric(horizontal: 14.r), padding: EdgeInsets.symmetric(horizontal: 14.r),
decoration: BoxDecoration(
border: Border(bottom: BorderSide(width: 1.r,color: Color(0xFFCCCCCC)))
),
child: TabBar( child: TabBar(
onTap: (int val) { onTap: (int val) {
print(val); print(val);
@ -132,7 +126,6 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
labelPadding: const EdgeInsets.all(0), labelPadding: const EdgeInsets.all(0),
), ),
), ),
Expanded( Expanded(
child:Padding( child:Padding(
padding: EdgeInsets.symmetric(vertical:14.r,horizontal: 14.r), padding: EdgeInsets.symmetric(vertical:14.r,horizontal: 14.r),
@ -164,9 +157,6 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
Text(item.studentName,style: TextStyle(fontSize: 12.sp,color: Color(0xFF6888FD)),), Text(item.studentName,style: TextStyle(fontSize: 12.sp,color: Color(0xFF6888FD)),),
tabIndex == 0?InkWell( tabIndex == 0?InkWell(
onTap: (){ onTap: (){
setState(() {
isClicking = true;
});
setJobReadLevel(item.studentGroupDetailId,0); setJobReadLevel(item.studentGroupDetailId,0);
EasyLoading.show(status: 'loading...'); EasyLoading.show(status: 'loading...');
}, },
@ -175,7 +165,7 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
width: 70.r, width: 70.r,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(20.r)), borderRadius: BorderRadius.all(Radius.circular(20.r)),
color: isClicking?Color(0xFFDCE3FF):Color(0xFF6888FD), color: Color(0xFF6888FD),
), ),
child: Center( child: Center(
child:Text('取消优先',style: TextStyle(fontSize: 10.sp,color: Colors.white),), child:Text('取消优先',style: TextStyle(fontSize: 10.sp,color: Colors.white),),
@ -183,9 +173,6 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
), ),
):InkWell( ):InkWell(
onTap: (){ onTap: (){
setState(() {
isClicking = true;
});
setJobReadLevel(item.studentGroupDetailId,1); setJobReadLevel(item.studentGroupDetailId,1);
EasyLoading.show(status: 'loading...'); EasyLoading.show(status: 'loading...');
}, },
@ -194,11 +181,11 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
width: 70.r, width: 70.r,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(20.r)), borderRadius: BorderRadius.all(Radius.circular(20.r)),
color: isClicking?Color(0xFF6888FD):Color(0xFFFFFFFF), color: Color(0xFFFFFFFF),
border: Border.all(width: 1.r,color: isClicking?Color(0xFFFFFFFF):Color(0xFF6888FD)), border: Border.all(width: 1.r,color: Color(0xFF6888FD)),
), ),
child: Center( child: Center(
child:Text('设为优先',style: TextStyle(fontSize: 10.sp,color: isClicking?Color(0xFFFFFFFF):Color(0xFF6888FD)),), child:Text('设为优先',style: TextStyle(fontSize: 10.sp,color: Color(0xFF6888FD)),),
), ),
), ),
) )
@ -220,9 +207,6 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
Text(item.studentName,style: TextStyle(fontSize: 12.sp,color: Color(0xFF6888FD)),), Text(item.studentName,style: TextStyle(fontSize: 12.sp,color: Color(0xFF6888FD)),),
tabIndex == 0?InkWell( tabIndex == 0?InkWell(
onTap: (){ onTap: (){
setState(() {
isClicking = true;
});
setJobReadLevel(item.studentGroupDetailId,0); setJobReadLevel(item.studentGroupDetailId,0);
EasyLoading.show(status: 'loading...'); EasyLoading.show(status: 'loading...');
}, },
@ -231,7 +215,7 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
width: 82.r, width: 82.r,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(20.r)), borderRadius: BorderRadius.all(Radius.circular(20.r)),
color: isClicking?Color(0xFFDCE3FF):Color(0xFF6888FD), color: Color(0xFF6888FD),
), ),
child: Center( child: Center(
child:Text('取消优先',style: TextStyle(fontSize: 10.sp,color: Colors.white),), child:Text('取消优先',style: TextStyle(fontSize: 10.sp,color: Colors.white),),

60
marking_app/lib/pages/homework_correction/job_report.dart
View File

@ -300,11 +300,10 @@ class _JobReportState extends State<JobReport> with CommonMixin {
backgroundColor: Color.fromRGBO(245, 245, 245, 1), backgroundColor: Color.fromRGBO(245, 245, 245, 1),
appBar: AppBar( appBar: AppBar(
backgroundColor: Colors.white, backgroundColor: Colors.white,
centerTitle: true,
title: Center( title: Center(
child: quickText( child: quickText(
widget.title + '作业报告', widget.title + '作业报告',
size: 14.sp, size: 16.sp,
color: Color.fromRGBO(51, 51, 51, 1), color: Color.fromRGBO(51, 51, 51, 1),
)), )),
leading: IconButton( leading: IconButton(
@ -371,7 +370,7 @@ class _JobReportState extends State<JobReport> with CommonMixin {
),*/ ),*/
//客观题 //客观题
Container( Container(
padding: EdgeInsets.symmetric(vertical: 10.r, horizontal: 14.r), padding: EdgeInsets.symmetric(vertical: 10.r, horizontal: 10.r),
margin: EdgeInsets.symmetric(vertical: 10.r, horizontal: 10.r), margin: EdgeInsets.symmetric(vertical: 10.r, horizontal: 10.r),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
@ -383,12 +382,12 @@ class _JobReportState extends State<JobReport> with CommonMixin {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
Text('客观题',style: TextStyle(fontSize: 14.sp,color: Color(0xFF5C5C5C),fontWeight: FontWeight.w600),), Text('客观题',style: TextStyle(fontSize: 14.sp,color: Color(0xFF5C5C5C),fontWeight: FontWeight.w500),),
SizedBox(width: 10.r,), SizedBox(width: 10.r,),
Text('${data.kgReport.correctRate}%',style: TextStyle(fontSize: 14.sp,color: Color(0xFF6888FD),fontWeight: FontWeight.w600),), Text('${data.kgReport.correctRate}%',style: TextStyle(fontSize: 14.sp,color: Color(0xFF6888FD),fontWeight: FontWeight.w500),),
], ],
), ),
SizedBox(height: 6.r,), SizedBox(height: 10.r,),
SizedBox( SizedBox(
height: data.kgReport.details.length>10?300.r:data.kgReport.details.length * 50.r + 20.r, height: data.kgReport.details.length>10?300.r:data.kgReport.details.length * 50.r + 20.r,
child: ReportTable( child: ReportTable(
@ -403,7 +402,7 @@ class _JobReportState extends State<JobReport> with CommonMixin {
), ),
//主观题 //主观题
Container( Container(
padding: EdgeInsets.symmetric(vertical: 10.r, horizontal: 14.r), padding: EdgeInsets.symmetric(vertical: 10.r, horizontal: 10.r),
margin: EdgeInsets.symmetric(vertical: 10.r, horizontal: 10.r), margin: EdgeInsets.symmetric(vertical: 10.r, horizontal: 10.r),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
@ -415,9 +414,9 @@ class _JobReportState extends State<JobReport> with CommonMixin {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
Text('主观题',style: TextStyle(fontSize: 14.sp,color: Color(0xFF5C5C5C),fontWeight: FontWeight.w600),), Text('主观题',style: TextStyle(fontSize: 14.sp,color: Color(0xFF5C5C5C),fontWeight: FontWeight.w500),),
SizedBox(width: 6.r,), SizedBox(width: 10.r,),
Text('${data.zgReport.correctRate}%',style: TextStyle(fontSize: 14.sp,color: Color(0xFF6888FD),fontWeight: FontWeight.w600),), Text('${data.zgReport.correctRate}%',style: TextStyle(fontSize: 14.sp,color: Color(0xFF6888FD),fontWeight: FontWeight.w500),),
], ],
), ),
SizedBox(height: 10.r,), SizedBox(height: 10.r,),
@ -437,21 +436,13 @@ class _JobReportState extends State<JobReport> with CommonMixin {
// 顶部图形数据 // 顶部图形数据
/* $TopGraphic(data),*/ /* $TopGraphic(data),*/
// 掌握知识点的情况 // 掌握知识点的情况
Container( $MasterKnowledgePoint(data.knowledgeInfos, detailKnowledgeCall),
margin: EdgeInsets.symmetric(horizontal: 10.r),
child: $MasterKnowledgePoint(data.knowledgeInfos, detailKnowledgeCall)),
// 掌握知识点的情况 // 掌握知识点的情况
Container( $OverallPerformance(data.studentCount, data.overallTitles),
margin: EdgeInsets.symmetric(horizontal: 10.r),
child: $OverallPerformance(data.studentCount, data.overallTitles)),
// 单位时间答题情况 // 单位时间答题情况
Container( $UnitTimeAnsweringSituation(widget.id, data.questionAnswerInfos),
margin: EdgeInsets.symmetric(horizontal: 10.r),
child: $UnitTimeAnsweringSituation(widget.id, data.questionAnswerInfos)),
// 人员数据概况 // 人员数据概况
Container( $PersonnelDataOverview(data.studentAnswerInfos),
margin: EdgeInsets.symmetric(horizontal: 10.r),
child: $PersonnelDataOverview(data.studentAnswerInfos)),
], ],
); );
}), }),
@ -1248,7 +1239,7 @@ Widget $masterKnowledgePoint(
List<KnowledgeInfos> knowledgeInfos, List<KnowledgeInfos> knowledgeInfos,
Future<void> Function(KnowledgeInfos knowledge) detailCall) { Future<void> Function(KnowledgeInfos knowledge) detailCall) {
Widget childItem(int serialNumber, KnowledgeInfos knowItem) => Container( Widget childItem(int serialNumber, KnowledgeInfos knowItem) => Container(
margin: EdgeInsets.only(bottom: 15.h,left: 15.r,right: 15.r), margin: EdgeInsets.only(bottom: 20.h),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -1266,8 +1257,9 @@ Widget $masterKnowledgePoint(
size: 12.sp, size: 12.sp,
color: Color.fromRGBO(152, 152, 152, 1)), color: Color.fromRGBO(152, 152, 152, 1)),
quickText('${doubleToStringAsFixed(knowItem.rate)}%', quickText('${doubleToStringAsFixed(knowItem.rate)}%',
size: 12.sp, size: 14.sp,
color: Color.fromRGBO(64, 64, 64, 1)), color: Color.fromRGBO(64, 64, 64, 1),
fontWeight: FontWeight.bold),
], ],
), ),
), ),
@ -1275,7 +1267,7 @@ Widget $masterKnowledgePoint(
Expanded(flex: 1, child: SizedBox()), Expanded(flex: 1, child: SizedBox()),
], ],
), ),
SizedBox(height: 3.h), SizedBox(height: 6.h),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
@ -1284,14 +1276,13 @@ Widget $masterKnowledgePoint(
child: LinearPercentIndicator( child: LinearPercentIndicator(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
animation: true, animation: true,
lineHeight: 10.h, lineHeight: 15.h,
animationDuration: 2500, animationDuration: 2500,
percent: 0.1, percent: 0.1,
/* center: center: Text(
Text(
'${doubleToStringAsFixed(knowItem.rate)}%', '${doubleToStringAsFixed(knowItem.rate)}%',
style: TextStyle(color: Colors.white, fontSize: 10.sp), style: TextStyle(color: Colors.white, fontSize: 10.sp),
),*/ ),
progressColor: Theme.of(context).primaryColor, progressColor: Theme.of(context).primaryColor,
backgroundColor: const Color.fromRGBO(219, 224, 243, 1), backgroundColor: const Color.fromRGBO(219, 224, 243, 1),
barRadius: Radius.circular(10.r), barRadius: Radius.circular(10.r),
@ -1303,7 +1294,7 @@ Widget $masterKnowledgePoint(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
quickText('查看', quickText('查看',
size: 12.sp, color: Color.fromRGBO(239, 135, 20, 1)), size: 14.sp, color: Color.fromRGBO(239, 135, 20, 1)),
Icon(Icons.arrow_forward_ios, Icon(Icons.arrow_forward_ios,
size: 11.sp, color: Color.fromRGBO(239, 135, 20, 1)), size: 11.sp, color: Color.fromRGBO(239, 135, 20, 1)),
], ],
@ -1375,7 +1366,7 @@ Widget $overallPerformance(int totalNumber, List<OverallTitles> overallTitles) {
child: PieChart( child: PieChart(
PieChartData( PieChartData(
borderData: FlBorderData(show: false), borderData: FlBorderData(show: false),
sectionsSpace: 0, sectionsSpace: 2,
centerSpaceRadius: 0, centerSpaceRadius: 0,
sections: overallTitles.asMap().keys.map((index) { sections: overallTitles.asMap().keys.map((index) {
var e = overallTitles[index]; var e = overallTitles[index];
@ -1387,8 +1378,9 @@ Widget $overallPerformance(int totalNumber, List<OverallTitles> overallTitles) {
(doubleToStringAsFixed(e.count / totalNumber * 100) + (doubleToStringAsFixed(e.count / totalNumber * 100) +
'%'), '%'),
titleStyle: TextStyle( titleStyle: TextStyle(
fontSize: 12.sp, fontSize: 14.sp,
color: Color(0xFF999999)), color: Colors.white,
fontWeight: FontWeight.bold),
); );
}).toList(), }).toList(),
), ),

14
marking_app/lib/pages/homework_correction/pages/job_favorite.dart
View File

@ -175,7 +175,6 @@ class _JobFavoriteState extends State<JobFavorite> with CommonMixin {
padding: EdgeInsets.symmetric(vertical: 0.r, horizontal: 14.r), padding: EdgeInsets.symmetric(vertical: 0.r, horizontal: 14.r),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Text( Text(
widget.jobName, widget.jobName,
@ -216,16 +215,14 @@ class _JobFavoriteState extends State<JobFavorite> with CommonMixin {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: List.generate(groupList.length, (index) { children: List.generate(groupList.length, (index) {
var item = groupList[index]; var item = groupList[index];
return Padding( return Column(
padding: EdgeInsets.only(bottom: 8.r),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Padding( Padding(
padding: EdgeInsets.only(bottom: 5.r), padding: EdgeInsets.only(bottom: 5.r),
child: Text( child: Text(
'第${item['questionPage']}页', '第${item['questionPage']}页',
style: TextStyle(fontSize: 12.sp, color: Color(0xFF2E5BFF)), style: TextStyle(fontSize: 14.sp, color: Color(0xFF2E5BFF)),
), ),
), ),
GridView( GridView(
@ -266,8 +263,8 @@ class _JobFavoriteState extends State<JobFavorite> with CommonMixin {
}, },
child: Image.asset( child: Image.asset(
'assets/images/favorite_delete_icon.png', 'assets/images/favorite_delete_icon.png',
width: 24.r, width: 26.r,
height: 24.r, height: 26.r,
), ),
), ),
], ],
@ -277,7 +274,6 @@ class _JobFavoriteState extends State<JobFavorite> with CommonMixin {
}) })
), ),
], ],
),
); );
}) })
@ -383,7 +379,7 @@ Widget $classSelection(List<JobReportJoinClass>? involveClasses, JobReportJoinCl
return DropdownMenuItem( return DropdownMenuItem(
value: e.uniqueId!, value: e.uniqueId!,
child: quickText(e.uniqueId == '-1' ? e.graduationYear : e.graduationYear + e.className, child: quickText(e.uniqueId == '-1' ? e.graduationYear : e.graduationYear + e.className,
size: 10.sp, color: Colors.black), size: 12.sp, color: Colors.black),
); );
}).toList(), }).toList(),
onChanged: (String? value) { onChanged: (String? value) {

10
marking_app/lib/pages/homework_correction/quick_check_personal.dart
View File

@ -62,7 +62,7 @@ class _QuickCheckPersonalState extends State<QuickCheckPersonal>
backgroundColor: Colors.white, backgroundColor: Colors.white,
title: Text( title: Text(
studentInfo!.studentName!, studentInfo!.studentName!,
style: TextStyle(fontSize: 14.sp, color: Color(0xFF000000)), style: TextStyle(fontSize: 16.sp, color: Color(0xFF000000)),
), ),
centerTitle: true, centerTitle: true,
leading: IconButton( leading: IconButton(
@ -91,7 +91,7 @@ class _QuickCheckPersonalState extends State<QuickCheckPersonal>
Text( Text(
'客观题', '客观题',
style: TextStyle( style: TextStyle(
fontSize: 14.sp, color: Color(0xFF5C5C5C),fontWeight: FontWeight.w600), fontSize: 14.sp, color: Color(0xFF5C5C5C)),
), ),
SizedBox( SizedBox(
width: 10.r, width: 10.r,
@ -99,7 +99,7 @@ class _QuickCheckPersonalState extends State<QuickCheckPersonal>
Text( Text(
'${studentInfo!.kgValidRate}%', '${studentInfo!.kgValidRate}%',
style: TextStyle( style: TextStyle(
fontSize: 14.sp, color: Color(0xFF6888FD),fontWeight: FontWeight.w600), fontSize: 14.sp, color: Color(0xFF6888FD)),
), ),
], ],
), ),
@ -132,7 +132,7 @@ class _QuickCheckPersonalState extends State<QuickCheckPersonal>
Text( Text(
'主观题', '主观题',
style: TextStyle( style: TextStyle(
fontSize: 14.sp, color: Color(0xFF5C5C5C),fontWeight: FontWeight.w600), fontSize: 14.sp, color: Color(0xFF5C5C5C)),
), ),
SizedBox( SizedBox(
width: 10.r, width: 10.r,
@ -140,7 +140,7 @@ class _QuickCheckPersonalState extends State<QuickCheckPersonal>
Text( Text(
'${studentInfo!.zgValidRate}%', '${studentInfo!.zgValidRate}%',
style: TextStyle( style: TextStyle(
fontSize: 14.sp, color: Color(0xFF6888FD),fontWeight: FontWeight.w600), fontSize: 14.sp, color: Color(0xFF6888FD)),
), ),
], ],
), ),

19
marking_app/lib/pages/homework_correction/quick_data_check.dart
View File

@ -90,21 +90,17 @@ class _QuickDataCheckPageState extends State<QuickDataCheckPage>
child: Column( child: Column(
children: [ children: [
Row( Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
IconButton( IconButton(
icon: Icon(Icons.arrow_back_ios, color: Colors.white), icon: Icon(Icons.arrow_back_ios, color: Colors.white),
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pop(),
), ),
Expanded( Expanded(
child: Padding(
padding: EdgeInsets.only(right: 8.r),
child: Center( child: Center(
child: Text( child: Text(
'数据快查', '数据快查',
style: TextStyle(fontSize: 14.sp, color: Colors.white), style: TextStyle(fontSize: 16.sp, color: Colors.white),
)), ))),
)),
], ],
), ),
SizedBox(height: 10.r), SizedBox(height: 10.r),
@ -136,7 +132,7 @@ class _QuickDataCheckPageState extends State<QuickDataCheckPage>
), ),
Container( Container(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
vertical: 15.r, horizontal: 15.r), vertical: 10.r, horizontal: 15.r),
margin: EdgeInsets.symmetric( margin: EdgeInsets.symmetric(
vertical: 10.r, horizontal: 14.r), vertical: 10.r, horizontal: 14.r),
decoration: BoxDecoration( decoration: BoxDecoration(
@ -146,13 +142,12 @@ class _QuickDataCheckPageState extends State<QuickDataCheckPage>
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
SizedBox(height: 10.r,),
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Container( Container(
width: 12.r, width: 14.r,
height: 12.r, height: 14.r,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xFF4CC793), color: Color(0xFF4CC793),
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
@ -171,8 +166,8 @@ class _QuickDataCheckPageState extends State<QuickDataCheckPage>
width: 35.r, width: 35.r,
), ),
Container( Container(
width: 12.r, width: 14.r,
height: 12.r, height: 14.r,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xFF6888FD), color: Color(0xFF6888FD),
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(

4
marking_app/lib/pages/homework_correction/widget/quick_student_data_table.dart
View File

@ -117,7 +117,7 @@ class _QuickStudentDataTableState extends State<QuickStudentDataTable> {
height: 14.r, height: 14.r,
decoration: BoxDecoration( decoration: BoxDecoration(
color: kgInfo.state == 0 color: kgInfo.state == 0
? Colors.white ? Color(0xFFD9D9D9)
: kgInfo.state == 1 : kgInfo.state == 1
? Color(0xFFFF7474) ? Color(0xFFFF7474)
: Color(0xFF4CC793), : Color(0xFF4CC793),
@ -152,7 +152,7 @@ class _QuickStudentDataTableState extends State<QuickStudentDataTable> {
height: 14.r, height: 14.r,
decoration: BoxDecoration( decoration: BoxDecoration(
color: kgInfo.state == 0 color: kgInfo.state == 0
? Colors.white ? Color(0xFFD9D9D9)
: kgInfo.state == 1 : kgInfo.state == 1
? Color(0xFFFF7474) ? Color(0xFFFF7474)
: Color(0xFF4CC793), : Color(0xFF4CC793),

78
marking_app/lib/pages/homework_correction/widget/report_table.dart
View File

@ -2,8 +2,6 @@ import 'package:data_table_2/data_table_2.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart'; import 'package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart';
import 'package:marking_app/utils/toast_utils.dart';
import 'package:photo_view/photo_view.dart';
class ReportTable extends StatefulWidget { class ReportTable extends StatefulWidget {
final List headList; final List headList;
@ -40,71 +38,56 @@ class _ReportTableState extends State<ReportTable> {
DataCell( Center( DataCell( Center(
child: Padding( child: Padding(
padding: EdgeInsets.symmetric(horizontal: 5.r), padding: EdgeInsets.symmetric(horizontal: 5.r),
child: Text(item.questionNo, child:
style: TextStyle(fontSize: 12.sp, color: Color(0xFF525252))), Text(item.questionNo,
style:
TextStyle(fontSize: 12.sp, color: Color(0xFF525252))),
), ),
)), )),
DataCell( Center( DataCell( Center(
child: Padding( child: Padding(
padding: EdgeInsets.symmetric(horizontal: 5.r), padding: EdgeInsets.symmetric(horizontal: 5.r),
child: Text('${item.validRate}%', child:
style: TextStyle(fontSize: 12.sp, color: Color(0xFF525252))), Text('${item.validRate}%',
style:
TextStyle(fontSize: 12.sp, color: Color(0xFF525252))),
), ),
)), )),
DataCell( Center( DataCell( Center(
child: Padding( child: Padding(
padding: EdgeInsets.symmetric(horizontal: 5.r), padding: EdgeInsets.symmetric(horizontal: 5.r),
child: Text(item.validCount, child:
style: TextStyle(fontSize: 12.sp, color: Color(0xFF4CC793))), Text(item.validCount,
style:
TextStyle(fontSize: 12.sp, color: Color(0xFF4CC793))),
), ),
)), )),
DataCell( Center( DataCell( Center(
child: Padding( child: Padding(
padding: EdgeInsets.symmetric(horizontal: 5.r), padding: EdgeInsets.symmetric(horizontal: 5.r),
child: Text('${item.correctRate}%', child:
style: TextStyle(fontSize: 12.sp, color: Color(0xFF525252))), Text('${item.correctRate}%',
style:
TextStyle(fontSize: 12.sp, color: Color(0xFF525252))),
), ),
)), )),
DataCell( Center( DataCell( Center(
child: Padding( child: Padding(
padding: EdgeInsets.symmetric(horizontal: 5.r), padding: EdgeInsets.symmetric(horizontal: 5.r),
child: widget.isKG == true child:
? InkWell( Text(
onTap: () { widget.isKG == true?'原题':item.questionAnswer,
if (item.questionPicture == null) style:
return ToastUtils.showInfo('当前试题没有原题'); TextStyle(fontSize: 12.sp, color: widget.isKG == true?Color(0xFFFF8A00):Color(0xFF4CC793))),
Navigator.push(
context,
MaterialPageRoute(builder: (_) {
return Scaffold(
appBar: AppBar(),
body: PhotoView(
imageProvider: NetworkImage(
item.questionPicture!)),
);
}),
);
},
child: Text('原题',
style: TextStyle(
fontSize: 12.sp,
color: widget.isKG == true
? Color(0xFFFF8A00)
: Color(0xFF4CC793))),
)
: Text(item.questionAnswer,
style: TextStyle(
fontSize: 12.sp,
color: widget.isKG == true
? Color(0xFFFF8A00)
: Color(0xFF4CC793))),
), ),
)), )),
DataCell( Center( DataCell( Center(
child: Padding( child: Padding(
padding: EdgeInsets.symmetric(horizontal: 5.r), padding: EdgeInsets.symmetric(horizontal: 5.r),
child: Text(item.priorityGeneral, child:
style: TextStyle(fontSize: 12.sp, color: Color(0xFF6888FD))), Text(item.priorityGeneral,
style:
TextStyle(fontSize: 12.sp, color: Color(0xFF6888FD))),
), ),
)), )),
], ],
@ -142,9 +125,7 @@ class _ReportTableState extends State<ReportTable> {
headingRowDecoration: BoxDecoration(color: Color(0xFFE6E6E6)), headingRowDecoration: BoxDecoration(color: Color(0xFFE6E6E6)),
fixedColumnsColor: Color(0xFFE6E6E6), fixedColumnsColor: Color(0xFFE6E6E6),
fixedCornerColor: Colors.grey[400], fixedCornerColor: Colors.grey[400],
minWidth: widget.headList.length > 6 minWidth: widget.headList.length > 6?80.r * widget.headList.length:MediaQuery.of(context).size.width,
? 80.r * widget.headList.length
: MediaQuery.of(context).size.width,
fixedTopRows: widget.fixedRows!, fixedTopRows: widget.fixedRows!,
fixedLeftColumns: widget.fixedCols!, fixedLeftColumns: widget.fixedCols!,
sortColumnIndex: _sortColumnIndex, sortColumnIndex: _sortColumnIndex,
@ -158,12 +139,7 @@ class _ReportTableState extends State<ReportTable> {
style: TextStyle(fontSize: 12.sp, color: Color(0xFF505767))), style: TextStyle(fontSize: 12.sp, color: Color(0xFF505767))),
), ),
// size: ColumnSize.S, // size: ColumnSize.S,
fixedWidth: index == 0 fixedWidth: index == 0 ? 40.r:widget.headList.length > 6 ?80.r:(MediaQuery.of(context).size.width)/widget.headList.length,
? 40.r
: widget.headList.length > 6
? 80.r
: (MediaQuery.of(context).size.width - 8.r) /
widget.headList.length,
); );
}), }),
rows: List<DataRow>.generate(widget.bodyList.length, rows: List<DataRow>.generate(widget.bodyList.length,

2
marking_app/lib/pages/homework_correction/widget/student_zg_table.dart
View File

@ -40,7 +40,7 @@ class _StudentZgTableState extends State<StudentZgTable> {
child: Column( child: Column(
children: [ children: [
Center( Center(
child: Text('批注答案',style: TextStyle(fontSize: 15.sp,color: Color(0xFF3C3C3C),fontWeight: FontWeight.w500),), child: Text('批注答案',style: TextStyle(fontSize: 15.sp,color: Color(0xFF3C3C3C)),),
), ),
SizedBox(height: 10.r,), SizedBox(height: 10.r,),
Image.network(imgUrl,fit: BoxFit.cover, errorBuilder: (context, error, stackTrace) { Image.network(imgUrl,fit: BoxFit.cover, errorBuilder: (context, error, stackTrace) {

23
marking_app/lib/pages/homework_correction/widget/top_count.dart
View File

@ -10,7 +10,7 @@ class TopCount extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
padding: EdgeInsets.symmetric(vertical: 20.r), padding: EdgeInsets.symmetric(vertical: 10.r),
margin: EdgeInsets.symmetric(vertical: 10.r, horizontal: 10.r), margin: EdgeInsets.symmetric(vertical: 10.r, horizontal: 10.r),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
@ -35,7 +35,6 @@ class TopCount extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
SizedBox(height: 5.r,),
Row( Row(
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
@ -56,7 +55,7 @@ class TopCount extends StatelessWidget {
], ],
), ),
SizedBox( SizedBox(
height: 20.r, height: 15.r,
child: Row( child: Row(
children: [ children: [
Text( Text(
@ -102,7 +101,6 @@ class TopCount extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
SizedBox(height: 5.r,),
Row( Row(
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
@ -123,7 +121,7 @@ class TopCount extends StatelessWidget {
], ],
), ),
SizedBox( SizedBox(
height: 20.r, height: 15.r,
), ),
Text( Text(
'正确率', '正确率',
@ -147,7 +145,6 @@ class TopCount extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
SizedBox(height: 5.r,),
Row( Row(
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
@ -168,7 +165,7 @@ class TopCount extends StatelessWidget {
], ],
), ),
SizedBox( SizedBox(
height: 20.r, height: 10.r,
), ),
Text( Text(
'全对', '全对',
@ -215,7 +212,7 @@ class TopCount extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
SizedBox( SizedBox(
width: (MediaQuery.of(context).size.width - 55.r)/4 , width: (MediaQuery.of(context).size.width - 55.r)/4 - 20.r,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: [ children: [
@ -233,25 +230,27 @@ class TopCount extends StatelessWidget {
child: Text( child: Text(
item.title, item.title,
style: TextStyle( style: TextStyle(
color: bgColor, fontSize: 12.r), color: bgColor, fontSize: 14.r),
)), )),
), ),
], ],
), ),
), ),
SizedBox( SizedBox(
width: 10.r, width: 20.r,
), ),
Text( Text(
item.count.toString(), item.count.toString(),
style: TextStyle( style: TextStyle(
fontSize: 20.sp, fontSize: 24.sp,
fontWeight: FontWeight.w600,
color: Color(0xFF595959)), color: Color(0xFF595959)),
), ),
Text( Text(
'人', '人',
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 16.sp,
fontWeight: FontWeight.w600,
color: Color(0xFF595959)), color: Color(0xFF595959)),
), ),
], ],

17
marking_app/lib/utils/easy_refresh/MyEmptyWidget.dart
View File

@ -12,7 +12,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
class MyEmptyWidget extends StatelessWidget { class MyEmptyWidget extends StatelessWidget {
static const String defText = "抱歉，暂无内容"; static const String defText = "抱歉，暂无内容";
static const String defimg = "assets/images/not_data_bgm2.png"; static const String defimg = "assets/images/not_data_bgm.png";
final String? textVal; final String? textVal;
final String? imgAssetPath; final String? imgAssetPath;
final AlignmentGeometry alignment; final AlignmentGeometry alignment;
@ -32,25 +32,22 @@ class MyEmptyWidget extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
padding: padding != null?padding:EdgeInsets.only(bottom: 40.r), padding: padding,
alignment: alignment, alignment: alignment,
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: <Widget>[ children: <Widget>[
Opacity( Image.asset(
opacity: 0.6,
child: Image.asset(
imgAssetPath ?? defimg, imgAssetPath ?? defimg,
fit: BoxFit.cover, fit: BoxFit.cover,
width: imgWidth ?? 150.w, width: imgWidth ?? 130.w,
height: imgHeight ?? 150.w, height: imgHeight ?? 130.w,
),
), ),
Padding( Padding(
padding: EdgeInsets.only(top: 5.h), padding: EdgeInsets.only(top: 15.h),
child: Text( child: Text(
textVal ?? defText, textVal ?? defText,
style: TextStyle(fontSize: 12.sp, color: Color(0xB2898B8D)), style: TextStyle(fontSize: 16.sp, color: Colors.grey),
), ),
) )
], ],