From 0149e0761fc023ca1a0279874b26e8db3471b63b Mon Sep 17 00:00:00 2001 From: machuanyu <840649825@qq.com> Date: Thu, 11 Apr 2024 13:44:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=85=88=E6=89=B9=E9=98=85?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/images/youx_icon_active.png | Bin 0 -> 1258 bytes .../assets/images/youx_icon_default.png | Bin 0 -> 1304 bytes .../lib/pages/homework_correction/index.dart | 12 + .../job_priority_review_set.dart | 470 ++++++++++-------- .../quick_check_personal.dart | 6 +- 5 files changed, 268 insertions(+), 220 deletions(-) create mode 100644 marking_app/assets/images/youx_icon_active.png create mode 100644 marking_app/assets/images/youx_icon_default.png 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 0000000000000000000000000000000000000000..9a75b84fa5935134bc84434b1ee8a4d186edc8be GIT binary patch literal 1258 zcmVuPZ(DpiQ-h z_SkKao5UIqU@u~5TGK?tL=*oIHQ<_HV4uJ5bKg45&hGr#0h!5u%w+z(c{AVN-{(RU zQN$;cKb)lq66b9XMUWUpl!~yhQ4tn4D#F4>MOfIV2n!n(VPT^zVTpKk!TI*OSJmEn zuNX()*h`-`zL!5A*w#s7ZHK8`$`ba|u7j&Ss<~zhegDn@+QH&RcYH=Ck_XjsF8O8Od1W>;UvMw8yhPvp`#XKdBC#ExJ5PV!yi_nw8wCRUw{@sv zZ3umC<|@C-ZXP>)3+v{Oy0x@G7w*m4-p9Q!FP>84rfkL_WIO8LQbvFxj+S(X{kb*ZdE05GQwKoZvVWE=$nMDPOXJLn4dw*53 zBQ$h)z%vm2?f>I+jEjfW8=4w6z?nP$u_2yRQ8Rk(?Ins1yzhi3VF){H7w*ndEAOqe zB(^9oJy?EJa-Of6J}6l&0jjGV$lXI1e<3G42}1?^?fTz5`J%0`1`fg5hx3l}oM2BT zjHi7L$4B4XtHKlW1LQGsEp=srL;h*L!fbg?qQvpTm*fpHm!!ld!N@*va4!CNTb*3#Zw zQ_mr~NNwD}&7MT>>)N_Y6$b!O)@OB*_>{+CDTN*h;~)>+P`0rC*E>}hnJu1KSyDo} zw(e9Lz$!)4+3=*|=_+U!f)n$XmH4h#b{1TB1OD0~$s?$W1DrEh=%T#Cn%3M>|8>c& zM1b`^Jng16m@fC_{4Y)xCX(~SrgpCLb6EsaxL(+7NWcCk= z7+K1mi^Vr(Q$o^xiV#(zDiup72k(=RgA^6AG?H%rdQRwbZq&oP8=?>+C7l}I-PeO- zVZOoQ_6QO`^N%b|6e5sHSrQ}TyAP-G*X#y{%6mdg$E9%q;kW8?vGMySe{5Qzm9rb% zdn2dY`-bgq2y$TG)aU?Z#gG*A0&NgDUFO)}y)5dlVq+Xv9%F4sQig~px#^Yn(`-Ow zB^@(1C6c8?0Y{IS**7`b!?qZD7UAi}OJ+Q+7023-oHWSzXuZAX)=OqQdCbguv<8%M zX;AO!*1j}(#J4cbnzaTg&&4;_?oTIseJ%IO76yWB4R+1e*E|#;sx`=1zi)x?l6bDi z+HCz0s4xKUEz9L$p7{&6&jjVARddoBp#=&dKD6_oDhwnq@du=h&9x`}=29^p18Mx* US(?w35dZ)H07*qoM6N<$g7`L12mk;8 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..270892367e3b8a2fd24c60acbea7315f9da8709c GIT binary patch literal 1304 zcmV+z1?T#SP)%B3FH{M5Xv^V4jAvfRS=KQ~NzH`3Z z0F)@~*vU2tN)Q1`l(I0pQ5I%5%EIhMS(x1@3$q(#VRmD}33FFgLhZEaP$&fn%Qe7V z>4twA7sC`Zj;_f_Ew*iLf#$&S^k;wL643)hjZLe3?_j|6mLC#_Efe1T<1kD(!Xd4xSUStir)NYOq0AQ^|NL} z?erP^+U0Qack*N|1A}kjYWH=}gK1%8^uW7882a#DwLh6mLf5Su5KkoF(erP`|32q8 z?ybZ~0^%bh>2`+E>%@gfWV9)aj*Wp{ObMg#BBQQ$UFQZi;EN#75KaDnVHAZa)Ome; z5pLhR!#`6PFO$7>uJb~cu;#!DXqfBf?S)`i7#T(3rH~v;rdO9SrELsmVrUJ#dy5_$ z?<3DB(DnU?eO!E8#WPl5NEn64hE;2`+Ftg*<}ZRWV(qjU=*eq*k37Wv_c%`&O85xL ziTjD>Wa6o*PTxxn3UOK#Eer{(_s-^%KEuo`jM z+gcbB_9FHQ4Ie@Q9@TzNbv5=6Yu@Ml<%?OLDH8T<-46F2^g(y@25%#ek+{=m+f@^Z z7KZ8=g~8AVb;E1WTa-{<_P+w7czzuZzeFMdR$OgCD%g*nJyFea4Rhwfmh~G|=aR9s=O|O=tBDE==l=yQ>o4Go@1tB6{;`11r4ZLsx5!)Z5q;rWurMmtwBl5JbG=nBp9SlEzN`d5g6Nz` znNbmyJ69Rs+_Zw9UI-fhLM|;@6fDf;a`9Rfz5CT$aUNE~Fcq`sR5^oY_5&L?l0vuZ z_DwD>7s|kO{XU#u166paCMZ<9qrIR9Q~$QmYA^Hu4_B}dn@JV~g{GPyt1#uU%+rQh ziYbaHKN_$bB`i#Wk5GaLOkmnaWt)LNiFySwmFk2NgMru~I6gxMUdNzxh@}MR5kjHR zN07udC9~HgvGvf7P>g5A13N>w&%^-O+;gcEw4#;{x=yEi5|?6P0MA!vz<$IS+J0#F z-mucZ)J7dU5orM?9L7s8OmIXA+D0df;czgNwUt=D2}e#vycMFb4@c~Ui3xcrxPM2e zN3D}-&E^6np&KTY_t>RRzode>UdkE)IyrixEsPID55rG{VdfSk)_QQ)p5vNh!2smF zNl?))NzzjI@$_PHYoS!GXRsk*3O_Qr81YipJTM7)PmqK#-e3z94?|wc#I!JlVtG#z zS;(lDGAURX5s5^qK0Ac4MWvw+RRzaSL*}tWm_nhYAz!gIgQdb0Jq6j0x?UAaRBIn7j-C O0000 ], ), ), + + /* 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)),), ), - ), + ),*/ ], ), ), From aa920d41fac88f4b5ca16a4b79f4119da4b5181c Mon Sep 17 00:00:00 2001 From: machuanyu <840649825@qq.com> Date: Thu, 11 Apr 2024 14:38:40 +0800 Subject: [PATCH 2/2] -- --- .../lib/pages/homework_correction/widget/top_count.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 { ); }, ), - ), + ),*/ ], ), );