From d05e6d301dacc60491fbca20e4c745f877bd47ff Mon Sep 17 00:00:00 2001 From: xufei <727302827@qq.com> Date: Tue, 2 Sep 2025 14:42:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?2025.9.2=20bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/customWidget/ItemWidgetFactory.dart | 5 ++--- lib/http/ApiService.dart | 6 +++++- lib/http/HttpManager.dart | 1 + lib/pages/app/hidden_danger_acceptance_page.dart | 2 +- .../app/pending_rectification_detail_page.dart | 16 ++++++++-------- lib/pages/home/work/danger_project_page.dart | 2 +- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/lib/customWidget/ItemWidgetFactory.dart b/lib/customWidget/ItemWidgetFactory.dart index 466d3e0..831a870 100644 --- a/lib/customWidget/ItemWidgetFactory.dart +++ b/lib/customWidget/ItemWidgetFactory.dart @@ -40,14 +40,13 @@ class ListItemFactory { ], ), if (isRight) - Row( mainAxisSize: MainAxisSize.min, children: [ Flexible( fit: FlexFit.loose, child: Text( - rightText, + _truncateText(rightText,17) , style: TextStyle(fontSize: 13, color: Colors.grey), maxLines: 1, overflow: TextOverflow.ellipsis, @@ -65,7 +64,7 @@ class ListItemFactory { Flexible( fit: FlexFit.loose, child: Text( - rightText, + _truncateText(rightText,17) , style: TextStyle(fontSize: 13, color: Colors.grey), maxLines: 1, overflow: TextOverflow.ellipsis, diff --git a/lib/http/ApiService.dart b/lib/http/ApiService.dart index 90bc7c7..19fa315 100644 --- a/lib/http/ApiService.dart +++ b/lib/http/ApiService.dart @@ -2883,6 +2883,7 @@ U6Hzm1ninpWeE+awIDAQAB "CHECK_CONTENT": item["CHECK_CONTENT"] ?? "", "CHECK_STANDARD": item["CHECK_STANDARD"] ?? "", "REFERENCE_BASIS": item["REFERENCE_BASIS"] ?? "", + "SOURCE": '2', "STATE": '0', "CLEARIMG": '1', @@ -3108,6 +3109,7 @@ U6Hzm1ninpWeE+awIDAQAB String hiddenType3, result, ) { + print("======>$type"); return HttpManager().request( basePath, @@ -3120,10 +3122,12 @@ U6Hzm1ninpWeE+awIDAQAB "HIDDEN_CATEGORY": result["HIDDEN_CATEGORY"] ?? '', "LISTMANAGER_ID": item["LISTMANAGER_ID"], - "RISKITEM_ID": result["LISTCHECKITEM_ID"], + "RISKITEM_ID": item["LISTCHECKITEM_ID"], "CHECK_CONTENT": item["CHECK_CONTENT"] ?? "", "RECORDITEM_ID": item["RECORDITEM_ID"] ?? "", + + "HIDDENDESCR": hazardDescription, "HIDDENPART": partDescription, "LATITUDE": latitude, diff --git a/lib/http/HttpManager.dart b/lib/http/HttpManager.dart index 052e651..08a3ac1 100644 --- a/lib/http/HttpManager.dart +++ b/lib/http/HttpManager.dart @@ -96,6 +96,7 @@ class HttpManager { ); try { + print("======>$data"); switch (method) { case Method.get: resp = await _dio.get(url, diff --git a/lib/pages/app/hidden_danger_acceptance_page.dart b/lib/pages/app/hidden_danger_acceptance_page.dart index 1a3c4e1..89b99ba 100644 --- a/lib/pages/app/hidden_danger_acceptance_page.dart +++ b/lib/pages/app/hidden_danger_acceptance_page.dart @@ -557,7 +557,7 @@ class _HiddenDangerAcceptancePageState extends State String hiddenCheckId=""; try{ - data['check']['HIDDENCHECK_ID']; + hiddenCheckId= data['check']['HIDDENCHECK_ID']; }catch(e){ hiddenCheckId=""; } diff --git a/lib/pages/app/pending_rectification_detail_page.dart b/lib/pages/app/pending_rectification_detail_page.dart index ce558bd..b2c59fe 100644 --- a/lib/pages/app/pending_rectification_detail_page.dart +++ b/lib/pages/app/pending_rectification_detail_page.dart @@ -213,14 +213,14 @@ class _PendingRectificationDetailPageState extends State { } if (hasNoSelectItem) { - ToastUtil.showNormal(context, "还有位选择的排查项"); + ToastUtil.showNormal(context, "还有未选择的排查项"); LoadingDialogHelper.hide(); return; } From 009b4af68a32511d7f088760888abbe846c9fa2e Mon Sep 17 00:00:00 2001 From: xufei <727302827@qq.com> Date: Tue, 2 Sep 2025 15:30:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?2025.9.2=20=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../study/strengthen_video_study_page.dart | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/lib/pages/home/study/strengthen_video_study_page.dart b/lib/pages/home/study/strengthen_video_study_page.dart index 708180c..2f34e16 100644 --- a/lib/pages/home/study/strengthen_video_study_page.dart +++ b/lib/pages/home/study/strengthen_video_study_page.dart @@ -166,16 +166,31 @@ class _StrengthenStudyPageState extends State { body: Column( children: [ ListItemFactory.createBuildSimpleSection('加强学习课件'), - SizedBox( - width: double.infinity, - height: 250, - child: VideoPlayerWidget( - allowSeek: false, - controller: _videoController, - coverUrl:'', - aspectRatio: _videoController?.value.aspectRatio ?? 16 / 9, + if(_videoList.isEmpty) + Stack(children: [ + Container( + width: double.infinity, + height: 200, + color: Colors.white, + child: Center( + child:Text("暂未播放", + ), + ), ), - ), + if(_videoList.isNotEmpty) + SizedBox( + width: double.infinity, + height: 250, + child: VideoPlayerWidget( + allowSeek: false, + controller: _videoController, + coverUrl:'', + aspectRatio: _videoController?.value.aspectRatio ?? 16 / 9, + ), + ), + ],), + + Expanded( child: ListView.builder( padding: const EdgeInsets.all(12), From 5af97be5039bfa266f811d4f88dc1ffc3b9cd3d9 Mon Sep 17 00:00:00 2001 From: xufei <727302827@qq.com> Date: Tue, 2 Sep 2025 15:44:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?2025.9.2=20=E9=AA=8C=E6=94=B6=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=B2=A1=E6=9C=89=E9=AA=8C=E6=94=B6=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/app/hidden_record_detail_page.dart | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/pages/app/hidden_record_detail_page.dart b/lib/pages/app/hidden_record_detail_page.dart index ad4a21f..d366e9e 100644 --- a/lib/pages/app/hidden_record_detail_page.dart +++ b/lib/pages/app/hidden_record_detail_page.dart @@ -137,7 +137,13 @@ class _HiddenRecordDetailPageState extends State { files5.add(img["FILEPATH"]); } files6 = data['yImgs'] ?? []; + checkList = data['checkList'] ?? []; + if(checkList.isNotEmpty) { + for (var img in checkList[0]['cImgs']) { + files7.add(img["FILEPATH"]); + } + } }); } @@ -398,7 +404,7 @@ class _HiddenRecordDetailPageState extends State { // _buildImageGrid(files2, onTap: (index) => _showImageGallery(files2, index)), ListItemFactory.createTextImageItem( text: "验收图片", - imageUrls: files5, + imageUrls: files7, onImageTapped: (index) { presentOpaque( SingleImageViewer(imageUrl: ApiService.baseImgPath +files5[index]),