Merge remote-tracking branch 'origin/master'
commit
1136d87e33
|
|
@ -1,5 +1,6 @@
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
import 'package:dio/dio.dart';
|
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/common/route_service.dart';
|
||||||
import 'package:qhd_prevention/http/ApiService.dart';
|
import 'package:qhd_prevention/http/ApiService.dart';
|
||||||
import 'package:qhd_prevention/http/HttpManager.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 {
|
static Future<Map<String, dynamic>> getRectificationList(int page,String search ,int pageSize ) async {
|
||||||
final parentPerm = 'dashboard:Hazard:Management:Hidden-danger-rectification';
|
// final parentPerm = '';//dashboard:Hazard:Management:Hidden-danger-rectification
|
||||||
final targetPerm = '';
|
// final targetPerm = 'hidden-container-branchCompany-average-rectification-list';
|
||||||
final menuPath = await RouteService.getMenuPath(parentPerm, targetPerm);
|
// 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(
|
return HttpManager().request(
|
||||||
'${ApiService.basePath}/hidden',
|
'${ApiService.basePath}/hidden',
|
||||||
'/hidden/rectifyList',
|
'/hidden/rectifyList',
|
||||||
|
|
@ -238,9 +245,15 @@ class HiddenDangerApi {
|
||||||
|
|
||||||
/// 监管端:一般隐患列表
|
/// 监管端:一般隐患列表
|
||||||
static Future<Map<String, dynamic>> getGeneralHazardList(int page,String search,searchData, String corpId) async {
|
static Future<Map<String, dynamic>> getGeneralHazardList(int page,String search,searchData, String corpId) async {
|
||||||
final parentPerm = 'dashboard:Hazard:Management:Hidden-hazard-record';
|
// final parentPerm = 'dashboard:Hazard:Management:Hidden-hazard-record';
|
||||||
final targetPerm = '';
|
// final targetPerm = '';
|
||||||
final menuPath = await RouteService.getMenuPath(parentPerm, 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(
|
return HttpManager().request(
|
||||||
'${ApiService.basePath}/hidden',
|
'${ApiService.basePath}/hidden',
|
||||||
'/hidden/list',
|
'/hidden/list',
|
||||||
|
|
|
||||||
|
|
@ -235,6 +235,7 @@ class DannerRepairState extends State<DannerRepair> {
|
||||||
ItemListWidget.singleLineTitleText(
|
ItemListWidget.singleLineTitleText(
|
||||||
label: '投入资金(元)',
|
label: '投入资金(元)',
|
||||||
isEditable: true,
|
isEditable: true,
|
||||||
|
isNumericInput: true,
|
||||||
text: '',
|
text: '',
|
||||||
onChanged: (value) {
|
onChanged: (value) {
|
||||||
investmentFunds=value;
|
investmentFunds=value;
|
||||||
|
|
|
||||||
|
|
@ -635,7 +635,7 @@ class _HiddenRecordDetailPageState extends State<HiddenRecordDetailPage> {
|
||||||
),
|
),
|
||||||
|
|
||||||
Divider(height: 1),
|
Divider(height: 1),
|
||||||
_buildInfoItem('是否相关方', _getText(pd['isRelated'])),
|
_buildInfoItem('是否相关方', _getText(pd['isRelated']??0)),
|
||||||
|
|
||||||
if(pd['isRelated'] == 1)...[
|
if(pd['isRelated'] == 1)...[
|
||||||
Divider(height: 1),
|
Divider(height: 1),
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue