Merge remote-tracking branch 'origin/master'

master
hs 2026-08-12 09:26:51 +08:00
commit 1136d87e33
3 changed files with 21 additions and 7 deletions

View File

@ -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<Map<String, dynamic>> 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<Map<String, dynamic>> 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',

View File

@ -235,6 +235,7 @@ class DannerRepairState extends State<DannerRepair> {
ItemListWidget.singleLineTitleText(
label: '投入资金(元)',
isEditable: true,
isNumericInput: true,
text: '',
onChanged: (value) {
investmentFunds=value;

View File

@ -635,7 +635,7 @@ class _HiddenRecordDetailPageState extends State<HiddenRecordDetailPage> {
),
Divider(height: 1),
_buildInfoItem('是否相关方', _getText(pd['isRelated'])),
_buildInfoItem('是否相关方', _getText(pd['isRelated']??0)),
if(pd['isRelated'] == 1)...[
Divider(height: 1),