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

Compare commits

base: marking:f63c1ea6782aedd2a211be15a1977c81dd5083fd
Branches Tags
marking:main
marking:login_school_choice
marking:update_scoring_method_0521
marking:marking_annotations_04_29
marking:mcy
marking:t
..
compare: marking:74c814830527bdfeeee50b14c760bec9836f405b
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. "f63c1ea6782aedd2a211be15a1977c81dd5083fd" and "74c814830527bdfeeee50b14c760bec9836f405b" have entirely different histories.
f63c1ea678 ... 74c8148305

6 changed files with 214 additions and 262 deletions
Show Stats Expand all files Collapse all files

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

12
marking_app/lib/pages/homework_correction/index.dart
View File

@ -273,18 +273,6 @@ class _HomeworkCorrectionState extends ConsumerState<HomeworkCorrection>
], ],
), ),
), ),
/* Row(
children: [
InkWell(
onTap: (){
},
child: Text('历史作业'),
),
],
),*/
if (_tabIndex == 1) if (_tabIndex == 1)
$CompletedJobConditionFilter( $CompletedJobConditionFilter(
controller: _tabController2, controller: _tabController2,

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

@ -184,136 +184,121 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
), ),
children: List.generate(levelList.length, (index) { children: List.generate(levelList.length, (index) {
JobStudentLevel item = levelList[index]; JobStudentLevel item = levelList[index];
return InkWell( return Container(
onTap: (){ padding: EdgeInsets.symmetric(horizontal: 10.r),
RouterManager.router.navigateTo(context, decoration: BoxDecoration(
'${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}'); borderRadius:
}, BorderRadius.all(Radius.circular(10.r)),
child: Container( color: Colors.white,
padding: EdgeInsets.symmetric(horizontal: 10.r), ),
decoration: BoxDecoration( child: Row(
borderRadius: mainAxisAlignment:
BorderRadius.all(Radius.circular(10.r)), MainAxisAlignment.spaceBetween,
color: Colors.white, children: [
), Expanded(
child: Row( child: Text(
mainAxisAlignment: item.studentName,
MainAxisAlignment.spaceBetween, style: TextStyle(
children: [ fontSize: 12.sp,
Expanded( color: Color(0xFF6888FD)),
child: Text( )),
item.studentName, item.readLevel == 1
style: TextStyle( ? InkWell(
fontSize: 12.sp, onTap: () {
color: Color(0xFF6888FD)), setState(() {
)), isClicking = true;
item.readLevel == 1 });
? InkWell( setJobReadLevel(
onTap: () { item.studentGroupDetailId, 0);
setState(() { EasyLoading.show(
isClicking = true; status: 'loading...');
}); },
setJobReadLevel( child: Container(
item.studentGroupDetailId, 0); height: 20.r,
EasyLoading.show( width: 70.r,
status: 'loading...'); decoration: BoxDecoration(
}, borderRadius: BorderRadius.all(
child: Container( Radius.circular(20.r)),
height: 20.r, color: isClicking
width: 70.r, ? Color(0xFFDCE3FF)
decoration: BoxDecoration( : Color(0xFF6888FD),
borderRadius: BorderRadius.all(
Radius.circular(4.r)),
color:Color(0xFFB7FFE0),
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: EdgeInsets.only(left: 3.r),
child: Image.asset('assets/images/youx_icon_active.png',width: 14.r,height: 14.r,),
),
Padding(
padding: EdgeInsets.only(top: 2.r,left: 4.r),
child: Text(
'优先批阅',
style: TextStyle(
fontSize: 10.sp,
color: Color(0xFF4CC793)),
),
),
],
),
), ),
) child: Center(
: InkWell( child: Text(
onTap: () { '取消优先',
setState(() { style: TextStyle(
isClicking = true; fontSize: 10.sp,
}); color: Colors.white),
setJobReadLevel(
item.studentGroupDetailId, 1);
EasyLoading.show(
status: 'loading...');
},
child: Container(
height: 20.r,
width: 70.r,
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(4.r)),
color: Color(0xFFE1E1E1),
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: EdgeInsets.only(left: 3.r),
child: Image.asset('assets/images/youx_icon_default.png',width: 14.r,height: 14.r,),
),
Padding(
padding: EdgeInsets.only(top: 2.r,left: 4.r),
child: Text(
'优先批阅',
style: TextStyle(
fontSize: 10.sp,
color: Color(0xFF8A9691)),
),
),
],
), ),
), ),
), ),
/* SizedBox( )
width: 5.r, : InkWell(
), onTap: () {
InkWell( setState(() {
onTap: () { isClicking = true;
RouterManager.router.navigateTo(context, });
'${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}'); setJobReadLevel(
}, item.studentGroupDetailId, 1);
child: Container( EasyLoading.show(
height: 20.r, status: 'loading...');
width: 70.r, },
decoration: BoxDecoration( child: Container(
borderRadius: BorderRadius.all( height: 20.r,
Radius.circular(20.r)), width: 70.r,
color: Colors.white, decoration: BoxDecoration(
border: Border.all( borderRadius: BorderRadius.all(
width: 1.r, Radius.circular(20.r)),
color: Color(0xFFFCA017))), color: isClicking
child: Center( ? Color(0xFF6888FD)
child: Text( : Color(0xFFFFFFFF),
'详情', border: Border.all(
style: TextStyle( width: 1.r,
fontSize: 10.sp, color: isClicking
color: Color(0xFFFCA017)), ? Color(0xFFFFFFFF)
: Color(0xFF6888FD)),
),
child: Center(
child: Text(
'设为优先',
style: TextStyle(
fontSize: 10.sp,
color: isClicking
? Color(0xFFFFFFFF)
: Color(0xFF6888FD)),
),
),
), ),
), ),
SizedBox(
width: 5.r,
),
InkWell(
onTap: () {
RouterManager.router.navigateTo(context,
'${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}');
},
child: Container(
height: 20.r,
width: 70.r,
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(20.r)),
color: Colors.white,
border: Border.all(
width: 1.r,
color: Color(0xFFFCA017))),
child: Center(
child: Text(
'详情',
style: TextStyle(
fontSize: 10.sp,
color: Color(0xFFFCA017)),
),
), ),
)*/ ),
], )
), ],
), ),
); );
}), }),
@ -321,135 +306,114 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
: ListView.builder( : ListView.builder(
itemBuilder: (context, index) { itemBuilder: (context, index) {
JobStudentLevel item = levelList[index]; JobStudentLevel item = levelList[index];
return InkWell( return Container(
onTap: (){ padding: EdgeInsets.symmetric(
RouterManager.router.navigateTo(context, vertical: 20.r, horizontal: 15.r),
'${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}'); margin: EdgeInsets.only(bottom: 15.r),
}, decoration: BoxDecoration(
child: Container( borderRadius:
padding: EdgeInsets.symmetric( BorderRadius.all(Radius.circular(10.r)),
vertical: 20.r, horizontal: 15.r), color: Colors.white,
margin: EdgeInsets.only(bottom: 15.r), ),
decoration: BoxDecoration( child: Row(
borderRadius: mainAxisAlignment:
BorderRadius.all(Radius.circular(10.r)), MainAxisAlignment.spaceBetween,
color: Colors.white, children: [
), Expanded(
child: Row( child: Text(
mainAxisAlignment: item.studentName,
MainAxisAlignment.spaceBetween, style: TextStyle(
children: [ fontSize: 12.sp,
Expanded( color: Color(0xFF6888FD)),
child: Text( )),
item.studentName, item.readLevel == 1
style: TextStyle( ? InkWell(
fontSize: 12.sp, onTap: () {
color: Color(0xFF6888FD)), setState(() {
)), isClicking = true;
item.readLevel == 1 });
? InkWell( setJobReadLevel(
onTap: () { item.studentGroupDetailId, 0);
setState(() { EasyLoading.show(
isClicking = true; status: 'loading...');
}); },
setJobReadLevel( child: Container(
item.studentGroupDetailId, 0); height: 24.r,
EasyLoading.show( width: 82.r,
status: 'loading...'); decoration: BoxDecoration(
}, borderRadius: BorderRadius.all(
child: Container( Radius.circular(20.r)),
height: 24.r, color: isClicking
width: 82.r, ? Color(0xFFDCE3FF)
decoration: BoxDecoration( : Color(0xFF6888FD),
borderRadius: BorderRadius.all(
Radius.circular(4.r)),
color:Color(0xFFB7FFE0),
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: EdgeInsets.only(left: 3.r),
child: Image.asset('assets/images/youx_icon_active.png',width: 14.r,height: 14.r,),
),
Padding(
padding: EdgeInsets.only(top: 2.r,left: 4.r),
child: Text(
'优先批阅',
style: TextStyle(
fontSize: 10.sp,
color: Color(0xFF4CC793)),
),
),
],
),
), ),
) child: Center(
: InkWell( child: Text(
onTap: () { '取消优先',
setJobReadLevel( style: TextStyle(
item.studentGroupDetailId, 1); fontSize: 10.sp,
EasyLoading.show( color: Colors.white),
status: 'loading...');
},
child: Container(
height: 24.r,
width: 82.r,
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(4.r)),
color: Color(0xFFE1E1E1),
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: EdgeInsets.only(left: 3.r),
child: Image.asset('assets/images/youx_icon_default.png',width: 14.r,height: 14.r,),
),
Padding(
padding: EdgeInsets.only(top: 2.r,left: 4.r),
child: Text(
'优先批阅',
style: TextStyle(
fontSize: 10.sp,
color: Color(0xFF8A9691)),
),
),
],
), ),
), ),
), ),
/* SizedBox( )
width: 5.r, : InkWell(
), onTap: () {
InkWell( setJobReadLevel(
onTap: () { item.studentGroupDetailId, 1);
RouterManager.router.navigateTo(context, EasyLoading.show(
'${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}'); status: 'loading...');
}, },
child: Container( child: Container(
height: 20.r, height: 24.r,
width: 70.r, width: 82.r,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(20.r)), Radius.circular(20.r)),
color: Colors.white, color: Color(0xFFFFFFFF),
border: Border.all( border: Border.all(
width: 1.r, width: 1.r,
color: Color(0xFFFCA017))), color: Color(0xFF6888FD)),
child: Center( ),
child: Text( child: Center(
'详情', child: Text(
style: TextStyle( '设为优先',
fontSize: 10.sp, style: TextStyle(
color: Color(0xFFFCA017)), fontSize: 10.sp,
color: Color(0xFF6888FD)),
),
),
), ),
), ),
SizedBox(
width: 5.r,
),
InkWell(
onTap: () {
RouterManager.router.navigateTo(context,
'${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}');
},
child: Container(
height: 20.r,
width: 70.r,
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(20.r)),
color: Colors.white,
border: Border.all(
width: 1.r,
color: Color(0xFFFCA017))),
child: Center(
child: Text(
'详情',
style: TextStyle(
fontSize: 10.sp,
color: Color(0xFFFCA017)),
),
), ),
)*/ ),
], )
), ],
), ),
); );
}, },

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

@ -117,7 +117,7 @@ class _QuickCheckPersonalState extends State<QuickCheckPersonal>
), ),
), ),
SizedBox(width: 10.r,), SizedBox(width: 10.r,),
/*Container( Container(
width: 93.r, width: 93.r,
height: 28.r, height: 28.r,
decoration: BoxDecoration( decoration: BoxDecoration(
@ -125,9 +125,9 @@ class _QuickCheckPersonalState extends State<QuickCheckPersonal>
borderRadius: BorderRadius.circular(4.r), borderRadius: BorderRadius.circular(4.r),
), ),
child: Center( child: Center(
child: Text('原稿笔迹',style: TextStyle(fontSize: 10.r,color: Color(0xFF4CC793)),), child: Text('查看原稿',style: TextStyle(fontSize: 10.r,color: Color(0xFF4CC793)),),
), ),
),*/ ),
], ],
), ),
), ),

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

@ -338,7 +338,7 @@ class TopCount extends StatelessWidget {
), ),
SizedBox( SizedBox(
height: 15.r, height: 15.r,
), ),*/
Padding( Padding(
padding: EdgeInsets.symmetric(horizontal: 15.r), padding: EdgeInsets.symmetric(horizontal: 15.r),
child: GridView.builder( child: GridView.builder(
@ -412,7 +412,7 @@ class TopCount extends StatelessWidget {
); );
}, },
), ),
),*/ ),
], ],
), ),
); );