marking
/
Marking.Client.Moblie
19
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: marking:1c159dbda342d5dcfa488a276591a537c7bd1288
Branches Tags
marking:main
marking:login_school_choice
marking:update_scoring_method_0521
marking:marking_annotations_04_29
marking:mcy
marking:t
..
compare: marking:8e0522bc6b6b9e10aae57112eb2d00795400b40a
Branches Tags
marking:main
marking:login_school_choice
marking:update_scoring_method_0521
marking:marking_annotations_04_29
marking:mcy
marking:t

No commits in common. "1c159dbda342d5dcfa488a276591a537c7bd1288" and "8e0522bc6b6b9e10aae57112eb2d00795400b40a" have entirely different histories.
1c159dbda3 ... 8e0522bc6b

6 changed files with 38 additions and 85 deletions
Show Stats Expand all files Collapse all files

4
marking_app/lib/pages/homework_correction/components/new_version_of_homework/homework_tasks_view_item.dart
View File

@ -233,7 +233,7 @@ Widget $completedHomeworkView(BuildContext context,
SizedBox(height: 20.h),
Container(
padding: EdgeInsets.symmetric(vertical: 10.h),
padding: EdgeInsets.symmetric(vertical: 8.h),
decoration: BoxDecoration(
borderRadius: BorderRadius.only(bottomLeft: Radius.circular(6.r), bottomRight: Radius.circular(6.r)),
color: Colors.white,
@ -259,7 +259,7 @@ Widget $completedHomeworkView(BuildContext context,
}),
child: Container(
alignment: Alignment.center,
child: quickText('查看报告', color: Color.fromRGBO(118, 118, 118, 1), size: 13.sp),
child: quickText('查看报告', color: Color.fromRGBO(118, 118, 118, 1), size: 12.sp),
),
)),
]),

3
marking_app/lib/pages/homework_correction/job_priority_review_set.dart
View File

@ -40,9 +40,8 @@ class _JobPriorityReviewSetState extends State<JobPriorityReviewSet>
RestClient _client = await getClient();
BaseStructureResult<List<JobStudentLevel>> res = await _client.getJobReadLevel(widget.groupId,tabIndex == 0?1:0);
setState(() {
if(res.success){
if(res.code == 200){
levelList = res.data!;
print(levelList.length);
}else{
levelList = [];
}

4
marking_app/lib/pages/homework_correction/pages/job_favorite.dart
View File

@ -47,14 +47,14 @@ class _JobFavoriteState extends State<JobFavorite> with CommonMixin {
@override
void initState() {
super.initState();
/* FastData fastData = FastData.getInstance();
FastData fastData = FastData.getInstance();
fastData.getUser().then((value) {
if (value == null || value == '') return;
Map<String, dynamic> userInfo = json.decode(value);
setState(() {
loginName = userInfo['loginName'];
});
});*/
});
getInvolveClasses();
_future = getData();
}

87
marking_app/lib/pages/homework_correction/pages/job_list_participate_in_class.dart
View File

@ -1,7 +1,6 @@
import 'package:achievement_view/achievement_view.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
import 'package:functional_widget_annotation/functional_widget_annotation.dart';
import 'package:marking_app/common/mixin/common.dart';
import 'package:marking_app/common/model/common/base_structure_result.dart';
@ -41,10 +40,10 @@ class _JobListParticipateInClassState extends State<JobListParticipateInClass> w
getListOfJobFavoritesData();
_future = getData();
// Future.delayed(Duration.zero, () {
// print(ScreenUtil().scaleWidth);
// print(MediaQuery.of(context).devicePixelRatio);
// });
Future.delayed(Duration.zero, () {
print(ScreenUtil().scaleWidth);
print(MediaQuery.of(context).devicePixelRatio);
});
}
@override
@ -271,7 +270,7 @@ class _JobListParticipateInClassState extends State<JobListParticipateInClass> w
RouterManager.router.navigateTo(
context,
RouterManager.jobFavoritePagePath +
'?className=${Uri.encodeComponent(task.className)}&jobId=${widget.jobId}&schoolId=${task.dpcSchoolId}&gradeId=${task.dpcGradeId}&jobName=${Uri.encodeComponent(widget.jobName)}',
'?className=${Uri.encodeComponent(task.className)}&jobId=${widget.jobId}&schoolId=${task.dpcSchoolId}&gradeId=${task.dpcGradeId}&jobName=${widget.jobName}',
transition: getTransition(),
);
}
@ -429,7 +428,6 @@ class _JobListParticipateInClassState extends State<JobListParticipateInClass> w
jobViewReport: jobViewReport,
quickDataCheck: quickDataCheck,
oneClickReview: oneClickReview,
showStudentList: showStudentList,
);
return MobileEnd(
@ -441,7 +439,6 @@ class _JobListParticipateInClassState extends State<JobListParticipateInClass> w
jobViewReport: jobViewReport,
quickDataCheck: quickDataCheck,
oneClickReview: oneClickReview,
showStudentList: showStudentList,
);
}),
);
@ -459,7 +456,6 @@ class TabletEnd extends StatelessWidget {
final JobViewReport jobViewReport;
final OneClickReview oneClickReview; // 一键批阅
final QuickDataCheck quickDataCheck; // 数据快查
final ShowStudentList showStudentList;
const TabletEnd({
required this.genderName,
required this.data,
@ -471,7 +467,6 @@ class TabletEnd extends StatelessWidget {
required this.jobViewReport,
required this.oneClickReview,
required this.quickDataCheck,
required this.showStudentList,
super.key,
});
@ -480,14 +475,11 @@ class TabletEnd extends StatelessWidget {
return Container(
width: ScreenUtil().screenWidth,
padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 16.h),
child: MasonryGridView.count(
crossAxisCount: 2, //几列
mainAxisSpacing: 4.w, // 间距
crossAxisSpacing: 4.h, // 纵向间距？
itemCount: data.length,
itemBuilder: (context, index) {
var e = data[index];
return $ItemDataViewOfPad(
child: Wrap(
spacing: 8.0.w, // 子元素之间的间距
runSpacing: 10.h, // 主轴方向上不同行之间的间距
children: data
.map((e) => $ItemDataViewOfPad(
task: e,
bookmarks: bookmarks,
endReview: endReview,
@ -496,27 +488,9 @@ class TabletEnd extends StatelessWidget {
jobViewReport: jobViewReport,
quickDataCheck: quickDataCheck,
oneClickReview: oneClickReview,
showStudentList: showStudentList,
);
},
))
.toList(),
),
// Wrap(
// spacing: 8.0.w, // 子元素之间的间距
// runSpacing: 10.h, // 主轴方向上不同行之间的间距
// children: [...data, ...data]
// .map((e) => $ItemDataViewOfPad(
// task: e,
// bookmarks: bookmarks,
// endReview: endReview,
// genderName: genderName,
// goToReview: goToReview,
// jobViewReport: jobViewReport,
// quickDataCheck: quickDataCheck,
// oneClickReview: oneClickReview,
// showStudentList: showStudentList,
// ))
// .toList(),
// ),
);
}
}
@ -884,7 +858,7 @@ class MobileEndCompleted extends StatelessWidget {
),
),
),
Container(width: 1.w, height: 36.h, color: Color.fromRGBO(221, 221, 221, 1)),
Container(width: 1.w, height: 34.h, color: Color.fromRGBO(221, 221, 221, 1)),
Expanded(
child: InkWell(
onTap: () => easyThrottle('go_to_end_review_homework', () => jobViewReport(task)),
@ -904,7 +878,7 @@ class MobileEndCompleted extends StatelessWidget {
),
),
),
Container(width: 1.w, height: 36.h, color: Color.fromRGBO(221, 221, 221, 1)),
Container(width: 1.w, height: 32.h, color: Color.fromRGBO(221, 221, 221, 1)),
Expanded(
child: InkWell(
onTap: () => easyThrottle('go_to_end_review_homework', () => {}),
@ -934,7 +908,6 @@ class MobileEnd extends StatelessWidget {
final JobViewReport jobViewReport;
final OneClickReview oneClickReview; // 一键批阅
final QuickDataCheck quickDataCheck; // 数据快查
final ShowStudentList showStudentList; // 数据快查
const MobileEnd({
required this.genderName,
@ -947,7 +920,6 @@ class MobileEnd extends StatelessWidget {
required this.jobViewReport,
required this.oneClickReview,
required this.quickDataCheck,
required this.showStudentList,
super.key,
});
@ -965,7 +937,6 @@ class MobileEnd extends StatelessWidget {
jobViewReport: jobViewReport,
quickDataCheck: quickDataCheck,
oneClickReview: oneClickReview,
showStudentList: showStudentList,
);
}).toList(),
);
@ -986,7 +957,6 @@ Widget $itemDataViewOfPad(
required JobViewReport jobViewReport,
required OneClickReview oneClickReview,
required QuickDataCheck quickDataCheck,
required ShowStudentList showStudentList,
}) {
EdgeInsets edgins = EdgeInsets.only(left: 8.w, right: 8.w);
return Container(
@ -1006,16 +976,10 @@ Widget $itemDataViewOfPad(
children: [
quickText(genderName + task.className, color: Color.fromRGBO(0, 0, 0, 1), size: 10.sp),
Expanded(child: SizedBox()),
InkWell(
onTap: () => easyThrottle('OneClickReview', () => showStudentList([task.id], task.className, true)),
child: quickText('已交：${task.commitStudentCount}', color: Color.fromRGBO(104, 136, 253, 1), size: 8.sp),
),
quickText('已交：${task.commitStudentCount}', color: Color.fromRGBO(104, 136, 253, 1), size: 8.sp),
SizedBox(width: 10.w),
InkWell(
onTap: () => easyThrottle('OneClickReview', () => showStudentList([task.id], task.className)),
child: quickText('未交：${task.studentCount - task.commitStudentCount}',
quickText('未交：${task.studentCount - task.commitStudentCount}',
color: Color.fromRGBO(255, 86, 86, 1), size: 8.sp),
),
],
),
),
@ -1195,7 +1159,7 @@ Widget $itemDataViewOfPad(
),
),
),
Container(width: 1.w, height: 30.h, color: Color.fromRGBO(221, 221, 221, 1)),
Container(width: 1.w, height: 32.h, color: Color.fromRGBO(221, 221, 221, 1)),
Expanded(
child: InkWell(
onTap: () => easyThrottle('go_to_end_review_homework', () => jobViewReport(task)),
@ -1215,7 +1179,7 @@ Widget $itemDataViewOfPad(
),
),
),
Container(width: 0.3.w, height: 30.h, color: Color.fromRGBO(221, 221, 221, 1)),
Container(width: 0.3.w, height: 24.h, color: Color.fromRGBO(221, 221, 221, 1)),
Expanded(
child: InkWell(
onTap: () => easyThrottle('go_to_end_review_homework', () => endReview(task)),
@ -1246,12 +1210,10 @@ Widget $itemDataView(
required OneClickReview oneClickReview,
required QuickDataCheck quickDataCheck,
required JobViewReport jobViewReport,
required ShowStudentList showStudentList,
}) {
var padingEdg = EdgeInsets.only(left: 10.w, right: 10.w);
return Container(
padding: EdgeInsets.only(top: 11.h),
margin: EdgeInsets.only(bottom: 12.h),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadiusDirectional.circular(10.r),
@ -1266,17 +1228,10 @@ Widget $itemDataView(
children: [
quickText(genderName + task.className, color: Color.fromRGBO(0, 0, 0, 1), size: 14.sp),
Expanded(child: SizedBox()),
InkWell(
onTap: () => easyThrottle('OneClickReview', () => showStudentList([task.id], task.className, true)),
child:
quickText('已交：${task.commitStudentCount}', color: Color.fromRGBO(104, 136, 253, 1), size: 12.sp),
),
SizedBox(width: 16.w),
InkWell(
onTap: () => easyThrottle('OneClickReview', () => showStudentList([task.id], task.className)),
child: quickText('未交：${task.studentCount - task.commitStudentCount}',
quickText('未交：${task.studentCount - task.commitStudentCount}',
color: Color.fromRGBO(255, 86, 86, 1), size: 12.sp),
),
],
),
),
@ -1460,7 +1415,7 @@ Widget $itemDataView(
),
),
),
Container(width: 1.w, height: 36.h, color: Color.fromRGBO(221, 221, 221, 1)),
Container(width: 1.w, height: 32.h, color: Color.fromRGBO(221, 221, 221, 1)),
Expanded(
child: InkWell(
onTap: () => easyThrottle('go_to_end_review_homework', () => jobViewReport(task)),
@ -1480,7 +1435,7 @@ Widget $itemDataView(
),
),
),
Container(width: 1.w, height: 36.h, color: Color.fromRGBO(221, 221, 221, 1)),
Container(width: 1.w, height: 32.h, color: Color.fromRGBO(221, 221, 221, 1)),
Expanded(
child: InkWell(
onTap: () => easyThrottle('go_to_end_review_homework', () => endReview(task)),

2
marking_app/lib/utils/request/rest_client.dart
View File

@ -299,7 +299,7 @@ abstract class RestClient {
@the_retrofit.Query("markingId") int jobId);
// 作业 => 作业收藏数量
@the_retrofit.GET("/dpc-api/api/read/job-favorite-count-by-class")
@the_retrofit.GET("${RequestConfig.hwProxyKeywords}/dpc-api/api/read/job-favorite-count-by-class")
Future<BaseStructureResult<List<JobFavoriteModel>>> getListOfJobFavoriteNumber(
@the_retrofit.Query("jobid") int jobId);

1
marking_app/pubspec.yaml
View File

@ -111,7 +111,6 @@ dependencies:
horizontal_data_table: ^4.1.1
data_table_2: ^2.5.10
syncfusion_flutter_datepicker: ^21.2.10
flutter_staggered_grid_view: ^0.6.2
dev_dependencies:
flutter_test: