From a77758104e08233497aa66603c81346a390fca47 Mon Sep 17 00:00:00 2001 From: xufei <727302827@qq.com> Date: Wed, 10 Sep 2025 13:48:52 +0800 Subject: [PATCH] =?UTF-8?q?2025.9.10=20=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/app/danner_repair.dart | 2 +- .../CheckPersonSure/check_person_detail.dart | 2 +- .../check_person_list_page.dart | 7 ++- lib/pages/home/work/danger_project_page.dart | 59 +++++++++++++++---- lib/pages/home/work/danger_wait_deawer.dart | 3 + 5 files changed, 57 insertions(+), 16 deletions(-) diff --git a/lib/pages/app/danner_repair.dart b/lib/pages/app/danner_repair.dart index cad7358..03f0a46 100644 --- a/lib/pages/app/danner_repair.dart +++ b/lib/pages/app/danner_repair.dart @@ -495,7 +495,7 @@ class DannerRepairState extends State { /// 整改计划 Widget _acceptPlan() { return Padding( - padding: EdgeInsets.symmetric(horizontal: 10), + padding: EdgeInsets.symmetric(horizontal: 15), child: MediaPickerRow( maxCount: 4, onChanged: (List files) { diff --git a/lib/pages/home/SafeCheck/CheckPersonSure/check_person_detail.dart b/lib/pages/home/SafeCheck/CheckPersonSure/check_person_detail.dart index cec47c2..8c0cf44 100644 --- a/lib/pages/home/SafeCheck/CheckPersonSure/check_person_detail.dart +++ b/lib/pages/home/SafeCheck/CheckPersonSure/check_person_detail.dart @@ -189,7 +189,7 @@ class _CheckPersonDetailState extends State { inspectorForm['OPERATOR'] = SessionService.instance.loginUserId; inspectorForm['ACTION_USER'] = SessionService.instance.username; - + inspectorForm['INSPECTION_USER_SIGN_TIME'] = DateFormat('yyyy-MM-dd HH:mm:ss').format(DateTime.now()); try { // 准备上传文件路径（兼容多种 signImgList 存法） String filePath = signImages.first; diff --git a/lib/pages/home/SafeCheck/CheckPersonSure/check_person_list_page.dart b/lib/pages/home/SafeCheck/CheckPersonSure/check_person_list_page.dart index c8eeaeb..be5a5c2 100644 --- a/lib/pages/home/SafeCheck/CheckPersonSure/check_person_list_page.dart +++ b/lib/pages/home/SafeCheck/CheckPersonSure/check_person_list_page.dart @@ -240,9 +240,12 @@ class _CheckPersonListPageState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Text( - "检查时间: ${item['INSPECTION_TIME_START'] ?? ''}至${item['INSPECTION_TIME_END'] ?? ''}", + Expanded( + child: Text( + "检查时间: ${item['INSPECTION_TIME_START'] ?? ''}至${item['INSPECTION_TIME_END'] ?? ''}", + ), ), + ], ), const SizedBox(height: 8), diff --git a/lib/pages/home/work/danger_project_page.dart b/lib/pages/home/work/danger_project_page.dart index 7ffee4d..4c51f12 100644 --- a/lib/pages/home/work/danger_project_page.dart +++ b/lib/pages/home/work/danger_project_page.dart @@ -265,6 +265,7 @@ class _DangerProjectPageState extends State { Widget _itemCell(final screenWidth, final item) { final TextEditingController _controller = TextEditingController(); + _controller.text=item["CHECK_QUALIFIED"]; return Padding( padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 10), child: Column( @@ -334,17 +335,35 @@ class _DangerProjectPageState extends State { color: const Color(0xFFF1F1F1), child: Container( width: screenWidth, - padding: const EdgeInsets.all(10), - child: - // TextField( - // controller: _controller, - // decoration: InputDecoration( - // labelText: '输入框', - // hintText: '请输入内容', - // ), - // ), + child:Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (item["OPERATION_TYPE"] != 1 ) + TextField( + onChanged: (value) { + item["CHECK_QUALIFIED"]=value; + print('当前输入内容: $value'); + // 在这里处理文字改变逻辑 + }, + decoration: InputDecoration( + hintText: '检查详细描述(必填项)', + ), + style: TextStyle( + fontSize: 12.0, // 输入文字的大小 + color: Colors.black, + ), + controller: _controller, + ), + if (item["OPERATION_TYPE"] == 1 ) + Padding( + padding: EdgeInsets.all(10), + child: Text(item["CHECK_QUALIFIED"], style: const TextStyle(color: Colors.black, fontSize: 12)), + ) + ], + ) + + - Text(item["CHECK_QUALIFIED"], style: const TextStyle(color: Colors.black, fontSize: 12)), )), ], ), @@ -401,6 +420,11 @@ class _DangerProjectPageState extends State { return GestureDetector( onTap: () { + if(item["HASHIDDEN"]> 0){ + ToastUtil.showNormal(context, "此检查内容存在未处理隐患，无法检查"); + return; + } + setState(() { if (value != "option2") { SessionService.instance.setUnqualifiedInspectionItemIDJson(""); @@ -555,6 +579,7 @@ class _DangerProjectPageState extends State { } Future _submitInvestigationItems() async { + try { //获取定位 await fetchAndSaveBd09(context); final prefs = await SharedPreferences.getInstance(); @@ -566,7 +591,16 @@ class _DangerProjectPageState extends State { String ids = ""; for (int i = 0; i < listDates.length; i++) { final item = listDates[i]; - if (item["REFERENCE_BASIS"] == "option1") { + if(item["HASHIDDEN"]> 0){ + upDataItemList.add({ + "CUSTOM_ITEM_ID": item["CUSTOM_ITEM_ID"], + "LISTCHECKITEM_ID": item["LISTCHECKITEM_ID"], + "RECORDITEM_ID": item["RECORDITEM_ID"], + "ISNORMAL": null, + "CHECK_RESULT": item["CHECK_QUALIFIED"], + }); + + }else if (item["REFERENCE_BASIS"] == "option1") { upDataItemList.add({ "CUSTOM_ITEM_ID": item["CUSTOM_ITEM_ID"], "LISTCHECKITEM_ID": item["LISTCHECKITEM_ID"], @@ -603,6 +637,7 @@ class _DangerProjectPageState extends State { } } + if (hasNoSelectItem) { ToastUtil.showNormal(context, "还有未选择的排查项"); LoadingDialogHelper.hide(); @@ -610,7 +645,7 @@ class _DangerProjectPageState extends State { } String itemsString = jsonEncode(upDataItemList); String CHECKRECORD_ID = widget.checkrecordId ?? ""; - try { + final Map result; if (widget.type == 1) { result = await ApiService.submitInvestigationItemsYinHuan(widget.item, longitude, latitude, itemsString, ids, CHECKRECORD_ID); diff --git a/lib/pages/home/work/danger_wait_deawer.dart b/lib/pages/home/work/danger_wait_deawer.dart index f6838b8..8c33e21 100644 --- a/lib/pages/home/work/danger_wait_deawer.dart +++ b/lib/pages/home/work/danger_wait_deawer.dart @@ -476,6 +476,8 @@ class DangerWaitDrawerState extends State { _startDate = null; _endDate = null; + startTime=""; + endTime=""; itemNameOne="请选择"; itemNameTwo="请选择"; @@ -521,6 +523,7 @@ class DangerWaitDrawerState extends State { color: Colors.white, ), child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text(title, style: const TextStyle(fontSize: 14)), const SizedBox(height: 20),