From f39c8e7fb066463b121661f0323992807f4552c2 Mon Sep 17 00:00:00 2001 From: xufei <727302827@qq.com> Date: Thu, 21 May 2026 16:23:51 +0800 Subject: [PATCH] =?UTF-8?q?2026.5.21=20=20=E9=9A=90=E6=82=A3=E6=B2=BB?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/http/modules/hidden_danger_api.dart | 12 ++- .../hidden_danger_acceptance.dart | 48 +++++---- .../hiddenDanger/hidden_danger_deawer.dart | 102 +++++++++++------- .../hidden_danger_record_two.dart | 14 ++- .../hiddenDanger/hidden_danger_tab_page.dart | 53 ++++----- .../hidden_record_detail_page.dart | 16 +-- ...hidden_record_detail_pastrecords_page.dart | 46 ++++---- lib/pages/home/home_page.dart | 11 +- 8 files changed, 178 insertions(+), 124 deletions(-) diff --git a/lib/http/modules/hidden_danger_api.dart b/lib/http/modules/hidden_danger_api.dart index 34395e3..e7d27d3 100644 --- a/lib/http/modules/hidden_danger_api.dart +++ b/lib/http/modules/hidden_danger_api.dart @@ -131,15 +131,19 @@ class HiddenDangerApi { } /// 获取整改列表 - static Future> getRectificationList(int page,String search) { + static Future> getRectificationList(int page,String search ,int pageSize ) { return HttpManager().request( '${ApiService.basePath}/hidden', '/hidden/rectifyList', method: Method.post, data: { "pageIndex": page, + "pageSize":pageSize, "hiddenDesc": search, + "hiddenLevels": ["hiddenLevel1004", "hiddenLevel1002"], + // "menuPath": "/hidden/container/stakeholder/rectification/list", + }, ); } @@ -232,12 +236,14 @@ class HiddenDangerApi { static Future> getGeneralHazardList(int page,String search,searchData, String corpId) { return HttpManager().request( '${ApiService.basePath}/hidden', - '/hidden/generalHiddenList', + '/hidden/list', method: Method.post, data: { + 'hiddenLevels': ["hiddenLevel1001", "hiddenLevel1004", "hiddenLevel1002"], "pageIndex": page, "hiddenDesc": search, - "corpId": corpId, + // 'menuPath':"/hidden/container/stakeholder/hiddenRecord/list", + // "corpId": corpId, "hiddenFindTime": searchData['beginTIme'], "hiddenFindTimeLe": searchData['endTime'], diff --git a/lib/pages/home/hiddenDanger/hidden_danger_acceptance.dart b/lib/pages/home/hiddenDanger/hidden_danger_acceptance.dart index e8d2672..778684d 100644 --- a/lib/pages/home/hiddenDanger/hidden_danger_acceptance.dart +++ b/lib/pages/home/hiddenDanger/hidden_danger_acceptance.dart @@ -606,7 +606,7 @@ class _HiddenDangerAcceptanceState extends State { if (widget.appItem == 2) { result = await HiddenDangerApi.getIgnoreList(_page, searchKey); } else if (widget.appItem == 3) { - result = await HiddenDangerApi.getRectificationList(_page, searchKey); + result = await HiddenDangerApi.getRectificationList(_page, searchKey,20); } else if (widget.appItem == 4) { result = await HiddenDangerApi.getSpecialHandlingList( _page, @@ -698,36 +698,40 @@ class _HiddenDangerAcceptanceState extends State { String _getState(final item) { int type = item["state"]; - if(100==type){ + if (100 == type) { return "待确认"; - }else if(200==type){ - return "未整改"; - }else if(201==type){ + } else if (200 == type) { + return "待整改"; + } else if (201 == type) { return "确认打回"; - }else if(202==type){ + } else if (202 == type) { return "待处理特殊隐患"; - }else if(300==type){ - return "待验收"; - }else if(301==type){ + } else if (300 == type) { + return "已整改"; + } else if (301 == type) { return "已验收"; - }else if(302==type){ + } else if (302 == type) { return "验收打回"; - }else if(303==type){ + } else if (303 == type) { return "验收打回"; - }else if(400==type){ - return "已处理特殊隐患"; - }else if(99==type){ + } else if (400 == type) { + return "已归档"; + } else if (99 == type) { return "强制关闭(人员变动)"; - }else if(98==type){ + } else if (98 == type) { return "安全环保检查/清单排查暂存"; - }else if(102==type){ - return "安全环保检查，隐患待指派"; - }else if(97==type){ - return "已过期"; - }else if(101==type){ - return "忽略隐患"; - }else{ + } else if (102 == type) { + return "安全环保检查，隐患带指派"; + } else if (97 == type) { return "已过期"; + } else if (101 == type) { + return "已忽略"; + } else if (110 == type) { + return "待核实"; + }else if (120 == type) { + return "待核定"; + }else { + return ""; } } diff --git a/lib/pages/home/hiddenDanger/hidden_danger_deawer.dart b/lib/pages/home/hiddenDanger/hidden_danger_deawer.dart index 3787ff4..07bcd7a 100644 --- a/lib/pages/home/hiddenDanger/hidden_danger_deawer.dart +++ b/lib/pages/home/hiddenDanger/hidden_danger_deawer.dart @@ -241,51 +241,73 @@ class _HiddenDangerDeawerState extends State { const SizedBox(height: 10), - GestureDetector( - onTap: () async { - - if(_HazardPersonlist.isEmpty){ - await _getHazardPersonlist(); - } - String choice = await BottomPickerTwo.show( - context, - items: _HazardPersonlist, - itemName: "name", - itemBuilder: (item) => Text(item["name"], textAlign: TextAlign.center), - initialIndex: 0, - ); - if (choice != null) { - for(int i=0;i<_HazardPersonlist.length;i++){ - if(choice==_HazardPersonlist[i]["name"]){ - _hazardLeve = _HazardPersonlist[i]; - } - } - + Container( + padding: EdgeInsets.symmetric(horizontal: 0), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(4), + border: Border.all(color: Colors.grey.shade400), + color: Colors.white, + ), + child: ItemListWidget.singleLineTitleText( + label: '隐患确认人', + isEditable: true, + isRequired:false, + isTextFont:false, + hintText: '', + text: allData['trueUserName'] ?? '', + onChanged: (value) { setState(() { - allData['trueUserId']=_hazardLeve["userId"]; - allData['trueUserName']=_hazardLeve["name"]; - - // addData['confirmDeptId']=_hazardLeve["deptId"]; - // addData['confirmDeptName']=_hazardLeve["deptName"]; + allData['trueUserName'] = value; }); - } - }, - child:Container( - padding: EdgeInsets.symmetric(horizontal: 0), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(4), - border: Border.all(color: Colors.grey.shade400), - color: Colors.white, - ), - child: ListItemFactory.createRowSpaceBetweenItem( - isRequired:false, - leftText: "隐患确认人", - rightText: allData['trueUserName'].isNotEmpty?allData['trueUserName']:"请选择", - isRight: true, - ), + }, ), ), + // GestureDetector( + // onTap: () async { + // + // if(_HazardPersonlist.isEmpty){ + // await _getHazardPersonlist(); + // } + // String choice = await BottomPickerTwo.show( + // context, + // items: _HazardPersonlist, + // itemName: "name", + // itemBuilder: (item) => Text(item["name"], textAlign: TextAlign.center), + // initialIndex: 0, + // ); + // if (choice != null) { + // for(int i=0;i<_HazardPersonlist.length;i++){ + // if(choice==_HazardPersonlist[i]["name"]){ + // _hazardLeve = _HazardPersonlist[i]; + // } + // } + // + // setState(() { + // allData['trueUserId']=_hazardLeve["userId"]; + // allData['trueUserName']=_hazardLeve["name"]; + // + // // addData['confirmDeptId']=_hazardLeve["deptId"]; + // // addData['confirmDeptName']=_hazardLeve["deptName"]; + // + // }); + // } + // }, + // child:Container( + // padding: EdgeInsets.symmetric(horizontal: 0), + // decoration: BoxDecoration( + // borderRadius: BorderRadius.circular(4), + // border: Border.all(color: Colors.grey.shade400), + // color: Colors.white, + // ), + // child: ListItemFactory.createRowSpaceBetweenItem( + // isRequired:false, + // leftText: "隐患确认人", + // rightText: allData['trueUserName'].isNotEmpty?allData['trueUserName']:"请选择", + // isRight: true, + // ), + // ), + // ), const SizedBox(height: 10), diff --git a/lib/pages/home/hiddenDanger/hidden_danger_record_two.dart b/lib/pages/home/hiddenDanger/hidden_danger_record_two.dart index dea4394..bebc7f4 100644 --- a/lib/pages/home/hiddenDanger/hidden_danger_record_two.dart +++ b/lib/pages/home/hiddenDanger/hidden_danger_record_two.dart @@ -673,7 +673,7 @@ class _HiddenDangerRecordTwoState extends State { if (100 == type) { return "待确认"; } else if (200 == type) { - return "未整改"; + return "待整改"; } else if (201 == type) { return "确认打回"; } else if (202 == type) { @@ -687,7 +687,7 @@ class _HiddenDangerRecordTwoState extends State { } else if (303 == type) { return "验收打回"; } else if (400 == type) { - return "已处理特殊隐患"; + return "已归档"; } else if (99 == type) { return "强制关闭(人员变动)"; } else if (98 == type) { @@ -697,9 +697,13 @@ class _HiddenDangerRecordTwoState extends State { } else if (97 == type) { return "已过期"; } else if (101 == type) { - return "忽略隐患"; - } else { - return "已过期"; + return "已忽略"; + } else if (110 == type) { + return "待核实"; + }else if (120 == type) { + return "待核定"; + }else { + return ""; } } diff --git a/lib/pages/home/hiddenDanger/hidden_danger_tab_page.dart b/lib/pages/home/hiddenDanger/hidden_danger_tab_page.dart index 5176e1b..2cbd75e 100644 --- a/lib/pages/home/hiddenDanger/hidden_danger_tab_page.dart +++ b/lib/pages/home/hiddenDanger/hidden_danger_tab_page.dart @@ -3,6 +3,7 @@ import 'dart:ffi'; import 'package:flutter/material.dart'; import 'package:qhd_prevention/common/route_service.dart'; +import 'package:qhd_prevention/http/modules/hidden_danger_api.dart'; import 'package:qhd_prevention/http/modules/key_tasks_api.dart'; import 'package:qhd_prevention/pages/home/doorAndCar/doorCar_tab_page.dart'; import 'package:qhd_prevention/pages/home/hiddenDanger/hidden_danger_acceptance.dart'; @@ -70,32 +71,32 @@ class _HiddenDangerTabPageState extends State { } Future _getDoorCarCount() async { - // try { - // String userId= SessionService.instance.accountId??''; - // final result = await KeyTasksApi.getKeyTasksToDoCount(userId); - // if (result['success'] ) { - // dynamic data = result['data']?? {} ; - // - // setState(() { - // // 隐患治理 - // final gateSection = defaultSections[0]; - // - // // 隐患治理 - // gateSection.items[0].badge = int.parse(data['zdzysqCount']??0); - // // 确认 - // gateSection.items[1].badge = int.parse(data['bjcrqrCount']??0); - // // 整改 - // gateSection.items[2].badge = int.parse(data['yhdzgCount']??0); - // - // }); - // } - // // else { - // // ToastUtil.showNormal(context, result['errMessage'] ?? "加载数据失败"); - // // } - // } catch (e) { - // LoadingDialogHelper.hide(); - // print('加载数据失败：$e'); - // } + try { + + final result = await HiddenDangerApi.getRectificationList(1, '',101); + if (result['success'] ) { + List data = result['data']?? [] ; + + setState(() { + // 隐患治理 + final gateSection = defaultSections[0]; + + // 隐患治理 + gateSection.items[0].badge = data.length; + // // 确认 + // gateSection.items[1].badge = int.parse(data['bjcrqrCount']??0); + // // 整改 + // gateSection.items[2].badge = int.parse(data['yhdzgCount']??0); + + }); + } + // else { + // ToastUtil.showNormal(context, result['errMessage'] ?? "加载数据失败"); + // } + } catch (e) { + LoadingDialogHelper.hide(); + print('加载数据失败：$e'); + } } @override diff --git a/lib/pages/home/hiddenDanger/hidden_record_detail_page.dart b/lib/pages/home/hiddenDanger/hidden_record_detail_page.dart index 73a0c95..1e2fe4f 100644 --- a/lib/pages/home/hiddenDanger/hidden_record_detail_page.dart +++ b/lib/pages/home/hiddenDanger/hidden_record_detail_page.dart @@ -3186,7 +3186,7 @@ class _HiddenRecordDetailPageState extends State { if (100 == type) { return "待确认"; } else if (200 == type) { - return "未整改"; + return "待整改"; } else if (201 == type) { return "确认打回"; } else if (202 == type) { @@ -3200,19 +3200,23 @@ class _HiddenRecordDetailPageState extends State { } else if (303 == type) { return "验收打回"; } else if (400 == type) { - return "已处理特殊隐患"; + return "已归档"; } else if (99 == type) { return "强制关闭(人员变动)"; } else if (98 == type) { return "安全环保检查/清单排查暂存"; } else if (102 == type) { - return "安全环保检查，隐患待指派"; + return "安全环保检查，隐患带指派"; } else if (97 == type) { return "已过期"; } else if (101 == type) { - return "忽略隐患"; - } else { - return "已过期"; + return "已忽略"; + } else if (110 == type) { + return "待核实"; + }else if (120 == type) { + return "待核定"; + }else { + return ""; } } diff --git a/lib/pages/home/hiddenDanger/hidden_record_detail_pastrecords_page.dart b/lib/pages/home/hiddenDanger/hidden_record_detail_pastrecords_page.dart index f65edf4..5ea2e97 100644 --- a/lib/pages/home/hiddenDanger/hidden_record_detail_pastrecords_page.dart +++ b/lib/pages/home/hiddenDanger/hidden_record_detail_pastrecords_page.dart @@ -1497,36 +1497,40 @@ class _HiddenRecordDetailPastrecordsPageState extends State final result = await TodoApi.getTodoList(data); final specialWork = await SpecialWorkApi.specialWorkTaskLogTotalCount(); final keyTasksWork = await KeyTasksApi.getKeyTasksToDoCount(SessionService.instance.accountId??''); + final hiddenDangerWork = await HiddenDangerApi.getRectificationList(1, '',101); int specialWorkNum = 0; int keyTasksNum = 0; + int hiddenDangerNum = 0; try { if (specialWork['success']) { List specialWorkList = specialWork['data'] ?? []; @@ -1133,6 +1135,11 @@ class HomePageState extends RouteAwareState int yhdzgCount = int.parse(keyTasksWork['data']['yhdzgCount']??0); keyTasksNum = bjcrqrCount+yhdzgCount+zdzysqCount; } + + if (hiddenDangerWork['success']) { + List data = hiddenDangerWork['data']?? [] ; + hiddenDangerNum = data.length; + } setState(() { for (var section in buttonInfos) { if (section['title'] == '危险作业') { @@ -1141,7 +1148,9 @@ class HomePageState extends RouteAwareState if (section['title'] == '重点作业') { section['unreadCount'] = keyTasksNum; } - + if (section['title'] == '隐患治理') { + section['unreadCount'] = hiddenDangerNum; + } } }); } catch (e) {}