From 11001600dd775f86b4b67432b1cfe6225bb37b92 Mon Sep 17 00:00:00 2001 From: xufei <727302827@qq.com> Date: Mon, 30 Mar 2026 16:21:06 +0800 Subject: [PATCH] =?UTF-8?q?2026.3.30=20=E5=BE=85=E5=8A=9E=EF=BC=8C?= =?UTF-8?q?=E5=8F=A3=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/constants/app_enums.dart | 24 +++++++++++++++---- lib/http/modules/doorAndCar_api.dart | 1 + .../doorAndCar/car/doorArea_car_add_page.dart | 2 +- .../car/firstlevel_car_add_page.dart | 2 +- .../car/onlyLook_car_application.dart | 2 +- .../doorAndCar/car/onlyLook_doorarea_car.dart | 2 +- .../person/doorArea_person_add_page.dart | 2 +- .../person/doorArea_person_record_page.dart | 16 ++++++------- .../person/firstlevel_person_add_page.dart | 2 +- .../person/onlyLook_doorarea_person.dart | 2 +- .../person/onlyLook_person_application.dart | 2 +- lib/pages/home/home_page.dart | 24 +++++++++++++------ 12 files changed, 53 insertions(+), 28 deletions(-) diff --git a/lib/constants/app_enums.dart b/lib/constants/app_enums.dart index 98b37a1..b44c348 100644 --- a/lib/constants/app_enums.dart +++ b/lib/constants/app_enums.dart @@ -394,8 +394,8 @@ enum UploadFileType { '302', 'fire_safety_inspection_passed_images', ), - /// 门口门禁签字照片 - 类型: '303', 路径: 'gate_access_vehicle_signature_photo' - gateAccessVehicleSignaturePhoto('303', 'gate_access_vehicle_signature_photo'), + // /// 门口门禁签字照片 - 类型: '303', 路径: 'gate_access_vehicle_signature_photo' + // gateAccessVehicleSignaturePhoto('303', 'gate_access_vehicle_signature_photo'), /// 门口门禁车辆行驶证照片 - 类型: '601', 路径: 'gate_access_vehicle_license_photo' gateAccessVehicleLicensePhoto('601', 'gate_access_vehicle_license_photo'), @@ -406,14 +406,28 @@ enum UploadFileType { /// 门口门禁车辆附件 - 类型: '603', 路径: 'gate_access_vehicle_attachment' gateAccessVehicleAttachment('603', 'gate_access_vehicle_attachment'), - /// 排放标准证明 - 类型: '604', 路径: 'emission_standard_certificate' - emissionStandardCertificate('604', 'emission_standard_certificate'), + // /// 排放标准证明 - 类型: '604', 路径: 'emission_standard_certificate' + // emissionStandardCertificate('604', 'emission_standard_certificate'), /// 机动车登记证书(绿本) - 类型: '605', 路径: 'motor_vehicle_registration_certificate_green_book' motorVehicleRegistrationCertificateGreenBook( '605', 'motor_vehicle_registration_certificate_green_book', - ); + ), + + /// 门口门禁人员申请人签字 - 类型: '611', 路径: 'gate_access_personnel_applicant_signature' + gateAccessPersonnelApplicantSignature('611', 'gate_access_personnel_applicant_signature'), + /// 门口门禁车辆申请人签字 - 类型: '606', 路径: 'gate_access_vehicle_applicant_signature' + gateAccessVehicleApplicantSignature('606', 'gate_access_vehicle_applicant_signature'), + /// 封闭区域人员申请人签字 - 类型: '609', 路径: 'enclosed_area_personnel_applicant_signature' + enclosedAreaPersonnelApplicantSignature('609', 'enclosed_area_personnel_applicant_signature'), + /// 封闭区域车辆申请人签字 - 类型: '610', 路径: 'emission_standard_certificate' + emissionStandardCertificate('610', 'emission_standard_certificate'); + + + + + const UploadFileType(this.type, this.path); diff --git a/lib/http/modules/doorAndCar_api.dart b/lib/http/modules/doorAndCar_api.dart index 1fa44e9..36ffb05 100644 --- a/lib/http/modules/doorAndCar_api.dart +++ b/lib/http/modules/doorAndCar_api.dart @@ -73,6 +73,7 @@ class DoorAndCarApi { '&temporaryPermissionFlag=$temporaryPermissionFlag', method: Method.get, data: { + "zgdw-mjspr": '/primeport/container/stakeholder/firstLevelDoor/approverUser', // ...data }, ); diff --git a/lib/pages/home/doorAndCar/car/doorArea_car_add_page.dart b/lib/pages/home/doorAndCar/car/doorArea_car_add_page.dart index cb27b44..627aa7a 100644 --- a/lib/pages/home/doorAndCar/car/doorArea_car_add_page.dart +++ b/lib/pages/home/doorAndCar/car/doorArea_car_add_page.dart @@ -877,7 +877,7 @@ class _DoorareaCarAddPageState extends State { } if(signImages.isNotEmpty){ - String signImagesId= await _addImgFilesLicense(signImages, UploadFileType.gateAccessVehicleSignaturePhoto,''); + String signImagesId= await _addImgFilesLicense(signImages, UploadFileType.emissionStandardCertificate,''); addData['informSignId']=signImagesId; } LoadingDialogHelper.hide(); diff --git a/lib/pages/home/doorAndCar/car/firstlevel_car_add_page.dart b/lib/pages/home/doorAndCar/car/firstlevel_car_add_page.dart index 3acc367..d2aff0c 100644 --- a/lib/pages/home/doorAndCar/car/firstlevel_car_add_page.dart +++ b/lib/pages/home/doorAndCar/car/firstlevel_car_add_page.dart @@ -813,7 +813,7 @@ class _FirstlevelCarAddPageState extends State { } if(signImages.isNotEmpty){ - String signImagesId= await _addImgFilesLicense(signImages, UploadFileType.gateAccessVehicleSignaturePhoto,''); + String signImagesId= await _addImgFilesLicense(signImages, UploadFileType.gateAccessVehicleApplicantSignature,''); addData['informSignId']=signImagesId; } LoadingDialogHelper.hide(); diff --git a/lib/pages/home/doorAndCar/car/onlyLook_car_application.dart b/lib/pages/home/doorAndCar/car/onlyLook_car_application.dart index f0abdaa..fd62bfd 100644 --- a/lib/pages/home/doorAndCar/car/onlyLook_car_application.dart +++ b/lib/pages/home/doorAndCar/car/onlyLook_car_application.dart @@ -365,7 +365,7 @@ class _OnlylookCarApplicationState extends State { personnelList=applicationInfo['vehicleAuditLogList']??[]; final imageResults = await Future.wait([ - FileApi.getImagePath(applicationInfo['informSignId'], UploadFileType.gateAccessVehicleSignaturePhoto), + FileApi.getImagePath(applicationInfo['informSignId'], UploadFileType.gateAccessVehicleApplicantSignature), FileApi.getImagePath(applicationInfo['drivingLicenseId'], UploadFileType.gateAccessVehicleLicensePhoto), FileApi.getImagePath(applicationInfo['attachmentId'], UploadFileType.gateAccessVehiclePhoto), ]); diff --git a/lib/pages/home/doorAndCar/car/onlyLook_doorarea_car.dart b/lib/pages/home/doorAndCar/car/onlyLook_doorarea_car.dart index ed2857c..0e8a3c7 100644 --- a/lib/pages/home/doorAndCar/car/onlyLook_doorarea_car.dart +++ b/lib/pages/home/doorAndCar/car/onlyLook_doorarea_car.dart @@ -415,7 +415,7 @@ class _OnlylookDoorareaCarState extends State { personnelList=applicationInfo['vehicleAuditLogList']??[]; final imageResults = await Future.wait([ - FileApi.getImagePath(applicationInfo['informSignId'], UploadFileType.gateAccessVehicleSignaturePhoto), + FileApi.getImagePath(applicationInfo['informSignId'], UploadFileType.emissionStandardCertificate), FileApi.getImagePath(applicationInfo['drivingLicenseId'], UploadFileType.gateAccessVehicleLicensePhoto), FileApi.getImagePath(applicationInfo['attachmentId'], UploadFileType.gateAccessVehiclePhoto), ]); diff --git a/lib/pages/home/doorAndCar/person/doorArea_person_add_page.dart b/lib/pages/home/doorAndCar/person/doorArea_person_add_page.dart index 1e6d025..291c9c5 100644 --- a/lib/pages/home/doorAndCar/person/doorArea_person_add_page.dart +++ b/lib/pages/home/doorAndCar/person/doorArea_person_add_page.dart @@ -778,7 +778,7 @@ class _DoorareaPersonApplyPageState extends State { LoadingDialogHelper.show(); if(signImages.isNotEmpty){ - String licenseId= await _addImgFilesLicense(signImages, UploadFileType.gateAccessVehicleSignaturePhoto,''); + String licenseId= await _addImgFilesLicense(signImages, UploadFileType.enclosedAreaPersonnelApplicantSignature,''); addData['informSignId']=licenseId; } diff --git a/lib/pages/home/doorAndCar/person/doorArea_person_record_page.dart b/lib/pages/home/doorAndCar/person/doorArea_person_record_page.dart index b88483c..523e153 100644 --- a/lib/pages/home/doorAndCar/person/doorArea_person_record_page.dart +++ b/lib/pages/home/doorAndCar/person/doorArea_person_record_page.dart @@ -67,7 +67,7 @@ class _DoorareaPersonRecordPageState extends State { isAdd=true; xgfDataApplyListData['processOrRecord']=1; - xgfDataApplyListData['xgf-stk-personnel-application'] = '/primeport/container/stakeholder/firstLevelDoor/personnelApplication/list'; + xgfDataApplyListData['menuPath'] = '/primeport/container/stakeholder/firstLevelDoor/personnelApplication/list'; break; case 2:// 2 进港口门申请记录(人) titleName='人员审核记录'; @@ -75,7 +75,7 @@ class _DoorareaPersonRecordPageState extends State { isAdd=false; xgfDataApplyListData['processOrRecord']=2; - xgfDataApplyListData['xgf-stk-personnel-app-records'] = '/primeport/container/stakeholder/firstLevelDoor/personnelApplicationRecords/list'; + xgfDataApplyListData['menuPath'] = '/primeport/container/stakeholder/firstLevelDoor/personnelApplicationRecords/list'; break; case 3://3 封闭区域口门申请(人) titleName='人员审核'; @@ -84,7 +84,7 @@ class _DoorareaPersonRecordPageState extends State { xgfDataApplyListData['processOrRecord']=1; xgfDataApplyListData['personBelongType']=3; - xgfDataApplyListData['xgs-ren-yuan-feng-bi-qu-yu-shen-qing'] = '/primeport/container/stakeholder/enclosedArea/apply/personnel/list'; + xgfDataApplyListData['menuPath'] = '/primeport/container/stakeholder/enclosedArea/apply/personnel/list'; break; case 4://4 封闭区域口门申请记录(人) titleName='人员审核记录'; @@ -93,7 +93,7 @@ class _DoorareaPersonRecordPageState extends State { xgfDataApplyListData['processOrRecord']=2; xgfDataApplyListData['personBelongType']=3; - xgfDataApplyListData['xgs-ren-yuan-feng-bi-qu-yu-shen-qing-ji-lu'] = '/primeport/container/stakeholder/enclosedArea/apply/personnelRecords/list'; + xgfDataApplyListData['menuPath'] = '/primeport/container/stakeholder/enclosedArea/apply/personnelRecords/list'; break; case 5: //5 进港口门申请(车) titleName='车辆审核'; @@ -102,7 +102,7 @@ class _DoorareaPersonRecordPageState extends State { xgfDataApplyListData['processOrRecord']=1; xgfDataApplyListData['vehicleBelongType']='5'; - xgfDataApplyListData['xgf-stk-vehicle-application'] = '/primeport/container/stakeholder/firstLevelDoor/vehicleApplication/list'; + xgfDataApplyListData['menuPath'] = '/primeport/container/stakeholder/firstLevelDoor/vehicleApplication/list'; break; case 6: // 6 进港口门申请记录(车) titleName='车辆审核记录'; @@ -111,7 +111,7 @@ class _DoorareaPersonRecordPageState extends State { xgfDataApplyListData['processOrRecord']=2; xgfDataApplyListData['vehicleBelongType']='5'; - xgfDataApplyListData['xgf-stk-vehicle-app-records'] = '/primeport/container/stakeholder/firstLevelDoor/vehicleApplicationRecords/list'; + xgfDataApplyListData['menuPath'] = '/primeport/container/stakeholder/firstLevelDoor/vehicleApplicationRecords/list'; break; case 7: // 7 封闭区域口门申请(车) titleName='车辆审核'; @@ -120,7 +120,7 @@ class _DoorareaPersonRecordPageState extends State { xgfDataApplyListData['processOrRecord']=1; xgfDataApplyListData['personBelongType']=3; - xgfDataApplyListData['xgs-che-liang-feng-bi-qu-yu-shen-qing'] = '/primeport/container/stakeholder/enclosedArea/apply/vehicle/list'; + xgfDataApplyListData['menuPath'] = '/primeport/container/stakeholder/enclosedArea/apply/vehicle/list'; break; case 8: // 8 封闭区域口门申请记录(车) titleName='车辆审核记录'; @@ -129,7 +129,7 @@ class _DoorareaPersonRecordPageState extends State { xgfDataApplyListData['processOrRecord']=2; xgfDataApplyListData['personBelongType']=3; - xgfDataApplyListData['xgs-che-liang-feng-bi-qu-yu-shen-qing-ji-lu'] = '/primeport/container/stakeholder/enclosedArea/apply/vehicleRecords/list'; + xgfDataApplyListData['menuPath'] = '/primeport/container/stakeholder/enclosedArea/apply/vehicleRecords/list'; break; } diff --git a/lib/pages/home/doorAndCar/person/firstlevel_person_add_page.dart b/lib/pages/home/doorAndCar/person/firstlevel_person_add_page.dart index 509b757..2569b5b 100644 --- a/lib/pages/home/doorAndCar/person/firstlevel_person_add_page.dart +++ b/lib/pages/home/doorAndCar/person/firstlevel_person_add_page.dart @@ -731,7 +731,7 @@ class _FirstlevelPersonAddPageState extends State { } if(signImages.isNotEmpty){ - String licenseId= await _addImgFilesLicense(signImages, UploadFileType.gateAccessVehicleSignaturePhoto,''); + String licenseId= await _addImgFilesLicense(signImages, UploadFileType.gateAccessPersonnelApplicantSignature,''); addData['informSignId']=licenseId; } diff --git a/lib/pages/home/doorAndCar/person/onlyLook_doorarea_person.dart b/lib/pages/home/doorAndCar/person/onlyLook_doorarea_person.dart index afdb26f..c772c3d 100644 --- a/lib/pages/home/doorAndCar/person/onlyLook_doorarea_person.dart +++ b/lib/pages/home/doorAndCar/person/onlyLook_doorarea_person.dart @@ -365,7 +365,7 @@ class _OnlylookDoorareaPersonState extends State { personnelList=applicationInfo['personApplyList']??[]; final imageResults = await Future.wait([ - FileApi.getImagePath(applicationInfo['informSignId'], UploadFileType.gateAccessVehicleSignaturePhoto), + FileApi.getImagePath(applicationInfo['informSignId'], UploadFileType.enclosedAreaPersonnelApplicantSignature), ]); if (imageResults[0]['success']) { setState(() { diff --git a/lib/pages/home/doorAndCar/person/onlyLook_person_application.dart b/lib/pages/home/doorAndCar/person/onlyLook_person_application.dart index 340d8d0..dcbc04d 100644 --- a/lib/pages/home/doorAndCar/person/onlyLook_person_application.dart +++ b/lib/pages/home/doorAndCar/person/onlyLook_person_application.dart @@ -360,7 +360,7 @@ class _OnlylookPersonApplicationState extends State { personnelList=applicationInfo['personApplyList']??[]; final imageResults = await Future.wait([ - FileApi.getImagePath(applicationInfo['informSignId'], UploadFileType.gateAccessVehicleSignaturePhoto), + FileApi.getImagePath(applicationInfo['informSignId'], UploadFileType.gateAccessPersonnelApplicantSignature), ]); if (imageResults[0]['success']) { setState(() { diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart index 53a6a29..ab20ddc 100644 --- a/lib/pages/home/home_page.dart +++ b/lib/pages/home/home_page.dart @@ -854,13 +854,23 @@ class HomePageState extends RouteAwareState if(pcType==2){ return; } - // if(item['appName']=="隐患治理"||item['appName']=="隐患管理"||item['appName']=="风险管控应用"){ - // await pushPage(ApplicationPageTwo(), context); - // }else if(item['appName']=="消防检查"){ - // await pushPage(FireManagementTabPage(), context); - // }else{ - // await pushPage(SafecheckTabList(), context); - // } + switch(item['appName']){ + case "隐患治理": + case "隐患管理": + case "风险管控应用": + // await pushPage(ApplicationPageTwo(), context); + break; + case "消防检查": + // await pushPage(FireManagementTabPage(), context); + break; + case "一级口门管理": + await pushPage(DoorcarTabPage(), context); + break; + case "安全环保检查": + // await pushPage(SafecheckTabList(), context); + break; + + } _getToDoWorkList(pcType); // _getHiddenIssuesNum();