diff --git a/lib/http/modules/hidden_danger_api.dart b/lib/http/modules/hidden_danger_api.dart index 8093f47..c13388d 100644 --- a/lib/http/modules/hidden_danger_api.dart +++ b/lib/http/modules/hidden_danger_api.dart @@ -1,5 +1,6 @@ import 'dart:io'; import 'package:dio/dio.dart'; +import 'package:qhd_prevention/common/route_model.dart'; import 'package:qhd_prevention/common/route_service.dart'; import 'package:qhd_prevention/http/ApiService.dart'; import 'package:qhd_prevention/http/HttpManager.dart'; @@ -133,9 +134,15 @@ class HiddenDangerApi { /// 获取整改列表 static Future> getRectificationList(int page,String search ,int pageSize ) async { - final parentPerm = 'dashboard:Hazard:Management:Hidden-danger-rectification'; - final targetPerm = ''; - final menuPath = await RouteService.getMenuPath(parentPerm, targetPerm); + // final parentPerm = '';//dashboard:Hazard:Management:Hidden-danger-rectification + // final targetPerm = 'hidden-container-branchCompany-average-rectification-list'; + // final menuPath = await RouteService.getMenuPath(parentPerm, targetPerm); + String perm = "hidden-container-branchCompany-average-rectification-list"; + RouteModel? route = RouteService().findRouteByPerm(perm); + String menuPath=''; + if (route != null) { + menuPath = route.menuUrl; + } return HttpManager().request( '${ApiService.basePath}/hidden', '/hidden/rectifyList', @@ -238,9 +245,15 @@ class HiddenDangerApi { /// 监管端:一般隐患列表 static Future> getGeneralHazardList(int page,String search,searchData, String corpId) async { - final parentPerm = 'dashboard:Hazard:Management:Hidden-hazard-record'; - final targetPerm = ''; - final menuPath = await RouteService.getMenuPath(parentPerm, targetPerm); + // final parentPerm = 'dashboard:Hazard:Management:Hidden-hazard-record'; + // final targetPerm = ''; + // final menuPath = await RouteService.getMenuPath(parentPerm, targetPerm); + String perm = "hidden-container-branchCompany-average-ledger-list"; + RouteModel? route = RouteService().findRouteByPerm(perm); + String menuPath=''; + if (route != null) { + menuPath = route.menuUrl; + } return HttpManager().request( '${ApiService.basePath}/hidden', '/hidden/list', diff --git a/lib/pages/home/hiddenDanger/danner_repair.dart b/lib/pages/home/hiddenDanger/danner_repair.dart index d605dc7..07c958a 100644 --- a/lib/pages/home/hiddenDanger/danner_repair.dart +++ b/lib/pages/home/hiddenDanger/danner_repair.dart @@ -235,6 +235,7 @@ class DannerRepairState extends State { ItemListWidget.singleLineTitleText( label: '投入资金(元)', isEditable: true, + isNumericInput: true, text: '', onChanged: (value) { investmentFunds=value; diff --git a/lib/pages/home/hiddenDanger/hidden_record_detail_page.dart b/lib/pages/home/hiddenDanger/hidden_record_detail_page.dart index d9c4158..9aa29af 100644 --- a/lib/pages/home/hiddenDanger/hidden_record_detail_page.dart +++ b/lib/pages/home/hiddenDanger/hidden_record_detail_page.dart @@ -635,7 +635,7 @@ class _HiddenRecordDetailPageState extends State { ), Divider(height: 1), - _buildInfoItem('是否相关方', _getText(pd['isRelated'])), + _buildInfoItem('是否相关方', _getText(pd['isRelated']??0)), if(pd['isRelated'] == 1)...[ Divider(height: 1),