Compare commits
No commits in common. "96203b02ae65bbbea1bc9ce4c44790e553896e5c" and "9c66503154bde5898e0035d270ab03e0c89b5337" have entirely different histories.
96203b02ae
...
9c66503154
|
|
@ -209,5 +209,3 @@ marking_app/lib/common/model/job/job_favorite_item_model.g.dart
|
|||
marking_app/lib/pages/homework_correction/pages/job_favorite.g.dart
|
||||
marking_app/lib/common/model/job/job_fav_student.g.dart
|
||||
marking_app/lib/common/model/job/job_data_report.g.dart
|
||||
marking_app/lib/common/model/job/job_student_history.g.dart
|
||||
marking_app/lib/pages/homework_correction/job_personal_detail.g.dart
|
||||
|
|
|
|||
|
|
@ -352,7 +352,7 @@
|
|||
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
|
||||
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CURRENT_PROJECT_VERSION = 20;
|
||||
CURRENT_PROJECT_VERSION = 18;
|
||||
DEVELOPMENT_TEAM = CYDU583KN6;
|
||||
ENABLE_BITCODE = NO;
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
|
|
@ -360,7 +360,7 @@
|
|||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0.102;
|
||||
MARKETING_VERSION = 1.0.98;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.example.markingApp;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||
|
|
@ -490,7 +490,7 @@
|
|||
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
|
||||
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CURRENT_PROJECT_VERSION = 20;
|
||||
CURRENT_PROJECT_VERSION = 18;
|
||||
DEVELOPMENT_TEAM = CYDU583KN6;
|
||||
ENABLE_BITCODE = NO;
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
|
|
@ -498,7 +498,7 @@
|
|||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0.102;
|
||||
MARKETING_VERSION = 1.0.98;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.example.markingApp;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||
|
|
@ -520,7 +520,7 @@
|
|||
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
|
||||
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CURRENT_PROJECT_VERSION = 20;
|
||||
CURRENT_PROJECT_VERSION = 18;
|
||||
DEVELOPMENT_TEAM = CYDU583KN6;
|
||||
ENABLE_BITCODE = NO;
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
|
|
@ -528,7 +528,7 @@
|
|||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0.102;
|
||||
MARKETING_VERSION = 1.0.98;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.example.markingApp;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_easyloading/flutter_easyloading.dart';
|
||||
import 'package:flutter_easyrefresh/easy_refresh.dart';
|
||||
import 'package:flutter_hooks/flutter_hooks.dart';
|
||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||
import 'package:functional_widget_annotation/functional_widget_annotation.dart';
|
||||
import 'package:marking_app/common/mixin/common.dart';
|
||||
|
|
@ -16,19 +15,20 @@ import 'package:marking_app/utils/request/rest_client.dart';
|
|||
import 'package:percent_indicator/percent_indicator.dart';
|
||||
import 'package:syncfusion_flutter_datepicker/datepicker.dart';
|
||||
|
||||
part 'job_personal_detail.g.dart';
|
||||
|
||||
class JobPersonalDetail extends StatefulWidget {
|
||||
final String studentName;
|
||||
final int studentId;
|
||||
|
||||
const JobPersonalDetail({Key? key, required this.studentName, required this.studentId}) : super(key: key);
|
||||
const JobPersonalDetail(
|
||||
{Key? key, required this.studentName, required this.studentId})
|
||||
: super(key: key);
|
||||
|
||||
@override
|
||||
_JobPersonalDetailState createState() => _JobPersonalDetailState();
|
||||
}
|
||||
|
||||
class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin, TickerProviderStateMixin {
|
||||
class _JobPersonalDetailState extends State<JobPersonalDetail>
|
||||
with CommonMixin, TickerProviderStateMixin {
|
||||
@override
|
||||
int page = 1;
|
||||
int pageSize = 10;
|
||||
|
|
@ -60,7 +60,8 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
void getList() async {
|
||||
RestClient _client = await getClient();
|
||||
BaseStructureResult<JobStudentHistory> res =
|
||||
await _client.getStudentJobHistory(widget.studentId, !isJob, startDataTime, endDataTime, page, pageSize);
|
||||
await _client.getStudentJobHistory(widget.studentId, !isJob,
|
||||
startDataTime, endDataTime, page, pageSize);
|
||||
if (res.success) {
|
||||
res.data!.pagedList.items.forEach((element) {
|
||||
int num = 0;
|
||||
|
|
@ -74,7 +75,8 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
num = num + 1;
|
||||
}
|
||||
});
|
||||
if (num == (element.objectiveDtls.length + element.subjectiveDtls.length)) {
|
||||
if (num ==
|
||||
(element.objectiveDtls.length + element.subjectiveDtls.length)) {
|
||||
element.allNotDone = true;
|
||||
}
|
||||
});
|
||||
|
|
@ -104,7 +106,8 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
backgroundColor: Color.fromRGBO(245, 245, 245, 1),
|
||||
appBar: AppBar(
|
||||
backgroundColor: Colors.white,
|
||||
title: Text('${widget.studentName}作业详情', style: TextStyle(fontSize: 14.sp, color: Color(0xFF333333))),
|
||||
title: Text('${widget.studentName}作业详情',
|
||||
style: TextStyle(fontSize: 14.sp, color: Color(0xFF333333))),
|
||||
centerTitle: true,
|
||||
leading: IconButton(
|
||||
icon: Icon(Icons.arrow_back_ios, color: Colors.black),
|
||||
|
|
@ -140,7 +143,9 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
child: Center(
|
||||
child: Text(
|
||||
'作业',
|
||||
style: TextStyle(fontSize: 14.sp, color: isJob ? Color(0xFF7491FD) : Color(0xFF505E6E)),
|
||||
style: TextStyle(
|
||||
fontSize: 14.sp,
|
||||
color: isJob ? Color(0xFF7491FD) : Color(0xFF505E6E)),
|
||||
)),
|
||||
),
|
||||
),
|
||||
|
|
@ -165,7 +170,10 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
child: Center(
|
||||
child: Text(
|
||||
'考试',
|
||||
style: TextStyle(fontSize: 14.sp, color: !isJob ? Color(0xFF7491FD) : Color(0xFF505E6E)),
|
||||
style: TextStyle(
|
||||
fontSize: 14.sp,
|
||||
color:
|
||||
!isJob ? Color(0xFF7491FD) : Color(0xFF505E6E)),
|
||||
)),
|
||||
),
|
||||
),
|
||||
|
|
@ -173,16 +181,17 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
),
|
||||
),
|
||||
Container(
|
||||
margin: EdgeInsets.symmetric(vertical: 10.r, horizontal: 14.r),
|
||||
margin: EdgeInsets.symmetric(
|
||||
vertical: 10.r, horizontal: 14.r),
|
||||
padding: EdgeInsets.only(top: 10.r,left: 10.r,right: 10.r,bottom: 10.r),
|
||||
decoration: BoxDecoration(borderRadius: BorderRadius.all(Radius.circular(10.r)), color: Colors.white),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius:
|
||||
BorderRadius.all(Radius.circular(10.r)),
|
||||
color: Colors.white),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
'总览：',
|
||||
style: TextStyle(fontSize: 12.sp, color: Color(0xFF7491FD), fontWeight: FontWeight.w600),
|
||||
),
|
||||
Text('总览：',style: TextStyle(fontSize: 12.sp,color: Color(0xFF7491FD),fontWeight: FontWeight.w600),),
|
||||
progressBar(context,
|
||||
title: '客观题正确率：',
|
||||
color: Color(0xFFB8C7FF),
|
||||
|
|
@ -213,11 +222,16 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
jobType: isJob ? 1 : 2,
|
||||
customTimeStr: customTimeStr,
|
||||
customTime: tabController.index != 3 ||
|
||||
((endDataTime == null || endDataTime == '') && (startDataTime == null || startDataTime == ''))
|
||||
((endDataTime == null || endDataTime == '') &&
|
||||
(startDataTime == null || startDataTime == ''))
|
||||
? null
|
||||
: PickerDateRange(
|
||||
startDataTime == null || startDataTime == '' ? null : DateTime.parse(startDataTime!),
|
||||
endDataTime == null || endDataTime == '' ? null : DateTime.parse(endDataTime!),
|
||||
startDataTime == null || startDataTime == ''
|
||||
? null
|
||||
: DateTime.parse(startDataTime!),
|
||||
endDataTime == null || endDataTime == ''
|
||||
? null
|
||||
: DateTime.parse(endDataTime!),
|
||||
), onTimeFilter: (String? startTime, String? endTime) {
|
||||
EasyLoading.show(status: 'loading...');
|
||||
if (startTime == null && endTime == null) {
|
||||
|
|
@ -239,15 +253,17 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
// _refreshController2.callRefresh();
|
||||
}, refreshTime: (value) {
|
||||
if (value != null && value.startDate != null) {
|
||||
customTimeStr = value.startDate?.toString().substring(0, 10) ?? '';
|
||||
customTimeStr =
|
||||
value.startDate?.toString().substring(0, 10) ?? '';
|
||||
setState(() {});
|
||||
if (value.endDate != null) {
|
||||
if (!isPad() && value.startDate!.year == value.endDate!.year) {
|
||||
customTimeStr =
|
||||
value.startDate.toString().substring(5, 10) + '~${value.endDate.toString().substring(5, 10)}';
|
||||
customTimeStr = value.startDate.toString().substring(5, 10) +
|
||||
'~${value.endDate.toString().substring(5, 10)}';
|
||||
setState(() {});
|
||||
} else {
|
||||
customTimeStr = '$customTimeStr~${value.endDate?.toString().substring(0, 10)}';
|
||||
customTimeStr =
|
||||
'$customTimeStr~${value.endDate?.toString().substring(0, 10)}';
|
||||
setState(() {});
|
||||
}
|
||||
}
|
||||
|
|
@ -260,7 +276,8 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
children: [
|
||||
Text(
|
||||
'注：',
|
||||
style: TextStyle(fontSize: 8.sp, color: Color(0xFF8B8B8B)),
|
||||
style: TextStyle(
|
||||
fontSize: 8.sp, color: Color(0xFF8B8B8B)),
|
||||
),
|
||||
Container(
|
||||
width:10.r,
|
||||
|
|
@ -271,16 +288,13 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
border: Border.all(width: 1.r,color: Color(0xFF4CC793)),
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
width: 2.r,
|
||||
),
|
||||
SizedBox(width: 2.r,),
|
||||
Text(
|
||||
'正确',
|
||||
style: TextStyle(fontSize: 8.sp, color: Color(0xFF8B8B8B)),
|
||||
),
|
||||
SizedBox(
|
||||
width: 15.r,
|
||||
style: TextStyle(
|
||||
fontSize: 8.sp, color: Color(0xFF8B8B8B)),
|
||||
),
|
||||
SizedBox(width: 15.r,),
|
||||
Container(
|
||||
width:10.r,
|
||||
height: 10.r,
|
||||
|
|
@ -290,16 +304,13 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
border: Border.all(width: 1.r,color: Color(0xFFFF7474)),
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
width: 2.r,
|
||||
),
|
||||
SizedBox(width: 2.r,),
|
||||
Text(
|
||||
'错误',
|
||||
style: TextStyle(fontSize: 8.sp, color: Color(0xFF8B8B8B)),
|
||||
),
|
||||
SizedBox(
|
||||
width: 15.r,
|
||||
style: TextStyle(
|
||||
fontSize: 8.sp, color: Color(0xFF8B8B8B)),
|
||||
),
|
||||
SizedBox(width: 15.r,),
|
||||
Container(
|
||||
width:10.r,
|
||||
height: 10.r,
|
||||
|
|
@ -318,16 +329,13 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
],*/
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
width: 2.r,
|
||||
),
|
||||
SizedBox(width: 2.r,),
|
||||
Text(
|
||||
'已作答未批阅',
|
||||
style: TextStyle(fontSize: 8.sp, color: Color(0xFF8B8B8B)),
|
||||
),
|
||||
SizedBox(
|
||||
width: 15.r,
|
||||
style: TextStyle(
|
||||
fontSize: 8.sp, color: Color(0xFF8B8B8B)),
|
||||
),
|
||||
SizedBox(width: 15.r,),
|
||||
Container(
|
||||
width:10.r,
|
||||
height: 10.r,
|
||||
|
|
@ -337,12 +345,11 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
// color: Color(0xFFDDDDDD),
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
width: 2.r,
|
||||
),
|
||||
SizedBox(width: 2.r,),
|
||||
Text(
|
||||
'未做',
|
||||
style: TextStyle(fontSize: 8.sp, color: Color(0xFF8B8B8B)),
|
||||
style: TextStyle(
|
||||
fontSize: 8.sp, color: Color(0xFF8B8B8B)),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
|
@ -391,11 +398,16 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
);
|
||||
},
|
||||
child: Container(
|
||||
margin: EdgeInsets.symmetric(vertical: 5.r, horizontal: 14.r),
|
||||
padding: EdgeInsets.symmetric(vertical: 14.r, horizontal: 10.r),
|
||||
margin: EdgeInsets.symmetric(
|
||||
vertical: 5.r, horizontal: 14.r),
|
||||
padding: EdgeInsets.symmetric(
|
||||
vertical: 14.r, horizontal: 10.r),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.all(Radius.circular(10.r)),
|
||||
color: item.allNotDone ? Color(0xFFFFEDD3) : Colors.white),
|
||||
borderRadius:
|
||||
BorderRadius.all(Radius.circular(10.r)),
|
||||
color: item.allNotDone
|
||||
? Color(0xFFFFEDD3)
|
||||
: Colors.white),
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
|
|
@ -410,7 +422,10 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
alignment: Alignment.center,
|
||||
padding: EdgeInsets.only(left: 2.w),
|
||||
decoration: BoxDecoration(
|
||||
color: isJob ? const Color.fromRGBO(104, 136, 253, 1) : Color(0xFFFFA116),
|
||||
color: isJob
|
||||
? const Color.fromRGBO(
|
||||
104, 136, 253, 1)
|
||||
: Color(0xFFFFA116),
|
||||
borderRadius: BorderRadius.only(
|
||||
topLeft: Radius.circular(14.r),
|
||||
topRight: Radius.circular(3.r),
|
||||
|
|
@ -421,13 +436,17 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
margin: EdgeInsets.only(right: 4.w),
|
||||
child: Text(
|
||||
isJob ? '作业' : '考试',
|
||||
style: TextStyle(fontSize: 10.sp, color: Colors.white),
|
||||
style: TextStyle(
|
||||
fontSize: 10.sp,
|
||||
color: Colors.white),
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: Text(
|
||||
item.name,
|
||||
style: TextStyle(fontSize: 12.sp, color: Color(0xFF464646)),
|
||||
style: TextStyle(
|
||||
fontSize: 12.sp,
|
||||
color: Color(0xFF464646)),
|
||||
)),
|
||||
// SizedBox(width: 5.r,),
|
||||
// Text('2024.1',style: TextStyle(fontSize: 12.sp,color: Color(0xFF5B5B5B)),),
|
||||
|
|
@ -436,13 +455,18 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
width: 40.r,
|
||||
height: 20.r,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.all(Radius.circular(4.r)),
|
||||
border: Border.all(width: 1.r, color: Color(0xFF4CC793)),
|
||||
borderRadius: BorderRadius.all(
|
||||
Radius.circular(4.r)),
|
||||
border: Border.all(
|
||||
width: 1.r,
|
||||
color: Color(0xFF4CC793)),
|
||||
),
|
||||
child: Center(
|
||||
child: Text(
|
||||
item.subjectName,
|
||||
style: TextStyle(fontSize: 10.sp, color: Color(0xFF4CC793)),
|
||||
style: TextStyle(
|
||||
fontSize: 10.sp,
|
||||
color: Color(0xFF4CC793)),
|
||||
)),
|
||||
),
|
||||
],
|
||||
|
|
@ -455,7 +479,9 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
children: [
|
||||
Text(
|
||||
'客：',
|
||||
style: TextStyle(fontSize: 12.sp, color: Color(0xFF5B5B5B)),
|
||||
style: TextStyle(
|
||||
fontSize: 12.sp,
|
||||
color: Color(0xFF5B5B5B)),
|
||||
),
|
||||
SizedBox(
|
||||
width: 5.r,
|
||||
|
|
@ -467,8 +493,11 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
alignment: WrapAlignment.start,
|
||||
spacing: 8,
|
||||
runSpacing: 5,
|
||||
children: List.generate(item.objectiveDtls.length, (i) {
|
||||
SubjectiveDtls subjective = item.objectiveDtls[i];
|
||||
children: List.generate(
|
||||
item.objectiveDtls.length,
|
||||
(i) {
|
||||
SubjectiveDtls subjective =
|
||||
item.objectiveDtls[i];
|
||||
return Container(
|
||||
width: 20.r,
|
||||
height: 20.r,
|
||||
|
|
@ -476,26 +505,44 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
color: Colors.transparent,
|
||||
border: Border.all(
|
||||
width: 1.r,
|
||||
color: subjective.state == 0
|
||||
? Color(0xFFDDDDDD)
|
||||
: subjective.state == 3
|
||||
? Color(0xFF666666)
|
||||
: subjective.state == 1
|
||||
? Color(0xFFFF7474)
|
||||
: Color(0xFF4CC793)),
|
||||
borderRadius: BorderRadius.all(Radius.circular(10.r))),
|
||||
color: subjective
|
||||
.state ==
|
||||
0
|
||||
? Color(
|
||||
0xFFDDDDDD)
|
||||
: subjective.state ==
|
||||
3
|
||||
? Color(
|
||||
0xFF666666)
|
||||
: subjective.state ==
|
||||
1
|
||||
? Color(
|
||||
0xFFFF7474)
|
||||
: Color(
|
||||
0xFF4CC793)),
|
||||
borderRadius:
|
||||
BorderRadius.all(
|
||||
Radius.circular(
|
||||
10.r))),
|
||||
child: Center(
|
||||
child: Text(
|
||||
subjective.questionNo,
|
||||
style: TextStyle(
|
||||
fontSize: 10.r,
|
||||
color: subjective.state == 0
|
||||
color: subjective
|
||||
.state ==
|
||||
0
|
||||
? Color(0xFFDDDDDD)
|
||||
: subjective.state == 3
|
||||
? Color(0xFF666666)
|
||||
: subjective.state == 1
|
||||
? Color(0xFFFF7474)
|
||||
: Color(0xFF4CC793)),
|
||||
: subjective.state ==
|
||||
3
|
||||
? Color(
|
||||
0xFF666666)
|
||||
: subjective.state ==
|
||||
1
|
||||
? Color(
|
||||
0xFFFF7474)
|
||||
: Color(
|
||||
0xFF4CC793)),
|
||||
)),
|
||||
);
|
||||
}),
|
||||
|
|
@ -503,7 +550,9 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
)
|
||||
: Text(
|
||||
'无',
|
||||
style: TextStyle(fontSize: 12.sp, color: Color(0xFF5B5B5B)),
|
||||
style: TextStyle(
|
||||
fontSize: 12.sp,
|
||||
color: Color(0xFF5B5B5B)),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
|
@ -515,7 +564,9 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
children: [
|
||||
Text(
|
||||
'主：',
|
||||
style: TextStyle(fontSize: 12.sp, color: Color(0xFF5B5B5B)),
|
||||
style: TextStyle(
|
||||
fontSize: 12.sp,
|
||||
color: Color(0xFF5B5B5B)),
|
||||
),
|
||||
SizedBox(
|
||||
width: 5.r,
|
||||
|
|
@ -527,8 +578,11 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
alignment: WrapAlignment.start,
|
||||
spacing: 8,
|
||||
runSpacing: 5,
|
||||
children: List.generate(item.subjectiveDtls.length, (i) {
|
||||
SubjectiveDtls subjective = item.subjectiveDtls[i];
|
||||
children: List.generate(
|
||||
item.subjectiveDtls.length,
|
||||
(i) {
|
||||
SubjectiveDtls subjective =
|
||||
item.subjectiveDtls[i];
|
||||
return Container(
|
||||
width: 20.r,
|
||||
height: 20.r,
|
||||
|
|
@ -536,26 +590,44 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
color: Colors.transparent,
|
||||
border: Border.all(
|
||||
width: 1.r,
|
||||
color: subjective.state == 0
|
||||
? Color(0xFFDDDDDD)
|
||||
: subjective.state == 3
|
||||
? Color(0xFF666666)
|
||||
: subjective.state == 1
|
||||
? Color(0xFFFF7474)
|
||||
: Color(0xFF4CC793)),
|
||||
borderRadius: BorderRadius.all(Radius.circular(10.r))),
|
||||
color: subjective
|
||||
.state ==
|
||||
0
|
||||
? Color(
|
||||
0xFFDDDDDD)
|
||||
: subjective.state ==
|
||||
3
|
||||
? Color(
|
||||
0xFF666666)
|
||||
: subjective.state ==
|
||||
1
|
||||
? Color(
|
||||
0xFFFF7474)
|
||||
: Color(
|
||||
0xFF4CC793)),
|
||||
borderRadius:
|
||||
BorderRadius.all(
|
||||
Radius.circular(
|
||||
10.r))),
|
||||
child: Center(
|
||||
child: Text(
|
||||
subjective.questionNo,
|
||||
style: TextStyle(
|
||||
fontSize: 10.r,
|
||||
color: subjective.state == 0
|
||||
color: subjective
|
||||
.state ==
|
||||
0
|
||||
? Color(0xFFDDDDDD)
|
||||
: subjective.state == 3
|
||||
? Color(0xFF666666)
|
||||
: subjective.state == 1
|
||||
? Color(0xFFFF7474)
|
||||
: Color(0xFF4CC793)),
|
||||
: subjective.state ==
|
||||
3
|
||||
? Color(
|
||||
0xFF666666)
|
||||
: subjective.state ==
|
||||
1
|
||||
? Color(
|
||||
0xFFFF7474)
|
||||
: Color(
|
||||
0xFF4CC793)),
|
||||
)),
|
||||
);
|
||||
}),
|
||||
|
|
@ -563,7 +635,9 @@ class _JobPersonalDetailState extends State<JobPersonalDetail> with CommonMixin,
|
|||
)
|
||||
: Text(
|
||||
'无',
|
||||
style: TextStyle(fontSize: 12.sp, color: Color(0xFF5B5B5B)),
|
||||
style: TextStyle(
|
||||
fontSize: 12.sp,
|
||||
color: Color(0xFF5B5B5B)),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
|
@ -621,7 +695,8 @@ Widget progressBar(
|
|||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
if (title == '总正确率：') quickText('确率', color: Colors.transparent, size: fontSize),
|
||||
if (title == '总正确率：')
|
||||
quickText('确率', color: Colors.transparent, size: fontSize),
|
||||
quickText(title, color: Color(0xFF8B8B8B), size: fontSize),
|
||||
Expanded(
|
||||
flex: 1,
|
||||
|
|
@ -686,7 +761,8 @@ Widget jobConditionFilter(BuildContext context,
|
|||
var customTimeState = PickerDateRange(null, null);
|
||||
print('customTime=${customTime}');
|
||||
if (customTime != null) {
|
||||
customTimeState = PickerDateRange(customTime!.startDate != null ? customTime!.startDate : null,
|
||||
customTimeState = PickerDateRange(
|
||||
customTime!.startDate != null ? customTime!.startDate : null,
|
||||
customTime!.endDate != null ? customTime!.endDate : null);
|
||||
}
|
||||
|
||||
|
|
@ -722,7 +798,9 @@ Widget jobConditionFilter(BuildContext context,
|
|||
nextMonth = 1;
|
||||
now = now.add(Duration(days: 31 - now.day)); // 跨年了，所以加到当前月的最后一天
|
||||
} else {
|
||||
now = now.add(Duration(days: DateTime(now.year, nextMonth, 0).day - now.day)); // 加到下个月的第一天的前一天，即本月最后一天
|
||||
now = now.add(Duration(
|
||||
days: DateTime(now.year, nextMonth, 0).day -
|
||||
now.day)); // 加到下个月的第一天的前一天，即本月最后一天
|
||||
}
|
||||
return now;
|
||||
}
|
||||
|
|
@ -761,7 +839,9 @@ Widget jobConditionFilter(BuildContext context,
|
|||
return Center(
|
||||
child: Container(
|
||||
color: Colors.white,
|
||||
width: isPad() ? ScreenUtil().screenWidth / 2 : ScreenUtil().screenWidth / 1.3,
|
||||
width: isPad()
|
||||
? ScreenUtil().screenWidth / 2
|
||||
: ScreenUtil().screenWidth / 1.3,
|
||||
height: ScreenUtil().screenHeight / 2,
|
||||
child: SfDateRangePicker(
|
||||
showActionButtons: true,
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ import 'package:flutter/foundation.dart';
|
|||
import 'package:flutter/material.dart';
|
||||
|
||||
class AutoDrawer extends StatefulWidget {
|
||||
|
||||
final double elevation;
|
||||
final Widget child;
|
||||
final String? semanticLabel;
|
||||
|
|
@ -21,6 +22,7 @@ class AutoDrawer extends StatefulWidget {
|
|||
}
|
||||
|
||||
class _AutoDrawerState extends State<AutoDrawer> {
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
if(widget.callback!=null){
|
||||
|
|
@ -29,7 +31,6 @@ class _AutoDrawerState extends State<AutoDrawer> {
|
|||
}
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
if(widget.callback!=null){
|
||||
|
|
@ -42,7 +43,15 @@ class _AutoDrawerState extends State<AutoDrawer> {
|
|||
@override
|
||||
Widget build(BuildContext context) {
|
||||
assert(debugCheckHasMaterialLocalizations(context));
|
||||
String? label = widget.semanticLabel ?? MaterialLocalizations.of(context).drawerLabel;
|
||||
String? label = widget.semanticLabel;
|
||||
switch (defaultTargetPlatform) {
|
||||
case TargetPlatform.iOS:
|
||||
label = widget.semanticLabel;
|
||||
break;
|
||||
case TargetPlatform.android:
|
||||
case TargetPlatform.fuchsia:
|
||||
label = widget.semanticLabel ?? MaterialLocalizations.of(context)?.drawerLabel;
|
||||
}
|
||||
final double _width = MediaQuery.of(context).size.width * widget.widthPercent;
|
||||
return Semantics(
|
||||
scopesRoute: true,
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
|
|||
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
|
||||
# Read more about iOS versioning at
|
||||
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
||||
version: 1.0.102
|
||||
version: 1.0.101
|
||||
|
||||
environment:
|
||||
sdk: ">=2.17.1 <3.0.0"
|
||||
|
|
|
|||
Loading…
Reference in New Issue