Compare commits
No commits in common. "f63c1ea6782aedd2a211be15a1977c81dd5083fd" and "74c814830527bdfeeee50b14c760bec9836f405b" have entirely different histories.
f63c1ea678
...
74c8148305
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB |
|
|
@ -273,18 +273,6 @@ class _HomeworkCorrectionState extends ConsumerState<HomeworkCorrection>
|
|||
],
|
||||
),
|
||||
),
|
||||
|
||||
/* Row(
|
||||
children: [
|
||||
InkWell(
|
||||
onTap: (){
|
||||
|
||||
},
|
||||
child: Text('历史作业'),
|
||||
),
|
||||
],
|
||||
),*/
|
||||
|
||||
if (_tabIndex == 1)
|
||||
$CompletedJobConditionFilter(
|
||||
controller: _tabController2,
|
||||
|
|
|
|||
|
|
@ -184,12 +184,7 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
|
|||
),
|
||||
children: List.generate(levelList.length, (index) {
|
||||
JobStudentLevel item = levelList[index];
|
||||
return InkWell(
|
||||
onTap: (){
|
||||
RouterManager.router.navigateTo(context,
|
||||
'${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}');
|
||||
},
|
||||
child: Container(
|
||||
return Container(
|
||||
padding: EdgeInsets.symmetric(horizontal: 10.r),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius:
|
||||
|
|
@ -223,27 +218,19 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
|
|||
width: 70.r,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.all(
|
||||
Radius.circular(4.r)),
|
||||
color:Color(0xFFB7FFE0),
|
||||
Radius.circular(20.r)),
|
||||
color: isClicking
|
||||
? Color(0xFFDCE3FF)
|
||||
: Color(0xFF6888FD),
|
||||
),
|
||||
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: Center(
|
||||
child: Text(
|
||||
'优先批阅',
|
||||
'取消优先',
|
||||
style: TextStyle(
|
||||
fontSize: 10.sp,
|
||||
color: Color(0xFF4CC793)),
|
||||
color: Colors.white),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
)
|
||||
: InkWell(
|
||||
|
|
@ -261,30 +248,29 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
|
|||
width: 70.r,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.all(
|
||||
Radius.circular(4.r)),
|
||||
color: Color(0xFFE1E1E1),
|
||||
Radius.circular(20.r)),
|
||||
color: isClicking
|
||||
? Color(0xFF6888FD)
|
||||
: Color(0xFFFFFFFF),
|
||||
border: Border.all(
|
||||
width: 1.r,
|
||||
color: isClicking
|
||||
? Color(0xFFFFFFFF)
|
||||
: Color(0xFF6888FD)),
|
||||
),
|
||||
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: Center(
|
||||
child: Text(
|
||||
'优先批阅',
|
||||
'设为优先',
|
||||
style: TextStyle(
|
||||
fontSize: 10.sp,
|
||||
color: Color(0xFF8A9691)),
|
||||
),
|
||||
),
|
||||
],
|
||||
color: isClicking
|
||||
? Color(0xFFFFFFFF)
|
||||
: Color(0xFF6888FD)),
|
||||
),
|
||||
),
|
||||
),
|
||||
/* SizedBox(
|
||||
),
|
||||
SizedBox(
|
||||
width: 5.r,
|
||||
),
|
||||
InkWell(
|
||||
|
|
@ -311,22 +297,16 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
|
|||
),
|
||||
),
|
||||
),
|
||||
)*/
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}),
|
||||
)
|
||||
: ListView.builder(
|
||||
itemBuilder: (context, index) {
|
||||
JobStudentLevel item = levelList[index];
|
||||
return InkWell(
|
||||
onTap: (){
|
||||
RouterManager.router.navigateTo(context,
|
||||
'${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}');
|
||||
},
|
||||
child: Container(
|
||||
return Container(
|
||||
padding: EdgeInsets.symmetric(
|
||||
vertical: 20.r, horizontal: 15.r),
|
||||
margin: EdgeInsets.only(bottom: 15.r),
|
||||
|
|
@ -362,27 +342,19 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
|
|||
width: 82.r,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.all(
|
||||
Radius.circular(4.r)),
|
||||
color:Color(0xFFB7FFE0),
|
||||
Radius.circular(20.r)),
|
||||
color: isClicking
|
||||
? Color(0xFFDCE3FF)
|
||||
: Color(0xFF6888FD),
|
||||
),
|
||||
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: Center(
|
||||
child: Text(
|
||||
'优先批阅',
|
||||
'取消优先',
|
||||
style: TextStyle(
|
||||
fontSize: 10.sp,
|
||||
color: Color(0xFF4CC793)),
|
||||
color: Colors.white),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
)
|
||||
: InkWell(
|
||||
|
|
@ -397,30 +369,23 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
|
|||
width: 82.r,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.all(
|
||||
Radius.circular(4.r)),
|
||||
color: Color(0xFFE1E1E1),
|
||||
Radius.circular(20.r)),
|
||||
color: Color(0xFFFFFFFF),
|
||||
border: Border.all(
|
||||
width: 1.r,
|
||||
color: Color(0xFF6888FD)),
|
||||
),
|
||||
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: Center(
|
||||
child: Text(
|
||||
'优先批阅',
|
||||
'设为优先',
|
||||
style: TextStyle(
|
||||
fontSize: 10.sp,
|
||||
color: Color(0xFF8A9691)),
|
||||
),
|
||||
),
|
||||
],
|
||||
color: Color(0xFF6888FD)),
|
||||
),
|
||||
),
|
||||
),
|
||||
/* SizedBox(
|
||||
),
|
||||
SizedBox(
|
||||
width: 5.r,
|
||||
),
|
||||
InkWell(
|
||||
|
|
@ -447,10 +412,9 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
|
|||
),
|
||||
),
|
||||
),
|
||||
)*/
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
itemCount: levelList.length,
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ class _QuickCheckPersonalState extends State<QuickCheckPersonal>
|
|||
),
|
||||
),
|
||||
SizedBox(width: 10.r,),
|
||||
/*Container(
|
||||
Container(
|
||||
width: 93.r,
|
||||
height: 28.r,
|
||||
decoration: BoxDecoration(
|
||||
|
|
@ -125,9 +125,9 @@ class _QuickCheckPersonalState extends State<QuickCheckPersonal>
|
|||
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)),),
|
||||
),
|
||||
),
|
||||
),*/
|
||||
],
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -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 {
|
|||
);
|
||||
},
|
||||
),
|
||||
),*/
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
|
|
|
|||
Loading…
Reference in New Issue