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

Merge remote-tracking branch 'origin/main' 

# Conflicts:
#	lib/http/ApiService.dart
main
hs 2025-09-18 21:46:15 +08:00
parent 21387b3cbc 8a92df58d6
commit ba802aaaad
4 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pages/KeyProjects/SafeCheck/custom/safe_drawer_page.dart
View File

@ -645,7 +645,7 @@ class _SafeDrawerPageState extends State<SafeDrawerPage> {
_rectifyCtl.text = rectify; _rectifyCtl.text = rectify;
hiddenForm['HIDDENDESCR'] = desc; hiddenForm['HIDDENDESCR'] = desc;
hiddenForm['RECTIFYDESCR'] = rectify; hiddenForm['RECTIFYDESCR'] = rectify;
hiddenForm['RECTIFICATIONTYPE'] = '1'; // hiddenForm['RECTIFICATIONTYPE'] = '1';
}); });
} else { } else {
ToastUtil.showNormal(context, '识别失败'); ToastUtil.showNormal(context, '识别失败');

28
lib/pages/app/Danger_paicha/hazard_registration_page.dart
View File

@ -106,10 +106,10 @@ class _HazardRegistrationPageState extends State<HazardRegistrationPage> {
} }
// _yinHuanVido视频 // _yinHuanVido视频
// _yinHuanImages= hImgs.map((e) => ApiService.baseImgPath +e["FILEPATH"]).toList(); // _yinHuanImages= hImgs.map((e) => ApiService.baseImgPath +e["FILEPATH"]).toList();
_standardController.text=pd["HIDDENDESCR"]; _standardController.text=pd["HIDDENDESCR"]??"";
_partController.text=pd["HIDDENPART"]; _partController.text=pd["HIDDENPART"]??"";
_repairLevelName =pd["HIDDENLEVELNAME"]; _repairLevelName =pd["HIDDENLEVELNAME"]??"";
hazardLeve =pd["HIDDENLEVEL"]; hazardLeve =pd["HIDDENLEVEL"]??"";
_yinHuanTypeIds= pd["HIDDENTYPE"].toString().split(","); _yinHuanTypeIds= pd["HIDDENTYPE"].toString().split(",");
_yinHuanTypeNames= pd["HIDDENTYPE_NAME"].toString().split("/"); _yinHuanTypeNames= pd["HIDDENTYPE_NAME"].toString().split("/");
yinHuanName=pd["HIDDENTYPE_NAME"].toString(); yinHuanName=pd["HIDDENTYPE_NAME"].toString();
@ -120,14 +120,14 @@ class _HazardRegistrationPageState extends State<HazardRegistrationPage> {
_isDanger=false; _isDanger=false;
} }
buMenId=pd["RECTIFICATIONDEPT"]; buMenId=pd["RECTIFICATIONDEPT"]??"";
buMenPDId=pd["HIDDENFINDDEPT"]; buMenPDId=pd["HIDDENFINDDEPT"]??"";
buMenName=pd["RECTIFICATIONDEPTNAME"]; buMenName=pd["RECTIFICATIONDEPTNAME"]??"";
responsibleId=pd["RECTIFICATIONOR"]; responsibleId=pd["RECTIFICATIONOR"]??"";
responsibleName=pd["RECTIFICATIONORNAME"]; responsibleName=pd["RECTIFICATIONORNAME"]??"";
dataTime=pd["RECTIFICATIONDEADLINE"]; 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.map((e) => ImgData(path: ApiService.baseImgPath +e["FILEPATH"], id: '')).toList();
// _zhengGaiImages整改图片"rImgs" -> [_GrowableList] // _zhengGaiImages整改图片"rImgs" -> [_GrowableList]
@ -637,6 +637,12 @@ class _HazardRegistrationPageState extends State<HazardRegistrationPage> {
buMenId = SessionService.instance.loginUser?["DEPARTMENT_ID"];
buMenName = SessionService.instance.loginUser?["DEPARTMENT_NAME"];
responsibleId=SessionService.instance.loginUser?["USER_ID"];
responsibleName=SessionService.instance.loginUser?["NAME"];
}else{ }else{
type="2"; type="2";
if(buMenId.isEmpty){ if(buMenId.isEmpty){

3
lib/pages/home/tap/tabList/special_wrok/dangerous_options_page.dart
View File

@ -84,8 +84,7 @@ class _DangerousOptionsPageState extends State<DangerousOptionsPage> {
status = widget.status; status = widget.status;
measures = widget.measures; measures = widget.measures;
imgList = List<ImageData>.from(widget.imgList); imgList = List<ImageData>.from(widget.imgList);
signImgList = signImgList = widget.signImgList.map((map) => SignImageData.fromJson(map)).toList();
widget.signImgList.map((map) => SignImageData.fromJson(map)).toList();
} }
/// 拍照或选图后的回调 /// 拍照或选图后的回调

2
lib/pages/home/tap/tabList/special_wrok/dl_work/CutroadDetailFormWidget.dart
View File

@ -237,7 +237,7 @@ class _CutroadDetailFormWidgetState extends State<CutroadDetailFormWidget> {
), ),
if (FormUtils.hasValue(pd, 'WORK_START_DATE')) ...[ if (FormUtils.hasValue(pd, 'WORK_START_DATE')) ...[
const Divider(), 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'] ?? ''} - ${pd['WORK_END_DATE'] ?? ''}'
: pd['WORK_START_DATE'] ?? ''), : pd['WORK_START_DATE'] ?? ''),
if (!FormUtils.hasValue(pd, 'WORK_END_DATE')) if (!FormUtils.hasValue(pd, 'WORK_END_DATE'))