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

Compare commits

base: marking:74c814830527bdfeeee50b14c760bec9836f405b
Branches Tags
marking:main
marking:login_school_choice
marking:update_scoring_method_0521
marking:marking_annotations_04_29
marking:mcy
marking:t
..
compare: marking:f63c1ea6782aedd2a211be15a1977c81dd5083fd
Branches Tags
marking:main
marking:login_school_choice
marking:update_scoring_method_0521
marking:marking_annotations_04_29
marking:mcy
marking:t

4 Commits
74c8148305 ... f63c1ea678

Author SHA1 Message Date
1147192855@qq.com f63c1ea678 Merge branch 'mcy_revision' of https://gitea.23544.com/marking/Marking.Client.Moblie into job_new_demand 2024-04-11 16:12:27 +08:00
machuanyu aa920d41fa -- 2024-04-11 14:38:40 +08:00
machuanyu 6719526cd2 Merge branch 'mcy_revision' into main 2024-04-11 13:45:33 +08:00
machuanyu 0149e0761f 优先批阅样式修改 2024-04-11 13:44:49 +08:00
6 changed files with 270 additions and 222 deletions
Show Stats Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

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

@ -273,6 +273,18 @@ 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,7 +184,12 @@ 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 Container( return InkWell(
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:
@ -218,19 +223,27 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
width: 70.r, width: 70.r,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(20.r)), Radius.circular(4.r)),
color: isClicking color:Color(0xFFB7FFE0),
? Color(0xFFDCE3FF)
: Color(0xFF6888FD),
), ),
child: Center( 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( child: Text(
'取消优先', '优先批阅',
style: TextStyle( style: TextStyle(
fontSize: 10.sp, fontSize: 10.sp,
color: Colors.white), color: Color(0xFF4CC793)),
), ),
), ),
],
),
), ),
) )
: InkWell( : InkWell(
@ -248,29 +261,30 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
width: 70.r, width: 70.r,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(20.r)), Radius.circular(4.r)),
color: isClicking color: Color(0xFFE1E1E1),
? Color(0xFF6888FD)
: Color(0xFFFFFFFF),
border: Border.all(
width: 1.r,
color: isClicking
? Color(0xFFFFFFFF)
: Color(0xFF6888FD)),
), ),
child: Center( 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( child: Text(
'设为优先', '优先批阅',
style: TextStyle( style: TextStyle(
fontSize: 10.sp, fontSize: 10.sp,
color: isClicking color: Color(0xFF8A9691)),
? Color(0xFFFFFFFF) ),
: Color(0xFF6888FD)), ),
],
), ),
), ),
), ),
), /* SizedBox(
SizedBox(
width: 5.r, width: 5.r,
), ),
InkWell( InkWell(
@ -297,16 +311,22 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
), ),
), ),
), ),
) )*/
], ],
), ),
),
); );
}), }),
) )
: ListView.builder( : ListView.builder(
itemBuilder: (context, index) { itemBuilder: (context, index) {
JobStudentLevel item = levelList[index]; JobStudentLevel item = levelList[index];
return Container( return InkWell(
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),
@ -342,19 +362,27 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
width: 82.r, width: 82.r,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(20.r)), Radius.circular(4.r)),
color: isClicking color:Color(0xFFB7FFE0),
? Color(0xFFDCE3FF)
: Color(0xFF6888FD),
), ),
child: Center( 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( child: Text(
'取消优先', '优先批阅',
style: TextStyle( style: TextStyle(
fontSize: 10.sp, fontSize: 10.sp,
color: Colors.white), color: Color(0xFF4CC793)),
), ),
), ),
],
),
), ),
) )
: InkWell( : InkWell(
@ -369,23 +397,30 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
width: 82.r, width: 82.r,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(20.r)), Radius.circular(4.r)),
color: Color(0xFFFFFFFF), color: Color(0xFFE1E1E1),
border: Border.all(
width: 1.r,
color: Color(0xFF6888FD)),
), ),
child: Center( 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( child: Text(
'设为优先', '优先批阅',
style: TextStyle( style: TextStyle(
fontSize: 10.sp, fontSize: 10.sp,
color: Color(0xFF6888FD)), color: Color(0xFF8A9691)),
),
),
],
), ),
), ),
), ),
), /* SizedBox(
SizedBox(
width: 5.r, width: 5.r,
), ),
InkWell( InkWell(
@ -412,9 +447,10 @@ 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 {
); );
}, },
), ),
), ),*/
], ],
), ),
); );