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,

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

@ -184,12 +184,7 @@ 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: (){
RouterManager.router.navigateTo(context,
'${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}');
},
child: Container(
padding: EdgeInsets.symmetric(horizontal: 10.r), padding: EdgeInsets.symmetric(horizontal: 10.r),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: borderRadius:
@ -223,27 +218,19 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
width: 70.r, width: 70.r,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(4.r)), Radius.circular(20.r)),
color:Color(0xFFB7FFE0), color: isClicking
? Color(0xFFDCE3FF)
: Color(0xFF6888FD),
), ),
child: Row( child: Center(
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( child: Text(
'优先批阅', '取消优先',
style: TextStyle( style: TextStyle(
fontSize: 10.sp, fontSize: 10.sp,
color: Color(0xFF4CC793)), color: Colors.white),
), ),
), ),
],
),
), ),
) )
: InkWell( : InkWell(
@ -261,30 +248,29 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
width: 70.r, width: 70.r,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(4.r)), Radius.circular(20.r)),
color: Color(0xFFE1E1E1), color: isClicking
? Color(0xFF6888FD)
: Color(0xFFFFFFFF),
border: Border.all(
width: 1.r,
color: isClicking
? Color(0xFFFFFFFF)
: Color(0xFF6888FD)),
), ),
child: Row( child: Center(
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( child: Text(
'优先批阅', '设为优先',
style: TextStyle( style: TextStyle(
fontSize: 10.sp, fontSize: 10.sp,
color: Color(0xFF8A9691)), color: isClicking
), ? Color(0xFFFFFFFF)
), : Color(0xFF6888FD)),
],
), ),
), ),
), ),
/* SizedBox( ),
SizedBox(
width: 5.r, width: 5.r,
), ),
InkWell( InkWell(
@ -311,22 +297,16 @@ 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: (){
RouterManager.router.navigateTo(context,
'${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}');
},
child: Container(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
vertical: 20.r, horizontal: 15.r), vertical: 20.r, horizontal: 15.r),
margin: EdgeInsets.only(bottom: 15.r), margin: EdgeInsets.only(bottom: 15.r),
@ -362,27 +342,19 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
width: 82.r, width: 82.r,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(4.r)), Radius.circular(20.r)),
color:Color(0xFFB7FFE0), color: isClicking
? Color(0xFFDCE3FF)
: Color(0xFF6888FD),
), ),
child: Row( child: Center(
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( child: Text(
'优先批阅', '取消优先',
style: TextStyle( style: TextStyle(
fontSize: 10.sp, fontSize: 10.sp,
color: Color(0xFF4CC793)), color: Colors.white),
), ),
), ),
],
),
), ),
) )
: InkWell( : InkWell(
@ -397,30 +369,23 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
width: 82.r, width: 82.r,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(4.r)), Radius.circular(20.r)),
color: Color(0xFFE1E1E1), color: Color(0xFFFFFFFF),
border: Border.all(
width: 1.r,
color: Color(0xFF6888FD)),
), ),
child: Row( child: Center(
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( child: Text(
'优先批阅', '设为优先',
style: TextStyle( style: TextStyle(
fontSize: 10.sp, fontSize: 10.sp,
color: Color(0xFF8A9691)), color: Color(0xFF6888FD)),
),
),
],
), ),
), ),
), ),
/* SizedBox( ),
SizedBox(
width: 5.r, width: 5.r,
), ),
InkWell( InkWell(
@ -447,10 +412,9 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
), ),
), ),
), ),
)*/ )
], ],
), ),
),
); );
}, },
itemCount: levelList.length, itemCount: levelList.length,

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 {
); );
}, },
), ),
),*/ ),
], ],
), ),
); );