diff --git a/lib/pages/KeyProjects/SafeCheck/custom/safe_drawer_page.dart b/lib/pages/KeyProjects/SafeCheck/custom/safe_drawer_page.dart index c420961..5bf5d00 100644 --- a/lib/pages/KeyProjects/SafeCheck/custom/safe_drawer_page.dart +++ b/lib/pages/KeyProjects/SafeCheck/custom/safe_drawer_page.dart @@ -645,7 +645,7 @@ class _SafeDrawerPageState extends State { _rectifyCtl.text = rectify; hiddenForm['HIDDENDESCR'] = desc; hiddenForm['RECTIFYDESCR'] = rectify; - hiddenForm['RECTIFICATIONTYPE'] = '1'; + // hiddenForm['RECTIFICATIONTYPE'] = '1'; }); } else { ToastUtil.showNormal(context, '识别失败'); diff --git a/lib/pages/app/Danger_paicha/hazard_registration_page.dart b/lib/pages/app/Danger_paicha/hazard_registration_page.dart index cc60905..eff4a63 100644 --- a/lib/pages/app/Danger_paicha/hazard_registration_page.dart +++ b/lib/pages/app/Danger_paicha/hazard_registration_page.dart @@ -106,10 +106,10 @@ class _HazardRegistrationPageState extends State { } // _yinHuanVido视频 // _yinHuanImages= hImgs.map((e) => ApiService.baseImgPath +e["FILEPATH"]).toList(); - _standardController.text=pd["HIDDENDESCR"]; - _partController.text=pd["HIDDENPART"]; - _repairLevelName =pd["HIDDENLEVELNAME"]; - hazardLeve =pd["HIDDENLEVEL"]; + _standardController.text=pd["HIDDENDESCR"]??""; + _partController.text=pd["HIDDENPART"]??""; + _repairLevelName =pd["HIDDENLEVELNAME"]??""; + hazardLeve =pd["HIDDENLEVEL"]??""; _yinHuanTypeIds= pd["HIDDENTYPE"].toString().split(","); _yinHuanTypeNames= pd["HIDDENTYPE_NAME"].toString().split("/"); yinHuanName=pd["HIDDENTYPE_NAME"].toString(); @@ -120,14 +120,14 @@ class _HazardRegistrationPageState extends State { _isDanger=false; } - buMenId=pd["RECTIFICATIONDEPT"]; - buMenPDId=pd["HIDDENFINDDEPT"]; - buMenName=pd["RECTIFICATIONDEPTNAME"]; - responsibleId=pd["RECTIFICATIONOR"]; - responsibleName=pd["RECTIFICATIONORNAME"]; - dataTime=pd["RECTIFICATIONDEADLINE"]; + buMenId=pd["RECTIFICATIONDEPT"]??""; + buMenPDId=pd["HIDDENFINDDEPT"]??""; + buMenName=pd["RECTIFICATIONDEPTNAME"]??""; + responsibleId=pd["RECTIFICATIONOR"]??""; + responsibleName=pd["RECTIFICATIONORNAME"]??""; + dataTime=pd["RECTIFICATIONDEADLINE"]??""; - _dangerDetailController.text=pd["RECTIFYDESCR"]; + _dangerDetailController.text=pd["RECTIFYDESCR"]??""; _zhengGaiImages= rImgs.map((e) => ImgData(path: ApiService.baseImgPath +e["FILEPATH"], id: '')).toList(); // _zhengGaiImages整改图片"rImgs" -> [_GrowableList] @@ -637,6 +637,12 @@ class _HazardRegistrationPageState extends State { + buMenId = SessionService.instance.loginUser?["DEPARTMENT_ID"]; + buMenName = SessionService.instance.loginUser?["DEPARTMENT_NAME"]; + responsibleId=SessionService.instance.loginUser?["USER_ID"]; + responsibleName=SessionService.instance.loginUser?["NAME"]; + + }else{ type="2"; if(buMenId.isEmpty){ diff --git a/lib/pages/home/tap/tabList/special_wrok/dangerous_options_page.dart b/lib/pages/home/tap/tabList/special_wrok/dangerous_options_page.dart index 8eabf59..f1b59ba 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dangerous_options_page.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dangerous_options_page.dart @@ -84,8 +84,7 @@ class _DangerousOptionsPageState extends State { status = widget.status; measures = widget.measures; imgList = List.from(widget.imgList); - signImgList = - widget.signImgList.map((map) => SignImageData.fromJson(map)).toList(); + signImgList = widget.signImgList.map((map) => SignImageData.fromJson(map)).toList(); } /// 拍照或选图后的回调 diff --git a/lib/pages/home/tap/tabList/special_wrok/dl_work/CutroadDetailFormWidget.dart b/lib/pages/home/tap/tabList/special_wrok/dl_work/CutroadDetailFormWidget.dart index 7984dbc..dddcb99 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dl_work/CutroadDetailFormWidget.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dl_work/CutroadDetailFormWidget.dart @@ -237,7 +237,7 @@ class _CutroadDetailFormWidgetState extends State { ), if (FormUtils.hasValue(pd, 'WORK_START_DATE')) ...[ const Divider(), - ItemListWidget.twoRowTitleText(label: '段路作业实施时间', text: FormUtils.hasValue(pd, 'WORK_END_DATE') + ItemListWidget.twoRowTitleText(label: '断路作业实施时间', text: FormUtils.hasValue(pd, 'WORK_END_DATE') ? '${pd['WORK_START_DATE'] ?? ''} - ${pd['WORK_END_DATE'] ?? ''}' : pd['WORK_START_DATE'] ?? ''), if (!FormUtils.hasValue(pd, 'WORK_END_DATE'))