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

bug修改

This commit is contained in:
machuanyu 2024-04-24 16:43:08 +08:00
parent 8c10e6eb4d
commit 23bd9501ff
11 changed files with 84 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
marking_app/assets/images/icon_back_green.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 303 B

2
marking_app/lib/pages/homework_correction/answer_trajectory.dart
View File

@ -58,7 +58,6 @@ class _AnswerTrajectoryState extends State<AnswerTrajectory>
}); });
getStudentGroups(); getStudentGroups();
getWorkList(); getWorkList();
print(userInfo);
}); });
} }
@ -107,7 +106,6 @@ class _AnswerTrajectoryState extends State<AnswerTrajectory>
} }
jobList = arr; jobList = arr;
setState(() {}); setState(() {});
print('total=${res.data!.total}');
refreshController2.finishRefresh(); refreshController2.finishRefresh();
EasyLoading.dismiss(); EasyLoading.dismiss();
} }

20
marking_app/lib/pages/homework_correction/answer_trajectory_job_detail.dart
View File

@ -185,8 +185,14 @@ class _AnswerTrajectoryJobDetailState extends State<AnswerTrajectoryJobDetail>
var item = students[index]; var item = students[index];
return InkWell( return InkWell(
onTap: (){ onTap: (){
RouterManager.router.navigateTo(context, RouterManager.router.navigateTo(
'${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}'); 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( child: Container(
padding: EdgeInsets.symmetric(horizontal: 10.r), padding: EdgeInsets.symmetric(horizontal: 10.r),
@ -228,8 +234,14 @@ class _AnswerTrajectoryJobDetailState extends State<AnswerTrajectoryJobDetail>
var item = students[index]; var item = students[index];
return InkWell( return InkWell(
onTap: (){ onTap: (){
RouterManager.router.navigateTo(context, RouterManager.router.navigateTo(
'${RouterManager.jobPersonalDetailPath}?studentId=${item.studentId}&studentName=${Uri.encodeComponent(item.studentName)}'); 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( child: Container(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(

25
marking_app/lib/pages/homework_correction/components/imgDialog.dart Normal file
View File

@ -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)),
);
},
);
}
}

6
marking_app/lib/pages/homework_correction/job_knowledge_points.dart
View File

@ -63,8 +63,8 @@ class _JobKnowledgePointsState extends State<JobKnowledgePoints> with CommonMixi
} }
void getList() async { void getList() async {
print('startDataTime=$startDataTime'); /* print('startDataTime=$startDataTime');
print('endDataTime=$endDataTime'); print('endDataTime=$endDataTime');*/
RestClient _client = await getClient(); RestClient _client = await getClient();
BaseStructureResult<List<KnowledgePoints>> res = BaseStructureResult<List<KnowledgePoints>> res =
await _client.getKnowledgeReport(startDataTime,endDataTime,textController.text); await _client.getKnowledgeReport(startDataTime,endDataTime,textController.text);
@ -265,7 +265,7 @@ class _JobKnowledgePointsState extends State<JobKnowledgePoints> with CommonMixi
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Text( Text(
'2次', '${item.count}次',
style: TextStyle(fontSize: 10.sp, color: Color(0xFF6888FD)), style: TextStyle(fontSize: 10.sp, color: Color(0xFF6888FD)),
), ),
Image.asset('assets/images/right_icon_blue.png',width: 8.r,height: 8.r,), Image.asset('assets/images/right_icon_blue.png',width: 8.r,height: 8.r,),

13
marking_app/lib/pages/homework_correction/job_knowledge_points_detail.dart
View File

@ -271,7 +271,7 @@ class _JobKnowledgePointsDetailState extends State<JobKnowledgePointsDetail>
), ),
child: Center( child: Center(
child: Text( child: Text(
'${item.questionNo}题', '第${item.questionNo}题',
style: TextStyle( style: TextStyle(
fontSize: 10.sp, fontSize: 10.sp,
color: Color(0xFF8B8B8B)), color: Color(0xFF8B8B8B)),
@ -307,10 +307,15 @@ class _JobKnowledgePointsDetailState extends State<JobKnowledgePointsDetail>
borderRadius: borderRadius:
BorderRadius.circular(20.r), BorderRadius.circular(20.r),
), ),
child: Center( child: Row(
child: quickText('正确率 >', mainAxisAlignment: MainAxisAlignment.center,
children: [
quickText('正确率',
color: Color(0xFF4CC793), color: Color(0xFF4CC793),
size: 10.sp))), size: 10.sp),
Image.asset('assets/images/icon_back_green.png',width: 8.r,height: 8.r,)
],
)),
), ),
Expanded( Expanded(
flex: 1, flex: 1,

6
marking_app/lib/pages/homework_correction/job_report.dart
View File

@ -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_knowledge_model.dart';
import 'package:marking_app/common/model/job/job_report_model.dart'; import 'package:marking_app/common/model/job/job_report_model.dart';
import 'package:marking_app/components/ReturnToHomepage.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/report_table.dart';
import 'package:marking_app/pages/homework_correction/widget/top_count.dart'; import 'package:marking_app/pages/homework_correction/widget/top_count.dart';
import 'package:marking_app/pages/mainPage.dart'; import 'package:marking_app/pages/mainPage.dart';
@ -1445,7 +1446,7 @@ Widget $unitTimeAnsweringSituation(BuildContext context, int jobid, List<Questio
// return; // return;
// } // }
if (_qpm.questionPicture == null) return ToastUtils.showInfo('当前试题没有原题'); if (_qpm.questionPicture == null) return ToastUtils.showInfo('当前试题没有原题');
Navigator.push( /* Navigator.push(
context, context,
MaterialPageRoute(builder: (_) { MaterialPageRoute(builder: (_) {
return Scaffold( return Scaffold(
@ -1453,7 +1454,8 @@ Widget $unitTimeAnsweringSituation(BuildContext context, int jobid, List<Questio
body: PhotoView(imageProvider: NetworkImage(_qpm.questionPicture!)), body: PhotoView(imageProvider: NetworkImage(_qpm.questionPicture!)),
); );
}), }),
); );*/
ImageDialog.showImgDialog(context,_qpm.questionPicture!);
}, },
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,

2
marking_app/lib/pages/homework_correction/quick_check_personal.dart
View File

@ -111,7 +111,7 @@ class _QuickCheckPersonalState extends ConsumerState<QuickCheckPersonal> with Co
), ),
child: Center( child: Center(
child: Text( child: Text(
'历史查询', '历史作业',
style: TextStyle(fontSize: 10.r, color: Color(0xFF2080F7)), style: TextStyle(fontSize: 10.r, color: Color(0xFF2080F7)),
), ),
), ),

16
marking_app/lib/pages/homework_correction/widget/answer_trajectory_job.dart
View File

@ -23,7 +23,7 @@ class AnswerTrajectoryJob extends StatelessWidget {
crossAxisCount: 2, //横轴三个子widget crossAxisCount: 2, //横轴三个子widget
mainAxisSpacing: 10.h, mainAxisSpacing: 10.h,
crossAxisSpacing: 6.w, crossAxisSpacing: 6.w,
childAspectRatio: 2.5 //宽高比为1时，子widget childAspectRatio: 2.4 //宽高比为1时，子widget
), ),
children: List.generate(jobList.length, (index) { children: List.generate(jobList.length, (index) {
JobTaskItem item = jobList[index]; JobTaskItem item = jobList[index];
@ -49,6 +49,7 @@ class AnswerTrajectoryJob extends StatelessWidget {
), ),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
// 顶部任务名称 // 顶部任务名称
Padding( 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( Container(
padding: EdgeInsets.symmetric(vertical: 6.h), padding: EdgeInsets.symmetric(vertical: 6.h),
decoration: BoxDecoration( decoration: BoxDecoration(
@ -170,6 +174,7 @@ class AnswerTrajectoryJob extends StatelessWidget {
), ),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
// 顶部任务名称 // 顶部任务名称
Padding( 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( SizedBox(
height: 10.r, height: 10.r,
), ),

6
marking_app/lib/pages/homework_correction/widget/report_table.dart
View File

@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_widget_from_html_core/flutter_widget_from_html_core.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/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/routes/RouterManager.dart';
import 'package:marking_app/utils/easy_refresh/MyEmptyWidget.dart'; import 'package:marking_app/utils/easy_refresh/MyEmptyWidget.dart';
import 'package:marking_app/utils/index.dart'; import 'package:marking_app/utils/index.dart';
@ -359,7 +360,7 @@ class _ReportTableState extends State<ReportTable> {
onTap: () { onTap: () {
if (item.questionPicture == null) if (item.questionPicture == null)
return ToastUtils.showInfo('当前试题没有原题'); return ToastUtils.showInfo('当前试题没有原题');
Navigator.push( /* Navigator.push(
context, context,
MaterialPageRoute(builder: (_) { MaterialPageRoute(builder: (_) {
return Scaffold( return Scaffold(
@ -369,7 +370,8 @@ class _ReportTableState extends State<ReportTable> {
NetworkImage(item.questionPicture!)), NetworkImage(item.questionPicture!)),
); );
}), }),
); );*/
ImageDialog.showImgDialog(context,item.questionPicture!);
}, },
child: Text('原题', child: Text('原题',
style: TextStyle( style: TextStyle(

15
marking_app/lib/pages/homework_correction/widget/student_zg_table.dart
View File

@ -2,6 +2,7 @@ import 'package:data_table_2/data_table_2.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:marking_app/common/model/job/job_data_report.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/common_utils.dart';
import 'package:marking_app/utils/easy_refresh/MyEmptyWidget.dart'; import 'package:marking_app/utils/easy_refresh/MyEmptyWidget.dart';
import 'package:photo_view/photo_view.dart'; import 'package:photo_view/photo_view.dart';
@ -29,22 +30,22 @@ class _StudentZgTableState extends State<StudentZgTable> {
int? _sortColumnIndex; int? _sortColumnIndex;
bool _sortAscending = true; bool _sortAscending = true;
void showImgDialog(BuildContext context,String imgUrl){ /*void showImgDialog(BuildContext context,String imgUrl){
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (_) { MaterialPageRoute(builder: (_) {
return Scaffold( return Scaffold(
appBar: AppBar(), appBar: AppBar(),
body: SizedBox( body: SizedBox(
/* width: MediaQuery.of(context).size.width * 0.6, *//* width: MediaQuery.of(context).size.width * 0.6,
height: MediaQuery.of(context).size.height * 0.6,*/ height: MediaQuery.of(context).size.height * 0.6,*//*
child: PhotoView( child: PhotoView(
imageProvider: imageProvider:
NetworkImage(imgUrl)), NetworkImage(imgUrl)),
), ),
); );
}), }),
); );*/
/* showDialog(context: context, builder: (BuildContext context){ /* showDialog(context: context, builder: (BuildContext context){
return AlertDialog( return AlertDialog(
// insetPadding: EdgeInsets.symmetric(vertical: 20.r,horizontal: 20.r), // insetPadding: EdgeInsets.symmetric(vertical: 20.r,horizontal: 20.r),
@ -62,7 +63,7 @@ class _StudentZgTableState extends State<StudentZgTable> {
), ),
); );
});*/ });*/
} // }
DataRow _getRow(int index, [Color? color]) { DataRow _getRow(int index, [Color? color]) {
assert(index >= 0); assert(index >= 0);
@ -88,7 +89,7 @@ class _StudentZgTableState extends State<StudentZgTable> {
DataCell(InkWell( DataCell(InkWell(
onTap: (){ onTap: (){
if(item.state != 0){ if(item.state != 0){
showImgDialog(context,item.studentAnswer!); ImageDialog.showImgDialog(context,item.studentAnswer!);
} }
}, },
@ -111,7 +112,7 @@ class _StudentZgTableState extends State<StudentZgTable> {
DataCell(InkWell( DataCell(InkWell(
onTap: (){ onTap: (){
if(item.state==1 || item.state==2){ if(item.state==1 || item.state==2){
showImgDialog(context,item.annotateAnswers!); ImageDialog.showImgDialog(context,item.annotateAnswers!);
} }
}, },