diff --git a/marking_app/assets/images/icon_back_green.png b/marking_app/assets/images/icon_back_green.png new file mode 100644 index 0000000..3df3757 Binary files /dev/null and b/marking_app/assets/images/icon_back_green.png differ diff --git a/marking_app/lib/pages/homework_correction/answer_trajectory.dart b/marking_app/lib/pages/homework_correction/answer_trajectory.dart index cd25e60..492dc3d 100644 --- a/marking_app/lib/pages/homework_correction/answer_trajectory.dart +++ b/marking_app/lib/pages/homework_correction/answer_trajectory.dart @@ -58,7 +58,6 @@ class _AnswerTrajectoryState extends State }); getStudentGroups(); getWorkList(); - print(userInfo); }); } @@ -107,7 +106,6 @@ class _AnswerTrajectoryState extends State } jobList = arr; setState(() {}); - print('total=${res.data!.total}'); refreshController2.finishRefresh(); EasyLoading.dismiss(); } diff --git a/marking_app/lib/pages/homework_correction/answer_trajectory_job_detail.dart b/marking_app/lib/pages/homework_correction/answer_trajectory_job_detail.dart index 967160c..9d47897 100644 --- a/marking_app/lib/pages/homework_correction/answer_trajectory_job_detail.dart +++ b/marking_app/lib/pages/homework_correction/answer_trajectory_job_detail.dart @@ -185,8 +185,14 @@ class _AnswerTrajectoryJobDetailState extends State var item = students[index]; return InkWell( onTap: (){ - RouterManager.router.navigateTo(context, - '${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}'); + RouterManager.router.navigateTo( + context, + RouterManager.quickCheckPersonalPath + + '?jobId=${widget.jobId}&studentId=${item.studentId}', + transition: getTransition(), + ); + // RouterManager.router.navigateTo(context, + // '${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}'); }, child: Container( padding: EdgeInsets.symmetric(horizontal: 10.r), @@ -228,8 +234,14 @@ class _AnswerTrajectoryJobDetailState extends State var item = students[index]; return InkWell( onTap: (){ - RouterManager.router.navigateTo(context, - '${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}'); + RouterManager.router.navigateTo( + context, + RouterManager.quickCheckPersonalPath + + '?jobId=${widget.jobId}&studentId=${item.studentId}', + transition: getTransition(), + ); + // RouterManager.router.navigateTo(context, + // '${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}'); }, child: Container( padding: EdgeInsets.symmetric( diff --git a/marking_app/lib/pages/homework_correction/components/imgDialog.dart b/marking_app/lib/pages/homework_correction/components/imgDialog.dart new file mode 100644 index 0000000..50d9c09 --- /dev/null +++ b/marking_app/lib/pages/homework_correction/components/imgDialog.dart @@ -0,0 +1,25 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; + +class ImageDialog{ + static void showImgDialog(BuildContext context,String imgUrl) { + showDialog( + context: context, + builder: (BuildContext context) { + return AlertDialog( + // insetPadding: EdgeInsets.symmetric(vertical: 10.r,horizontal: 45.r), + backgroundColor: Colors.transparent, + contentPadding: EdgeInsets.all(0), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.all(Radius.circular(15.r))), + content: Container( + width: MediaQuery.of(context).size.width - 48.r, + // height: MediaQuery.of(context).size.height * 0.4, + color: Colors.white, + // child: PhotoView(imageProvider: NetworkImage(imgUrl),backgroundDecoration: BoxDecoration(color: Colors.transparent),)), + child: Image.network(imgUrl)), + ); + }, + ); + } +} \ No newline at end of file diff --git a/marking_app/lib/pages/homework_correction/job_knowledge_points.dart b/marking_app/lib/pages/homework_correction/job_knowledge_points.dart index d114935..3c6e1b9 100644 --- a/marking_app/lib/pages/homework_correction/job_knowledge_points.dart +++ b/marking_app/lib/pages/homework_correction/job_knowledge_points.dart @@ -63,8 +63,8 @@ class _JobKnowledgePointsState extends State with CommonMixi } void getList() async { - print('startDataTime=$startDataTime'); - print('endDataTime=$endDataTime'); +/* print('startDataTime=$startDataTime'); + print('endDataTime=$endDataTime');*/ RestClient _client = await getClient(); BaseStructureResult> res = await _client.getKnowledgeReport(startDataTime,endDataTime,textController.text); @@ -265,7 +265,7 @@ class _JobKnowledgePointsState extends State with CommonMixi mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - '2次', + '${item.count}次', style: TextStyle(fontSize: 10.sp, color: Color(0xFF6888FD)), ), Image.asset('assets/images/right_icon_blue.png',width: 8.r,height: 8.r,), diff --git a/marking_app/lib/pages/homework_correction/job_knowledge_points_detail.dart b/marking_app/lib/pages/homework_correction/job_knowledge_points_detail.dart index f2f9611..96f1b64 100644 --- a/marking_app/lib/pages/homework_correction/job_knowledge_points_detail.dart +++ b/marking_app/lib/pages/homework_correction/job_knowledge_points_detail.dart @@ -271,7 +271,7 @@ class _JobKnowledgePointsDetailState extends State ), child: Center( child: Text( - '${item.questionNo}题', + '第${item.questionNo}题', style: TextStyle( fontSize: 10.sp, color: Color(0xFF8B8B8B)), @@ -307,10 +307,15 @@ class _JobKnowledgePointsDetailState extends State borderRadius: BorderRadius.circular(20.r), ), - child: Center( - child: quickText('正确率 >', + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + quickText('正确率', color: Color(0xFF4CC793), - size: 10.sp))), + size: 10.sp), + Image.asset('assets/images/icon_back_green.png',width: 8.r,height: 8.r,) + ], + )), ), Expanded( flex: 1, diff --git a/marking_app/lib/pages/homework_correction/job_report.dart b/marking_app/lib/pages/homework_correction/job_report.dart index 810008f..98b2730 100644 --- a/marking_app/lib/pages/homework_correction/job_report.dart +++ b/marking_app/lib/pages/homework_correction/job_report.dart @@ -9,6 +9,7 @@ import 'package:marking_app/common/model/job/job_report_join_class.dart'; import 'package:marking_app/common/model/job/job_report_knowledge_model.dart'; import 'package:marking_app/common/model/job/job_report_model.dart'; import 'package:marking_app/components/ReturnToHomepage.dart'; +import 'package:marking_app/pages/homework_correction/components/imgDialog.dart'; import 'package:marking_app/pages/homework_correction/widget/report_table.dart'; import 'package:marking_app/pages/homework_correction/widget/top_count.dart'; import 'package:marking_app/pages/mainPage.dart'; @@ -1445,7 +1446,7 @@ Widget $unitTimeAnsweringSituation(BuildContext context, int jobid, List with Co ), child: Center( child: Text( - '历史查询', + '历史作业', style: TextStyle(fontSize: 10.r, color: Color(0xFF2080F7)), ), ), diff --git a/marking_app/lib/pages/homework_correction/widget/answer_trajectory_job.dart b/marking_app/lib/pages/homework_correction/widget/answer_trajectory_job.dart index afc5cd9..aa19102 100644 --- a/marking_app/lib/pages/homework_correction/widget/answer_trajectory_job.dart +++ b/marking_app/lib/pages/homework_correction/widget/answer_trajectory_job.dart @@ -23,7 +23,7 @@ class AnswerTrajectoryJob extends StatelessWidget { crossAxisCount: 2, //横轴三个子widget mainAxisSpacing: 10.h, crossAxisSpacing: 6.w, - childAspectRatio: 2.5 //宽高比为1时，子widget + childAspectRatio: 2.4 //宽高比为1时，子widget ), children: List.generate(jobList.length, (index) { JobTaskItem item = jobList[index]; @@ -49,6 +49,7 @@ class AnswerTrajectoryJob extends StatelessWidget { ), child: Column( mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, children: [ // 顶部任务名称 Padding( @@ -103,7 +104,10 @@ class AnswerTrajectoryJob extends StatelessWidget { ], ), ), - +Padding( + padding: EdgeInsets.symmetric(horizontal: 6.r), + child: Text('时间：${item.createTime.substring(0,10)}',style: TextStyle(fontSize: 10.sp),), +), Container( padding: EdgeInsets.symmetric(vertical: 6.h), decoration: BoxDecoration( @@ -170,6 +174,7 @@ class AnswerTrajectoryJob extends StatelessWidget { ), child: Column( mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, children: [ // 顶部任务名称 Padding( @@ -225,6 +230,13 @@ class AnswerTrajectoryJob extends StatelessWidget { ], ), ), + SizedBox( + height: 5.r, + ), + Padding( + padding: EdgeInsets.symmetric(horizontal: 14.r), + child: Text('时间：${item.createTime.substring(0,10)}',style: TextStyle(fontSize: 10.sp),), + ), SizedBox( height: 10.r, ), diff --git a/marking_app/lib/pages/homework_correction/widget/report_table.dart b/marking_app/lib/pages/homework_correction/widget/report_table.dart index cab74d0..840893c 100644 --- a/marking_app/lib/pages/homework_correction/widget/report_table.dart +++ b/marking_app/lib/pages/homework_correction/widget/report_table.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart'; import 'package:marking_app/common/model/job/job_report_model.dart'; +import 'package:marking_app/pages/homework_correction/components/imgDialog.dart'; import 'package:marking_app/routes/RouterManager.dart'; import 'package:marking_app/utils/easy_refresh/MyEmptyWidget.dart'; import 'package:marking_app/utils/index.dart'; @@ -359,7 +360,7 @@ class _ReportTableState extends State { onTap: () { if (item.questionPicture == null) return ToastUtils.showInfo('当前试题没有原题'); - Navigator.push( + /* Navigator.push( context, MaterialPageRoute(builder: (_) { return Scaffold( @@ -369,7 +370,8 @@ class _ReportTableState extends State { NetworkImage(item.questionPicture!)), ); }), - ); + );*/ + ImageDialog.showImgDialog(context,item.questionPicture!); }, child: Text('原题', style: TextStyle( diff --git a/marking_app/lib/pages/homework_correction/widget/student_zg_table.dart b/marking_app/lib/pages/homework_correction/widget/student_zg_table.dart index 8156fba..58c283c 100644 --- a/marking_app/lib/pages/homework_correction/widget/student_zg_table.dart +++ b/marking_app/lib/pages/homework_correction/widget/student_zg_table.dart @@ -2,6 +2,7 @@ import 'package:data_table_2/data_table_2.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:marking_app/common/model/job/job_data_report.dart'; +import 'package:marking_app/pages/homework_correction/components/imgDialog.dart'; import 'package:marking_app/utils/common_utils.dart'; import 'package:marking_app/utils/easy_refresh/MyEmptyWidget.dart'; import 'package:photo_view/photo_view.dart'; @@ -29,22 +30,22 @@ class _StudentZgTableState extends State { int? _sortColumnIndex; bool _sortAscending = true; - void showImgDialog(BuildContext context,String imgUrl){ + /*void showImgDialog(BuildContext context,String imgUrl){ Navigator.push( context, MaterialPageRoute(builder: (_) { return Scaffold( appBar: AppBar(), body: SizedBox( - /* width: MediaQuery.of(context).size.width * 0.6, - height: MediaQuery.of(context).size.height * 0.6,*/ + *//* width: MediaQuery.of(context).size.width * 0.6, + height: MediaQuery.of(context).size.height * 0.6,*//* child: PhotoView( imageProvider: NetworkImage(imgUrl)), ), ); }), - ); + );*/ /* showDialog(context: context, builder: (BuildContext context){ return AlertDialog( // insetPadding: EdgeInsets.symmetric(vertical: 20.r,horizontal: 20.r), @@ -62,7 +63,7 @@ class _StudentZgTableState extends State { ), ); });*/ - } + // } DataRow _getRow(int index, [Color? color]) { assert(index >= 0); @@ -88,7 +89,7 @@ class _StudentZgTableState extends State { DataCell(InkWell( onTap: (){ if(item.state != 0){ - showImgDialog(context,item.studentAnswer!); + ImageDialog.showImgDialog(context,item.studentAnswer!); } }, @@ -111,7 +112,7 @@ class _StudentZgTableState extends State { DataCell(InkWell( onTap: (){ if(item.state==1 || item.state==2){ - showImgDialog(context,item.annotateAnswers!); + ImageDialog.showImgDialog(context,item.annotateAnswers!); } },