diff --git a/assets/route/routes.txt b/assets/route/routes.txt index 37de48d..36c617e 100644 --- a/assets/route/routes.txt +++ b/assets/route/routes.txt @@ -1,581 +1,1049 @@ { - "extValues": {}, - "success": true, - "errCode": null, - "errMessage": null, - "exception": null, - "traceId": "18491030037470208", - "data": [ - { - "extValues": {}, - "id": "2030925300149387265", - "menuName": "首页", - "menuUrl": "/dashboard", - "parentId": "0", - "parentIds": null, - "menuPerms": "dashboard", - "menuType": 1, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 0, - "showFlag": 1, - "children": [ - { - "extValues": {}, - "id": "2030925300149387268", - "menuName": "单位管理", - "menuUrl": "/dashboard/Unit/Management", - "parentId": "2030925300149387265", - "parentIds": null, - "menuPerms": "dashboard-Unit-Management", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 3, - "showFlag": 1, - "children": [ - { - "extValues": {}, - "id": "2030925300149387286", - "menuName": "就职单位", - "menuUrl": "/dashboard/Unit/Management/Employment/Unit", - "parentId": "2030925300149387268", - "parentIds": null, - "menuPerms": "dashboard-Unit-Management-Employment-Unit", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 21, - "showFlag": 1, - "children": null - }, - { - "extValues": {}, - "id": "2030925300149387287", - "menuName": "服务单位管理", - "menuUrl": "/dashboard/Unit/Management/Managee/Service/Unit/Management", - "parentId": "2030925300149387268", - "parentIds": null, - "menuPerms": "dashboard-Unit-Management-Managee-Service-Unit-Management", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 22, - "showFlag": 1, - "children": null - } - ] - }, - { - "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", - "menuName": "口门门禁", - "menuUrl": "/dashboard/Gate/Access/Control", - "parentId": "2030925300149387265", - "parentIds": null, - "menuPerms": "dashboard-Gate-Access-Control", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 5, - "showFlag": 1, - "children": [ - { - "extValues": {}, - "id": "2030925300149387288", - "menuName": "进港口门申请", - "menuUrl": "/dashboard/Gate/Access/Control/Port/Gate/Entry/Application", - "parentId": "2030925300149387270", - "parentIds": null, - "menuPerms": "dashboard-Gate-Access-Control-Port-Gate-Entry-Application", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 23, - "showFlag": 1, - "children": [ - { - "extValues": {}, - "id": "2030925300149387292", - "menuName": "人员申请", - "menuUrl": "/dashboard/Port/Gate/Entry/Application/Personnel/Application", - "parentId": "2030925300149387288", - "parentIds": null, - "menuPerms": "dashboard-Port-Gate-Entry-Application-Personnel-Application", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 27, - "showFlag": 1, - "children": null - }, - { - "extValues": {}, - "id": "2030925300149387293", - "menuName": "车辆申请", - "menuUrl": "/dashboard/Port/Gate/Entry/Application/Vehicle/Application", - "parentId": "2030925300149387288", - "parentIds": null, - "menuPerms": "dashboard-Port-Gate-Entry-Application-Vehicle-Application", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 28, - "showFlag": 1, - "children": null - } - ] - }, - { - "extValues": {}, - "id": "2030925300149387289", - "menuName": "进港口门申请记录", - "menuUrl": "/dashboard/Gate/Access/Crdtrol/Port/Gate/Entry/Record", - "parentId": "2030925300149387270", - "parentIds": null, - "menuPerms": "dashboard-Gate-Access-Crdtrol-Port-Gate-Entry-Record", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 24, - "showFlag": 1, - "children": [ - { - "extValues": {}, - "id": "2030925300149387294", - "menuName": "人员申请记录", - "menuUrl": "/dashboard/Port/Gate/Entry/Record/Record/Personnel/Application/Record", - "parentId": "2030925300149387289", - "parentIds": null, - "menuPerms": "dashboard-Port-Gate-Entry-Record-Record-Personnel-Application-Record", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 29, - "showFlag": 1, - "children": null - }, - { - "extValues": {}, - "id": "2030925300149387295", - "menuName": "车辆申请记录", - "menuUrl": "/dashboard/Port/Gate/Entry/Record/Record/Vehicle/Application/Record", - "parentId": "2030925300149387289", - "parentIds": null, - "menuPerms": "dashboard-Port-Gate-Entry-Record-Record-Vehicle-Application-Record", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 30, - "showFlag": 1, - "children": null - } - ] - }, - { - "extValues": {}, - "id": "2030925300149387290", - "menuName": "封闭区域口门申请", - "menuUrl": "/dashboard/Area/Access/Cionsedrol/Closed/Area/Gate/Application", - "parentId": "2030925300149387270", - "parentIds": null, - "menuPerms": "dashboard-Area-Access-Cionsedrol-Closed-Area-Gate-Application", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 25, - "showFlag": 1, - "children": [ - { - "extValues": {}, - "id": "2030925300149387296", - "menuName": "人员申请", - "menuUrl": "/dashboard/Closed/Area/Gate/Application/Personnel/Application", - "parentId": "2030925300149387290", - "parentIds": null, - "menuPerms": "dashboard-Closed-Area-Gate-Application-Personnel-Application", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 31, - "showFlag": 1, - "children": null - }, - { - "extValues": {}, - "id": "2030925300149387297", - "menuName": "车辆申请", - "menuUrl": "/dashboard/Closed/Area/Gate/Application/Vehicle/Application", - "parentId": "2030925300149387290", - "parentIds": null, - "menuPerms": "dashboard-Closed-Area-Gate-Application-Vehicle-Application", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 32, - "showFlag": 1, - "children": null - } - ] - }, - { - "extValues": {}, - "id": "2030925300149387291", - "menuName": "封闭区域口门申请记录", - "menuUrl": "/dashboard/Area/Access/Crdsedrol/Closed/Area/Gate/Record", - "parentId": "2030925300149387270", - "parentIds": null, - "menuPerms": "dashboard-Area-Access-Crdsedrol-Closed-Area-Gate-Record", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 26, - "showFlag": 1, - "children": [ - { - "extValues": {}, - "id": "2030925300149387298", - "menuName": "人员申请记录", - "menuUrl": "/dashboard/Closed/Area/Gate/Record/Record/Personnel/Application/Record", - "parentId": "2030925300149387291", - "parentIds": null, - "menuPerms": "dashboard-Closed-Area-Gate-Record-Record-Personnel-Application-Record", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 33, - "showFlag": 1, - "children": null - }, - { - "extValues": {}, - "id": "2030925300149387299", - "menuName": "车辆申请记录", - "menuUrl": "/dashboard/Closed/Area/Gate/Record/Record/Vehicle/Application/Record", - "parentId": "2030925300149387291", - "parentIds": null, - "menuPerms": "dashboard-Closed-Area-Gate-Record-Record-Vehicle-Application-Record", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 34, - "showFlag": 1, - "children": null - } - ] - } - ] - }, - { - "extValues": {}, - "id": "2030925300149387271", - "menuName": "现场监管", - "menuUrl": "/dashboard/Site/Supervision", - "parentId": "2030925300149387265", - "parentIds": null, - "menuPerms": "dashboard-Site-Supervision", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 6, - "showFlag": 1, - "children": null - }, - { - "extValues": {}, - "id": "2030925300149387272", - "menuName": "危险作业", - "menuUrl": "/dashboard/Hazardous/Work", - "parentId": "2030925300149387265", - "parentIds": null, - "menuPerms": "dashboard-Hazardous-Work", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 7, - "showFlag": 1, - "children": null - }, - { - "extValues": {}, - "id": "2030925300149387273", - "menuName": "隐患治理", - "menuUrl": "/dashboard/Hazard/Management", - "parentId": "2030925300149387265", - "parentIds": null, - "menuPerms": "dashboard-Hazard-Management", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 8, - "showFlag": 1, - "children": null - }, - { - "extValues": {}, - "id": "2030935458707537921", - "menuName": "入港培训", - "menuUrl": "/dashboard/Study/Training", - "parentId": "2030925300149387265", - "parentIds": null, - "menuPerms": "dashboard-Study-Training", - "menuType": 1, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 11, - "showFlag": 1, - "children": null - }, - { - "extValues": {}, - "id": "2030925300149387300", - "menuName": "首页扫码", - "menuUrl": "/dashboard/scan", - "parentId": "2030925300149387265", - "parentIds": null, - "menuPerms": "dashboard-scan", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 35, - "showFlag": 1, - "children": null - }, - { - "extValues": {}, - "id": "2030925300149387301", - "menuName": "首页滚动通知", - "menuUrl": "/dashboard/roll-notice", - "parentId": "2030925300149387265", - "parentIds": null, - "menuPerms": "dashboard-roll-notice", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 36, - "showFlag": 1, - "children": null - }, - { - "extValues": {}, - "id": "2030925300149387302", - "menuName": "首页待办梳理", - "menuUrl": "/dashboard/todo-sort", - "parentId": "2030925300149387265", - "parentIds": null, - "menuPerms": "dashboard-todo-sort", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 37, - "showFlag": 1, - "children": null - }, - { - "extValues": {}, - "id": "2030925300149387303", - "menuName": "首页待办事项", - "menuUrl": "/dashboard/todo-list", - "parentId": "2030925300149387265", - "parentIds": null, - "menuPerms": "dashboard-todo-list", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 38, - "showFlag": 1, - "children": null - } - ] - }, - { - "extValues": {}, - "id": "2030925300149387266", - "menuName": "通知", - "menuUrl": "/notice", - "parentId": "0", - "parentIds": null, - "menuPerms": "notice", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 1, - "showFlag": 1, - "children": [ - { - "extValues": {}, - "id": "2030925300149387274", - "menuName": "公告通知", - "menuUrl": "/notice/Announcement/Notice", - "parentId": "2030925300149387266", - "parentIds": null, - "menuPerms": "notice-Announcement-Notice", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 9, - "showFlag": 1, - "children": null - } - ] - }, - { - "extValues": {}, - "id": "2030925300149387267", - "menuName": "我的", - "menuUrl": "/my-center", - "parentId": "0", - "parentIds": null, - "menuPerms": "my-center", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 2, - "showFlag": 1, - "children": [ - { - "extValues": {}, - "id": "2030925300149387275", - "menuName": "我的信息", - "menuUrl": "/my-center/My/Information", - "parentId": "2030925300149387267", - "parentIds": null, - "menuPerms": "my-center-My-Information", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 10, - "showFlag": 1, - "children": null - }, - { - "extValues": {}, - "id": "2030925300149387276", - "menuName": "扫码入职", - "menuUrl": "/my-center/Scan/Code/Onboarding", - "parentId": "2030925300149387267", - "parentIds": null, - "menuPerms": "my-center-Scan-Code-Onboarding", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 11, - "showFlag": 1, - "children": null - }, - { - "extValues": {}, - "id": "2030925300149387277", - "menuName": "人脸认证", - "menuUrl": "/my-center/Face/Authentication", - "parentId": "2030925300149387267", - "parentIds": null, - "menuPerms": "my-center-Face-Authentication", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 12, - "showFlag": 1, - "children": null - }, - { - "extValues": {}, - "id": "2030925300149387278", - "menuName": "证书信息", - "menuUrl": "/my-center/Certificate/Information", - "parentId": "2030925300149387267", - "parentIds": null, - "menuPerms": "my-center-Certificate-Information", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 13, - "showFlag": 1, - "children": null - }, - { - "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", - "menuName": "切换账号", - "menuUrl": "/my-center/Switch/Account", - "parentId": "2030925300149387267", - "parentIds": null, - "menuPerms": "my-center-Switch-Account", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 17, - "showFlag": 1, - "children": null - }, - { - "extValues": {}, - "id": "2030925300149387283", - "menuName": "修改密码", - "menuUrl": "/my-center/Change/Password", - "parentId": "2030925300149387267", - "parentIds": null, - "menuPerms": "my-center-Change-Password", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 18, - "showFlag": 1, - "children": null - }, - { - "extValues": {}, - "id": "2030925300149387284", - "menuName": "用户注销", - "menuUrl": "/my-center/User/Logout", - "parentId": "2030925300149387267", - "parentIds": null, - "menuPerms": "my-center-User-Logout", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 19, - "showFlag": 1, - "children": null - }, - { - "extValues": {}, - "id": "2030925300149387285", - "menuName": "退出登录", - "menuUrl": "/my-center/Logout", - "parentId": "2030925300149387267", - "parentIds": null, - "menuPerms": "my-center-Logout", - "menuType": 2, - "menuAttribution": "QINGANG_RELATED_PARTIES", - "sort": 20, - "showFlag": 1, - "children": null - } - ] - } - ], - "notEmpty": true, - "empty": false + "extValues": { + + }, + "success": true, + "errCode": null, + "errMessage": null, + "exception": null, + "traceId": "18688908153423296", + "data": [ + { + "extValues": { + + }, + "id": "2030925300149387265", + "menuName": "首页", + "menuUrl": "/dashboard", + "parentId": "0", + "parentIds": null, + "menuPerms": "dashboard", + "menuType": 1, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 0, + "showFlag": 1, + "children": [ + { + "extValues": { + + }, + "id": "2030925300149387268", + "menuName": "单位管理", + "menuUrl": "/dashboard/Unit/Management", + "parentId": "2030925300149387265", + "parentIds": null, + "menuPerms": "dashboard-Unit-Management", + "menuType": 1, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 3, + "showFlag": 1, + "children": [ + { + "extValues": { + + }, + "id": "2030925300149387286", + "menuName": "就职单位", + "menuUrl": "/dashboard/Unit/Management/Employment/Unit", + "parentId": "2030925300149387268", + "parentIds": null, + "menuPerms": "dashboard-Unit-Management-Employment-Unit", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 21, + "showFlag": 1, + "children": null + }, + { + "extValues": { + + }, + "id": "2030925300149387287", + "menuName": "服务单位管理", + "menuUrl": "/dashboard/Unit/Management/Managee/Service/Unit/Management", + "parentId": "2030925300149387268", + "parentIds": null, + "menuPerms": "dashboard-Unit-Management-Managee-Service-Unit-Management", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 22, + "showFlag": 1, + "children": null + } + ] + }, + { + "extValues": { + + }, + "id": "2030925300149387270", + "menuName": "口门门禁", + "menuUrl": "/dashboard/Gate/Access/Control", + "parentId": "2030925300149387265", + "parentIds": null, + "menuPerms": "dashboard-Gate-Access-Control", + "menuType": 1, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 5, + "showFlag": 1, + "children": [ + { + "extValues": { + + }, + "id": "2030925300149387288", + "menuName": "进港口门申请", + "menuUrl": "/dashboard/Gate/Access/Control/Port/Gate/Entry/Application", + "parentId": "2030925300149387270", + "parentIds": null, + "menuPerms": "dashboard-Gate-Access-Control-Port-Gate-Entry-Application", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 23, + "showFlag": 1, + "children": [ + { + "extValues": { + + }, + "id": "2030925300149387292", + "menuName": "人员申请", + "menuUrl": "/dashboard/Port/Gate/Entry/Application/Personnel/Application", + "parentId": "2030925300149387288", + "parentIds": null, + "menuPerms": "dashboard-Port-Gate-Entry-Application-Personnel-Application", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 27, + "showFlag": 1, + "children": null + }, + { + "extValues": { + + }, + "id": "2030925300149387293", + "menuName": "车辆申请", + "menuUrl": "/dashboard/Port/Gate/Entry/Application/Vehicle/Application", + "parentId": "2030925300149387288", + "parentIds": null, + "menuPerms": "dashboard-Port-Gate-Entry-Application-Vehicle-Application", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 28, + "showFlag": 1, + "children": null + } + ] + }, + { + "extValues": { + + }, + "id": "2030925300149387289", + "menuName": "进港口门申请记录", + "menuUrl": "/dashboard/Gate/Access/Crdtrol/Port/Gate/Entry/Record", + "parentId": "2030925300149387270", + "parentIds": null, + "menuPerms": "dashboard-Gate-Access-Crdtrol-Port-Gate-Entry-Record", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 24, + "showFlag": 1, + "children": [ + { + "extValues": { + + }, + "id": "2030925300149387294", + "menuName": "人员申请记录", + "menuUrl": "/dashboard/Port/Gate/Entry/Record/Record/Personnel/Application/Record", + "parentId": "2030925300149387289", + "parentIds": null, + "menuPerms": "dashboard-Port-Gate-Entry-Record-Record-Personnel-Application-Record", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 29, + "showFlag": 1, + "children": null + }, + { + "extValues": { + + }, + "id": "2030925300149387295", + "menuName": "车辆申请记录", + "menuUrl": "/dashboard/Port/Gate/Entry/Record/Record/Vehicle/Application/Record", + "parentId": "2030925300149387289", + "parentIds": null, + "menuPerms": "dashboard-Port-Gate-Entry-Record-Record-Vehicle-Application-Record", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 30, + "showFlag": 1, + "children": null + } + ] + }, + { + "extValues": { + + }, + "id": "2030925300149387290", + "menuName": "封闭区域口门申请", + "menuUrl": "/dashboard/Area/Access/Cionsedrol/Closed/Area/Gate/Application", + "parentId": "2030925300149387270", + "parentIds": null, + "menuPerms": "dashboard-Area-Access-Cionsedrol-Closed-Area-Gate-Application", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 25, + "showFlag": 1, + "children": [ + { + "extValues": { + + }, + "id": "2030925300149387296", + "menuName": "人员申请", + "menuUrl": "/dashboard/Closed/Area/Gate/Application/Personnel/Application", + "parentId": "2030925300149387290", + "parentIds": null, + "menuPerms": "dashboard-Closed-Area-Gate-Application-Personnel-Application", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 31, + "showFlag": 1, + "children": null + }, + { + "extValues": { + + }, + "id": "2030925300149387297", + "menuName": "车辆申请", + "menuUrl": "/dashboard/Closed/Area/Gate/Application/Vehicle/Application", + "parentId": "2030925300149387290", + "parentIds": null, + "menuPerms": "dashboard-Closed-Area-Gate-Application-Vehicle-Application", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 32, + "showFlag": 1, + "children": null + } + ] + }, + { + "extValues": { + + }, + "id": "2030925300149387291", + "menuName": "封闭区域口门申请记录", + "menuUrl": "/dashboard/Area/Access/Crdsedrol/Closed/Area/Gate/Record", + "parentId": "2030925300149387270", + "parentIds": null, + "menuPerms": "dashboard-Area-Access-Crdsedrol-Closed-Area-Gate-Record", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 26, + "showFlag": 1, + "children": [ + { + "extValues": { + + }, + "id": "2030925300149387298", + "menuName": "人员申请记录", + "menuUrl": "/dashboard/Closed/Area/Gate/Record/Record/Personnel/Application/Record", + "parentId": "2030925300149387291", + "parentIds": null, + "menuPerms": "dashboard-Closed-Area-Gate-Record-Record-Personnel-Application-Record", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 33, + "showFlag": 1, + "children": null + }, + { + "extValues": { + + }, + "id": "2030925300149387299", + "menuName": "车辆申请记录", + "menuUrl": "/dashboard/Closed/Area/Gate/Record/Record/Vehicle/Application/Record", + "parentId": "2030925300149387291", + "parentIds": null, + "menuPerms": "dashboard-Closed-Area-Gate-Record-Record-Vehicle-Application-Record", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 34, + "showFlag": 1, + "children": null + } + ] + } + ] + }, + { + "extValues": { + + }, + "id": "2030925300149387271", + "menuName": "现场监管", + "menuUrl": "/dashboard/Site/Supervision", + "parentId": "2030925300149387265", + "parentIds": null, + "menuPerms": "dashboard-Site-Supervision", + "menuType": 1, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 6, + "showFlag": 1, + "children": null + }, + { + "extValues": { + + }, + "id": "2030925300149387272", + "menuName": "危险作业", + "menuUrl": "/dashboard/Hazardous/Work", + "parentId": "2030925300149387265", + "parentIds": null, + "menuPerms": "dashboard-Hazardous-Work", + "menuType": 1, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 7, + "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 + } + ] + } + ] + }, + { + "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", + "menuName": "隐患治理", + "menuUrl": "/dashboard/Hazard/Management", + "parentId": "2030925300149387265", + "parentIds": null, + "menuPerms": "dashboard-Hazard-Management", + "menuType": 1, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 8, + "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 + }, + { + "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", + "menuName": "入港培训", + "menuUrl": "/dashboard/Study/Training", + "parentId": "2030925300149387265", + "parentIds": null, + "menuPerms": "dashboard-Study-Training", + "menuType": 1, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 11, + "showFlag": 1, + "children": null + }, + { + "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", + "menuName": "首页扫码", + "menuUrl": "/dashboard/scan", + "parentId": "2030925300149387265", + "parentIds": null, + "menuPerms": "dashboard-scan", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 35, + "showFlag": 1, + "children": null + }, + { + "extValues": { + + }, + "id": "2030925300149387301", + "menuName": "首页滚动通知", + "menuUrl": "/dashboard/roll-notice", + "parentId": "2030925300149387265", + "parentIds": null, + "menuPerms": "dashboard-roll-notice", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 36, + "showFlag": 1, + "children": null + }, + { + "extValues": { + + }, + "id": "2030925300149387302", + "menuName": "首页待办汇总", + "menuUrl": "/dashboard/todo-sort", + "parentId": "2030925300149387265", + "parentIds": null, + "menuPerms": "dashboard-todo-sort", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 37, + "showFlag": 1, + "children": null + }, + { + "extValues": { + + }, + "id": "2030925300149387303", + "menuName": "首页待办事项", + "menuUrl": "/dashboard/todo-list", + "parentId": "2030925300149387265", + "parentIds": null, + "menuPerms": "dashboard-todo-list", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 38, + "showFlag": 1, + "children": null + } + ] + }, + { + "extValues": { + + }, + "id": "2030925300149387266", + "menuName": "通知", + "menuUrl": "/notice", + "parentId": "0", + "parentIds": null, + "menuPerms": "notice", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 1, + "showFlag": 2, + "children": [ + { + "extValues": { + + }, + "id": "2030925300149387274", + "menuName": "公告通知", + "menuUrl": "/notice/Announcement/Notice", + "parentId": "2030925300149387266", + "parentIds": null, + "menuPerms": "notice-Announcement-Notice", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 9, + "showFlag": 2, + "children": null + } + ] + }, + { + "extValues": { + + }, + "id": "2030925300149387267", + "menuName": "我的", + "menuUrl": "/my-center", + "parentId": "0", + "parentIds": null, + "menuPerms": "my-center", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 2, + "showFlag": 1, + "children": [ + { + "extValues": { + + }, + "id": "2030925300149387275", + "menuName": "我的信息", + "menuUrl": "/my-center/My/Information", + "parentId": "2030925300149387267", + "parentIds": null, + "menuPerms": "my-center-My-Information", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 10, + "showFlag": 1, + "children": null + }, + { + "extValues": { + + }, + "id": "2030925300149387276", + "menuName": "扫码入职", + "menuUrl": "/my-center/Scan/Code/Onboarding", + "parentId": "2030925300149387267", + "parentIds": null, + "menuPerms": "my-center-Scan-Code-Onboarding", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 11, + "showFlag": 1, + "children": null + }, + { + "extValues": { + + }, + "id": "2030925300149387277", + "menuName": "人脸认证", + "menuUrl": "/my-center/Face/Authentication", + "parentId": "2030925300149387267", + "parentIds": null, + "menuPerms": "my-center-Face-Authentication", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 12, + "showFlag": 1, + "children": null + }, + { + "extValues": { + + }, + "id": "2030925300149387278", + "menuName": "证书信息", + "menuUrl": "/my-center/Certificate/Information", + "parentId": "2030925300149387267", + "parentIds": null, + "menuPerms": "my-center-Certificate-Information", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 13, + "showFlag": 1, + "children": null + }, + { + "extValues": { + + }, + "id": "2030925300149387282", + "menuName": "切换账号", + "menuUrl": "/my-center/Switch/Account", + "parentId": "2030925300149387267", + "parentIds": null, + "menuPerms": "my-center-Switch-Account", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 17, + "showFlag": 1, + "children": null + }, + { + "extValues": { + + }, + "id": "2030925300149387283", + "menuName": "修改密码", + "menuUrl": "/my-center/Change/Password", + "parentId": "2030925300149387267", + "parentIds": null, + "menuPerms": "my-center-Change-Password", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 18, + "showFlag": 1, + "children": null + }, + { + "extValues": { + + }, + "id": "2030925300149387284", + "menuName": "用户注销", + "menuUrl": "/my-center/User/Logout", + "parentId": "2030925300149387267", + "parentIds": null, + "menuPerms": "my-center-User-Logout", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 19, + "showFlag": 1, + "children": null + }, + { + "extValues": { + + }, + "id": "2030925300149387285", + "menuName": "退出登录", + "menuUrl": "/my-center/Logout", + "parentId": "2030925300149387267", + "parentIds": null, + "menuPerms": "my-center-Logout", + "menuType": 2, + "menuAttribution": "QINGANG_RELATED_PARTIES", + "sort": 20, + "showFlag": 1, + "children": null + } + ] + } + ], + "notEmpty": true, + "empty": false } \ No newline at end of file diff --git a/lib/common/route_service.dart b/lib/common/route_service.dart index 8e270d9..86ee6d5 100644 --- a/lib/common/route_service.dart +++ b/lib/common/route_service.dart @@ -120,7 +120,7 @@ class RouteService extends ChangeNotifier { void visit(RouteModel m) { if (found) return; // 若父节点不可见，跳过（不再遍历子节点） - if (!m.visible) return; + if (m.showFlag == 2) return; final mp = (m.menuPerms ?? '').trim(); if (mp.isNotEmpty && mp == needle) { diff --git a/lib/http/ApiService.dart b/lib/http/ApiService.dart index 16b0a1e..37759fc 100644 --- a/lib/http/ApiService.dart +++ b/lib/http/ApiService.dart @@ -17,11 +17,11 @@ class ApiService { /// 图片文件服务 - // static final String baseImgPath = - // isProduct - // ? "https://jpfz.qhdsafety.com/gbsFileTest/" - // : "http://192.168.20.240:9787/mnt/"; //内网图片地址 - static final String baseImgPath = "https://skqhdg.porthebei.com:9004/file/uploadFiles2/"; + static final String baseImgPath = + isProduct + ? "https://jpfz.qhdsafety.com/gbsFileTest/" + : "http://192.168.20.240:9787/mnt/"; //内网图片地址 + // static final String baseImgPath = "https://skqhdg.porthebei.com:9004/file/uploadFiles2/"; static const publicKey = diff --git a/lib/http/modules/special_work_api.dart b/lib/http/modules/special_work_api.dart index 91fde44..0408d4f 100644 --- a/lib/http/modules/special_work_api.dart +++ b/lib/http/modules/special_work_api.dart @@ -153,7 +153,7 @@ class SpecialWorkApi { static Future> specialWorkFlowList(String workId) { return HttpManager().request( basePath + '/eightwork', - '/taskLog/listAll/$workId', + '/taskLog/flowChart/$workId', method: Method.get, data: {}, ); diff --git a/lib/pages/home/Tap/special_work/dh_work/HotWorkDetailFormWidget.dart b/lib/pages/home/Tap/special_work/dh_work/HotWorkDetailFormWidget.dart index e31d056..780c221 100644 --- a/lib/pages/home/Tap/special_work/dh_work/HotWorkDetailFormWidget.dart +++ b/lib/pages/home/Tap/special_work/dh_work/HotWorkDetailFormWidget.dart @@ -376,7 +376,6 @@ class _HotWorkDetailFormWidgetState extends State { ), ], if (_otherMeasuresList.isNotEmpty) ...[ - const Divider(), ListItemFactory.createBuildSimpleSection('其他安全措施'), Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -398,10 +397,11 @@ class _HotWorkDetailFormWidgetState extends State { ); }).toList(), ), + const Divider(), + ], // 气体分析 if (gasUsername.isNotEmpty) ...[ - const Divider(), ItemListWidget.OneRowButtonTitleText( label: '气体分析人:', text: gasUsername, @@ -410,9 +410,10 @@ class _HotWorkDetailFormWidgetState extends State { pushPage(SpecialWorkGasList(data: widget.pd), context); }, ), + const Divider(), + ], if (delayStatus.isNotEmpty) ...[ - const Divider(), ItemListWidget.OneRowButtonTitleText( label: '延时监火', text: '', @@ -421,14 +422,17 @@ class _HotWorkDetailFormWidgetState extends State { pushPage(HotDelayPage(data: widget.pd, isEdit: false,), context); }, ), + const Divider(), + ], if (_finishMeasures.isNotEmpty && pd['specialStepCode'] != 'measures') ...[ - const Divider(), MeasuresListWidget( measuresList: _finishMeasures, isAllowEdit: false, ), + const Divider(), + ], @@ -438,7 +442,6 @@ class _HotWorkDetailFormWidgetState extends State { ..._buildStepSignWidgets(pd), if (rejectReason.keys.isNotEmpty) ...[ - const Divider(), ListItemFactory.createBuildSimpleSection('打回信息'), // 打回信息 ItemListWidget.singleLineTitleText( diff --git a/lib/pages/home/Tap/special_work/dh_work/dh_wait_page.dart b/lib/pages/home/Tap/special_work/dh_work/dh_wait_page.dart index dddbaae..a57bf62 100644 --- a/lib/pages/home/Tap/special_work/dh_work/dh_wait_page.dart +++ b/lib/pages/home/Tap/special_work/dh_work/dh_wait_page.dart @@ -1,6 +1,7 @@ import 'dart:io'; import 'package:flutter/material.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/item_list_widget.dart'; import 'package:qhd_prevention/customWidget/toast_util.dart'; @@ -95,12 +96,15 @@ class _DhWaitPageState extends State { }; response = await SpecialWorkApi.specialWorkTaskLogList(data); }else{ + final parentPerm = 'dashboard:hazardous:work:hot-work:Hot-Work-Operation-Ledger'; + final targetPerm = ''; + final menuPath = await RouteService.getMenuPath(parentPerm, targetPerm); final data = { "eqWorkType": SpecialWorkTypeEnum.hotWork.code, "pageSize": rows, "pageIndex": currentPage, + "menuPath" : menuPath, ...searchData - // "eqStatus" : 1, }; response = await SpecialWorkApi.specialWorkList(data); } @@ -435,7 +439,7 @@ class _DhWaitPageState extends State { if (status != '0' && widget.listType == SpecialListType.task) { buttons.add( CustomButton( - text: '审批', + text: status == '2' ? '编辑' : '审批', backgroundColor: Colors.blue, onPressed: () { _goToDetail(item, true); diff --git a/lib/pages/home/Tap/special_work/dh_work/hot_apply_page.dart b/lib/pages/home/Tap/special_work/dh_work/hot_apply_page.dart index 1a6c1ae..44cc557 100644 --- a/lib/pages/home/Tap/special_work/dh_work/hot_apply_page.dart +++ b/lib/pages/home/Tap/special_work/dh_work/hot_apply_page.dart @@ -993,7 +993,7 @@ class _HotworkApplyDetailState extends State { DateTime? picked = await BottomDateTimePicker.showDate( mode: BottomPickerMode.dateTimeWithSeconds, context, - minTimeStr: pd['workEndTime'] ?? '', + minTimeStr: pd['workStartTime'] ?? '', allowFuture: true, ); if (picked != null) { @@ -1034,7 +1034,6 @@ class _HotworkApplyDetailState extends State { }, ), const Divider(), - if (widget.isReEdit && FormUtils.hasValue(form, 'id')) ...[ HotWorkDetailFormWidget(pd: form, isEditable: true), ], diff --git a/lib/pages/home/Tap/special_work/dh_work/work_tab_dh_list.dart b/lib/pages/home/Tap/special_work/dh_work/work_tab_dh_list.dart index 5407480..bc253c1 100644 --- a/lib/pages/home/Tap/special_work/dh_work/work_tab_dh_list.dart +++ b/lib/pages/home/Tap/special_work/dh_work/work_tab_dh_list.dart @@ -175,8 +175,8 @@ class _workTabDhListState extends State { final button = stepsData[buttonIndex]; final workTypeTitle = - (group is Map && group['groupName'] != null) - ? group['groupName'].toString() + (button is Map && button['stepName'] != null) + ? button['stepName'].toString() : ''; final stepId = button['stepId'] ?? ''; await pushPage( diff --git a/lib/pages/home/Tap/special_work/dl_work/dl_apply_page.dart b/lib/pages/home/Tap/special_work/dl_work/dl_apply_page.dart index 487bf52..ea3bba4 100644 --- a/lib/pages/home/Tap/special_work/dl_work/dl_apply_page.dart +++ b/lib/pages/home/Tap/special_work/dl_work/dl_apply_page.dart @@ -965,24 +965,7 @@ class _DlApplyPageState extends State { } 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( padding: const EdgeInsets.symmetric(vertical: 10), decoration: const BoxDecoration( @@ -1148,7 +1131,7 @@ class _DlApplyPageState extends State { DateTime? picked = await BottomDateTimePicker.showDate( mode: BottomPickerMode.dateTimeWithSeconds, context, - minTimeStr: pd['workEndTime'] ?? '', + minTimeStr: pd['workStartTime'] ?? '', allowFuture: true, ); if (picked != null) { diff --git a/lib/pages/home/Tap/special_work/dl_work/dl_wait_page.dart b/lib/pages/home/Tap/special_work/dl_work/dl_wait_page.dart index 71198af..479b949 100644 --- a/lib/pages/home/Tap/special_work/dl_work/dl_wait_page.dart +++ b/lib/pages/home/Tap/special_work/dl_work/dl_wait_page.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.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/item_list_widget.dart'; import 'package:qhd_prevention/customWidget/toast_util.dart'; @@ -94,12 +95,15 @@ class _DlWaitPageState extends State { }; response = await SpecialWorkApi.specialWorkTaskLogList(data); } else { + final parentPerm = 'dashboard:hazardous:work:circuit-breaking-operation:Circuit-Breaker-Work-Ledger'; + final targetPerm = ''; + final menuPath = await RouteService.getMenuPath(parentPerm, targetPerm); final data = { "eqWorkType": SpecialWorkTypeEnum.cutRoadWork.code, "pageSize": rows, "pageIndex": currentPage, - ...searchData, - // "eqStatus" : 1, + "menuPath" : menuPath, + ...searchData }; response = await SpecialWorkApi.specialWorkList(data); } @@ -504,7 +508,7 @@ class _DlWaitPageState extends State { if (status != '0' && widget.listType == SpecialListType.task) { buttons.add( CustomButton( - text: '审批', + text: status == '2' ? '编辑' : '审批', backgroundColor: Colors.blue, onPressed: () { _goToDetail(item, true); diff --git a/lib/pages/home/Tap/special_work/dl_work/work_tab_dl_list.dart b/lib/pages/home/Tap/special_work/dl_work/work_tab_dl_list.dart index 0d45f5c..248e828 100644 --- a/lib/pages/home/Tap/special_work/dl_work/work_tab_dl_list.dart +++ b/lib/pages/home/Tap/special_work/dl_work/work_tab_dl_list.dart @@ -170,8 +170,8 @@ class _WorkTabDlListState extends State { final button = stepsData[buttonIndex]; final workTypeTitle = - (group is Map && group['groupName'] != null) - ? group['groupName'].toString() + (button is Map && button['stepName'] != null) + ? button['stepName'].toString() : ''; final stepId = button['stepId'] ?? ''; await pushPage(DlWaitPage(stepId: stepId, workTypeTitle: workTypeTitle , listType: SpecialListType.task), context); diff --git a/lib/pages/home/Tap/special_work/dt_work/dt_apply_page.dart b/lib/pages/home/Tap/special_work/dt_work/dt_apply_page.dart index 930445b..fb3361b 100644 --- a/lib/pages/home/Tap/special_work/dt_work/dt_apply_page.dart +++ b/lib/pages/home/Tap/special_work/dt_work/dt_apply_page.dart @@ -962,24 +962,7 @@ class _DtApplyPageState extends State { } 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( padding: const EdgeInsets.symmetric(vertical: 10), decoration: const BoxDecoration( @@ -1069,7 +1052,7 @@ class _DtApplyPageState extends State { DateTime? picked = await BottomDateTimePicker.showDate( mode: BottomPickerMode.dateTimeWithSeconds, context, - minTimeStr: pd['workEndTime'] ?? '', + minTimeStr: pd['workStartTime'] ?? '', allowFuture: true, ); if (picked != null) { diff --git a/lib/pages/home/Tap/special_work/dt_work/dt_wait_page.dart b/lib/pages/home/Tap/special_work/dt_work/dt_wait_page.dart index 5087abc..2a45bf3 100644 --- a/lib/pages/home/Tap/special_work/dt_work/dt_wait_page.dart +++ b/lib/pages/home/Tap/special_work/dt_work/dt_wait_page.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.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/item_list_widget.dart'; import 'package:qhd_prevention/customWidget/toast_util.dart'; @@ -78,13 +79,6 @@ class _DtWaitPageState extends State { setState(() => isLoading = true); try { - final data = { - "eqWorkType": "confinedspace_work", - "pageSize": rows, - "pageIndex": currentPage, - ...searchData, - "eqStepId": widget.stepId, - }; var response = {}; if (widget.listType == SpecialListType.task) { final data = { @@ -95,12 +89,15 @@ class _DtWaitPageState extends State { }; response = await SpecialWorkApi.specialWorkTaskLogList(data); }else{ + final parentPerm = 'dashboard:hazardous:work:earthwork-operations:Earthmoving-Work-Ledger'; + final targetPerm = ''; + final menuPath = await RouteService.getMenuPath(parentPerm, targetPerm); final data = { "eqWorkType": SpecialWorkTypeEnum.breakgroundWork.code, "pageSize": rows, "pageIndex": currentPage, + "menuPath" : menuPath, ...searchData - // "eqStatus" : 1, }; response = await SpecialWorkApi.specialWorkList(data); } @@ -491,7 +488,7 @@ class _DtWaitPageState extends State { if (status != '0' && widget.listType == SpecialListType.task) { buttons.add( CustomButton( - text: '审批', + text: status == '2' ? '编辑' : '审批', backgroundColor: Colors.blue, onPressed: () { _goToDetail(item, true); diff --git a/lib/pages/home/Tap/special_work/dt_work/work_tab_dt_list.dart b/lib/pages/home/Tap/special_work/dt_work/work_tab_dt_list.dart index 448ae50..24d33f7 100644 --- a/lib/pages/home/Tap/special_work/dt_work/work_tab_dt_list.dart +++ b/lib/pages/home/Tap/special_work/dt_work/work_tab_dt_list.dart @@ -170,8 +170,8 @@ class _WorkTabDtListState extends State { final button = stepsData[buttonIndex]; final workTypeTitle = - (group is Map && group['groupName'] != null) - ? group['groupName'].toString() + (button is Map && button['stepName'] != null) + ? button['stepName'].toString() : ''; final stepId = button['stepId'] ?? ''; await pushPage(DtWaitPage(stepId: stepId, workTypeTitle: workTypeTitle , listType: SpecialListType.task), context); diff --git a/lib/pages/home/Tap/special_work/dz_work/dz_apply_page.dart b/lib/pages/home/Tap/special_work/dz_work/dz_apply_page.dart index 604362e..e1c8791 100644 --- a/lib/pages/home/Tap/special_work/dz_work/dz_apply_page.dart +++ b/lib/pages/home/Tap/special_work/dz_work/dz_apply_page.dart @@ -968,24 +968,7 @@ class _DzApplyPageState extends State { } 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( padding: const EdgeInsets.symmetric(vertical: 10), decoration: const BoxDecoration( @@ -1149,7 +1132,7 @@ class _DzApplyPageState extends State { DateTime? picked = await BottomDateTimePicker.showDate( mode: BottomPickerMode.dateTimeWithSeconds, context, - minTimeStr: pd['workEndTime'] ?? '', + minTimeStr: pd['workStartTime'] ?? '', allowFuture: true, ); if (picked != null) { diff --git a/lib/pages/home/Tap/special_work/dz_work/dz_wait_page.dart b/lib/pages/home/Tap/special_work/dz_work/dz_wait_page.dart index cee3a34..b709a31 100644 --- a/lib/pages/home/Tap/special_work/dz_work/dz_wait_page.dart +++ b/lib/pages/home/Tap/special_work/dz_work/dz_wait_page.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.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/item_list_widget.dart'; import 'package:qhd_prevention/customWidget/toast_util.dart'; @@ -78,13 +79,6 @@ class _DzWaitPageState extends State { setState(() => isLoading = true); try { - final data = { - "eqWorkType": "confinedspace_work", - "pageSize": rows, - "pageIndex": currentPage, - ...searchData, - "eqStepId": widget.stepId, - }; var response = {}; if (widget.listType == SpecialListType.task) { final data = { @@ -95,12 +89,15 @@ class _DzWaitPageState extends State { }; response = await SpecialWorkApi.specialWorkTaskLogList(data); }else{ + final parentPerm = 'dashboard:hazardous:work:hoisting-operations:Hoisting-Operation-Ledger'; + final targetPerm = ''; + final menuPath = await RouteService.getMenuPath(parentPerm, targetPerm); final data = { "eqWorkType": SpecialWorkTypeEnum.hoistingWork.code, "pageSize": rows, "pageIndex": currentPage, + "menuPath" : menuPath, ...searchData - // "eqStatus" : 1, }; response = await SpecialWorkApi.specialWorkList(data); } @@ -490,7 +487,7 @@ class _DzWaitPageState extends State { if (status != '0' && widget.listType == SpecialListType.task) { buttons.add( CustomButton( - text: '审批', + text: status == '2' ? '编辑' : '审批', backgroundColor: Colors.blue, onPressed: () { _goToDetail(item, true); diff --git a/lib/pages/home/Tap/special_work/dz_work/work_tab_dz_list.dart b/lib/pages/home/Tap/special_work/dz_work/work_tab_dz_list.dart index 625a60d..db39146 100644 --- a/lib/pages/home/Tap/special_work/dz_work/work_tab_dz_list.dart +++ b/lib/pages/home/Tap/special_work/dz_work/work_tab_dz_list.dart @@ -170,8 +170,8 @@ class _WorkTabDzListState extends State { final button = stepsData[buttonIndex]; final workTypeTitle = - (group is Map && group['groupName'] != null) - ? group['groupName'].toString() + (button is Map && button['stepName'] != null) + ? button['stepName'].toString() : ''; final stepId = button['stepId'] ?? ''; await pushPage(DzWaitPage(stepId: stepId, workTypeTitle: workTypeTitle , listType: SpecialListType.task), context); diff --git a/lib/pages/home/Tap/special_work/gc_work/gc_wait_page.dart b/lib/pages/home/Tap/special_work/gc_work/gc_wait_page.dart index 8523218..206266a 100644 --- a/lib/pages/home/Tap/special_work/gc_work/gc_wait_page.dart +++ b/lib/pages/home/Tap/special_work/gc_work/gc_wait_page.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.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/item_list_widget.dart'; import 'package:qhd_prevention/customWidget/toast_util.dart'; @@ -78,13 +79,7 @@ class _GcWaitPageState extends State { setState(() => isLoading = true); try { - final data = { - "eqWorkType": "confinedspace_work", - "pageSize": rows, - "pageIndex": currentPage, - ...searchData, - "eqStepId": widget.stepId, - }; + var response = {}; if (widget.listType == SpecialListType.task) { final data = { @@ -95,12 +90,15 @@ class _GcWaitPageState extends State { }; response = await SpecialWorkApi.specialWorkTaskLogList(data); }else{ + final parentPerm = 'dashboard:hazardous:work:work-at-height:High-altitude-Work-Ledger'; + final targetPerm = ''; + final menuPath = await RouteService.getMenuPath(parentPerm, targetPerm); final data = { "eqWorkType": SpecialWorkTypeEnum.highWork.code, "pageSize": rows, "pageIndex": currentPage, + "menuPath" : menuPath, ...searchData - // "eqStatus" : 1, }; response = await SpecialWorkApi.specialWorkList(data); } @@ -493,7 +491,7 @@ class _GcWaitPageState extends State { if (status != '0' && widget.listType == SpecialListType.task) { buttons.add( CustomButton( - text: '审批', + text: status == '2' ? '编辑' : '审批', backgroundColor: Colors.blue, onPressed: () { _goToDetail(item, true); diff --git a/lib/pages/home/Tap/special_work/gc_work/work_tab_gc_list.dart b/lib/pages/home/Tap/special_work/gc_work/work_tab_gc_list.dart index 80211cd..0a35b5a 100644 --- a/lib/pages/home/Tap/special_work/gc_work/work_tab_gc_list.dart +++ b/lib/pages/home/Tap/special_work/gc_work/work_tab_gc_list.dart @@ -170,8 +170,8 @@ class _WorkTabGcListState extends State { final button = stepsData[buttonIndex]; final workTypeTitle = - (group is Map && group['groupName'] != null) - ? group['groupName'].toString() + (button is Map && button['stepName'] != null) + ? button['stepName'].toString() : ''; final stepId = button['stepId'] ?? ''; await pushPage(GcWaitPage(stepId: stepId, workTypeTitle: workTypeTitle , listType: SpecialListType.task), context); diff --git a/lib/pages/home/Tap/special_work/lsyd_work/lsyd_apply_page.dart b/lib/pages/home/Tap/special_work/lsyd_work/lsyd_apply_page.dart index ed3642e..4fcbe91 100644 --- a/lib/pages/home/Tap/special_work/lsyd_work/lsyd_apply_page.dart +++ b/lib/pages/home/Tap/special_work/lsyd_work/lsyd_apply_page.dart @@ -1143,7 +1143,7 @@ class _LsydApplyPageState extends State { DateTime? picked = await BottomDateTimePicker.showDate( mode: BottomPickerMode.dateTimeWithSeconds, context, - minTimeStr: pd['workEndTime'] ?? '', + minTimeStr: pd['workStartTime'] ?? '', allowFuture: true, ); if (picked != null) { diff --git a/lib/pages/home/Tap/special_work/lsyd_work/lsyd_wait_page.dart b/lib/pages/home/Tap/special_work/lsyd_work/lsyd_wait_page.dart index aed7e02..c6996bb 100644 --- a/lib/pages/home/Tap/special_work/lsyd_work/lsyd_wait_page.dart +++ b/lib/pages/home/Tap/special_work/lsyd_work/lsyd_wait_page.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.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/item_list_widget.dart'; import 'package:qhd_prevention/customWidget/toast_util.dart'; @@ -79,13 +80,6 @@ class _LsydWaitPageState extends State { setState(() => isLoading = true); try { - final data = { - "eqWorkType": "confinedspace_work", - "pageSize": rows, - "pageIndex": currentPage, - ...searchData, - "eqStepId": widget.stepId, - }; var response = {}; if (widget.listType == SpecialListType.task) { final data = { @@ -96,12 +90,15 @@ class _LsydWaitPageState extends State { }; response = await SpecialWorkApi.specialWorkTaskLogList(data); }else{ + final parentPerm = 'dashboard:hazardous:work:temporary-electrical-work:Temporary-Electricity-Work-Ledger'; + final targetPerm = ''; + final menuPath = await RouteService.getMenuPath(parentPerm, targetPerm); final data = { "eqWorkType": SpecialWorkTypeEnum.electricityWork.code, "pageSize": rows, "pageIndex": currentPage, + "menuPath" : menuPath, ...searchData - // "eqStatus" : 1, }; response = await SpecialWorkApi.specialWorkList(data); } @@ -516,7 +513,7 @@ class _LsydWaitPageState extends State { if (status != '0' && widget.listType == SpecialListType.task) { buttons.add( CustomButton( - text: '审批', + text: status == '2' ? '编辑' : '审批', backgroundColor: Colors.blue, onPressed: () { _goToDetail(item, true); diff --git a/lib/pages/home/Tap/special_work/lsyd_work/work_tab_lsyd_list.dart b/lib/pages/home/Tap/special_work/lsyd_work/work_tab_lsyd_list.dart index 7b12346..177c530 100644 --- a/lib/pages/home/Tap/special_work/lsyd_work/work_tab_lsyd_list.dart +++ b/lib/pages/home/Tap/special_work/lsyd_work/work_tab_lsyd_list.dart @@ -170,8 +170,8 @@ class _WorkTabLsydListState extends State { final button = stepsData[buttonIndex]; final workTypeTitle = - (group is Map && group['groupName'] != null) - ? group['groupName'].toString() + (button is Map && button['stepName'] != null) + ? button['stepName'].toString() : ''; final stepId = button['stepId'] ?? ''; await pushPage(LsydWaitPage(stepId: stepId, workTypeTitle: workTypeTitle , listType: SpecialListType.task), context); diff --git a/lib/pages/home/Tap/special_work/mbcd_work/mbcd_apply_page.dart b/lib/pages/home/Tap/special_work/mbcd_work/mbcd_apply_page.dart index e0fb185..45d1c0f 100644 --- a/lib/pages/home/Tap/special_work/mbcd_work/mbcd_apply_page.dart +++ b/lib/pages/home/Tap/special_work/mbcd_work/mbcd_apply_page.dart @@ -62,7 +62,7 @@ class _MbcdApplyPageState extends State { // 初始化必填规则 final Map _requiredRules = { "operationTypeName": "请选择作业类型", - "blindboardWorkName": "请选择作业类别", + "blindboardWorkTypeName": "请选择作业类别", "devicePipelineName": "请输入设备管道名称", "workStartTime": "请选择作业开始时间", "workUserName": "请填写作业人", diff --git a/lib/pages/home/Tap/special_work/mbcd_work/mbcd_wait_page.dart b/lib/pages/home/Tap/special_work/mbcd_work/mbcd_wait_page.dart index 217a2da..f507000 100644 --- a/lib/pages/home/Tap/special_work/mbcd_work/mbcd_wait_page.dart +++ b/lib/pages/home/Tap/special_work/mbcd_work/mbcd_wait_page.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.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/item_list_widget.dart'; import 'package:qhd_prevention/customWidget/toast_util.dart'; @@ -78,13 +79,6 @@ class _MbcdWaitPageState extends State { setState(() => isLoading = true); try { - final data = { - "eqWorkType": "confinedspace_work", - "pageSize": rows, - "pageIndex": currentPage, - ...searchData, - "eqStepId": widget.stepId, - }; var response = {}; if (widget.listType == SpecialListType.task) { final data = { @@ -95,12 +89,15 @@ class _MbcdWaitPageState extends State { }; response = await SpecialWorkApi.specialWorkTaskLogList(data); }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 = { "eqWorkType": SpecialWorkTypeEnum.blindboardWork.code, "pageSize": rows, "pageIndex": currentPage, + "menuPath" : menuPath, ...searchData - // "eqStatus" : 1, }; response = await SpecialWorkApi.specialWorkList(data); } @@ -490,7 +487,7 @@ class _MbcdWaitPageState extends State { if (status != '0' && widget.listType == SpecialListType.task) { buttons.add( CustomButton( - text: '审批', + text: status == '2' ? '编辑' : '审批', backgroundColor: Colors.blue, onPressed: () { _goToDetail(item, true); diff --git a/lib/pages/home/Tap/special_work/mbcd_work/work_tab_mbcd_list.dart b/lib/pages/home/Tap/special_work/mbcd_work/work_tab_mbcd_list.dart index ae9eb52..14f04d5 100644 --- a/lib/pages/home/Tap/special_work/mbcd_work/work_tab_mbcd_list.dart +++ b/lib/pages/home/Tap/special_work/mbcd_work/work_tab_mbcd_list.dart @@ -170,8 +170,8 @@ class _WorkTabMbcdListState extends State { final button = stepsData[buttonIndex]; final workTypeTitle = - (group is Map && group['groupName'] != null) - ? group['groupName'].toString() + (button is Map && button['stepName'] != null) + ? button['stepName'].toString() : ''; final stepId = button['stepId'] ?? ''; await pushPage(MbcdWaitPage(stepId: stepId, workTypeTitle: workTypeTitle , listType: SpecialListType.task), context); diff --git a/lib/pages/home/Tap/special_work/sxkj_work/sxkj_wait_page.dart b/lib/pages/home/Tap/special_work/sxkj_work/sxkj_wait_page.dart index 502f87c..9de6afc 100644 --- a/lib/pages/home/Tap/special_work/sxkj_work/sxkj_wait_page.dart +++ b/lib/pages/home/Tap/special_work/sxkj_work/sxkj_wait_page.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.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/item_list_widget.dart'; import 'package:qhd_prevention/customWidget/toast_util.dart'; @@ -79,13 +80,6 @@ class _SxkjWaitPageState extends State { setState(() => isLoading = true); try { - final data = { - "eqWorkType": "confinedspace_work", - "pageSize": rows, - "pageIndex": currentPage, - ...searchData, - "eqStepId": widget.stepId, - }; var response = {}; if (widget.listType == SpecialListType.task) { final data = { @@ -96,12 +90,15 @@ class _SxkjWaitPageState extends State { }; response = await SpecialWorkApi.specialWorkTaskLogList(data); }else{ + final parentPerm = 'dashboard:hazardous:work:confined-space-operations:Confined-Space-Work-Ledger'; + final targetPerm = ''; + final menuPath = await RouteService.getMenuPath(parentPerm, targetPerm); final data = { "eqWorkType": SpecialWorkTypeEnum.confinedspaceWork.code, "pageSize": rows, "pageIndex": currentPage, + "menuPath" : menuPath, ...searchData - // "eqStatus" : 1, }; response = await SpecialWorkApi.specialWorkList(data); } @@ -430,7 +427,7 @@ class _SxkjWaitPageState extends State { if (status != '0' && widget.listType == SpecialListType.task) { buttons.add( CustomButton( - text: '审批', + text: status == '2' ? '编辑' : '审批', backgroundColor: Colors.blue, onPressed: () { _goToDetail(item, true); diff --git a/lib/pages/home/Tap/special_work/sxkj_work/tz/sxkj_tz_list_page.dart b/lib/pages/home/Tap/special_work/sxkj_work/tz/sxkj_tz_list_page.dart index afbd72d..aae8966 100644 --- a/lib/pages/home/Tap/special_work/sxkj_work/tz/sxkj_tz_list_page.dart +++ b/lib/pages/home/Tap/special_work/sxkj_work/tz/sxkj_tz_list_page.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.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/toast_util.dart'; import 'package:qhd_prevention/CustomWidget/range_filter_bar.dart'; @@ -71,12 +72,6 @@ class _SxkjTzListPageState extends State { } } - Future _fetchSteps() async { - try {} catch (e) { - print('Error fetching steps: $e'); - } - } - Future _fetchData() async { if (isLoading) return; setState(() => isLoading = true); @@ -84,10 +79,15 @@ class _SxkjTzListPageState extends State { try { 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 = { "eqWorkType": "confinedspace_work", "pageSize": rows, "pageIndex": currentPage, + "menuPath" : menuPath, + ...searchData }; response = await SpecialWorkApi.specialWorkLimitedSpaceList(data); setState(() { diff --git a/lib/pages/home/Tap/special_work/sxkj_work/work_tab_space_list.dart b/lib/pages/home/Tap/special_work/sxkj_work/work_tab_space_list.dart index 292632a..775f1ad 100644 --- a/lib/pages/home/Tap/special_work/sxkj_work/work_tab_space_list.dart +++ b/lib/pages/home/Tap/special_work/sxkj_work/work_tab_space_list.dart @@ -180,8 +180,8 @@ class _WorkTabSpaceListState extends State { final button = stepsData[buttonIndex]; final workTypeTitle = - (group is Map && group['groupName'] != null) - ? group['groupName'].toString() + (button is Map && button['stepName'] != null) + ? button['stepName'].toString() : ''; final stepId = button['stepId'] ?? ''; await pushPage(SxkjWaitPage(stepId: stepId, workTypeTitle: workTypeTitle , listType: SpecialListType.task,), context); diff --git a/lib/pages/home/Tap/work_tab_list_page.dart b/lib/pages/home/Tap/work_tab_list_page.dart index 2af38bc..e83de80 100644 --- a/lib/pages/home/Tap/work_tab_list_page.dart +++ b/lib/pages/home/Tap/work_tab_list_page.dart @@ -25,59 +25,59 @@ class WorkTabListPage extends StatefulWidget { class _WorkTabListPageState extends RouteAwareState { final List<_WorkButtonConfig> _allButtons = [ _WorkButtonConfig( - icon: 'assets/image/wxzy_ico7.png', + icon: 'assets/images/wxzy_ico7.png', title: '动火作业', workType: 'hot_work', - menuPerms: 'dashboard:hazardous-work:hot-work', + menuPerms: 'dashboard:hazardous:work:hot-work', pageBuilder: () => workTabDhList(), ), _WorkButtonConfig( - icon: 'assets/image/wxzy_ico6.png', + icon: 'assets/images/wxzy_ico6.png', title: '受限空间作业', workType: 'confinedspace_work', - menuPerms: 'dashboard:hazardous-work:confined-space-operations', + menuPerms: 'dashboard:hazardous:work:confined-space-operations', pageBuilder: () => WorkTabSpaceList(), ), _WorkButtonConfig( - icon: 'assets/image/wxzy_ico5.png', + icon: 'assets/images/wxzy_ico5.png', title: '高处作业', workType: 'high_work', - menuPerms: 'dashboard:hazardous-work:work-at-height', + menuPerms: 'dashboard:hazardous:work:work-at-height', pageBuilder: () => WorkTabGcList(), ), _WorkButtonConfig( - icon: 'assets/image/wxzy_ico4.png', + icon: 'assets/images/wxzy_ico4.png', title: '动土作业', workType: 'breakground_work', - menuPerms: 'dashboard:hazardous-work:earthwork-operations', + menuPerms: 'dashboard:hazardous:work:earthwork-operations', pageBuilder: () => WorkTabDtList(), ), _WorkButtonConfig( - icon: 'assets/image/wxzy_ico3.png', + icon: 'assets/images/wxzy_ico3.png', title: '吊装作业', workType: 'hoisting_work', - menuPerms: 'dashboard:hazardous-work:hoisting-operations', + menuPerms: 'dashboard:hazardous:work:hoisting-operations', pageBuilder: () => WorkTabDzList(), ), _WorkButtonConfig( - icon: 'assets/image/wxzy_ico2.png', + icon: 'assets/images/wxzy_ico2.png', title: '断路作业', workType: 'cutroad_work', - menuPerms: 'dashboard:hazardous-work:circuit-breaking-operation', + menuPerms: 'dashboard:hazardous:work:circuit-breaking-operation', pageBuilder: () => WorkTabDlList(), ), _WorkButtonConfig( - icon: 'assets/image/wxzy_ico1.png', + icon: 'assets/images/wxzy_ico1.png', title: '临时用电作业', workType: 'electricity_work', - menuPerms: 'dashboard:hazardous-work:temporary-electrical-work', + menuPerms: 'dashboard:hazardous:work:temporary-electrical-work', pageBuilder: () => WorkTabLsydList(), ), _WorkButtonConfig( - icon: 'assets/image/wxzy_ico8.png', + icon: 'assets/images/wxzy_ico8.png', title: '盲板抽堵作业', workType: 'blindboard_work', - menuPerms: 'dashboard:hazardous-work:blind-flange-plugging-operation', + menuPerms: 'dashboard:hazardous:work:blind-flange-plugging-operation', pageBuilder: () => WorkTabMbcdList(), ), ]; @@ -188,7 +188,7 @@ class _WorkTabListPageState extends RouteAwareState { return Stack( children: [ Image.asset( - 'assets/image/wxzy_banner.png', + 'assets/images/wxzy_banner.png', width: MediaQuery.of(context).size.width, height: bannerHeight, fit: BoxFit.fitWidth, diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart index e617e1b..9647cc9 100644 --- a/lib/pages/home/home_page.dart +++ b/lib/pages/home/home_page.dart @@ -10,6 +10,7 @@ import 'package:qhd_prevention/customWidget/custom_button.dart'; import 'package:qhd_prevention/customWidget/toast_util.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/Tap/work_tab_list_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/scan_page.dart'; @@ -118,7 +119,7 @@ class HomePageState extends RouteAwareState final Map _titleToPerm = { "单位管理": "dashboard-Unit-Management", "现场监管": "dashboard-Site-Supervision", - "危险作业": "dashboard-Hazardous-Work", + "危险作业": "dashboard:hazardous:work:hot-work", "隐患治理": "dashboard-Hazard-Management", "重点作业": "dashboard-Hazard-Management", // 无对应，暂时留空 "口门门禁": "dashboard-Gate-Access-Control", @@ -640,6 +641,9 @@ class HomePageState extends RouteAwareState case "重点作业": pushPage(KeyTasksTabPage(), context); break; + case "危险作业": + pushPage(WorkTabListPage(), context); + break; default: ToastUtil.showNormal(context, '功能开发中...'); break; diff --git a/lib/pages/home/unit/unit_join_detail_page.dart b/lib/pages/home/unit/unit_join_detail_page.dart index 39caedd..43af5c1 100644 --- a/lib/pages/home/unit/unit_join_detail_page.dart +++ b/lib/pages/home/unit/unit_join_detail_page.dart @@ -70,6 +70,19 @@ class _UnitJoinDetailPageState extends State { // 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(() { pd = data; @@ -98,7 +111,7 @@ class _UnitJoinDetailPageState extends State { @override Widget build(BuildContext context) { bool isShow = _isEdit; - if (!_isEdit && FormUtils.hasValue(pd, 'id')) { + if (!_isEdit && FormUtils.hasValue(pd, 'userAvatarUrl')) { isShow = true; } return Scaffold( diff --git a/lib/pages/main_tab.dart b/lib/pages/main_tab.dart index 29c497e..bcd3669 100644 --- a/lib/pages/main_tab.dart +++ b/lib/pages/main_tab.dart @@ -95,26 +95,27 @@ class _MainPageState extends State with WidgetsBindingObserver { try { 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 { - final routeString = await loadFromAssets(); - route = jsonDecode(routeString) as Map; + LoadingDialogHelper.show(message: '加载中...'); + 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) { - debugPrint('loadFromAssets error: $e'); + debugPrint( + 'AppMenuApi.getAppMenu error: $e -> fallback to local assets.', + ); } + // 本地获取 + // try { + // final routeString = await loadFromAssets(); + // route = jsonDecode(routeString) as Map; + // } catch (e) { + // debugPrint('loadFromAssets error: $e'); + // } final data = route?['data'] ?? []; RouteService().initializeRoutes(data); } catch (e) { diff --git a/lib/pages/user/full_userinfo_page.dart b/lib/pages/user/full_userinfo_page.dart index bb49e06..83b1614 100644 --- a/lib/pages/user/full_userinfo_page.dart +++ b/lib/pages/user/full_userinfo_page.dart @@ -96,6 +96,8 @@ class _FullUserinfoPageState extends State { ); if (res['success']) { final data = res['data']; + pd = data; + _genderText = data['sex'] ?? ''; _birthText = data['birthday'] ?? ''; final eqForeignKey = data['userId']; @@ -112,9 +114,21 @@ class _FullUserinfoPageState extends State { _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(() { - pd = data; try { final idCardBase64 = utf8.decode(base64.decode(pd['userIdCard'])); if (idCardBase64.isNotEmpty) { @@ -156,18 +170,6 @@ class _FullUserinfoPageState extends State { }); } - 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) { @@ -312,7 +314,8 @@ class _FullUserinfoPageState extends State { .then((result) { if (result['success']) { pd['userAvatarUrl'] = result['data']['filePath'] ?? ''; - isSuccess = true; + pd['userId'] = result['data']['foreignKey'] ?? ''; + isSuccess = true; } else { LoadingDialogHelper.hide(); ToastUtil.showNormal(context, '人脸照片上传失败'); @@ -356,7 +359,7 @@ class _FullUserinfoPageState extends State { @override Widget build(BuildContext context) { bool isShow = _isEdit; - if (!_isEdit && FormUtils.hasValue(pd, 'id')) { + if (!_isEdit && FormUtils.hasValue(pd, 'userAvatarUrl')) { isShow = true; } String token = SessionService.instance.token ?? '';