marking
/
Making.School.Asignment.app
19
1
Fork 0
Code Pull Requests Actions Releases Activity

bug修改

This commit is contained in:
machuanyu 2025-04-23 17:51:17 +08:00
parent 9d2f15c80c
commit 158fbc355f
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
making_school_asignment_app/lib/page/home_page/children/job_report/widget/personnel_data_overview.dart
View File

@ -83,24 +83,26 @@ class _PersonnelDataOverviewState extends State<PersonnelDataOverview> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( Container(
width: 94.r, width: 100.r,
height: 40.h,
alignment: Alignment.center, alignment: Alignment.center,
color: const Color.fromRGBO(230, 230, 230, 1), color: const Color.fromRGBO(230, 230, 230, 1),
margin: EdgeInsets.only(bottom: 1.h, right: 1.w), margin: EdgeInsets.only(bottom: 1.h, right: 1.w),
padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w), // padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w),
child: quickText(entrie.key, color: const Color.fromRGBO(24, 35, 77, 1), size: 12.sp, maxLines: 2), child: quickText(entrie.key, color: const Color.fromRGBO(24, 35, 77, 1), size: 12.sp, maxLines: 2),
), ),
...entrie.value.map((e) { ...entrie.value.map((e) {
bool isTransparentChineseNew = isTransparentChinese && (e?.length ?? 0) == 0; bool isTransparentChineseNew = isTransparentChinese && (e?.length ?? 0) == 0;
return Container( return Container(
width: 100.r, width: 100.r,
height: 40.h,
alignment: Alignment.center, alignment: Alignment.center,
margin: EdgeInsets.only(bottom: 1.h, right: 1.w), margin: EdgeInsets.only(bottom: 1.h, right: 1.w),
padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w), // padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 8.w),
color: const Color.fromRGBO(245, 245, 245, 1), color: const Color.fromRGBO(245, 245, 245, 1),
child: isTransparentChineseNew child: isTransparentChineseNew
? quickText('透明', color: Colors.transparent, size: 12.sp) ? quickText('透明', color: Colors.transparent, size: 12.sp)
: RegExp(r'^\d+$').hasMatch(e) || e.contains('%') : RegExp(r'^\d+$').hasMatch(e) || e.contains(' %')
? Row( ? Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [

3
making_school_asignment_app/lib/page/home_page/children/read_over/widget/annotate_list.dart
View File

@ -271,7 +271,8 @@ Widget $easyRefresh({
emptyWidget: data.isEmpty ? const MyEmptyWidget() : null, emptyWidget: data.isEmpty ? const MyEmptyWidget() : null,
controller: controller, controller: controller,
header: MaterialHeader(), header: MaterialHeader(),
footer: MaterialFooter(), // footer: MaterialFooter(),
footer: TaurusFooter(),
child: completed && isPadFlag child: completed && isPadFlag
? GridView( ? GridView(
padding: EdgeInsets.only( padding: EdgeInsets.only(