diff --git a/marking_app/assets/images/youx_icon_active.png b/marking_app/assets/images/youx_icon_active.png new file mode 100644 index 0000000..9a75b84 Binary files /dev/null and b/marking_app/assets/images/youx_icon_active.png differ diff --git a/marking_app/assets/images/youx_icon_default.png b/marking_app/assets/images/youx_icon_default.png new file mode 100644 index 0000000..2708923 Binary files /dev/null and b/marking_app/assets/images/youx_icon_default.png differ diff --git a/marking_app/lib/pages/homework_correction/index.dart b/marking_app/lib/pages/homework_correction/index.dart index 51b9c4e..8bd1319 100644 --- a/marking_app/lib/pages/homework_correction/index.dart +++ b/marking_app/lib/pages/homework_correction/index.dart @@ -273,6 +273,18 @@ class _HomeworkCorrectionState extends ConsumerState ], ), ), + + /* Row( + children: [ + InkWell( + onTap: (){ + + }, + child: Text('历史作业'), + ), + ], + ),*/ + if (_tabIndex == 1) $CompletedJobConditionFilter( controller: _tabController2, diff --git a/marking_app/lib/pages/homework_correction/job_priority_review_set.dart b/marking_app/lib/pages/homework_correction/job_priority_review_set.dart index 37d8239..ceb876a 100644 --- a/marking_app/lib/pages/homework_correction/job_priority_review_set.dart +++ b/marking_app/lib/pages/homework_correction/job_priority_review_set.dart @@ -184,121 +184,136 @@ class _JobPriorityReviewSetState extends State ), children: List.generate(levelList.length, (index) { JobStudentLevel item = levelList[index]; - return Container( - padding: EdgeInsets.symmetric(horizontal: 10.r), - decoration: BoxDecoration( - borderRadius: - BorderRadius.all(Radius.circular(10.r)), - color: Colors.white, - ), - child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Expanded( - child: Text( - item.studentName, - style: TextStyle( - fontSize: 12.sp, - color: Color(0xFF6888FD)), - )), - item.readLevel == 1 - ? InkWell( - onTap: () { - setState(() { - isClicking = true; - }); - setJobReadLevel( - item.studentGroupDetailId, 0); - EasyLoading.show( - status: 'loading...'); - }, - child: Container( - height: 20.r, - width: 70.r, - decoration: BoxDecoration( - borderRadius: BorderRadius.all( - Radius.circular(20.r)), - color: isClicking - ? Color(0xFFDCE3FF) - : Color(0xFF6888FD), - ), - child: Center( - child: Text( - '取消优先', - style: TextStyle( - fontSize: 10.sp, - color: Colors.white), - ), - ), - ), - ) - : InkWell( - onTap: () { - setState(() { - isClicking = true; - }); - setJobReadLevel( - item.studentGroupDetailId, 1); - EasyLoading.show( - status: 'loading...'); - }, - child: Container( - height: 20.r, - width: 70.r, - decoration: BoxDecoration( - borderRadius: BorderRadius.all( - Radius.circular(20.r)), - color: isClicking - ? Color(0xFF6888FD) - : Color(0xFFFFFFFF), - border: Border.all( - width: 1.r, - color: isClicking - ? 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( + 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), + decoration: BoxDecoration( + borderRadius: + BorderRadius.all(Radius.circular(10.r)), + color: Colors.white, + ), + child: Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Expanded( child: Text( - '详情', - style: TextStyle( - fontSize: 10.sp, - color: Color(0xFFFCA017)), + item.studentName, + style: TextStyle( + fontSize: 12.sp, + color: Color(0xFF6888FD)), + )), + item.readLevel == 1 + ? InkWell( + onTap: () { + setState(() { + isClicking = true; + }); + setJobReadLevel( + item.studentGroupDetailId, 0); + EasyLoading.show( + status: 'loading...'); + }, + child: Container( + height: 20.r, + width: 70.r, + decoration: BoxDecoration( + 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)), + ), + ), + ], + ), + ), + ) + : InkWell( + onTap: () { + setState(() { + isClicking = true; + }); + 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: () { + 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)), + ), ), ), - ), - ) - ], + )*/ + ], + ), ), ); }), @@ -306,114 +321,135 @@ class _JobPriorityReviewSetState extends State : ListView.builder( itemBuilder: (context, index) { JobStudentLevel item = levelList[index]; - return Container( - padding: EdgeInsets.symmetric( - vertical: 20.r, horizontal: 15.r), - margin: EdgeInsets.only(bottom: 15.r), - decoration: BoxDecoration( - borderRadius: - BorderRadius.all(Radius.circular(10.r)), - color: Colors.white, - ), - child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Expanded( - child: Text( - item.studentName, - style: TextStyle( - fontSize: 12.sp, - color: Color(0xFF6888FD)), - )), - item.readLevel == 1 - ? InkWell( - onTap: () { - setState(() { - isClicking = true; - }); - setJobReadLevel( - item.studentGroupDetailId, 0); - EasyLoading.show( - status: 'loading...'); - }, - child: Container( - height: 24.r, - width: 82.r, - decoration: BoxDecoration( - borderRadius: BorderRadius.all( - Radius.circular(20.r)), - color: isClicking - ? Color(0xFFDCE3FF) - : Color(0xFF6888FD), - ), - child: Center( - child: Text( - '取消优先', - style: TextStyle( - fontSize: 10.sp, - color: Colors.white), - ), - ), - ), - ) - : InkWell( - onTap: () { - setJobReadLevel( - item.studentGroupDetailId, 1); - EasyLoading.show( - status: 'loading...'); - }, - child: Container( - height: 24.r, - width: 82.r, - decoration: BoxDecoration( - borderRadius: BorderRadius.all( - Radius.circular(20.r)), - color: Color(0xFFFFFFFF), - border: Border.all( - width: 1.r, - color: Color(0xFF6888FD)), - ), - child: Center( - child: Text( - '设为优先', - style: TextStyle( - 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( + return InkWell( + onTap: (){ + RouterManager.router.navigateTo(context, + '${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}'); + }, + child: Container( + padding: EdgeInsets.symmetric( + vertical: 20.r, horizontal: 15.r), + margin: EdgeInsets.only(bottom: 15.r), + decoration: BoxDecoration( + borderRadius: + BorderRadius.all(Radius.circular(10.r)), + color: Colors.white, + ), + child: Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Expanded( child: Text( - '详情', - style: TextStyle( - fontSize: 10.sp, - color: Color(0xFFFCA017)), + item.studentName, + style: TextStyle( + fontSize: 12.sp, + color: Color(0xFF6888FD)), + )), + item.readLevel == 1 + ? InkWell( + onTap: () { + setState(() { + isClicking = true; + }); + setJobReadLevel( + item.studentGroupDetailId, 0); + EasyLoading.show( + status: 'loading...'); + }, + child: Container( + height: 24.r, + width: 82.r, + decoration: BoxDecoration( + 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)), + ), + ), + ], + ), + ), + ) + : InkWell( + onTap: () { + setJobReadLevel( + item.studentGroupDetailId, 1); + EasyLoading.show( + 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: () { + 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)), + ), ), ), - ), - ) - ], + )*/ + ], + ), ), ); }, diff --git a/marking_app/lib/pages/homework_correction/quick_check_personal.dart b/marking_app/lib/pages/homework_correction/quick_check_personal.dart index 329e951..e53aef8 100644 --- a/marking_app/lib/pages/homework_correction/quick_check_personal.dart +++ b/marking_app/lib/pages/homework_correction/quick_check_personal.dart @@ -117,7 +117,7 @@ class _QuickCheckPersonalState extends State ), ), SizedBox(width: 10.r,), - Container( + /*Container( width: 93.r, height: 28.r, decoration: BoxDecoration( @@ -125,9 +125,9 @@ class _QuickCheckPersonalState extends State borderRadius: BorderRadius.circular(4.r), ), child: Center( - child: Text('查看原稿',style: TextStyle(fontSize: 10.r,color: Color(0xFF4CC793)),), + child: Text('原稿笔迹',style: TextStyle(fontSize: 10.r,color: Color(0xFF4CC793)),), ), - ), + ),*/ ], ), ), diff --git a/marking_app/lib/pages/homework_correction/widget/top_count.dart b/marking_app/lib/pages/homework_correction/widget/top_count.dart index c92fb22..6bf318c 100644 --- a/marking_app/lib/pages/homework_correction/widget/top_count.dart +++ b/marking_app/lib/pages/homework_correction/widget/top_count.dart @@ -338,7 +338,7 @@ class TopCount extends StatelessWidget { ), SizedBox( height: 15.r, - ),*/ + ), Padding( padding: EdgeInsets.symmetric(horizontal: 15.r), child: GridView.builder( @@ -412,7 +412,7 @@ class TopCount extends StatelessWidget { ); }, ), - ), + ),*/ ], ), );