hanshuang
/
QinGang_interested
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

危险作业bug修改

master
hs 2026-04-14 16:24:31 +08:00
parent 95c410bf1b
commit 627ef2201f
33 changed files with 1215 additions and 784 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

668
assets/route/routes.txt
View File

@ -1,13 +1,17 @@
{ {
"extValues": {}, "extValues": {
},
"success": true, "success": true,
"errCode": null, "errCode": null,
"errMessage": null, "errMessage": null,
"exception": null, "exception": null,
"traceId": "18491030037470208", "traceId": "18688908153423296",
"data": [ "data": [
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387265", "id": "2030925300149387265",
"menuName": "首页", "menuName": "首页",
"menuUrl": "/dashboard", "menuUrl": "/dashboard",
@ -20,20 +24,24 @@
"showFlag": 1, "showFlag": 1,
"children": [ "children": [
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387268", "id": "2030925300149387268",
"menuName": "单位管理", "menuName": "单位管理",
"menuUrl": "/dashboard/Unit/Management", "menuUrl": "/dashboard/Unit/Management",
"parentId": "2030925300149387265", "parentId": "2030925300149387265",
"parentIds": null, "parentIds": null,
"menuPerms": "dashboard-Unit-Management", "menuPerms": "dashboard-Unit-Management",
"menuType": 2, "menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES", "menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 3, "sort": 3,
"showFlag": 1, "showFlag": 1,
"children": [ "children": [
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387286", "id": "2030925300149387286",
"menuName": "就职单位", "menuName": "就职单位",
"menuUrl": "/dashboard/Unit/Management/Employment/Unit", "menuUrl": "/dashboard/Unit/Management/Employment/Unit",
@ -47,7 +55,9 @@
"children": null "children": null
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387287", "id": "2030925300149387287",
"menuName": "服务单位管理", "menuName": "服务单位管理",
"menuUrl": "/dashboard/Unit/Management/Managee/Service/Unit/Management", "menuUrl": "/dashboard/Unit/Management/Managee/Service/Unit/Management",
@ -63,34 +73,24 @@
] ]
}, },
{ {
"extValues": {}, "extValues": {
"id": "2030925300149387269",
"menuName": "通知公告",
"menuUrl": "/dashboard/Notice/Announcement",
"parentId": "2030925300149387265",
"parentIds": null,
"menuPerms": "dashboard-Notice-Announcement",
"menuType": 2,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 4,
"showFlag": 1,
"children": null
}, },
{
"extValues": {},
"id": "2030925300149387270", "id": "2030925300149387270",
"menuName": "口门门禁", "menuName": "口门门禁",
"menuUrl": "/dashboard/Gate/Access/Control", "menuUrl": "/dashboard/Gate/Access/Control",
"parentId": "2030925300149387265", "parentId": "2030925300149387265",
"parentIds": null, "parentIds": null,
"menuPerms": "dashboard-Gate-Access-Control", "menuPerms": "dashboard-Gate-Access-Control",
"menuType": 2, "menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES", "menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 5, "sort": 5,
"showFlag": 1, "showFlag": 1,
"children": [ "children": [
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387288", "id": "2030925300149387288",
"menuName": "进港口门申请", "menuName": "进港口门申请",
"menuUrl": "/dashboard/Gate/Access/Control/Port/Gate/Entry/Application", "menuUrl": "/dashboard/Gate/Access/Control/Port/Gate/Entry/Application",
@ -103,7 +103,9 @@
"showFlag": 1, "showFlag": 1,
"children": [ "children": [
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387292", "id": "2030925300149387292",
"menuName": "人员申请", "menuName": "人员申请",
"menuUrl": "/dashboard/Port/Gate/Entry/Application/Personnel/Application", "menuUrl": "/dashboard/Port/Gate/Entry/Application/Personnel/Application",
@ -117,7 +119,9 @@
"children": null "children": null
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387293", "id": "2030925300149387293",
"menuName": "车辆申请", "menuName": "车辆申请",
"menuUrl": "/dashboard/Port/Gate/Entry/Application/Vehicle/Application", "menuUrl": "/dashboard/Port/Gate/Entry/Application/Vehicle/Application",
@ -133,7 +137,9 @@
] ]
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387289", "id": "2030925300149387289",
"menuName": "进港口门申请记录", "menuName": "进港口门申请记录",
"menuUrl": "/dashboard/Gate/Access/Crdtrol/Port/Gate/Entry/Record", "menuUrl": "/dashboard/Gate/Access/Crdtrol/Port/Gate/Entry/Record",
@ -146,7 +152,9 @@
"showFlag": 1, "showFlag": 1,
"children": [ "children": [
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387294", "id": "2030925300149387294",
"menuName": "人员申请记录", "menuName": "人员申请记录",
"menuUrl": "/dashboard/Port/Gate/Entry/Record/Record/Personnel/Application/Record", "menuUrl": "/dashboard/Port/Gate/Entry/Record/Record/Personnel/Application/Record",
@ -160,7 +168,9 @@
"children": null "children": null
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387295", "id": "2030925300149387295",
"menuName": "车辆申请记录", "menuName": "车辆申请记录",
"menuUrl": "/dashboard/Port/Gate/Entry/Record/Record/Vehicle/Application/Record", "menuUrl": "/dashboard/Port/Gate/Entry/Record/Record/Vehicle/Application/Record",
@ -176,7 +186,9 @@
] ]
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387290", "id": "2030925300149387290",
"menuName": "封闭区域口门申请", "menuName": "封闭区域口门申请",
"menuUrl": "/dashboard/Area/Access/Cionsedrol/Closed/Area/Gate/Application", "menuUrl": "/dashboard/Area/Access/Cionsedrol/Closed/Area/Gate/Application",
@ -189,7 +201,9 @@
"showFlag": 1, "showFlag": 1,
"children": [ "children": [
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387296", "id": "2030925300149387296",
"menuName": "人员申请", "menuName": "人员申请",
"menuUrl": "/dashboard/Closed/Area/Gate/Application/Personnel/Application", "menuUrl": "/dashboard/Closed/Area/Gate/Application/Personnel/Application",
@ -203,7 +217,9 @@
"children": null "children": null
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387297", "id": "2030925300149387297",
"menuName": "车辆申请", "menuName": "车辆申请",
"menuUrl": "/dashboard/Closed/Area/Gate/Application/Vehicle/Application", "menuUrl": "/dashboard/Closed/Area/Gate/Application/Vehicle/Application",
@ -219,7 +235,9 @@
] ]
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387291", "id": "2030925300149387291",
"menuName": "封闭区域口门申请记录", "menuName": "封闭区域口门申请记录",
"menuUrl": "/dashboard/Area/Access/Crdsedrol/Closed/Area/Gate/Record", "menuUrl": "/dashboard/Area/Access/Crdsedrol/Closed/Area/Gate/Record",
@ -232,7 +250,9 @@
"showFlag": 1, "showFlag": 1,
"children": [ "children": [
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387298", "id": "2030925300149387298",
"menuName": "人员申请记录", "menuName": "人员申请记录",
"menuUrl": "/dashboard/Closed/Area/Gate/Record/Record/Personnel/Application/Record", "menuUrl": "/dashboard/Closed/Area/Gate/Record/Record/Personnel/Application/Record",
@ -246,7 +266,9 @@
"children": null "children": null
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387299", "id": "2030925300149387299",
"menuName": "车辆申请记录", "menuName": "车辆申请记录",
"menuUrl": "/dashboard/Closed/Area/Gate/Record/Record/Vehicle/Application/Record", "menuUrl": "/dashboard/Closed/Area/Gate/Record/Record/Vehicle/Application/Record",
@ -264,49 +286,491 @@
] ]
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387271", "id": "2030925300149387271",
"menuName": "现场监管", "menuName": "现场监管",
"menuUrl": "/dashboard/Site/Supervision", "menuUrl": "/dashboard/Site/Supervision",
"parentId": "2030925300149387265", "parentId": "2030925300149387265",
"parentIds": null, "parentIds": null,
"menuPerms": "dashboard-Site-Supervision", "menuPerms": "dashboard-Site-Supervision",
"menuType": 2, "menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES", "menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 6, "sort": 6,
"showFlag": 1, "showFlag": 1,
"children": null "children": null
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387272", "id": "2030925300149387272",
"menuName": "危险作业", "menuName": "危险作业",
"menuUrl": "/dashboard/Hazardous/Work", "menuUrl": "/dashboard/Hazardous/Work",
"parentId": "2030925300149387265", "parentId": "2030925300149387265",
"parentIds": null, "parentIds": null,
"menuPerms": "dashboard-Hazardous-Work", "menuPerms": "dashboard-Hazardous-Work",
"menuType": 2, "menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES", "menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 7, "sort": 7,
"showFlag": 1, "showFlag": 1,
"children": [
{
"extValues": {
},
"id": "2043489228225683458",
"menuName": "动火作业",
"menuUrl": "/dashboard/hazardous/work/hot-work",
"parentId": "2030925300149387272",
"parentIds": null,
"menuPerms": "dashboard:hazardous:work:hot-work",
"menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 1,
"showFlag": 1,
"children": [
{
"extValues": {
},
"id": "2043493319253336066",
"menuName": "动火作业台账",
"menuUrl": "/dashboard/hazardous/work/hot-work/Hot-Work-Operation-Ledger",
"parentId": "2043489228225683458",
"parentIds": null,
"menuPerms": "dashboard:hazardous:work:hot-work:Hot-Work-Operation-Ledger",
"menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 1,
"showFlag": 1,
"children": [
{
"extValues": {
},
"id": "2043498882628493314",
"menuName": "相关方端",
"menuUrl": "eightwork/container/stakeholder/hotWork/homework/list",
"parentId": "2043493319253336066",
"parentIds": null,
"menuPerms": "container/stakeholder/hotWork",
"menuType": 2,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 1,
"showFlag": 1,
"children": null "children": null
}
]
}
]
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2043489445419327490",
"menuName": "有限空间作业",
"menuUrl": "/dashboard/hazardous/work/confined-space-operations",
"parentId": "2030925300149387272",
"parentIds": null,
"menuPerms": "dashboard:hazardous:work:confined-space-operations",
"menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 2,
"showFlag": 1,
"children": [
{
"extValues": {
},
"id": "2043494498838421506",
"menuName": "有限空间作业台账",
"menuUrl": "/dashboard/hazardous/work/confined-space-operations/Confined-Space-Work-Ledger",
"parentId": "2043489445419327490",
"parentIds": null,
"menuPerms": "dashboard:hazardous:work:confined-space-operations:Confined-Space-Work-Ledger",
"menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 2,
"showFlag": 1,
"children": [
{
"extValues": {
},
"id": "2043499269284601857",
"menuName": "相关方端",
"menuUrl": "eightwork/container/stakeholder/confinedSpaceWork/homework/list",
"parentId": "2043494498838421506",
"parentIds": null,
"menuPerms": "container/stakeholder/confinedSpaceWork",
"menuType": 2,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 1,
"showFlag": 1,
"children": null
}
]
}
]
},
{
"extValues": {
},
"id": "2043491361054433281",
"menuName": "高处作业",
"menuUrl": "/dashboard/hazardous/work/work-at-height",
"parentId": "2030925300149387272",
"parentIds": null,
"menuPerms": "dashboard:hazardous:work:work-at-height",
"menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 3,
"showFlag": 1,
"children": [
{
"extValues": {
},
"id": "2043494968994734081",
"menuName": "高处作业台账",
"menuUrl": "/dashboard/hazardous/work/work-at-height/High-altitude-Work-Ledger",
"parentId": "2043491361054433281",
"parentIds": null,
"menuPerms": "dashboard:hazardous:work:work-at-height:High-altitude-Work-Ledger",
"menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 1,
"showFlag": 1,
"children": [
{
"extValues": {
},
"id": "2043499407277203457",
"menuName": "相关方端",
"menuUrl": "eightwork/container/stakeholder/highPlaceWork/homework/list",
"parentId": "2043494968994734081",
"parentIds": null,
"menuPerms": "stakeholder/highPlaceWork/homework",
"menuType": 2,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 1,
"showFlag": 1,
"children": null
}
]
}
]
},
{
"extValues": {
},
"id": "2043491647223406594",
"menuName": "吊装作业",
"menuUrl": "/dashboard/hazardous/work/hoisting-operations",
"parentId": "2030925300149387272",
"parentIds": null,
"menuPerms": "dashboard:hazardous:work:hoisting-operations",
"menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 4,
"showFlag": 1,
"children": [
{
"extValues": {
},
"id": "2043496113083424769",
"menuName": "吊装作业台账",
"menuUrl": "/dashboard/hazardous/work/hoisting-operations/Hoisting-Operation-Ledger",
"parentId": "2043491647223406594",
"parentIds": null,
"menuPerms": "dashboard:hazardous:work:hoisting-operations:Hoisting-Operation-Ledger",
"menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 1,
"showFlag": 1,
"children": [
{
"extValues": {
},
"id": "2043499579373690881",
"menuName": "相关方端",
"menuUrl": "eightwork/container/stakeholder/liftingWork/homework/list",
"parentId": "2043496113083424769",
"parentIds": null,
"menuPerms": "container/stakeholder/liftingWork",
"menuType": 2,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 1,
"showFlag": 1,
"children": null
}
]
}
]
},
{
"extValues": {
},
"id": "2043491886437146626",
"menuName": "盲板抽堵作业",
"menuUrl": "/dashboard/hazardous/work/blind-flange-plugging-operation",
"parentId": "2030925300149387272",
"parentIds": null,
"menuPerms": "dashboard:hazardous:work:blind-flange-plugging-operation",
"menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 5,
"showFlag": 1,
"children": [
{
"extValues": {
},
"id": "2043496339164798978",
"menuName": "盲板抽堵作业台账",
"menuUrl": "/dashboard/hazardous/work/blind-flange-plugging-operation/Blind-Flange-Blocking-Work-Ledger",
"parentId": "2043491886437146626",
"parentIds": null,
"menuPerms": "dashboard:hazardous:work:blind-flange-plugging-operation:Blind-Flange-Blocking-Work-Ledger",
"menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 1,
"showFlag": 1,
"children": [
{
"extValues": {
},
"id": "2043499892205854721",
"menuName": "相关方端",
"menuUrl": "eightwork/container/stakeholder/liftingWork/homework/eightwork/container/stakeholder/blindBoardWork/homework/list",
"parentId": "2043496339164798978",
"parentIds": null,
"menuPerms": "container/stakeholder/blindBoardWork",
"menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 1,
"showFlag": 1,
"children": null
}
]
}
]
},
{
"extValues": {
},
"id": "2043492073868009474",
"menuName": "动土作业",
"menuUrl": "/dashboard/hazardous/work/earthwork-operations",
"parentId": "2030925300149387272",
"parentIds": null,
"menuPerms": "dashboard:hazardous:work:earthwork-operations",
"menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 6,
"showFlag": 1,
"children": [
{
"extValues": {
},
"id": "2043496580261781506",
"menuName": "动土作业台账",
"menuUrl": "/dashboard/hazardous/work/earthwork-operations/Earthmoving-Work-Ledger",
"parentId": "2043492073868009474",
"parentIds": null,
"menuPerms": "dashboard:hazardous:work:earthwork-operations:Earthmoving-Work-Ledger",
"menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 1,
"showFlag": 1,
"children": [
{
"extValues": {
},
"id": "2043500014041997314",
"menuName": "相关方端",
"menuUrl": "eightwork/container/stakeholder/digWork/homework/list",
"parentId": "2043496580261781506",
"parentIds": null,
"menuPerms": "eightwork/container/stakeholder/digWork",
"menuType": 2,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 1,
"showFlag": 1,
"children": null
}
]
}
]
},
{
"extValues": {
},
"id": "2043492255925968898",
"menuName": "断路作业",
"menuUrl": "/dashboard/hazardous/work/circuit-breaking-operation",
"parentId": "2030925300149387272",
"parentIds": null,
"menuPerms": "dashboard:hazardous:work:circuit-breaking-operation",
"menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 7,
"showFlag": 1,
"children": [
{
"extValues": {
},
"id": "2043496777767362561",
"menuName": "断路作业台账",
"menuUrl": "/dashboard/hazardous/work/circuit-breaking-operation/Circuit-Breaker-Work-Ledger",
"parentId": "2043492255925968898",
"parentIds": null,
"menuPerms": "dashboard:hazardous:work:circuit-breaking-operation:Circuit-Breaker-Work-Ledger",
"menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 1,
"showFlag": 1,
"children": [
{
"extValues": {
},
"id": "2043500162541330434",
"menuName": "相关方端",
"menuUrl": "eightwork/container/stakeholder/cutWork/homework/list",
"parentId": "2043496777767362561",
"parentIds": null,
"menuPerms": "container/stakeholder/cutWork",
"menuType": 2,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 1,
"showFlag": 1,
"children": null
}
]
}
]
},
{
"extValues": {
},
"id": "2043492703059746818",
"menuName": "临时用电作业",
"menuUrl": "/dashboard/hazardous/work/temporary-electrical-work",
"parentId": "2030925300149387272",
"parentIds": null,
"menuPerms": "dashboard:hazardous:work:temporary-electrical-work",
"menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 8,
"showFlag": 1,
"children": [
{
"extValues": {
},
"id": "2043496999897702402",
"menuName": "临时用电作业台账",
"menuUrl": "/dashboard/hazardous/work/temporary-electrical-work/Temporary-Electricity-Work-Ledger",
"parentId": "2043492703059746818",
"parentIds": null,
"menuPerms": "dashboard:hazardous:work:temporary-electrical-work:Temporary-Electricity-Work-Ledger",
"menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 1,
"showFlag": 1,
"children": [
{
"extValues": {
},
"id": "2043500266430046210",
"menuName": "相关方端",
"menuUrl": "eightwork/container/stakeholder/electricWork/homework/list",
"parentId": "2043496999897702402",
"parentIds": null,
"menuPerms": "container/stakeholder/electricWork",
"menuType": 2,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 1,
"showFlag": 1,
"children": null
}
]
}
]
}
]
},
{
"extValues": {
},
"id": "2030925300149387273", "id": "2030925300149387273",
"menuName": "隐患治理", "menuName": "隐患治理",
"menuUrl": "/dashboard/Hazard/Management", "menuUrl": "/dashboard/Hazard/Management",
"parentId": "2030925300149387265", "parentId": "2030925300149387265",
"parentIds": null, "parentIds": null,
"menuPerms": "dashboard-Hazard-Management", "menuPerms": "dashboard-Hazard-Management",
"menuType": 2, "menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES", "menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 8, "sort": 8,
"showFlag": 1, "showFlag": 1,
"children": [
{
"extValues": {
},
"id": "2033844996439449602",
"menuName": "隐患整改",
"menuUrl": "/hidden/container/branchCompany/average/rectification/list?clientId=XGFZD",
"parentId": "2030925300149387273",
"parentIds": null,
"menuPerms": "hidden-container-branchCompany-average-rectification-list",
"menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 1,
"showFlag": 1,
"children": null "children": null
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2033845090018566146",
"menuName": "隐患记录",
"menuUrl": "/hidden/container/branchCompany/average/ledger/list",
"parentId": "2030925300149387273",
"parentIds": null,
"menuPerms": "hidden-container-branchCompany-average-ledger-list",
"menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 2,
"showFlag": 1,
"children": null
}
]
},
{
"extValues": {
},
"id": "2030935458707537921", "id": "2030935458707537921",
"menuName": "入港培训", "menuName": "入港培训",
"menuUrl": "/dashboard/Study/Training", "menuUrl": "/dashboard/Study/Training",
@ -320,7 +784,25 @@
"children": null "children": null
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2033789896438398977",
"menuName": "首页入职企业",
"menuUrl": "/dashboard/start/work",
"parentId": "2030925300149387265",
"parentIds": null,
"menuPerms": "dashboard-start-work",
"menuType": 1,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 11,
"showFlag": 1,
"children": null
},
{
"extValues": {
},
"id": "2030925300149387300", "id": "2030925300149387300",
"menuName": "首页扫码", "menuName": "首页扫码",
"menuUrl": "/dashboard/scan", "menuUrl": "/dashboard/scan",
@ -334,7 +816,9 @@
"children": null "children": null
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387301", "id": "2030925300149387301",
"menuName": "首页滚动通知", "menuName": "首页滚动通知",
"menuUrl": "/dashboard/roll-notice", "menuUrl": "/dashboard/roll-notice",
@ -348,9 +832,11 @@
"children": null "children": null
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387302", "id": "2030925300149387302",
"menuName": "首页待办梳理", "menuName": "首页待办汇总",
"menuUrl": "/dashboard/todo-sort", "menuUrl": "/dashboard/todo-sort",
"parentId": "2030925300149387265", "parentId": "2030925300149387265",
"parentIds": null, "parentIds": null,
@ -362,7 +848,9 @@
"children": null "children": null
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387303", "id": "2030925300149387303",
"menuName": "首页待办事项", "menuName": "首页待办事项",
"menuUrl": "/dashboard/todo-list", "menuUrl": "/dashboard/todo-list",
@ -378,7 +866,9 @@
] ]
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387266", "id": "2030925300149387266",
"menuName": "通知", "menuName": "通知",
"menuUrl": "/notice", "menuUrl": "/notice",
@ -388,10 +878,12 @@
"menuType": 2, "menuType": 2,
"menuAttribution": "QINGANG_RELATED_PARTIES", "menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 1, "sort": 1,
"showFlag": 1, "showFlag": 2,
"children": [ "children": [
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387274", "id": "2030925300149387274",
"menuName": "公告通知", "menuName": "公告通知",
"menuUrl": "/notice/Announcement/Notice", "menuUrl": "/notice/Announcement/Notice",
@ -401,13 +893,15 @@
"menuType": 2, "menuType": 2,
"menuAttribution": "QINGANG_RELATED_PARTIES", "menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 9, "sort": 9,
"showFlag": 1, "showFlag": 2,
"children": null "children": null
} }
] ]
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387267", "id": "2030925300149387267",
"menuName": "我的", "menuName": "我的",
"menuUrl": "/my-center", "menuUrl": "/my-center",
@ -420,7 +914,9 @@
"showFlag": 1, "showFlag": 1,
"children": [ "children": [
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387275", "id": "2030925300149387275",
"menuName": "我的信息", "menuName": "我的信息",
"menuUrl": "/my-center/My/Information", "menuUrl": "/my-center/My/Information",
@ -434,7 +930,9 @@
"children": null "children": null
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387276", "id": "2030925300149387276",
"menuName": "扫码入职", "menuName": "扫码入职",
"menuUrl": "/my-center/Scan/Code/Onboarding", "menuUrl": "/my-center/Scan/Code/Onboarding",
@ -448,7 +946,9 @@
"children": null "children": null
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387277", "id": "2030925300149387277",
"menuName": "人脸认证", "menuName": "人脸认证",
"menuUrl": "/my-center/Face/Authentication", "menuUrl": "/my-center/Face/Authentication",
@ -462,7 +962,9 @@
"children": null "children": null
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387278", "id": "2030925300149387278",
"menuName": "证书信息", "menuName": "证书信息",
"menuUrl": "/my-center/Certificate/Information", "menuUrl": "/my-center/Certificate/Information",
@ -476,49 +978,9 @@
"children": null "children": null
}, },
{ {
"extValues": {}, "extValues": {
"id": "2030925300149387279",
"menuName": "问题反馈",
"menuUrl": "/my-center/Feedback",
"parentId": "2030925300149387267",
"parentIds": null,
"menuPerms": "my-center-Feedback",
"menuType": 2,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 14,
"showFlag": 1,
"children": null
}, },
{
"extValues": {},
"id": "2030925300149387280",
"menuName": "版本更新",
"menuUrl": "/my-center/Version/Update",
"parentId": "2030925300149387267",
"parentIds": null,
"menuPerms": "my-center-Version-Update",
"menuType": 2,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 15,
"showFlag": 1,
"children": null
},
{
"extValues": {},
"id": "2030925300149387281",
"menuName": "关于我们",
"menuUrl": "/my-center/About/Us",
"parentId": "2030925300149387267",
"parentIds": null,
"menuPerms": "my-center-About-Us",
"menuType": 2,
"menuAttribution": "QINGANG_RELATED_PARTIES",
"sort": 16,
"showFlag": 1,
"children": null
},
{
"extValues": {},
"id": "2030925300149387282", "id": "2030925300149387282",
"menuName": "切换账号", "menuName": "切换账号",
"menuUrl": "/my-center/Switch/Account", "menuUrl": "/my-center/Switch/Account",
@ -532,7 +994,9 @@
"children": null "children": null
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387283", "id": "2030925300149387283",
"menuName": "修改密码", "menuName": "修改密码",
"menuUrl": "/my-center/Change/Password", "menuUrl": "/my-center/Change/Password",
@ -546,7 +1010,9 @@
"children": null "children": null
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387284", "id": "2030925300149387284",
"menuName": "用户注销", "menuName": "用户注销",
"menuUrl": "/my-center/User/Logout", "menuUrl": "/my-center/User/Logout",
@ -560,7 +1026,9 @@
"children": null "children": null
}, },
{ {
"extValues": {}, "extValues": {
},
"id": "2030925300149387285", "id": "2030925300149387285",
"menuName": "退出登录", "menuName": "退出登录",
"menuUrl": "/my-center/Logout", "menuUrl": "/my-center/Logout",

2
lib/common/route_service.dart
View File

@ -120,7 +120,7 @@ class RouteService extends ChangeNotifier {
void visit(RouteModel m) { void visit(RouteModel m) {
if (found) return; if (found) return;
// 若父节点不可见，跳过（不再遍历子节点） // 若父节点不可见，跳过（不再遍历子节点）
if (!m.visible) return; if (m.showFlag == 2) return;
final mp = (m.menuPerms ?? '').trim(); final mp = (m.menuPerms ?? '').trim();
if (mp.isNotEmpty && mp == needle) { if (mp.isNotEmpty && mp == needle) {

10
lib/http/ApiService.dart
View File

@ -17,11 +17,11 @@ class ApiService {
/// 图片文件服务 /// 图片文件服务
// static final String baseImgPath = static final String baseImgPath =
// isProduct isProduct
// ? "https://jpfz.qhdsafety.com/gbsFileTest/" ? "https://jpfz.qhdsafety.com/gbsFileTest/"
// : "http://192.168.20.240:9787/mnt/"; //内网图片地址 : "http://192.168.20.240:9787/mnt/"; //内网图片地址
static final String baseImgPath = "https://skqhdg.porthebei.com:9004/file/uploadFiles2/"; // static final String baseImgPath = "https://skqhdg.porthebei.com:9004/file/uploadFiles2/";
static const publicKey = static const publicKey =

2
lib/http/modules/special_work_api.dart
View File

@ -153,7 +153,7 @@ class SpecialWorkApi {
static Future<Map<String, dynamic>> specialWorkFlowList(String workId) { static Future<Map<String, dynamic>> specialWorkFlowList(String workId) {
return HttpManager().request( return HttpManager().request(
basePath + '/eightwork', basePath + '/eightwork',
'/taskLog/listAll/$workId', '/taskLog/flowChart/$workId',
method: Method.get, method: Method.get,
data: {}, data: {},
); );

13
lib/pages/home/Tap/special_work/dh_work/HotWorkDetailFormWidget.dart
View File

@ -376,7 +376,6 @@ class _HotWorkDetailFormWidgetState extends State<HotWorkDetailFormWidget> {
), ),
], ],
if (_otherMeasuresList.isNotEmpty) ...[ if (_otherMeasuresList.isNotEmpty) ...[
const Divider(),
ListItemFactory.createBuildSimpleSection('其他安全措施'), ListItemFactory.createBuildSimpleSection('其他安全措施'),
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -398,10 +397,11 @@ class _HotWorkDetailFormWidgetState extends State<HotWorkDetailFormWidget> {
); );
}).toList(), }).toList(),
), ),
const Divider(),
], ],
// 气体分析 // 气体分析
if (gasUsername.isNotEmpty) ...[ if (gasUsername.isNotEmpty) ...[
const Divider(),
ItemListWidget.OneRowButtonTitleText( ItemListWidget.OneRowButtonTitleText(
label: '气体分析人:', label: '气体分析人:',
text: gasUsername, text: gasUsername,
@ -410,9 +410,10 @@ class _HotWorkDetailFormWidgetState extends State<HotWorkDetailFormWidget> {
pushPage(SpecialWorkGasList(data: widget.pd), context); pushPage(SpecialWorkGasList(data: widget.pd), context);
}, },
), ),
const Divider(),
], ],
if (delayStatus.isNotEmpty) ...[ if (delayStatus.isNotEmpty) ...[
const Divider(),
ItemListWidget.OneRowButtonTitleText( ItemListWidget.OneRowButtonTitleText(
label: '延时监火', label: '延时监火',
text: '', text: '',
@ -421,14 +422,17 @@ class _HotWorkDetailFormWidgetState extends State<HotWorkDetailFormWidget> {
pushPage(HotDelayPage(data: widget.pd, isEdit: false,), context); pushPage(HotDelayPage(data: widget.pd, isEdit: false,), context);
}, },
), ),
const Divider(),
], ],
if (_finishMeasures.isNotEmpty && if (_finishMeasures.isNotEmpty &&
pd['specialStepCode'] != 'measures') ...[ pd['specialStepCode'] != 'measures') ...[
const Divider(),
MeasuresListWidget( MeasuresListWidget(
measuresList: _finishMeasures, measuresList: _finishMeasures,
isAllowEdit: false, isAllowEdit: false,
), ),
const Divider(),
], ],
@ -438,7 +442,6 @@ class _HotWorkDetailFormWidgetState extends State<HotWorkDetailFormWidget> {
..._buildStepSignWidgets(pd), ..._buildStepSignWidgets(pd),
if (rejectReason.keys.isNotEmpty) ...[ if (rejectReason.keys.isNotEmpty) ...[
const Divider(),
ListItemFactory.createBuildSimpleSection('打回信息'), ListItemFactory.createBuildSimpleSection('打回信息'),
// 打回信息 // 打回信息
ItemListWidget.singleLineTitleText( ItemListWidget.singleLineTitleText(

8
lib/pages/home/Tap/special_work/dh_work/dh_wait_page.dart
View File

@ -1,6 +1,7 @@
import 'dart:io'; import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:qhd_prevention/common/route_service.dart';
import 'package:qhd_prevention/customWidget/custom_alert_dialog.dart'; import 'package:qhd_prevention/customWidget/custom_alert_dialog.dart';
import 'package:qhd_prevention/customWidget/item_list_widget.dart'; import 'package:qhd_prevention/customWidget/item_list_widget.dart';
import 'package:qhd_prevention/customWidget/toast_util.dart'; import 'package:qhd_prevention/customWidget/toast_util.dart';
@ -95,12 +96,15 @@ class _DhWaitPageState extends State<DhWaitPage> {
}; };
response = await SpecialWorkApi.specialWorkTaskLogList(data); response = await SpecialWorkApi.specialWorkTaskLogList(data);
}else{ }else{
final parentPerm = 'dashboard:hazardous:work:hot-work:Hot-Work-Operation-Ledger';
final targetPerm = '';
final menuPath = await RouteService.getMenuPath(parentPerm, targetPerm);
final data = { final data = {
"eqWorkType": SpecialWorkTypeEnum.hotWork.code, "eqWorkType": SpecialWorkTypeEnum.hotWork.code,
"pageSize": rows, "pageSize": rows,
"pageIndex": currentPage, "pageIndex": currentPage,
"menuPath" : menuPath,
...searchData ...searchData
// "eqStatus" : 1,
}; };
response = await SpecialWorkApi.specialWorkList(data); response = await SpecialWorkApi.specialWorkList(data);
} }
@ -435,7 +439,7 @@ class _DhWaitPageState extends State<DhWaitPage> {
if (status != '0' && widget.listType == SpecialListType.task) { if (status != '0' && widget.listType == SpecialListType.task) {
buttons.add( buttons.add(
CustomButton( CustomButton(
text: '审批', text: status == '2' ? '编辑' : '审批',
backgroundColor: Colors.blue, backgroundColor: Colors.blue,
onPressed: () { onPressed: () {
_goToDetail(item, true); _goToDetail(item, true);

3
lib/pages/home/Tap/special_work/dh_work/hot_apply_page.dart
View File

@ -993,7 +993,7 @@ class _HotworkApplyDetailState extends State<HotworkApplyDetail> {
DateTime? picked = await BottomDateTimePicker.showDate( DateTime? picked = await BottomDateTimePicker.showDate(
mode: BottomPickerMode.dateTimeWithSeconds, mode: BottomPickerMode.dateTimeWithSeconds,
context, context,
minTimeStr: pd['workEndTime'] ?? '', minTimeStr: pd['workStartTime'] ?? '',
allowFuture: true, allowFuture: true,
); );
if (picked != null) { if (picked != null) {
@ -1034,7 +1034,6 @@ class _HotworkApplyDetailState extends State<HotworkApplyDetail> {
}, },
), ),
const Divider(), const Divider(),
if (widget.isReEdit && FormUtils.hasValue(form, 'id')) ...[ if (widget.isReEdit && FormUtils.hasValue(form, 'id')) ...[
HotWorkDetailFormWidget(pd: form, isEditable: true), HotWorkDetailFormWidget(pd: form, isEditable: true),
], ],

4
lib/pages/home/Tap/special_work/dh_work/work_tab_dh_list.dart
View File

@ -175,8 +175,8 @@ class _workTabDhListState extends State<workTabDhList> {
final button = stepsData[buttonIndex]; final button = stepsData[buttonIndex];
final workTypeTitle = final workTypeTitle =
(group is Map && group['groupName'] != null) (button is Map && button['stepName'] != null)
? group['groupName'].toString() ? button['stepName'].toString()
: ''; : '';
final stepId = button['stepId'] ?? ''; final stepId = button['stepId'] ?? '';
await pushPage( await pushPage(

21
lib/pages/home/Tap/special_work/dl_work/dl_apply_page.dart
View File

@ -965,24 +965,7 @@ class _DlApplyPageState extends State<DlApplyPage> {
} }
Widget _buildDetail() { Widget _buildDetail() {
List linkWorks = pd['linkSpecialWorks'] ?? [];
String linkShowStr = linkWorks
.map((item) {
final workName = item['workTypeName'];
final checkNo = item['checkNo'] ?? '';
return '$workName $checkNo';
})
.toList()
.join(',');
List riskResults = pd['riskResults'] ?? [];
String riskShowStr =
riskResults
.map((item) {
final riskResultName = item['riskResultName'];
return riskResultName;
})
.toList()
.join();
return Container( return Container(
padding: const EdgeInsets.symmetric(vertical: 10), padding: const EdgeInsets.symmetric(vertical: 10),
decoration: const BoxDecoration( decoration: const BoxDecoration(
@ -1148,7 +1131,7 @@ class _DlApplyPageState extends State<DlApplyPage> {
DateTime? picked = await BottomDateTimePicker.showDate( DateTime? picked = await BottomDateTimePicker.showDate(
mode: BottomPickerMode.dateTimeWithSeconds, mode: BottomPickerMode.dateTimeWithSeconds,
context, context,
minTimeStr: pd['workEndTime'] ?? '', minTimeStr: pd['workStartTime'] ?? '',
allowFuture: true, allowFuture: true,
); );
if (picked != null) { if (picked != null) {

10
lib/pages/home/Tap/special_work/dl_work/dl_wait_page.dart
View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:qhd_prevention/common/route_service.dart';
import 'package:qhd_prevention/customWidget/custom_alert_dialog.dart'; import 'package:qhd_prevention/customWidget/custom_alert_dialog.dart';
import 'package:qhd_prevention/customWidget/item_list_widget.dart'; import 'package:qhd_prevention/customWidget/item_list_widget.dart';
import 'package:qhd_prevention/customWidget/toast_util.dart'; import 'package:qhd_prevention/customWidget/toast_util.dart';
@ -94,12 +95,15 @@ class _DlWaitPageState extends State<DlWaitPage> {
}; };
response = await SpecialWorkApi.specialWorkTaskLogList(data); response = await SpecialWorkApi.specialWorkTaskLogList(data);
} else { } else {
final parentPerm = 'dashboard:hazardous:work:circuit-breaking-operation:Circuit-Breaker-Work-Ledger';
final targetPerm = '';
final menuPath = await RouteService.getMenuPath(parentPerm, targetPerm);
final data = { final data = {
"eqWorkType": SpecialWorkTypeEnum.cutRoadWork.code, "eqWorkType": SpecialWorkTypeEnum.cutRoadWork.code,
"pageSize": rows, "pageSize": rows,
"pageIndex": currentPage, "pageIndex": currentPage,
...searchData, "menuPath" : menuPath,
// "eqStatus" : 1, ...searchData
}; };
response = await SpecialWorkApi.specialWorkList(data); response = await SpecialWorkApi.specialWorkList(data);
} }
@ -504,7 +508,7 @@ class _DlWaitPageState extends State<DlWaitPage> {
if (status != '0' && widget.listType == SpecialListType.task) { if (status != '0' && widget.listType == SpecialListType.task) {
buttons.add( buttons.add(
CustomButton( CustomButton(
text: '审批', text: status == '2' ? '编辑' : '审批',
backgroundColor: Colors.blue, backgroundColor: Colors.blue,
onPressed: () { onPressed: () {
_goToDetail(item, true); _goToDetail(item, true);

4
lib/pages/home/Tap/special_work/dl_work/work_tab_dl_list.dart
View File

@ -170,8 +170,8 @@ class _WorkTabDlListState extends State<WorkTabDlList> {
final button = stepsData[buttonIndex]; final button = stepsData[buttonIndex];
final workTypeTitle = final workTypeTitle =
(group is Map && group['groupName'] != null) (button is Map && button['stepName'] != null)
? group['groupName'].toString() ? button['stepName'].toString()
: ''; : '';
final stepId = button['stepId'] ?? ''; final stepId = button['stepId'] ?? '';
await pushPage(DlWaitPage(stepId: stepId, workTypeTitle: workTypeTitle , listType: SpecialListType.task), context); await pushPage(DlWaitPage(stepId: stepId, workTypeTitle: workTypeTitle , listType: SpecialListType.task), context);

21
lib/pages/home/Tap/special_work/dt_work/dt_apply_page.dart
View File

@ -962,24 +962,7 @@ class _DtApplyPageState extends State<DtApplyPage> {
} }
Widget _buildDetail() { Widget _buildDetail() {
List linkWorks = pd['linkSpecialWorks'] ?? [];
String linkShowStr = linkWorks
.map((item) {
final workName = item['workTypeName'];
final checkNo = item['checkNo'] ?? '';
return '$workName $checkNo';
})
.toList()
.join(',');
List riskResults = pd['riskResults'] ?? [];
String riskShowStr =
riskResults
.map((item) {
final riskResultName = item['riskResultName'];
return riskResultName;
})
.toList()
.join();
return Container( return Container(
padding: const EdgeInsets.symmetric(vertical: 10), padding: const EdgeInsets.symmetric(vertical: 10),
decoration: const BoxDecoration( decoration: const BoxDecoration(
@ -1069,7 +1052,7 @@ class _DtApplyPageState extends State<DtApplyPage> {
DateTime? picked = await BottomDateTimePicker.showDate( DateTime? picked = await BottomDateTimePicker.showDate(
mode: BottomPickerMode.dateTimeWithSeconds, mode: BottomPickerMode.dateTimeWithSeconds,
context, context,
minTimeStr: pd['workEndTime'] ?? '', minTimeStr: pd['workStartTime'] ?? '',
allowFuture: true, allowFuture: true,
); );
if (picked != null) { if (picked != null) {

15
lib/pages/home/Tap/special_work/dt_work/dt_wait_page.dart
View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:qhd_prevention/common/route_service.dart';
import 'package:qhd_prevention/customWidget/custom_alert_dialog.dart'; import 'package:qhd_prevention/customWidget/custom_alert_dialog.dart';
import 'package:qhd_prevention/customWidget/item_list_widget.dart'; import 'package:qhd_prevention/customWidget/item_list_widget.dart';
import 'package:qhd_prevention/customWidget/toast_util.dart'; import 'package:qhd_prevention/customWidget/toast_util.dart';
@ -78,13 +79,6 @@ class _DtWaitPageState extends State<DtWaitPage> {
setState(() => isLoading = true); setState(() => isLoading = true);
try { try {
final data = {
"eqWorkType": "confinedspace_work",
"pageSize": rows,
"pageIndex": currentPage,
...searchData,
"eqStepId": widget.stepId,
};
var response = {}; var response = {};
if (widget.listType == SpecialListType.task) { if (widget.listType == SpecialListType.task) {
final data = { final data = {
@ -95,12 +89,15 @@ class _DtWaitPageState extends State<DtWaitPage> {
}; };
response = await SpecialWorkApi.specialWorkTaskLogList(data); response = await SpecialWorkApi.specialWorkTaskLogList(data);
}else{ }else{
final parentPerm = 'dashboard:hazardous:work:earthwork-operations:Earthmoving-Work-Ledger';
final targetPerm = '';
final menuPath = await RouteService.getMenuPath(parentPerm, targetPerm);
final data = { final data = {
"eqWorkType": SpecialWorkTypeEnum.breakgroundWork.code, "eqWorkType": SpecialWorkTypeEnum.breakgroundWork.code,
"pageSize": rows, "pageSize": rows,
"pageIndex": currentPage, "pageIndex": currentPage,
"menuPath" : menuPath,
...searchData ...searchData
// "eqStatus" : 1,
}; };
response = await SpecialWorkApi.specialWorkList(data); response = await SpecialWorkApi.specialWorkList(data);
} }
@ -491,7 +488,7 @@ class _DtWaitPageState extends State<DtWaitPage> {
if (status != '0' && widget.listType == SpecialListType.task) { if (status != '0' && widget.listType == SpecialListType.task) {
buttons.add( buttons.add(
CustomButton( CustomButton(
text: '审批', text: status == '2' ? '编辑' : '审批',
backgroundColor: Colors.blue, backgroundColor: Colors.blue,
onPressed: () { onPressed: () {
_goToDetail(item, true); _goToDetail(item, true);

4
lib/pages/home/Tap/special_work/dt_work/work_tab_dt_list.dart
View File

@ -170,8 +170,8 @@ class _WorkTabDtListState extends State<WorkTabDtList> {
final button = stepsData[buttonIndex]; final button = stepsData[buttonIndex];
final workTypeTitle = final workTypeTitle =
(group is Map && group['groupName'] != null) (button is Map && button['stepName'] != null)
? group['groupName'].toString() ? button['stepName'].toString()
: ''; : '';
final stepId = button['stepId'] ?? ''; final stepId = button['stepId'] ?? '';
await pushPage(DtWaitPage(stepId: stepId, workTypeTitle: workTypeTitle , listType: SpecialListType.task), context); await pushPage(DtWaitPage(stepId: stepId, workTypeTitle: workTypeTitle , listType: SpecialListType.task), context);

21
lib/pages/home/Tap/special_work/dz_work/dz_apply_page.dart
View File

@ -968,24 +968,7 @@ class _DzApplyPageState extends State<DzApplyPage> {
} }
Widget _buildDetail() { Widget _buildDetail() {
List linkWorks = pd['linkSpecialWorks'] ?? [];
String linkShowStr = linkWorks
.map((item) {
final workName = item['workTypeName'];
final checkNo = item['checkNo'] ?? '';
return '$workName $checkNo';
})
.toList()
.join(',');
List riskResults = pd['riskResults'] ?? [];
String riskShowStr =
riskResults
.map((item) {
final riskResultName = item['riskResultName'];
return riskResultName;
})
.toList()
.join();
return Container( return Container(
padding: const EdgeInsets.symmetric(vertical: 10), padding: const EdgeInsets.symmetric(vertical: 10),
decoration: const BoxDecoration( decoration: const BoxDecoration(
@ -1149,7 +1132,7 @@ class _DzApplyPageState extends State<DzApplyPage> {
DateTime? picked = await BottomDateTimePicker.showDate( DateTime? picked = await BottomDateTimePicker.showDate(
mode: BottomPickerMode.dateTimeWithSeconds, mode: BottomPickerMode.dateTimeWithSeconds,
context, context,
minTimeStr: pd['workEndTime'] ?? '', minTimeStr: pd['workStartTime'] ?? '',
allowFuture: true, allowFuture: true,
); );
if (picked != null) { if (picked != null) {

15
lib/pages/home/Tap/special_work/dz_work/dz_wait_page.dart
View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:qhd_prevention/common/route_service.dart';
import 'package:qhd_prevention/customWidget/custom_alert_dialog.dart'; import 'package:qhd_prevention/customWidget/custom_alert_dialog.dart';
import 'package:qhd_prevention/customWidget/item_list_widget.dart'; import 'package:qhd_prevention/customWidget/item_list_widget.dart';
import 'package:qhd_prevention/customWidget/toast_util.dart'; import 'package:qhd_prevention/customWidget/toast_util.dart';
@ -78,13 +79,6 @@ class _DzWaitPageState extends State<DzWaitPage> {
setState(() => isLoading = true); setState(() => isLoading = true);
try { try {
final data = {
"eqWorkType": "confinedspace_work",
"pageSize": rows,
"pageIndex": currentPage,
...searchData,
"eqStepId": widget.stepId,
};
var response = {}; var response = {};
if (widget.listType == SpecialListType.task) { if (widget.listType == SpecialListType.task) {
final data = { final data = {
@ -95,12 +89,15 @@ class _DzWaitPageState extends State<DzWaitPage> {
}; };
response = await SpecialWorkApi.specialWorkTaskLogList(data); response = await SpecialWorkApi.specialWorkTaskLogList(data);
}else{ }else{
final parentPerm = 'dashboard:hazardous:work:hoisting-operations:Hoisting-Operation-Ledger';
final targetPerm = '';
final menuPath = await RouteService.getMenuPath(parentPerm, targetPerm);
final data = { final data = {
"eqWorkType": SpecialWorkTypeEnum.hoistingWork.code, "eqWorkType": SpecialWorkTypeEnum.hoistingWork.code,
"pageSize": rows, "pageSize": rows,
"pageIndex": currentPage, "pageIndex": currentPage,
"menuPath" : menuPath,
...searchData ...searchData
// "eqStatus" : 1,
}; };
response = await SpecialWorkApi.specialWorkList(data); response = await SpecialWorkApi.specialWorkList(data);
} }
@ -490,7 +487,7 @@ class _DzWaitPageState extends State<DzWaitPage> {
if (status != '0' && widget.listType == SpecialListType.task) { if (status != '0' && widget.listType == SpecialListType.task) {
buttons.add( buttons.add(
CustomButton( CustomButton(
text: '审批', text: status == '2' ? '编辑' : '审批',
backgroundColor: Colors.blue, backgroundColor: Colors.blue,
onPressed: () { onPressed: () {
_goToDetail(item, true); _goToDetail(item, true);

4
lib/pages/home/Tap/special_work/dz_work/work_tab_dz_list.dart
View File

@ -170,8 +170,8 @@ class _WorkTabDzListState extends State<WorkTabDzList> {
final button = stepsData[buttonIndex]; final button = stepsData[buttonIndex];
final workTypeTitle = final workTypeTitle =
(group is Map && group['groupName'] != null) (button is Map && button['stepName'] != null)
? group['groupName'].toString() ? button['stepName'].toString()
: ''; : '';
final stepId = button['stepId'] ?? ''; final stepId = button['stepId'] ?? '';
await pushPage(DzWaitPage(stepId: stepId, workTypeTitle: workTypeTitle , listType: SpecialListType.task), context); await pushPage(DzWaitPage(stepId: stepId, workTypeTitle: workTypeTitle , listType: SpecialListType.task), context);

16
lib/pages/home/Tap/special_work/gc_work/gc_wait_page.dart
View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:qhd_prevention/common/route_service.dart';
import 'package:qhd_prevention/customWidget/custom_alert_dialog.dart'; import 'package:qhd_prevention/customWidget/custom_alert_dialog.dart';
import 'package:qhd_prevention/customWidget/item_list_widget.dart'; import 'package:qhd_prevention/customWidget/item_list_widget.dart';
import 'package:qhd_prevention/customWidget/toast_util.dart'; import 'package:qhd_prevention/customWidget/toast_util.dart';
@ -78,13 +79,7 @@ class _GcWaitPageState extends State<GcWaitPage> {
setState(() => isLoading = true); setState(() => isLoading = true);
try { try {
final data = {
"eqWorkType": "confinedspace_work",
"pageSize": rows,
"pageIndex": currentPage,
...searchData,
"eqStepId": widget.stepId,
};
var response = {}; var response = {};
if (widget.listType == SpecialListType.task) { if (widget.listType == SpecialListType.task) {
final data = { final data = {
@ -95,12 +90,15 @@ class _GcWaitPageState extends State<GcWaitPage> {
}; };
response = await SpecialWorkApi.specialWorkTaskLogList(data); response = await SpecialWorkApi.specialWorkTaskLogList(data);
}else{ }else{
final parentPerm = 'dashboard:hazardous:work:work-at-height:High-altitude-Work-Ledger';
final targetPerm = '';
final menuPath = await RouteService.getMenuPath(parentPerm, targetPerm);
final data = { final data = {
"eqWorkType": SpecialWorkTypeEnum.highWork.code, "eqWorkType": SpecialWorkTypeEnum.highWork.code,
"pageSize": rows, "pageSize": rows,
"pageIndex": currentPage, "pageIndex": currentPage,
"menuPath" : menuPath,
...searchData ...searchData
// "eqStatus" : 1,
}; };
response = await SpecialWorkApi.specialWorkList(data); response = await SpecialWorkApi.specialWorkList(data);
} }
@ -493,7 +491,7 @@ class _GcWaitPageState extends State<GcWaitPage> {
if (status != '0' && widget.listType == SpecialListType.task) { if (status != '0' && widget.listType == SpecialListType.task) {
buttons.add( buttons.add(
CustomButton( CustomButton(
text: '审批', text: status == '2' ? '编辑' : '审批',
backgroundColor: Colors.blue, backgroundColor: Colors.blue,
onPressed: () { onPressed: () {
_goToDetail(item, true); _goToDetail(item, true);

4
lib/pages/home/Tap/special_work/gc_work/work_tab_gc_list.dart
View File

@ -170,8 +170,8 @@ class _WorkTabGcListState extends State<WorkTabGcList> {
final button = stepsData[buttonIndex]; final button = stepsData[buttonIndex];
final workTypeTitle = final workTypeTitle =
(group is Map && group['groupName'] != null) (button is Map && button['stepName'] != null)
? group['groupName'].toString() ? button['stepName'].toString()
: ''; : '';
final stepId = button['stepId'] ?? ''; final stepId = button['stepId'] ?? '';
await pushPage(GcWaitPage(stepId: stepId, workTypeTitle: workTypeTitle , listType: SpecialListType.task), context); await pushPage(GcWaitPage(stepId: stepId, workTypeTitle: workTypeTitle , listType: SpecialListType.task), context);

2
lib/pages/home/Tap/special_work/lsyd_work/lsyd_apply_page.dart
View File

@ -1143,7 +1143,7 @@ class _LsydApplyPageState extends State<LsydApplyPage> {
DateTime? picked = await BottomDateTimePicker.showDate( DateTime? picked = await BottomDateTimePicker.showDate(
mode: BottomPickerMode.dateTimeWithSeconds, mode: BottomPickerMode.dateTimeWithSeconds,
context, context,
minTimeStr: pd['workEndTime'] ?? '', minTimeStr: pd['workStartTime'] ?? '',
allowFuture: true, allowFuture: true,
); );
if (picked != null) { if (picked != null) {

15
lib/pages/home/Tap/special_work/lsyd_work/lsyd_wait_page.dart
View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:qhd_prevention/common/route_service.dart';
import 'package:qhd_prevention/customWidget/custom_alert_dialog.dart'; import 'package:qhd_prevention/customWidget/custom_alert_dialog.dart';
import 'package:qhd_prevention/customWidget/item_list_widget.dart'; import 'package:qhd_prevention/customWidget/item_list_widget.dart';
import 'package:qhd_prevention/customWidget/toast_util.dart'; import 'package:qhd_prevention/customWidget/toast_util.dart';
@ -79,13 +80,6 @@ class _LsydWaitPageState extends State<LsydWaitPage> {
setState(() => isLoading = true); setState(() => isLoading = true);
try { try {
final data = {
"eqWorkType": "confinedspace_work",
"pageSize": rows,
"pageIndex": currentPage,
...searchData,
"eqStepId": widget.stepId,
};
var response = {}; var response = {};
if (widget.listType == SpecialListType.task) { if (widget.listType == SpecialListType.task) {
final data = { final data = {
@ -96,12 +90,15 @@ class _LsydWaitPageState extends State<LsydWaitPage> {
}; };
response = await SpecialWorkApi.specialWorkTaskLogList(data); response = await SpecialWorkApi.specialWorkTaskLogList(data);
}else{ }else{
final parentPerm = 'dashboard:hazardous:work:temporary-electrical-work:Temporary-Electricity-Work-Ledger';
final targetPerm = '';
final menuPath = await RouteService.getMenuPath(parentPerm, targetPerm);
final data = { final data = {
"eqWorkType": SpecialWorkTypeEnum.electricityWork.code, "eqWorkType": SpecialWorkTypeEnum.electricityWork.code,
"pageSize": rows, "pageSize": rows,
"pageIndex": currentPage, "pageIndex": currentPage,
"menuPath" : menuPath,
...searchData ...searchData
// "eqStatus" : 1,
}; };
response = await SpecialWorkApi.specialWorkList(data); response = await SpecialWorkApi.specialWorkList(data);
} }
@ -516,7 +513,7 @@ class _LsydWaitPageState extends State<LsydWaitPage> {
if (status != '0' && widget.listType == SpecialListType.task) { if (status != '0' && widget.listType == SpecialListType.task) {
buttons.add( buttons.add(
CustomButton( CustomButton(
text: '审批', text: status == '2' ? '编辑' : '审批',
backgroundColor: Colors.blue, backgroundColor: Colors.blue,
onPressed: () { onPressed: () {
_goToDetail(item, true); _goToDetail(item, true);

4
lib/pages/home/Tap/special_work/lsyd_work/work_tab_lsyd_list.dart
View File

@ -170,8 +170,8 @@ class _WorkTabLsydListState extends State<WorkTabLsydList> {
final button = stepsData[buttonIndex]; final button = stepsData[buttonIndex];
final workTypeTitle = final workTypeTitle =
(group is Map && group['groupName'] != null) (button is Map && button['stepName'] != null)
? group['groupName'].toString() ? button['stepName'].toString()
: ''; : '';
final stepId = button['stepId'] ?? ''; final stepId = button['stepId'] ?? '';
await pushPage(LsydWaitPage(stepId: stepId, workTypeTitle: workTypeTitle , listType: SpecialListType.task), context); await pushPage(LsydWaitPage(stepId: stepId, workTypeTitle: workTypeTitle , listType: SpecialListType.task), context);

2
lib/pages/home/Tap/special_work/mbcd_work/mbcd_apply_page.dart
View File

@ -62,7 +62,7 @@ class _MbcdApplyPageState extends State<MbcdApplyPage> {
// 初始化必填规则 // 初始化必填规则
final Map<String, dynamic> _requiredRules = { final Map<String, dynamic> _requiredRules = {
"operationTypeName": "请选择作业类型", "operationTypeName": "请选择作业类型",
"blindboardWorkName": "请选择作业类别", "blindboardWorkTypeName": "请选择作业类别",
"devicePipelineName": "请输入设备管道名称", "devicePipelineName": "请输入设备管道名称",
"workStartTime": "请选择作业开始时间", "workStartTime": "请选择作业开始时间",
"workUserName": "请填写作业人", "workUserName": "请填写作业人",

15
lib/pages/home/Tap/special_work/mbcd_work/mbcd_wait_page.dart
View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:qhd_prevention/common/route_service.dart';
import 'package:qhd_prevention/customWidget/custom_alert_dialog.dart'; import 'package:qhd_prevention/customWidget/custom_alert_dialog.dart';
import 'package:qhd_prevention/customWidget/item_list_widget.dart'; import 'package:qhd_prevention/customWidget/item_list_widget.dart';
import 'package:qhd_prevention/customWidget/toast_util.dart'; import 'package:qhd_prevention/customWidget/toast_util.dart';
@ -78,13 +79,6 @@ class _MbcdWaitPageState extends State<MbcdWaitPage> {
setState(() => isLoading = true); setState(() => isLoading = true);
try { try {
final data = {
"eqWorkType": "confinedspace_work",
"pageSize": rows,
"pageIndex": currentPage,
...searchData,
"eqStepId": widget.stepId,
};
var response = {}; var response = {};
if (widget.listType == SpecialListType.task) { if (widget.listType == SpecialListType.task) {
final data = { final data = {
@ -95,12 +89,15 @@ class _MbcdWaitPageState extends State<MbcdWaitPage> {
}; };
response = await SpecialWorkApi.specialWorkTaskLogList(data); response = await SpecialWorkApi.specialWorkTaskLogList(data);
}else{ }else{
final parentPerm = 'dashboard:hazardous:work:blind-flange-plugging-operation:Blind-Flange-Blocking-Work-Ledger';
final targetPerm = '';
final menuPath = await RouteService.getMenuPath(parentPerm, targetPerm);
final data = { final data = {
"eqWorkType": SpecialWorkTypeEnum.blindboardWork.code, "eqWorkType": SpecialWorkTypeEnum.blindboardWork.code,
"pageSize": rows, "pageSize": rows,
"pageIndex": currentPage, "pageIndex": currentPage,
"menuPath" : menuPath,
...searchData ...searchData
// "eqStatus" : 1,
}; };
response = await SpecialWorkApi.specialWorkList(data); response = await SpecialWorkApi.specialWorkList(data);
} }
@ -490,7 +487,7 @@ class _MbcdWaitPageState extends State<MbcdWaitPage> {
if (status != '0' && widget.listType == SpecialListType.task) { if (status != '0' && widget.listType == SpecialListType.task) {
buttons.add( buttons.add(
CustomButton( CustomButton(
text: '审批', text: status == '2' ? '编辑' : '审批',
backgroundColor: Colors.blue, backgroundColor: Colors.blue,
onPressed: () { onPressed: () {
_goToDetail(item, true); _goToDetail(item, true);

4
lib/pages/home/Tap/special_work/mbcd_work/work_tab_mbcd_list.dart
View File

@ -170,8 +170,8 @@ class _WorkTabMbcdListState extends State<WorkTabMbcdList> {
final button = stepsData[buttonIndex]; final button = stepsData[buttonIndex];
final workTypeTitle = final workTypeTitle =
(group is Map && group['groupName'] != null) (button is Map && button['stepName'] != null)
? group['groupName'].toString() ? button['stepName'].toString()
: ''; : '';
final stepId = button['stepId'] ?? ''; final stepId = button['stepId'] ?? '';
await pushPage(MbcdWaitPage(stepId: stepId, workTypeTitle: workTypeTitle , listType: SpecialListType.task), context); await pushPage(MbcdWaitPage(stepId: stepId, workTypeTitle: workTypeTitle , listType: SpecialListType.task), context);

15
lib/pages/home/Tap/special_work/sxkj_work/sxkj_wait_page.dart
View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:qhd_prevention/common/route_service.dart';
import 'package:qhd_prevention/customWidget/custom_alert_dialog.dart'; import 'package:qhd_prevention/customWidget/custom_alert_dialog.dart';
import 'package:qhd_prevention/customWidget/item_list_widget.dart'; import 'package:qhd_prevention/customWidget/item_list_widget.dart';
import 'package:qhd_prevention/customWidget/toast_util.dart'; import 'package:qhd_prevention/customWidget/toast_util.dart';
@ -79,13 +80,6 @@ class _SxkjWaitPageState extends State<SxkjWaitPage> {
setState(() => isLoading = true); setState(() => isLoading = true);
try { try {
final data = {
"eqWorkType": "confinedspace_work",
"pageSize": rows,
"pageIndex": currentPage,
...searchData,
"eqStepId": widget.stepId,
};
var response = {}; var response = {};
if (widget.listType == SpecialListType.task) { if (widget.listType == SpecialListType.task) {
final data = { final data = {
@ -96,12 +90,15 @@ class _SxkjWaitPageState extends State<SxkjWaitPage> {
}; };
response = await SpecialWorkApi.specialWorkTaskLogList(data); response = await SpecialWorkApi.specialWorkTaskLogList(data);
}else{ }else{
final parentPerm = 'dashboard:hazardous:work:confined-space-operations:Confined-Space-Work-Ledger';
final targetPerm = '';
final menuPath = await RouteService.getMenuPath(parentPerm, targetPerm);
final data = { final data = {
"eqWorkType": SpecialWorkTypeEnum.confinedspaceWork.code, "eqWorkType": SpecialWorkTypeEnum.confinedspaceWork.code,
"pageSize": rows, "pageSize": rows,
"pageIndex": currentPage, "pageIndex": currentPage,
"menuPath" : menuPath,
...searchData ...searchData
// "eqStatus" : 1,
}; };
response = await SpecialWorkApi.specialWorkList(data); response = await SpecialWorkApi.specialWorkList(data);
} }
@ -430,7 +427,7 @@ class _SxkjWaitPageState extends State<SxkjWaitPage> {
if (status != '0' && widget.listType == SpecialListType.task) { if (status != '0' && widget.listType == SpecialListType.task) {
buttons.add( buttons.add(
CustomButton( CustomButton(
text: '审批', text: status == '2' ? '编辑' : '审批',
backgroundColor: Colors.blue, backgroundColor: Colors.blue,
onPressed: () { onPressed: () {
_goToDetail(item, true); _goToDetail(item, true);

12
lib/pages/home/Tap/special_work/sxkj_work/tz/sxkj_tz_list_page.dart
View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:qhd_prevention/common/route_service.dart';
import 'package:qhd_prevention/customWidget/item_list_widget.dart'; import 'package:qhd_prevention/customWidget/item_list_widget.dart';
import 'package:qhd_prevention/customWidget/toast_util.dart'; import 'package:qhd_prevention/customWidget/toast_util.dart';
import 'package:qhd_prevention/CustomWidget/range_filter_bar.dart'; import 'package:qhd_prevention/CustomWidget/range_filter_bar.dart';
@ -71,12 +72,6 @@ class _SxkjTzListPageState extends State<SxkjTzListPage> {
} }
} }
Future<void> _fetchSteps() async {
try {} catch (e) {
print('Error fetching steps: $e');
}
}
Future<void> _fetchData() async { Future<void> _fetchData() async {
if (isLoading) return; if (isLoading) return;
setState(() => isLoading = true); setState(() => isLoading = true);
@ -84,10 +79,15 @@ class _SxkjTzListPageState extends State<SxkjTzListPage> {
try { try {
var response = {}; var response = {};
final parentPerm = 'dashboard:hazardous:work:confined-space-operations:confined-space-management-ledger';
final targetPerm = '';
final menuPath = await RouteService.getMenuPath(parentPerm, targetPerm);
final data = { final data = {
"eqWorkType": "confinedspace_work", "eqWorkType": "confinedspace_work",
"pageSize": rows, "pageSize": rows,
"pageIndex": currentPage, "pageIndex": currentPage,
"menuPath" : menuPath,
...searchData
}; };
response = await SpecialWorkApi.specialWorkLimitedSpaceList(data); response = await SpecialWorkApi.specialWorkLimitedSpaceList(data);
setState(() { setState(() {

4
lib/pages/home/Tap/special_work/sxkj_work/work_tab_space_list.dart
View File

@ -180,8 +180,8 @@ class _WorkTabSpaceListState extends State<WorkTabSpaceList> {
final button = stepsData[buttonIndex]; final button = stepsData[buttonIndex];
final workTypeTitle = final workTypeTitle =
(group is Map && group['groupName'] != null) (button is Map && button['stepName'] != null)
? group['groupName'].toString() ? button['stepName'].toString()
: ''; : '';
final stepId = button['stepId'] ?? ''; final stepId = button['stepId'] ?? '';
await pushPage(SxkjWaitPage(stepId: stepId, workTypeTitle: workTypeTitle , listType: SpecialListType.task,), context); await pushPage(SxkjWaitPage(stepId: stepId, workTypeTitle: workTypeTitle , listType: SpecialListType.task,), context);

34
lib/pages/home/Tap/work_tab_list_page.dart
View File

@ -25,59 +25,59 @@ class WorkTabListPage extends StatefulWidget {
class _WorkTabListPageState extends RouteAwareState<WorkTabListPage> { class _WorkTabListPageState extends RouteAwareState<WorkTabListPage> {
final List<_WorkButtonConfig> _allButtons = [ final List<_WorkButtonConfig> _allButtons = [
_WorkButtonConfig( _WorkButtonConfig(
icon: 'assets/image/wxzy_ico7.png', icon: 'assets/images/wxzy_ico7.png',
title: '动火作业', title: '动火作业',
workType: 'hot_work', workType: 'hot_work',
menuPerms: 'dashboard:hazardous-work:hot-work', menuPerms: 'dashboard:hazardous:work:hot-work',
pageBuilder: () => workTabDhList(), pageBuilder: () => workTabDhList(),
), ),
_WorkButtonConfig( _WorkButtonConfig(
icon: 'assets/image/wxzy_ico6.png', icon: 'assets/images/wxzy_ico6.png',
title: '受限空间作业', title: '受限空间作业',
workType: 'confinedspace_work', workType: 'confinedspace_work',
menuPerms: 'dashboard:hazardous-work:confined-space-operations', menuPerms: 'dashboard:hazardous:work:confined-space-operations',
pageBuilder: () => WorkTabSpaceList(), pageBuilder: () => WorkTabSpaceList(),
), ),
_WorkButtonConfig( _WorkButtonConfig(
icon: 'assets/image/wxzy_ico5.png', icon: 'assets/images/wxzy_ico5.png',
title: '高处作业', title: '高处作业',
workType: 'high_work', workType: 'high_work',
menuPerms: 'dashboard:hazardous-work:work-at-height', menuPerms: 'dashboard:hazardous:work:work-at-height',
pageBuilder: () => WorkTabGcList(), pageBuilder: () => WorkTabGcList(),
), ),
_WorkButtonConfig( _WorkButtonConfig(
icon: 'assets/image/wxzy_ico4.png', icon: 'assets/images/wxzy_ico4.png',
title: '动土作业', title: '动土作业',
workType: 'breakground_work', workType: 'breakground_work',
menuPerms: 'dashboard:hazardous-work:earthwork-operations', menuPerms: 'dashboard:hazardous:work:earthwork-operations',
pageBuilder: () => WorkTabDtList(), pageBuilder: () => WorkTabDtList(),
), ),
_WorkButtonConfig( _WorkButtonConfig(
icon: 'assets/image/wxzy_ico3.png', icon: 'assets/images/wxzy_ico3.png',
title: '吊装作业', title: '吊装作业',
workType: 'hoisting_work', workType: 'hoisting_work',
menuPerms: 'dashboard:hazardous-work:hoisting-operations', menuPerms: 'dashboard:hazardous:work:hoisting-operations',
pageBuilder: () => WorkTabDzList(), pageBuilder: () => WorkTabDzList(),
), ),
_WorkButtonConfig( _WorkButtonConfig(
icon: 'assets/image/wxzy_ico2.png', icon: 'assets/images/wxzy_ico2.png',
title: '断路作业', title: '断路作业',
workType: 'cutroad_work', workType: 'cutroad_work',
menuPerms: 'dashboard:hazardous-work:circuit-breaking-operation', menuPerms: 'dashboard:hazardous:work:circuit-breaking-operation',
pageBuilder: () => WorkTabDlList(), pageBuilder: () => WorkTabDlList(),
), ),
_WorkButtonConfig( _WorkButtonConfig(
icon: 'assets/image/wxzy_ico1.png', icon: 'assets/images/wxzy_ico1.png',
title: '临时用电作业', title: '临时用电作业',
workType: 'electricity_work', workType: 'electricity_work',
menuPerms: 'dashboard:hazardous-work:temporary-electrical-work', menuPerms: 'dashboard:hazardous:work:temporary-electrical-work',
pageBuilder: () => WorkTabLsydList(), pageBuilder: () => WorkTabLsydList(),
), ),
_WorkButtonConfig( _WorkButtonConfig(
icon: 'assets/image/wxzy_ico8.png', icon: 'assets/images/wxzy_ico8.png',
title: '盲板抽堵作业', title: '盲板抽堵作业',
workType: 'blindboard_work', workType: 'blindboard_work',
menuPerms: 'dashboard:hazardous-work:blind-flange-plugging-operation', menuPerms: 'dashboard:hazardous:work:blind-flange-plugging-operation',
pageBuilder: () => WorkTabMbcdList(), pageBuilder: () => WorkTabMbcdList(),
), ),
]; ];
@ -188,7 +188,7 @@ class _WorkTabListPageState extends RouteAwareState<WorkTabListPage> {
return Stack( return Stack(
children: [ children: [
Image.asset( Image.asset(
'assets/image/wxzy_banner.png', 'assets/images/wxzy_banner.png',
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
height: bannerHeight, height: bannerHeight,
fit: BoxFit.fitWidth, fit: BoxFit.fitWidth,

6
lib/pages/home/home_page.dart
View File

@ -10,6 +10,7 @@ import 'package:qhd_prevention/customWidget/custom_button.dart';
import 'package:qhd_prevention/customWidget/toast_util.dart'; import 'package:qhd_prevention/customWidget/toast_util.dart';
import 'package:qhd_prevention/http/ApiService.dart'; import 'package:qhd_prevention/http/ApiService.dart';
import 'package:qhd_prevention/pages/home/Study/study_tab_list_page.dart'; import 'package:qhd_prevention/pages/home/Study/study_tab_list_page.dart';
import 'package:qhd_prevention/pages/home/Tap/work_tab_list_page.dart';
import 'package:qhd_prevention/pages/home/doorAndCar/doorCar_tab_page.dart'; import 'package:qhd_prevention/pages/home/doorAndCar/doorCar_tab_page.dart';
import 'package:qhd_prevention/pages/home/keyTasks/key_tasks_tab_page.dart'; import 'package:qhd_prevention/pages/home/keyTasks/key_tasks_tab_page.dart';
import 'package:qhd_prevention/pages/home/scan_page.dart'; import 'package:qhd_prevention/pages/home/scan_page.dart';
@ -118,7 +119,7 @@ class HomePageState extends RouteAwareState<HomePage>
final Map<String, String> _titleToPerm = { final Map<String, String> _titleToPerm = {
"单位管理": "dashboard-Unit-Management", "单位管理": "dashboard-Unit-Management",
"现场监管": "dashboard-Site-Supervision", "现场监管": "dashboard-Site-Supervision",
"危险作业": "dashboard-Hazardous-Work", "危险作业": "dashboard:hazardous:work:hot-work",
"隐患治理": "dashboard-Hazard-Management", "隐患治理": "dashboard-Hazard-Management",
"重点作业": "dashboard-Hazard-Management", // 无对应，暂时留空 "重点作业": "dashboard-Hazard-Management", // 无对应，暂时留空
"口门门禁": "dashboard-Gate-Access-Control", "口门门禁": "dashboard-Gate-Access-Control",
@ -640,6 +641,9 @@ class HomePageState extends RouteAwareState<HomePage>
case "重点作业": case "重点作业":
pushPage(KeyTasksTabPage(), context); pushPage(KeyTasksTabPage(), context);
break; break;
case "危险作业":
pushPage(WorkTabListPage(), context);
break;
default: default:
ToastUtil.showNormal(context, '功能开发中...'); ToastUtil.showNormal(context, '功能开发中...');
break; break;

15
lib/pages/home/unit/unit_join_detail_page.dart
View File

@ -70,6 +70,19 @@ class _UnitJoinDetailPageState extends State<UnitJoinDetailPage> {
// final filePath = fileData.first['filePath'] ?? ''; // final filePath = fileData.first['filePath'] ?? '';
} }
}); });
if ('${pd['userAvatarUrl']}'.isEmpty) {
await FileApi.getImagePathWithType(
eqForeignKey,
'',
UploadFileType.userAvatar,
).then((result) {
if (result['success']) {
List files = result['data'] ?? [];
pd['userAvatarUrl'] = files.map((item) => item['filePath'].toString()).toList().first;
}
});
}
setState(() { setState(() {
pd = data; pd = data;
@ -98,7 +111,7 @@ class _UnitJoinDetailPageState extends State<UnitJoinDetailPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
bool isShow = _isEdit; bool isShow = _isEdit;
if (!_isEdit && FormUtils.hasValue(pd, 'id')) { if (!_isEdit && FormUtils.hasValue(pd, 'userAvatarUrl')) {
isShow = true; isShow = true;
} }
return Scaffold( return Scaffold(

35
lib/pages/main_tab.dart
View File

@ -95,26 +95,27 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
try { try {
Map? route; Map? route;
// 接口获取 // 接口获取
// try {
// LoadingDialogHelper.show(message: '加载中...');
// final roleId = SessionService.instance.roleId;
// final res = await AppMenuApi.getAppMenu({'roleId': roleId});
// LoadingDialogHelper.hide();
// if (res['success'] == true) {
// route = res;
// } else {}
// } catch (e) {
// debugPrint(
// 'AppMenuApi.getAppMenu error: $e -> fallback to local assets.',
// );
// }
// 本地获取
try { try {
final routeString = await loadFromAssets(); LoadingDialogHelper.show(message: '加载中...');
route = jsonDecode(routeString) as Map<String, dynamic>; final roleId = SessionService.instance.roleId;
final res = await AppMenuApi.getAppMenu({'roleId': roleId});
LoadingDialogHelper.hide();
if (res['success'] == true) {
route = res;
printLongString(jsonEncode(route));
} else {}
} catch (e) { } catch (e) {
debugPrint('loadFromAssets error: $e'); debugPrint(
'AppMenuApi.getAppMenu error: $e -> fallback to local assets.',
);
} }
// 本地获取
// try {
// final routeString = await loadFromAssets();
// route = jsonDecode(routeString) as Map<String, dynamic>;
// } catch (e) {
// debugPrint('loadFromAssets error: $e');
// }
final data = route?['data'] ?? []; final data = route?['data'] ?? [];
RouteService().initializeRoutes(data); RouteService().initializeRoutes(data);
} catch (e) { } catch (e) {

31
lib/pages/user/full_userinfo_page.dart
View File

@ -96,6 +96,8 @@ class _FullUserinfoPageState extends State<FullUserinfoPage> {
); );
if (res['success']) { if (res['success']) {
final data = res['data']; final data = res['data'];
pd = data;
_genderText = data['sex'] ?? ''; _genderText = data['sex'] ?? '';
_birthText = data['birthday'] ?? ''; _birthText = data['birthday'] ?? '';
final eqForeignKey = data['userId']; final eqForeignKey = data['userId'];
@ -112,9 +114,21 @@ class _FullUserinfoPageState extends State<FullUserinfoPage> {
_idCartImgIds = files.map((item) => item['id'].toString()).toList(); _idCartImgIds = files.map((item) => item['id'].toString()).toList();
} }
}); });
if ('${pd['userAvatarUrl']}'.isEmpty) {
await FileApi.getImagePathWithType(
eqForeignKey,
'',
UploadFileType.userAvatar,
).then((result) {
if (result['success']) {
List files = result['data'] ?? [];
pd['userAvatarUrl'] = files.map((item) => item['filePath'].toString()).toList().first;
}
});
}
setState(() { setState(() {
pd = data;
try { try {
final idCardBase64 = utf8.decode(base64.decode(pd['userIdCard'])); final idCardBase64 = utf8.decode(base64.decode(pd['userIdCard']));
if (idCardBase64.isNotEmpty) { if (idCardBase64.isNotEmpty) {
@ -156,18 +170,6 @@ class _FullUserinfoPageState extends State<FullUserinfoPage> {
}); });
} }
void _applyParsedIdCardInfo(IDCardInfo info, String input) {
setState(() {
pd['userIdCard'] = info.id18 ?? input;
pd['birthday'] = info.birth;
pd['age'] = info.age;
pd['gender'] = info.gender;
pd['provinceCode'] = info.provinceCode;
pd['province'] = info.province;
_genderText = info.gender ?? '未知';
_birthText = info.birth ?? '未知';
});
}
/// 身份证输入变化 /// 身份证输入变化
void _onIdChanged(String value) { void _onIdChanged(String value) {
@ -312,6 +314,7 @@ class _FullUserinfoPageState extends State<FullUserinfoPage> {
.then((result) { .then((result) {
if (result['success']) { if (result['success']) {
pd['userAvatarUrl'] = result['data']['filePath'] ?? ''; pd['userAvatarUrl'] = result['data']['filePath'] ?? '';
pd['userId'] = result['data']['foreignKey'] ?? '';
isSuccess = true; isSuccess = true;
} else { } else {
LoadingDialogHelper.hide(); LoadingDialogHelper.hide();
@ -356,7 +359,7 @@ class _FullUserinfoPageState extends State<FullUserinfoPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
bool isShow = _isEdit; bool isShow = _isEdit;
if (!_isEdit && FormUtils.hasValue(pd, 'id')) { if (!_isEdit && FormUtils.hasValue(pd, 'userAvatarUrl')) {
isShow = true; isShow = true;
} }
String token = SessionService.instance.token ?? ''; String token = SessionService.instance.token ?? '';