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

Compare commits

base: hanshuang:fd20e9bcd5fbd44e1304c7820b3b8e9ca1fd3a90
Branches Tags
hanshuang:main
hanshuang:v2.0.0
hanshuang:v2.2.1-60
...
compare: hanshuang:6318206baacee17116132cc25dc361b10b9ba5c8
Branches Tags
hanshuang:main
hanshuang:v2.0.0
hanshuang:v2.2.1-60

2 Commits
fd20e9bcd5 ... 6318206baa

Author SHA1 Message Date
hs 6318206baa Merge remote-tracking branch 'origin/main' 2025-09-10 15:50:43 +08:00
hs dbda372f5a 。。。 2025-09-10 15:50:39 +08:00
19 changed files with 1028 additions and 1048 deletions
Show Stats Expand all files Collapse all files

175
lib/pages/home/tap/tabList/special_wrok/dh_work/SpecialWorkFormBaseWork.dart
View File

@ -97,77 +97,82 @@ class SpecialWorkFormBaseWork extends StatelessWidget {
children: [ children: [
ListItemFactory.createBuildSimpleSection('其他安全防护措施'), ListItemFactory.createBuildSimpleSection('其他安全防护措施'),
OtherMeasuresWidget( OtherMeasuresWidget(
otherMeasures: signs['MEASURES_CONFIRM'], otherMeasures: signs['MEASURES_CONFIRM'],
baseImgPath: baseImgPath, baseImgPath: baseImgPath,
), ),
], ],
), ),
), ),
if (FormUtils.hasValue(signs, 'CONFESS'))
ConfirmWithSignWidget( ConfirmWithSignWidget(
signs: signs, signs: signs,
pd: pd, pd: pd,
baseImgPath: baseImgPath, baseImgPath: baseImgPath,
sectionKey: 'CONFESS', sectionKey: 'CONFESS',
nameKey: 'CONFESS_USER_NAME', nameKey: 'CONFESS_USER_NAME',
headerTitle: '安全交底人意见', headerTitle: '安全交底人意见',
roleTitle: '安全交底人', roleTitle: '安全交底人',
), ),
ConfirmWithSignWidget( if (FormUtils.hasValue(signs, 'ACCEPT_CONFESS'))
signs: signs, ConfirmWithSignWidget(
pd: pd, signs: signs,
baseImgPath: baseImgPath, pd: pd,
sectionKey: 'ACCEPT_CONFESS', baseImgPath: baseImgPath,
nameKey: 'ACCEPT_CONFESS_USER_NAME', sectionKey: 'ACCEPT_CONFESS',
headerTitle: '接受交底人', nameKey: 'ACCEPT_CONFESS_USER_NAME',
roleTitle: '', headerTitle: '接受交底人',
), roleTitle: '',
ConfirmWithSignWidget( ),
signs: signs, if (FormUtils.hasValue(signs, 'GUARDIAN'))
pd: pd, ConfirmWithSignWidget(
baseImgPath: baseImgPath, signs: signs,
sectionKey: 'GUARDIAN', pd: pd,
nameKey: 'GUARDIAN_USER_NAME', baseImgPath: baseImgPath,
headerTitle: '监护人意见', sectionKey: 'GUARDIAN',
roleTitle: '监护人', nameKey: 'GUARDIAN_USER_NAME',
), headerTitle: '监护人意见',
ConfirmWithSignWidget( roleTitle: '监护人',
signs: signs, ),
pd: pd, if (FormUtils.hasValue(signs, 'CONFIRM'))
baseImgPath: baseImgPath, ConfirmWithSignWidget(
sectionKey: 'CONFIRM', signs: signs,
nameKey: 'CONFIRM_USER_NAME', pd: pd,
headerTitle: '作业负责人意见', baseImgPath: baseImgPath,
roleTitle: '作业负责人', sectionKey: 'CONFIRM',
), nameKey: 'CONFIRM_USER_NAME',
ConfirmWithSignWidget( headerTitle: '作业负责人意见',
signs: signs, roleTitle: '作业负责人',
pd: pd, ),
baseImgPath: baseImgPath, if (FormUtils.hasValue(signs, 'LEADER'))
sectionKey: 'LEADER', ConfirmWithSignWidget(
nameKey: 'LEADER_USER_NAME', signs: signs,
headerTitle: '所在单位意见', pd: pd,
roleTitle: '所在单位负责人', baseImgPath: baseImgPath,
), sectionKey: 'LEADER',
ConfirmWithSignWidget( nameKey: 'LEADER_USER_NAME',
signs: signs, headerTitle: '所在单位意见',
pd: pd, roleTitle: '所在单位负责人',
baseImgPath: baseImgPath, ),
sectionKey: 'AUDIT', if (FormUtils.hasValue(signs, 'AUDIT'))
nameKey: 'AUDIT_USER_NAME', ConfirmWithSignWidget(
headerTitle: '安全管理部门意见', signs: signs,
roleTitle: '安全管理部门', pd: pd,
), baseImgPath: baseImgPath,
ConfirmWithSignWidget( sectionKey: 'AUDIT',
signs: signs, nameKey: 'AUDIT_USER_NAME',
pd: pd, headerTitle: '安全管理部门意见',
baseImgPath: baseImgPath, roleTitle: '安全管理部门',
sectionKey: 'APPROVE', ),
nameKey: 'APPROVE_USER_NAME', if (FormUtils.hasValue(signs, 'APPROVE'))
headerTitle: '动火审批人意见', ConfirmWithSignWidget(
roleTitle: '动火审批人', signs: signs,
), pd: pd,
baseImgPath: baseImgPath,
sectionKey: 'APPROVE',
nameKey: 'APPROVE_USER_NAME',
headerTitle: '动火审批人意见',
roleTitle: '动火审批人',
),
// 作业开始负责人签字 // 作业开始负责人签字
// if (FormUtils.hasValue(signs, 'MONITOR')) // if (FormUtils.hasValue(signs, 'MONITOR'))
@ -176,26 +181,26 @@ class SpecialWorkFormBaseWork extends StatelessWidget {
// // 作业开始负责人签字 // // 作业开始负责人签字
// if (FormUtils.hasValue(signs, 'WORK_START')) // if (FormUtils.hasValue(signs, 'WORK_START'))
// signItemWidget('WORK_START', 'WORK_START_USER_NAME', '作业开始负责人', context), // signItemWidget('WORK_START', 'WORK_START_USER_NAME', '作业开始负责人', context),
ConfirmWithSignWidget( if (FormUtils.hasValue(signs, 'MONITOR'))
signs: signs, ConfirmWithSignWidget(
pd: pd, signs: signs,
baseImgPath: baseImgPath, pd: pd,
sectionKey: 'MONITOR', baseImgPath: baseImgPath,
nameKey: 'MONITOR_USER_NAME', sectionKey: 'MONITOR',
headerTitle: '动火前，岗位当班班长验票情况', nameKey: 'MONITOR_USER_NAME',
roleTitle: '动火前，岗位当班班长验票情况', headerTitle: '动火前，岗位当班班长验票情况',
), roleTitle: '动火前，岗位当班班长验票情况',
),
ConfirmWithSignWidget( if (FormUtils.hasValue(signs, 'ACCEPT'))
signs: signs, ConfirmWithSignWidget(
pd: pd, signs: signs,
baseImgPath: baseImgPath, pd: pd,
sectionKey: 'ACCEPT', baseImgPath: baseImgPath,
nameKey: 'ACCEPT_USER_NAME', sectionKey: 'ACCEPT',
headerTitle: '验收部门负责人意见', nameKey: 'ACCEPT_USER_NAME',
roleTitle: '验收部门负责人', headerTitle: '验收部门负责人意见',
), roleTitle: '验收部门负责人',
),
], ],
); );
} }

6
lib/pages/home/tap/tabList/special_wrok/dh_work/hotwork_list_page.dart
View File

@ -287,10 +287,8 @@ class _HotWorkListPageState extends State<HotWorkListPage> {
break; break;
} }
LoadingDialogHelper.show(); LoadingDialogHelper.show();
setState(() { _fetchSteps();
_fetchSteps(); _fetchData();
_fetchData();
});
} }
Widget _buildFlowStepItem({ Widget _buildFlowStepItem({

1
lib/pages/home/tap/tabList/special_wrok/dh_work/szaq_work_detail/hotwork_set_safe_detail.dart
View File

@ -58,6 +58,7 @@ class _HotworkSetSafeDetailState extends State<HotworkSetSafeDetail> {
return jsonEncode(jsonList); return jsonEncode(jsonList);
} }
Widget _chooseItem(MeasureItem item) { Widget _chooseItem(MeasureItem item) {
return Column( return Column(
children: [ children: [

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

@ -14,6 +14,8 @@ import 'package:qhd_prevention/pages/home/tap/tabList/special_wrok/MeasuresListW
/// 通用断路作业明细表单组件（支持编辑/只读） /// 通用断路作业明细表单组件（支持编辑/只读）
class CutroadDetailFormWidget extends StatefulWidget { class CutroadDetailFormWidget extends StatefulWidget {
final Map<String, dynamic> pd; final Map<String, dynamic> pd;
final Map<String, dynamic> signs;
final bool isEditable; final bool isEditable;
final VoidCallback onChooseLevel; final VoidCallback onChooseLevel;
@ -36,12 +38,11 @@ class CutroadDetailFormWidget extends StatefulWidget {
/// 作业地点经纬度 /// 作业地点经纬度
final VoidCallback? onWorkAreaLocationHandle; final VoidCallback? onWorkAreaLocationHandle;
/// 其他签字数据
final signs;
const CutroadDetailFormWidget({ const CutroadDetailFormWidget({
Key? key, Key? key,
required this.pd, required this.pd,
required this.signs,
required this.isEditable, required this.isEditable,
required this.onChooseLevel, required this.onChooseLevel,
@ -55,7 +56,6 @@ class CutroadDetailFormWidget extends StatefulWidget {
this.contentController, this.contentController,
this.relatedController, this.relatedController,
this.riskController, this.riskController,
this.signs = null,
}) : assert( }) : assert(
!isEditable || !isEditable ||
(unitController != null && (unitController != null &&
@ -83,178 +83,6 @@ class _CutroadDetailFormWidgetState extends State<CutroadDetailFormWidget> {
); );
} }
Widget signItemWidget(
String signKey,
BuildContext context,
) {
return _itemContainer(
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (FormUtils.hasValue(widget.signs, signKey))
...((widget.signs[signKey] as List<dynamic>)
.cast<Map<String, dynamic>>()
.map((item) {
// 解析 SIGN_PATH
List<String> signPaths = [];
final rawSP =
FormUtils.hasValue(item, 'SIGN_PATH')
? item['SIGN_PATH']
: null;
if (rawSP is String && rawSP.isNotEmpty) {
signPaths = rawSP.split(',').map((s) => s.trim()).toList();
} else if (rawSP is List) {
signPaths = rawSP.cast<String>();
}
// 解析 SIGN_TIME 保留空格
List<String> signTimes = [];
final rawST =
FormUtils.hasValue(item, 'SIGN_TIME')
? item['SIGN_TIME']
: null;
if (rawST is String && rawST.isNotEmpty) {
signTimes = rawST.split(',');
} else if (rawST is List) {
signTimes = rawST.cast<String>();
}
final pairCount = math.min(
signPaths.length,
signTimes.length,
);
// 解析 IMG_PATH, 最多 2 张
List<String> imgPaths = [];
final rawIP =
FormUtils.hasValue(item, 'IMG_PATH')
? item['IMG_PATH']
: null;
if (rawIP is String && rawIP.isNotEmpty) {
imgPaths =
rawIP.split(',').map((s) => s.trim()).take(2).toList();
} else if (rawIP is List) {
imgPaths = rawIP.cast<String>().take(2).toList();
}
return Padding(
padding: const EdgeInsets.symmetric(
vertical: 8.0,
horizontal: 10,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (imgPaths.isNotEmpty) ...[
Row(
children:
imgPaths.map((p) {
final fullUrl = '${ApiService.baseImgPath}$p';
return GestureDetector(
onTap:
() => presentOpaque(
SingleImageViewer(imageUrl: fullUrl),
context,
),
child: Padding(
padding: const EdgeInsets.only(
right: 8.0,
),
child: ClipRRect(
borderRadius: BorderRadius.circular(2),
child: Image.network(
fullUrl,
width: 50,
height: 50,
fit: BoxFit.fill,
errorBuilder:
(_, __, ___) => const Icon(
Icons.broken_image,
size: 40,
),
),
),
),
);
}).toList(),
),
const SizedBox(height: 8),
],
// 签名及时间
...List.generate(pairCount, (index) {
final imgPath = signPaths[index];
final timeLabel = signTimes[index];
final fullUrl = '${ApiService.baseImgPath}$imgPath';
const imageWidth = 200.0;
const imageHeight = 100.0;
return Padding(
padding: const EdgeInsets.symmetric(vertical: 8.0),
child: Column(
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
GestureDetector(
onTap:
() => presentOpaque(
SingleImageViewer(
imageUrl: fullUrl,
),
context,
),
child: ClipRRect(
borderRadius: BorderRadius.circular(4),
child: Image.network(
fullUrl,
width: imageWidth,
height: imageHeight,
fit: BoxFit.fill,
errorBuilder:
(_, __, ___) => const Icon(
Icons.broken_image,
size: 60,
),
),
),
),
const SizedBox(width: 12),
Expanded(
child: SizedBox(
height: imageHeight,
child: Align(
alignment: Alignment.bottomRight,
child: Text(
timeLabel,
style: const TextStyle(
fontSize: 14,
color: Colors.black87,
),
),
),
),
),
],
),
if (index < pairCount - 1)
const Padding(
padding: EdgeInsets.only(top: 8.0),
child: Divider(height: 1),
),
],
),
);
}),
],
),
);
})
.toList()),
],
),
);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
if (FormUtils.hasValue(widget.pd, 'LATITUDE')) { if (FormUtils.hasValue(widget.pd, 'LATITUDE')) {
@ -262,6 +90,7 @@ class _CutroadDetailFormWidgetState extends State<CutroadDetailFormWidget> {
'${widget.pd['LATITUDE']},${widget.pd['LONGITUDE']}'; //参数map '${widget.pd['LATITUDE']},${widget.pd['LONGITUDE']}'; //参数map
} }
final pd = widget.pd; final pd = widget.pd;
final signs = widget.signs;
return Container( return Container(
padding: const EdgeInsets.symmetric(vertical: 10), padding: const EdgeInsets.symmetric(vertical: 10),
@ -299,10 +128,16 @@ class _CutroadDetailFormWidgetState extends State<CutroadDetailFormWidget> {
text: pd['CONFIRM_DEPARTMENT_NAME'] ?? '', text: pd['CONFIRM_DEPARTMENT_NAME'] ?? '',
), ),
], ],
if (FormUtils.hasValue(pd, 'CONFIRM_USER_NAME')&& !widget.isEditable) ...[ if (FormUtils.hasValue(pd, 'CONFIRM_USER_NAME') &&
!widget.isEditable) ...[
const Divider(), const Divider(),
// ItemListWidget.OneRowImageTitle(label: '作业负责人', imgPatlabel: '作业负责人', imgPath: imgPathh: imgPath) // ItemListWidget.OneRowImageTitle(label: '作业负责人', imgPatlabel: '作业负责人', imgPath: imgPathh: imgPath)
SignRowImageTitle(label: '作业负责人:', signKey: 'CONFIRM', signs: widget.signs, text: pd['CONFIRM_USER_NAME']??'',), SignRowImageTitle(
label: '作业负责人:',
signKey: 'CONFIRM',
signs: widget.signs,
text: pd['CONFIRM_USER_NAME'] ?? '',
),
], ],
const Divider(), const Divider(),
ItemListWidget.singleLineTitleText( ItemListWidget.singleLineTitleText(
@ -312,10 +147,16 @@ class _CutroadDetailFormWidgetState extends State<CutroadDetailFormWidget> {
controller: widget.unitController, controller: widget.unitController,
text: pd['OTHER_DEPT'] ?? '', text: pd['OTHER_DEPT'] ?? '',
), ),
if (FormUtils.hasValue(pd, 'CONFIRM_USER_NAME')&& !widget.isEditable) ...[ if (FormUtils.hasValue(pd, 'CONFIRM_USER_NAME') &&
!widget.isEditable) ...[
const Divider(), const Divider(),
// ItemListWidget.OneRowImageTitle(label: '作业负责人', imgPath: imgPath) // ItemListWidget.OneRowImageTitle(label: '作业负责人', imgPath: imgPath)
SignRowImageTitle(label: '监护人:', signKey: 'GUARDIAN', signs: widget.signs, text: pd['GUARDIAN_USER_NAME']??'',), SignRowImageTitle(
label: '监护人:',
signKey: 'GUARDIAN',
signs: widget.signs,
text: pd['GUARDIAN_USER_NAME'] ?? '',
),
], ],
const Divider(), const Divider(),
ItemListWidget.multiLineTitleTextField( ItemListWidget.multiLineTitleTextField(
@ -352,17 +193,21 @@ class _CutroadDetailFormWidgetState extends State<CutroadDetailFormWidget> {
text: pd['SPECIAL_WORK'] ?? '', text: pd['SPECIAL_WORK'] ?? '',
), ),
const Divider(), const Divider(),
ConfirmWithSignWidget( if (FormUtils.hasValue(signs, 'PROJECT_MANAGER') &&
signs: widget.signs, !widget.isEditable) ...[
pd: pd, ConfirmWithSignWidget(
baseImgPath: ApiService.baseImgPath, signs: signs,
sectionKey: 'GUARDIAN', pd: pd,
nameKey: 'WORK_CONTENT', baseImgPath: ApiService.baseImgPath,
headerTitle: '断路地段示意图（可另附图）及相关说明', sectionKey: 'PROJECT_MANAGER',
imgsKey: 'CONTENT_IMG_PATH', nameKey: 'WORK_CONTENT',
contentKey: 'WORK_CONTENT', headerTitle: '断路地段示意图（可另附图）及相关说明',
roleTitle: '', imgsKey: 'CONTENT_IMG_PATH',
), contentKey: 'WORK_CONTENT',
roleTitle: '',
),
const Divider(),
],
ItemListWidget.twoRowButtonTitleText( ItemListWidget.twoRowButtonTitleText(
label: '风险辨识结果', label: '风险辨识结果',

413
lib/pages/home/tap/tabList/special_wrok/dl_work/CutroadFormBaseWork.dart
View File

@ -52,11 +52,11 @@ class CutroadFormBaseWork extends StatelessWidget {
} }
Widget signItemWidget( Widget signItemWidget(
String signKey, String signKey,
String nameKey, String nameKey,
String name, String name,
BuildContext context, BuildContext context,
) { ) {
return _itemContainer( return _itemContainer(
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -66,9 +66,7 @@ class CutroadFormBaseWork extends StatelessWidget {
padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 10), padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 10),
child: Row( child: Row(
children: [ children: [
Expanded( Expanded(child: ListItemFactory.headerTitle('$name')),
child: ListItemFactory.headerTitle('$name'),
),
if (FormUtils.hasValue(pd, nameKey)) if (FormUtils.hasValue(pd, nameKey))
Text( Text(
pd[nameKey]?.toString() ?? '', pd[nameKey]?.toString() ?? '',
@ -83,134 +81,162 @@ class CutroadFormBaseWork extends StatelessWidget {
...((signs[signKey] as List<dynamic>) ...((signs[signKey] as List<dynamic>)
.cast<Map<String, dynamic>>() .cast<Map<String, dynamic>>()
.map((item) { .map((item) {
// 解析 SIGN_PATH // 解析 SIGN_PATH
List<String> signPaths = []; List<String> signPaths = [];
final rawSP = FormUtils.hasValue(item, 'SIGN_PATH') ? item['SIGN_PATH'] : null; final rawSP =
if (rawSP is String && rawSP.isNotEmpty) { FormUtils.hasValue(item, 'SIGN_PATH')
signPaths = rawSP.split(',').map((s) => s.trim()).toList(); ? item['SIGN_PATH']
} else if (rawSP is List) { : null;
signPaths = rawSP.cast<String>(); if (rawSP is String && rawSP.isNotEmpty) {
} signPaths = rawSP.split(',').map((s) => s.trim()).toList();
} else if (rawSP is List) {
signPaths = rawSP.cast<String>();
}
// 解析 SIGN_TIME 保留空格 // 解析 SIGN_TIME 保留空格
List<String> signTimes = []; List<String> signTimes = [];
final rawST = FormUtils.hasValue(item, 'SIGN_TIME') ? item['SIGN_TIME'] : null; final rawST =
if (rawST is String && rawST.isNotEmpty) { FormUtils.hasValue(item, 'SIGN_TIME')
signTimes = rawST.split(','); ? item['SIGN_TIME']
} else if (rawST is List) { : null;
signTimes = rawST.cast<String>(); if (rawST is String && rawST.isNotEmpty) {
} signTimes = rawST.split(',');
} else if (rawST is List) {
signTimes = rawST.cast<String>();
}
final pairCount = math.min(signPaths.length, signTimes.length); final pairCount = math.min(
signPaths.length,
signTimes.length,
);
// 解析 IMG_PATH, 最多 2 张 // 解析 IMG_PATH, 最多 2 张
List<String> imgPaths = []; List<String> imgPaths = [];
final rawIP = FormUtils.hasValue(item, 'IMG_PATH') ? item['IMG_PATH'] : null; final rawIP =
if (rawIP is String && rawIP.isNotEmpty) { FormUtils.hasValue(item, 'IMG_PATH')
imgPaths = rawIP.split(',').map((s) => s.trim()).take(2).toList(); ? item['IMG_PATH']
} else if (rawIP is List) { : null;
imgPaths = rawIP.cast<String>().take(2).toList(); if (rawIP is String && rawIP.isNotEmpty) {
} imgPaths =
rawIP.split(',').map((s) => s.trim()).take(2).toList();
} else if (rawIP is List) {
imgPaths = rawIP.cast<String>().take(2).toList();
}
return Padding( return Padding(
padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 10), padding: const EdgeInsets.symmetric(
child: Column( vertical: 8.0,
crossAxisAlignment: CrossAxisAlignment.start, horizontal: 10,
children: [ ),
if (imgPaths.isNotEmpty) ...[ child: Column(
Row( crossAxisAlignment: CrossAxisAlignment.start,
children: imgPaths.map((p) { children: [
final fullUrl = '$baseImgPath$p'; if (imgPaths.isNotEmpty) ...[
return GestureDetector( Row(
onTap: () => presentOpaque( children:
SingleImageViewer(imageUrl: fullUrl), imgPaths.map((p) {
context, final fullUrl = '$baseImgPath$p';
), return GestureDetector(
child: Padding( onTap:
padding: const EdgeInsets.only(right: 8.0), () => presentOpaque(
child: ClipRRect( SingleImageViewer(imageUrl: fullUrl),
borderRadius: BorderRadius.circular(2), context,
child: Image.network( ),
fullUrl, child: Padding(
width: 50, padding: const EdgeInsets.only(
height: 50, right: 8.0,
fit: BoxFit.fill, ),
errorBuilder: (_, __, ___) => const Icon( child: ClipRRect(
Icons.broken_image, borderRadius: BorderRadius.circular(2),
size: 40, child: Image.network(
), fullUrl,
), width: 50,
), height: 50,
), fit: BoxFit.fill,
); errorBuilder:
}).toList(), (_, __, ___) => const Icon(
), Icons.broken_image,
const SizedBox(height: 8), size: 40,
], ),
// 签名及时间
...List.generate(pairCount, (index) {
final imgPath = signPaths[index];
final timeLabel = signTimes[index];
final fullUrl = '$baseImgPath$imgPath';
const imageWidth = 200.0;
const imageHeight = 100.0;
return Padding(
padding: const EdgeInsets.symmetric(vertical: 8.0),
child: Column(
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
GestureDetector(
onTap: () => presentOpaque(
SingleImageViewer(imageUrl: fullUrl),
context,
),
child: ClipRRect(
borderRadius: BorderRadius.circular(4),
child: Image.network(
fullUrl,
width: imageWidth,
height: imageHeight,
fit: BoxFit.fill,
errorBuilder: (_, __, ___) =>
const Icon(Icons.broken_image, size: 60),
),
),
),
const SizedBox(width: 12),
Expanded(
child: SizedBox(
height: imageHeight,
child: Align(
alignment: Alignment.bottomRight,
child: Text(
timeLabel,
style: const TextStyle(
fontSize: 14,
color: Colors.black87,
), ),
), ),
), ),
), );
}).toList(),
),
const SizedBox(height: 8),
],
// 签名及时间
...List.generate(pairCount, (index) {
final imgPath = signPaths[index];
final timeLabel = signTimes[index];
final fullUrl = '$baseImgPath$imgPath';
const imageWidth = 200.0;
const imageHeight = 100.0;
return Padding(
padding: const EdgeInsets.symmetric(vertical: 8.0),
child: Column(
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
GestureDetector(
onTap:
() => presentOpaque(
SingleImageViewer(
imageUrl: fullUrl,
),
context,
),
child: ClipRRect(
borderRadius: BorderRadius.circular(4),
child: Image.network(
fullUrl,
width: imageWidth,
height: imageHeight,
fit: BoxFit.fill,
errorBuilder:
(_, __, ___) => const Icon(
Icons.broken_image,
size: 60,
),
),
),
),
const SizedBox(width: 12),
Expanded(
child: SizedBox(
height: imageHeight,
child: Align(
alignment: Alignment.bottomRight,
child: Text(
timeLabel,
style: const TextStyle(
fontSize: 14,
color: Colors.black87,
),
),
),
),
),
],
), ),
if (index < pairCount - 1)
const Padding(
padding: EdgeInsets.only(top: 8.0),
child: Divider(height: 1),
),
], ],
), ),
if (index < pairCount - 1) );
const Padding( }),
padding: EdgeInsets.only(top: 8.0), ],
child: Divider(height: 1), ),
), );
], })
), .toList()),
);
}),
],
),
);
}).toList()),
], ],
), ),
); );
@ -261,71 +287,76 @@ class CutroadFormBaseWork extends StatelessWidget {
], ],
), ),
), ),
ConfirmWithSignWidget( if (FormUtils.hasValue(signs, 'CONFESS'))
signs: signs, ConfirmWithSignWidget(
pd: pd, signs: signs,
baseImgPath: baseImgPath, pd: pd,
sectionKey: 'CONFESS', baseImgPath: baseImgPath,
nameKey: 'CONFESS_USER_NAME', sectionKey: 'CONFESS',
headerTitle: '安全交底人', nameKey: 'CONFESS_USER_NAME',
roleTitle: '安全交底人', headerTitle: '安全交底人',
), roleTitle: '安全交底人',
ConfirmWithSignWidget( ),
signs: signs, if (FormUtils.hasValue(signs, 'ACCEPT_CONFESS'))
pd: pd, ConfirmWithSignWidget(
baseImgPath: baseImgPath, signs: signs,
sectionKey: 'ACCEPT_CONFESS', pd: pd,
nameKey: 'ACCEPT_CONFESS_USER_NAME', baseImgPath: baseImgPath,
headerTitle: '接受交底人', sectionKey: 'ACCEPT_CONFESS',
roleTitle: '', nameKey: 'ACCEPT_CONFESS_USER_NAME',
), headerTitle: '接受交底人',
ConfirmWithSignWidget( roleTitle: '',
signs: signs, ),
pd: pd, if (FormUtils.hasValue(signs, 'CONFIRM'))
baseImgPath: baseImgPath, ConfirmWithSignWidget(
sectionKey: 'CONFIRM', signs: signs,
nameKey: 'CONFIRM_USER_NAME', pd: pd,
headerTitle: '作业负责人意见', baseImgPath: baseImgPath,
roleTitle: '作业负责人', sectionKey: 'CONFIRM',
), nameKey: 'CONFIRM_USER_NAME',
ConfirmWithSignWidget( headerTitle: '作业负责人意见',
signs: signs, roleTitle: '作业负责人',
pd: pd, ),
baseImgPath: baseImgPath, if (FormUtils.hasValue(signs, 'LEADER'))
sectionKey: 'LEADER', ConfirmWithSignWidget(
nameKey: 'LEADER_USER_NAME', signs: signs,
headerTitle: '所在单位负责人意见', pd: pd,
roleTitle: '所在单位负责人', baseImgPath: baseImgPath,
), sectionKey: 'LEADER',
ConfirmWithSignWidget( nameKey: 'LEADER_USER_NAME',
signs: signs, headerTitle: '所在单位负责人意见',
pd: pd, roleTitle: '所在单位负责人',
baseImgPath: baseImgPath, ),
sectionKey: 'AUDIT', if (FormUtils.hasValue(signs, 'AUDIT'))
nameKey: 'AUDIT_USER_NAME', ConfirmWithSignWidget(
headerTitle: '消防、安全管理部门负责人意见', signs: signs,
roleTitle: '消防、安全管理部门负责人', pd: pd,
), baseImgPath: baseImgPath,
ConfirmWithSignWidget( sectionKey: 'AUDIT',
signs: signs, nameKey: 'AUDIT_USER_NAME',
pd: pd, headerTitle: '消防、安全管理部门负责人意见',
baseImgPath: baseImgPath, roleTitle: '消防、安全管理部门负责人',
sectionKey: 'APPROVE', ),
nameKey: 'APPROVE_USER_NAME', if (FormUtils.hasValue(signs, 'APPROVE'))
headerTitle: '审批部门负责人意见', ConfirmWithSignWidget(
roleTitle: '审批部门负责人', signs: signs,
), pd: pd,
baseImgPath: baseImgPath,
ConfirmWithSignWidget( sectionKey: 'APPROVE',
signs: signs, nameKey: 'APPROVE_USER_NAME',
pd: pd, headerTitle: '审批部门负责人意见',
baseImgPath: baseImgPath, roleTitle: '审批部门负责人',
sectionKey: 'ACCEPT', ),
nameKey: 'ACCEPT_USER_NAME', if (FormUtils.hasValue(signs, 'ACCEPT'))
headerTitle: '验收部门负责人意见', ConfirmWithSignWidget(
roleTitle: '验收部门负责人', signs: signs,
), pd: pd,
baseImgPath: baseImgPath,
sectionKey: 'ACCEPT',
nameKey: 'ACCEPT_USER_NAME',
headerTitle: '验收部门负责人意见',
roleTitle: '验收部门负责人',
),
], ],
); );
} }

88
lib/pages/home/tap/tabList/special_wrok/dl_work/aqcs_work_detail/cutroad_safe_func_sure.dart
View File

@ -36,9 +36,6 @@ class CutroadSafeFuncSure extends StatefulWidget {
class _CutroadSafeFuncSureState extends State<CutroadSafeFuncSure> { class _CutroadSafeFuncSureState extends State<CutroadSafeFuncSure> {
late bool isEditable = false; late bool isEditable = false;
/// 详情
late Map<String, dynamic> pd = {};
late List<Map<String, dynamic>> measuresList = [];
/// 其他安全措施 /// 其他安全措施
final TextEditingController _otherController = TextEditingController(); final TextEditingController _otherController = TextEditingController();
@ -53,7 +50,70 @@ class _CutroadSafeFuncSureState extends State<CutroadSafeFuncSure> {
_getData(); _getData();
} }
late Map<String, dynamic> pd = {};
late Map<String, dynamic> signs = {};
late List<Map<String, dynamic>> measuresList = [];
/// 初始化拉取数据（并行获取 pd / signs / measures，最后一次 setState）
Future<void> _getData() async {
LoadingDialogHelper.show();
try {
// 并行发起三个请求，并在出错时返回安全的默认值（避免 Future.wait 因一个失败而中断）
final futurePd = ApiService.getHomeworkFindById('cutroad', widget.CUTROAD_ID)
.catchError((e) {
// 可加入日志记录 e
return <String, dynamic>{}; // 回退为空 map
});
final futureSigns = ApiService.listSignFinished('cutroad', widget.CUTROAD_ID)
.catchError((e) {
return <String, dynamic>{'signs': <String, dynamic>{}};
});
final futureMeasures = ApiService.listSignFinishAllMeasures('cutroad')
.catchError((e) {
return <String, dynamic>{'measuresList': <Map<String, dynamic>>[]};
});
final results = await Future.wait([futurePd, futureSigns, futureMeasures]);
final pdResult = results[0] as Map<String, dynamic>? ?? <String, dynamic>{};
final signsResult = results[1] as Map<String, dynamic>? ?? <String, dynamic>{};
final measuresResult = results[2] as Map<String, dynamic>? ?? <String, dynamic>{};
// 从各自的结果里提取需要的字段，使用默认值以防字段缺失或类型不对
final newPd = (pdResult['pd'] is Map<String, dynamic>)
? Map<String, dynamic>.from(pdResult['pd'])
: <String, dynamic>{};
final newSigns = (signsResult['signs'] is Map<String, dynamic>)
? Map<String, dynamic>.from(signsResult['signs'])
: <String, dynamic>{};
final newMeasuresList = <Map<String, dynamic>>[];
final rawMeasures = measuresResult['measuresList'];
if (rawMeasures is List) {
for (final m in rawMeasures) {
if (m is Map) {
newMeasuresList.add(Map<String, dynamic>.from(m));
}
}
}
if (!mounted) return;
setState(() {
pd = newPd;
signs = newSigns;
measuresList = newMeasuresList;
});
} catch (e, st) {
debugPrint('[_getData] 未捕获异常: $e\n$st');
} finally {
LoadingDialogHelper.hide();
}
}
/// 弹出单位选择 /// 弹出单位选择
void chooseUnitHandle(MeasureItem item) { void chooseUnitHandle(MeasureItem item) {
showModalBottomSheet( showModalBottomSheet(
@ -265,27 +325,6 @@ if (path != null) {
} }
} }
/// 初始化拉取数据
Future<void> _getData() async {
final data = await ApiService.getHomeworkFindById('cutroad', widget.CUTROAD_ID);
setState(() {
pd = data['pd'];
_getMeasures();
});
}
Future<void> _getMeasures() async {
final data = await ApiService.listSignSureAllMeasures('cutroad',widget.CUTROAD_ID);
setState(() {
measuresList = List<Map<String, dynamic>>.from(
data['measuresForSignList'] ?? <Map<String, dynamic>>[],
);
});
}
Future<void> _itemToSign(Map<String, dynamic> measures, int index) async { Future<void> _itemToSign(Map<String, dynamic> measures, int index) async {
// 签名图片列表 // 签名图片列表
final List<Map<String, dynamic>> signImgList = measures['SIGN_ITEM'] ?? []; final List<Map<String, dynamic>> signImgList = measures['SIGN_ITEM'] ?? [];
@ -436,6 +475,7 @@ if (path != null) {
pd: pd, pd: pd,
isEditable: false, isEditable: false,
onChooseLevel: () {}, onChooseLevel: () {},
signs: signs,
), ),
SizedBox(height: 20), SizedBox(height: 20),
_setSafeDetailWidget(), _setSafeDetailWidget(),

11
lib/pages/home/tap/tabList/special_wrok/dl_work/cutroad_list_page.dart
View File

@ -230,14 +230,9 @@ class _CutroadListPageState extends State<CutroadListPage> {
default: default:
break; break;
} }
setState(() { LoadingDialogHelper.show();
_fetchSteps(); _fetchSteps();
}); _fetchData();
// Navigator.pushNamed(
// context,
// routeName,
// arguments: {'CUTROAD_ID': item['CUTROAD_ID'], 'flow': widget.flow},
// );
} }
Widget _buildFlowStepItem({ Widget _buildFlowStepItem({

158
lib/pages/home/tap/tabList/special_wrok/dl_work/szaq_work_detail/cutroad_set_safe_detail.dart
View File

@ -17,6 +17,7 @@ import 'package:qhd_prevention/customWidget/custom_alert_dialog.dart';
import 'package:qhd_prevention/customWidget/single_image_viewer.dart'; import 'package:qhd_prevention/customWidget/single_image_viewer.dart';
import 'package:qhd_prevention/pages/mine/mine_sign_page.dart'; import 'package:qhd_prevention/pages/mine/mine_sign_page.dart';
import 'package:qhd_prevention/pages/home/tap/tabList/special_Wrok/dh_work/szaq_work_detail/SafeFunctionDialog.dart'; import 'package:qhd_prevention/pages/home/tap/tabList/special_Wrok/dh_work/szaq_work_detail/SafeFunctionDialog.dart';
/// 设置安全措施确认人 /// 设置安全措施确认人
class CutroadSetSafeDetail extends StatefulWidget { class CutroadSetSafeDetail extends StatefulWidget {
const CutroadSetSafeDetail({ const CutroadSetSafeDetail({
@ -35,10 +36,6 @@ class CutroadSetSafeDetail extends StatefulWidget {
class _CutroadSetSafeDetailState extends State<CutroadSetSafeDetail> { class _CutroadSetSafeDetailState extends State<CutroadSetSafeDetail> {
late bool isEditable = false; late bool isEditable = false;
/// 详情
late Map<String, dynamic> pd = {};
late List<Map<String, dynamic>> measuresList = [];
/// 安全防护措施列表 /// 安全防护措施列表
late List<MeasureItem> measuresListCopy = []; late List<MeasureItem> measuresListCopy = [];
List<String> imagePaths = []; List<String> imagePaths = [];
@ -49,6 +46,70 @@ class _CutroadSetSafeDetailState extends State<CutroadSetSafeDetail> {
_getData(); _getData();
addMeasuresListCopy(); addMeasuresListCopy();
} }
late Map<String, dynamic> pd = {};
late Map<String, dynamic> signs = {};
late List<Map<String, dynamic>> measuresList = [];
/// 初始化拉取数据（并行获取 pd / signs / measures，最后一次 setState）
Future<void> _getData() async {
LoadingDialogHelper.show();
try {
// 并行发起三个请求，并在出错时返回安全的默认值（避免 Future.wait 因一个失败而中断）
final futurePd = ApiService.getHomeworkFindById('cutroad', widget.CUTROAD_ID)
.catchError((e) {
// 可加入日志记录 e
return <String, dynamic>{}; // 回退为空 map
});
final futureSigns = ApiService.listSignFinished('cutroad', widget.CUTROAD_ID)
.catchError((e) {
return <String, dynamic>{'signs': <String, dynamic>{}};
});
final futureMeasures = ApiService.listSignFinishAllMeasures('cutroad')
.catchError((e) {
return <String, dynamic>{'measuresList': <Map<String, dynamic>>[]};
});
final results = await Future.wait([futurePd, futureSigns, futureMeasures]);
final pdResult = results[0] as Map<String, dynamic>? ?? <String, dynamic>{};
final signsResult = results[1] as Map<String, dynamic>? ?? <String, dynamic>{};
final measuresResult = results[2] as Map<String, dynamic>? ?? <String, dynamic>{};
// 从各自的结果里提取需要的字段，使用默认值以防字段缺失或类型不对
final newPd = (pdResult['pd'] is Map<String, dynamic>)
? Map<String, dynamic>.from(pdResult['pd'])
: <String, dynamic>{};
final newSigns = (signsResult['signs'] is Map<String, dynamic>)
? Map<String, dynamic>.from(signsResult['signs'])
: <String, dynamic>{};
final newMeasuresList = <Map<String, dynamic>>[];
final rawMeasures = measuresResult['measuresList'];
if (rawMeasures is List) {
for (final m in rawMeasures) {
if (m is Map) {
newMeasuresList.add(Map<String, dynamic>.from(m));
}
}
}
if (!mounted) return;
setState(() {
pd = newPd;
signs = newSigns;
measuresList = newMeasuresList;
});
} catch (e, st) {
debugPrint('[_getData] 未捕获异常: $e\n$st');
} finally {
LoadingDialogHelper.hide();
}
}
String measuresListToJson() { String measuresListToJson() {
final List<Map<String, dynamic>> jsonList = final List<Map<String, dynamic>> jsonList =
@ -56,8 +117,6 @@ class _CutroadSetSafeDetailState extends State<CutroadSetSafeDetail> {
return jsonEncode(jsonList); return jsonEncode(jsonList);
} }
Widget _chooseItem(MeasureItem item) { Widget _chooseItem(MeasureItem item) {
return Column( return Column(
children: [ children: [
@ -83,7 +142,7 @@ class _CutroadSetSafeDetailState extends State<CutroadSetSafeDetail> {
onTap: () { onTap: () {
showSafeFunctionDialog( showSafeFunctionDialog(
context, context,
_getAvailableMeasures(item), // 只传可用的项 _getAvailableMeasures(item), // 只传可用的项
initialSelected: item.selectMeasures, initialSelected: item.selectMeasures,
(selected) { (selected) {
setState(() { setState(() {
@ -169,7 +228,7 @@ class _CutroadSetSafeDetailState extends State<CutroadSetSafeDetail> {
MaterialPageRoute(builder: (context) => MineSignPage()), MaterialPageRoute(builder: (context) => MineSignPage()),
); );
await NativeOrientation.setPortrait(); await NativeOrientation.setPortrait();
if (path != null) { if (path != null) {
final now = DateFormat('yyyy-MM-dd HH:mm').format(DateTime.now()); final now = DateFormat('yyyy-MM-dd HH:mm').format(DateTime.now());
setState(() { setState(() {
imagePaths.add(path); imagePaths.add(path);
@ -249,17 +308,11 @@ if (path != null) {
int index = 0; int index = 0;
for (var item in measuresListCopy) { for (var item in measuresListCopy) {
if (item.USER_ID.isEmpty) { if (item.USER_ID.isEmpty) {
ToastUtil.showNormal( ToastUtil.showNormal(context, '第${index + 1}项未设置确认人');
context,
'第${index + 1}项未设置确认人',
);
return; return;
} }
if (item.selectMeasures.isEmpty) { if (item.selectMeasures.isEmpty) {
ToastUtil.showNormal( ToastUtil.showNormal(context, '第${index + 1}项未选择安全措施');
context,
'第${index + 1}项未选择安全措施',
);
return; return;
} }
final userId = item.USER_ID; final userId = item.USER_ID;
@ -286,7 +339,7 @@ if (path != null) {
title: '作废原因', title: '作废原因',
hintText: '请输入作废原因', hintText: '请输入作废原因',
cancelText: '取消', cancelText: '取消',
confirmText: '确定' confirmText: '确定',
); );
if (reasonText.isEmpty) { if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因'); ToastUtil.showNormal(context, '请填写作废原因');
@ -312,26 +365,22 @@ if (path != null) {
barrierDismissible: false, barrierDismissible: false,
); );
if (confirmed) { if (confirmed) {
LoadingDialogHelper.show(); LoadingDialogHelper.show();
try { try {
final result = await ApiService.saveSafeFunctionSure( final result = await ApiService.saveSafeFunctionSure(
'cutroad', 'cutroad',
formData, formData,
imagePaths, imagePaths,
); );
LoadingDialogHelper.hide(); LoadingDialogHelper.hide();
if (result['result'] == 'success') { if (result['result'] == 'success') {
ToastUtil.showSuccess( ToastUtil.showSuccess(context, '保存成功');
context, Navigator.of(context).pop(true);
'保存成功', }
); } catch (e) {
Navigator.of(context).pop(true); LoadingDialogHelper.hide();
} ToastUtil.showNormal(context, '操作失败：$e');
} catch (e) { }
LoadingDialogHelper.hide();
ToastUtil.showNormal(context, '操作失败：$e');
}
} }
} }
@ -342,23 +391,6 @@ if (path != null) {
} }
} }
/// 初始化拉取数据
Future<void> _getData() async {
final data = await ApiService.getHomeworkFindById('cutroad', widget.CUTROAD_ID);
setState(() {
pd = data['pd'];
_getMeasures();
});
}
Future<void> _getMeasures() async {
final data = await ApiService.listSignFinishAllMeasures('cutroad');
setState(() {
measuresList = List<Map<String, dynamic>>.from(
data['measuresList'] ?? <Map<String, dynamic>>[],
);
});
}
void removeMeasuresListCopy(int index) { void removeMeasuresListCopy(int index) {
setState(() { setState(() {
@ -382,6 +414,7 @@ if (path != null) {
); );
}); });
} }
/// 计算当前 item 可选的安全措施 /// 计算当前 item 可选的安全措施
List<Map<String, dynamic>> _getAvailableMeasures(MeasureItem current) { List<Map<String, dynamic>> _getAvailableMeasures(MeasureItem current) {
// 把除了 current 之外，已经被选走的措施 ID 全部搜集起来 // 把除了 current 之外，已经被选走的措施 ID 全部搜集起来
@ -393,12 +426,14 @@ if (path != null) {
} }
} }
// 返回：所有 measuresList 中，ID 不在 usedIds 或者正好属于 current 的那几条 // 返回：所有 measuresList 中，ID 不在 usedIds 或者正好属于 current 的那几条
List<Map<String, dynamic>> list = measuresList.where((m) { List<Map<String, dynamic>> list =
final id = m['BUS_CUTROAD_MEASURES_ID']; measuresList.where((m) {
final isCurrentSelected = current.selectMeasures final id = m['BUS_CUTROAD_MEASURES_ID'];
.any((sm) => sm['BUS_CUTROAD_MEASURES_ID'] == id); final isCurrentSelected = current.selectMeasures.any(
return !usedIds.contains(id) || isCurrentSelected; (sm) => sm['BUS_CUTROAD_MEASURES_ID'] == id,
}).toList(); );
return !usedIds.contains(id) || isCurrentSelected;
}).toList();
return list; return list;
} }
@ -561,7 +596,8 @@ if (path != null) {
CutroadDetailFormWidget( CutroadDetailFormWidget(
pd: pd, pd: pd,
isEditable: false, isEditable: false,
onChooseLevel: (){}, onChooseLevel: () {},
signs: signs,
), ),
SizedBox(height: 20), SizedBox(height: 20),
_setSafeDetailWidget(), _setSafeDetailWidget(),

12
lib/pages/home/tap/tabList/special_wrok/dt_work/breakground_list_page.dart
View File

@ -314,15 +314,9 @@ class _BreakgroundListPageState extends State<BreakgroundListPage> {
default: default:
break; break;
} }
setState(() { LoadingDialogHelper.show();
_fetchSteps(); _fetchSteps();
_fetchData(); _fetchData();
});
// Navigator.pushNamed(
// context,
// routeName,
// arguments: {'BREAKGROUND_ID': item['BREAKGROUND_ID'], 'flow': widget.flow},
// );
} }
Widget _buildFlowStepItem({ Widget _buildFlowStepItem({

12
lib/pages/home/tap/tabList/special_wrok/dz_work/hoistwork_list_page.dart
View File

@ -231,15 +231,9 @@ class _HoistworkListPageState extends State<HoistworkListPage> {
default: default:
break; break;
} }
setState(() { LoadingDialogHelper.show();
_fetchSteps(); _fetchSteps();
_fetchData(); _fetchData();
});
// Navigator.pushNamed(
// context,
// routeName,
// arguments: {'HOISTING_ID': item['HOISTING_ID'], 'flow': widget.flow},
// );
} }
Widget _buildFlowStepItem({ Widget _buildFlowStepItem({

10
lib/pages/home/tap/tabList/special_wrok/gc_work/HighWorkDetailFormWidget.dart
View File

@ -93,6 +93,16 @@ class _HighWorkDetailFormWidgetState extends State<HighWorkDetailFormWidget> {
), ),
const Divider(), const Divider(),
], ],
ItemListWidget.singleLineTitleText(
label: '作业申请单位：',
isEditable: false,
text: pd['APPLY_DEPARTMENT_NAME'] ?? '',
),
ItemListWidget.singleLineTitleText(
label: '申请人：',
isEditable: false,
text: pd['APPLY_USER_NAME'] ?? '',
),
ItemListWidget.singleLineTitleText( ItemListWidget.singleLineTitleText(
label: '作业地点：', label: '作业地点：',
isEditable: widget.isEditable, isEditable: widget.isEditable,

479
lib/pages/home/tap/tabList/special_wrok/gc_work/SpecialWorkFormBaseWork.dart
View File

@ -52,11 +52,11 @@ class HighWorkFormBaseWork extends StatelessWidget {
} }
Widget signItemWidget( Widget signItemWidget(
String signKey, String signKey,
String nameKey, String nameKey,
String name, String name,
BuildContext context, BuildContext context,
) { ) {
return _itemContainer( return _itemContainer(
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -66,9 +66,7 @@ class HighWorkFormBaseWork extends StatelessWidget {
padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 10), padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 10),
child: Row( child: Row(
children: [ children: [
Expanded( Expanded(child: ListItemFactory.headerTitle(name)),
child: ListItemFactory.headerTitle(name),
),
if (FormUtils.hasValue(pd, nameKey)) if (FormUtils.hasValue(pd, nameKey))
Text( Text(
pd[nameKey]?.toString() ?? '', pd[nameKey]?.toString() ?? '',
@ -83,134 +81,162 @@ class HighWorkFormBaseWork extends StatelessWidget {
...((signs[signKey] as List<dynamic>) ...((signs[signKey] as List<dynamic>)
.cast<Map<String, dynamic>>() .cast<Map<String, dynamic>>()
.map((item) { .map((item) {
// 解析 SIGN_PATH // 解析 SIGN_PATH
List<String> signPaths = []; List<String> signPaths = [];
final rawSP = FormUtils.hasValue(item, 'SIGN_PATH') ? item['SIGN_PATH'] : null; final rawSP =
if (rawSP is String && rawSP.isNotEmpty) { FormUtils.hasValue(item, 'SIGN_PATH')
signPaths = rawSP.split(',').map((s) => s.trim()).toList(); ? item['SIGN_PATH']
} else if (rawSP is List) { : null;
signPaths = rawSP.cast<String>(); if (rawSP is String && rawSP.isNotEmpty) {
} signPaths = rawSP.split(',').map((s) => s.trim()).toList();
} else if (rawSP is List) {
signPaths = rawSP.cast<String>();
}
// 解析 SIGN_TIME 保留空格 // 解析 SIGN_TIME 保留空格
List<String> signTimes = []; List<String> signTimes = [];
final rawST = FormUtils.hasValue(item, 'SIGN_TIME') ? item['SIGN_TIME'] : null; final rawST =
if (rawST is String && rawST.isNotEmpty) { FormUtils.hasValue(item, 'SIGN_TIME')
signTimes = rawST.split(','); ? item['SIGN_TIME']
} else if (rawST is List) { : null;
signTimes = rawST.cast<String>(); if (rawST is String && rawST.isNotEmpty) {
} signTimes = rawST.split(',');
} else if (rawST is List) {
signTimes = rawST.cast<String>();
}
final pairCount = math.min(signPaths.length, signTimes.length); final pairCount = math.min(
signPaths.length,
signTimes.length,
);
// 解析 IMG_PATH, 最多 2 张 // 解析 IMG_PATH, 最多 2 张
List<String> imgPaths = []; List<String> imgPaths = [];
final rawIP = FormUtils.hasValue(item, 'IMG_PATH') ? item['IMG_PATH'] : null; final rawIP =
if (rawIP is String && rawIP.isNotEmpty) { FormUtils.hasValue(item, 'IMG_PATH')
imgPaths = rawIP.split(',').map((s) => s.trim()).take(2).toList(); ? item['IMG_PATH']
} else if (rawIP is List) { : null;
imgPaths = rawIP.cast<String>().take(2).toList(); if (rawIP is String && rawIP.isNotEmpty) {
} imgPaths =
rawIP.split(',').map((s) => s.trim()).take(2).toList();
} else if (rawIP is List) {
imgPaths = rawIP.cast<String>().take(2).toList();
}
return Padding( return Padding(
padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 10), padding: const EdgeInsets.symmetric(
child: Column( vertical: 8.0,
crossAxisAlignment: CrossAxisAlignment.start, horizontal: 10,
children: [ ),
if (imgPaths.isNotEmpty) ...[ child: Column(
Row( crossAxisAlignment: CrossAxisAlignment.start,
children: imgPaths.map((p) { children: [
final fullUrl = '$baseImgPath$p'; if (imgPaths.isNotEmpty) ...[
return GestureDetector( Row(
onTap: () => presentOpaque( children:
SingleImageViewer(imageUrl: fullUrl), imgPaths.map((p) {
context, final fullUrl = '$baseImgPath$p';
), return GestureDetector(
child: Padding( onTap:
padding: const EdgeInsets.only(right: 8.0), () => presentOpaque(
child: ClipRRect( SingleImageViewer(imageUrl: fullUrl),
borderRadius: BorderRadius.circular(2), context,
child: Image.network( ),
fullUrl, child: Padding(
width: 50, padding: const EdgeInsets.only(
height: 50, right: 8.0,
fit: BoxFit.fill, ),
errorBuilder: (_, __, ___) => const Icon( child: ClipRRect(
Icons.broken_image, borderRadius: BorderRadius.circular(2),
size: 40, child: Image.network(
), fullUrl,
), width: 50,
), height: 50,
), fit: BoxFit.fill,
); errorBuilder:
}).toList(), (_, __, ___) => const Icon(
), Icons.broken_image,
const SizedBox(height: 8), size: 40,
], ),
// 签名及时间
...List.generate(pairCount, (index) {
final imgPath = signPaths[index];
final timeLabel = signTimes[index];
final fullUrl = '$baseImgPath$imgPath';
const imageWidth = 200.0;
const imageHeight = 100.0;
return Padding(
padding: const EdgeInsets.symmetric(vertical: 8.0),
child: Column(
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
GestureDetector(
onTap: () => presentOpaque(
SingleImageViewer(imageUrl: fullUrl),
context,
),
child: ClipRRect(
borderRadius: BorderRadius.circular(4),
child: Image.network(
fullUrl,
width: imageWidth,
height: imageHeight,
fit: BoxFit.fill,
errorBuilder: (_, __, ___) =>
const Icon(Icons.broken_image, size: 60),
),
),
),
const SizedBox(width: 12),
Expanded(
child: SizedBox(
height: imageHeight,
child: Align(
alignment: Alignment.bottomRight,
child: Text(
timeLabel,
style: const TextStyle(
fontSize: 14,
color: Colors.black87,
), ),
), ),
), ),
), );
}).toList(),
),
const SizedBox(height: 8),
],
// 签名及时间
...List.generate(pairCount, (index) {
final imgPath = signPaths[index];
final timeLabel = signTimes[index];
final fullUrl = '$baseImgPath$imgPath';
const imageWidth = 200.0;
const imageHeight = 100.0;
return Padding(
padding: const EdgeInsets.symmetric(vertical: 8.0),
child: Column(
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
GestureDetector(
onTap:
() => presentOpaque(
SingleImageViewer(
imageUrl: fullUrl,
),
context,
),
child: ClipRRect(
borderRadius: BorderRadius.circular(4),
child: Image.network(
fullUrl,
width: imageWidth,
height: imageHeight,
fit: BoxFit.fill,
errorBuilder:
(_, __, ___) => const Icon(
Icons.broken_image,
size: 60,
),
),
),
),
const SizedBox(width: 12),
Expanded(
child: SizedBox(
height: imageHeight,
child: Align(
alignment: Alignment.bottomRight,
child: Text(
timeLabel,
style: const TextStyle(
fontSize: 14,
color: Colors.black87,
),
),
),
),
),
],
), ),
if (index < pairCount - 1)
const Padding(
padding: EdgeInsets.only(top: 8.0),
child: Divider(height: 1),
),
], ],
), ),
if (index < pairCount - 1) );
const Padding( }),
padding: EdgeInsets.only(top: 8.0), ],
child: Divider(height: 1), ),
), );
], })
), .toList()),
);
}),
],
),
);
}).toList()),
], ],
), ),
); );
@ -263,132 +289,85 @@ class HighWorkFormBaseWork extends StatelessWidget {
// 4. 各环节签字及意见 // 4. 各环节签字及意见
if (FormUtils.hasValue(signs, 'GUARDIAN')) if (FormUtils.hasValue(signs, 'GUARDIAN'))
signItemWidget('GUARDIAN', 'GUARDIAN_USER_NAME', '监护人', context), ConfirmWithSignWidget(
signs: signs,
pd: pd,
baseImgPath: baseImgPath,
sectionKey: 'GUARDIAN',
nameKey: 'GUARDIAN_USER_NAME',
headerTitle: '监护人意见',
roleTitle: '监护人',
),
if (FormUtils.hasValue(signs, 'CONFESS')) if (FormUtils.hasValue(signs, 'CONFESS'))
signItemWidget('CONFESS', 'CONFESS_USER_NAME', '安全交底人', context), ConfirmWithSignWidget(
signs: signs,
pd: pd,
baseImgPath: baseImgPath,
sectionKey: 'CONFESS',
nameKey: 'CONFESS_USER_NAME',
headerTitle: '安全交底人',
roleTitle: '安全交底人',
),
if (FormUtils.hasValue(signs, 'ACCEPT_CONFESS')) if (FormUtils.hasValue(signs, 'ACCEPT_CONFESS'))
signItemWidget('ACCEPT_CONFESS', 'ACCEPT_CONFESS_USER_NAME', '接受交底人', context), ConfirmWithSignWidget(
signs: signs,
// 作业负责人意见 pd: pd,
if (FormUtils.hasValue(signs, 'CONFIRM')) ...[ baseImgPath: baseImgPath,
Column( sectionKey: 'ACCEPT_CONFESS',
children: [ nameKey: 'ACCEPT_CONFESS_USER_NAME',
_itemContainer( headerTitle: '接受交底人',
Column( roleTitle: '',
crossAxisAlignment: CrossAxisAlignment.start, ),
children: [ if (FormUtils.hasValue(signs, 'CONFIRM'))
Padding(padding: EdgeInsets.symmetric(horizontal: 8), child: ListItemFactory.headerTitle('作业负责人意见'),), ConfirmWithSignWidget(
Padding( signs: signs,
padding: const EdgeInsets.all(8.0), pd: pd,
child: Text(signs['CONFIRM'][0]['DESCR'] ?? ''), baseImgPath: baseImgPath,
), sectionKey: 'CONFIRM',
], nameKey: 'CONFIRM_USER_NAME',
), headerTitle: '作业负责人意见',
), roleTitle: '作业负责人',
Divider(height: 1,), ),
signItemWidget('CONFIRM', 'CONFIRM_USER_NAME', '作业负责人', context), if (FormUtils.hasValue(signs, 'LEADER'))
], ConfirmWithSignWidget(
) signs: signs,
pd: pd,
], baseImgPath: baseImgPath,
sectionKey: 'LEADER',
// 所在单位负责人意见 nameKey: 'LEADER_USER_NAME',
if (FormUtils.hasValue(signs, 'LEADER')) ...[ headerTitle: '所在单位负责人意见',
Column( roleTitle: '所在单位负责人',
children: [ ),
_itemContainer( if (FormUtils.hasValue(signs, 'AUDIT'))
Column( ConfirmWithSignWidget(
crossAxisAlignment: CrossAxisAlignment.start, signs: signs,
children: [ pd: pd,
Padding(padding: EdgeInsets.symmetric(horizontal: 8), child: ListItemFactory.headerTitle('所在单位意见'),), baseImgPath: baseImgPath,
Padding( sectionKey: 'AUDIT',
padding: const EdgeInsets.all(8.0), nameKey: 'AUDIT_USER_NAME',
child: Text(signs['LEADER'][0]['DESCR'] ?? ''), headerTitle: '审核部门意见',
), roleTitle: '审核部门负责人',
], ),
), if (FormUtils.hasValue(signs, 'APPROVE'))
), ConfirmWithSignWidget(
Divider(height: 1,), signs: signs,
signItemWidget('LEADER', 'LEADER_USER_NAME', '所在单位负责人', context), pd: pd,
], baseImgPath: baseImgPath,
) sectionKey: 'APPROVE',
], nameKey: 'APPROVE_USER_NAME',
headerTitle: '审批人意见',
// 安全管理部门负责人意见 roleTitle: '审批部门负责人',
if (FormUtils.hasValue(signs, 'AUDIT')) ...[ ),
Column( if (FormUtils.hasValue(signs, 'ACCEPT'))
children: [ ConfirmWithSignWidget(
_itemContainer( signs: signs,
Column( pd: pd,
crossAxisAlignment: CrossAxisAlignment.start, baseImgPath: baseImgPath,
children: [ sectionKey: 'ACCEPT',
Padding(padding: EdgeInsets.symmetric(horizontal: 8), child: ListItemFactory.headerTitle('安全管理部门意见'),), nameKey: 'ACCEPT_USER_NAME',
Padding( headerTitle: '验收部门负责人意见',
padding: const EdgeInsets.all(8.0), roleTitle: '验收部门负责人',
child: Text(signs['AUDIT'][0]['DESCR'] ?? ''), ),
),
],
),
),
Divider(height: 1,),
signItemWidget('AUDIT', 'AUDIT_USER_NAME', '安全管理部门负责人', context),
],
)
],
// 审批人意见
if (FormUtils.hasValue(signs, 'APPROVE')) ...[
Column(
children: [
_itemContainer(
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(padding: EdgeInsets.symmetric(horizontal: 8), child: ListItemFactory.headerTitle('审批人意见'),),
Padding(
padding: const EdgeInsets.all(8.0),
child: Text(signs['APPROVE'][0]['DESCR'] ?? ''),
),
],
),
),
Divider(height: 1,),
signItemWidget('APPROVE', 'APPROVE_USER_NAME', '审批负责人', context),
],
)
],
// // 作业开始负责人签字
// if (FormUtils.hasValue(signs, 'WORK_START'))
// signItemWidget('WORK_START', 'WORK_START_USER_NAME', '作业开始负责人', context),
//
// // 作业结束负责人签字
// if (FormUtils.hasValue(signs, 'WORK_END'))
// signItemWidget('WORK_END', 'WORK_END_USER_NAME', '作业结束负责人', context),
// 完工验收意见和签字
if (FormUtils.hasValue(signs, 'ACCEPT')) ...[
Column(
children: [
_itemContainer(
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(padding: EdgeInsets.symmetric(horizontal: 8), child: ListItemFactory.headerTitle('完工验收意见'),),
Padding(
padding: const EdgeInsets.all(8.0),
child: Text(signs['ACCEPT'][0]['DESCR'] ?? ''),
),
],
),
),
Divider(height: 1,),
signItemWidget('ACCEPT', 'ACCEPT_USER_NAME', '验收部门负责人', context),
],
)
],
], ],
); );
} }

12
lib/pages/home/tap/tabList/special_wrok/gc_work/highwork_list_page.dart
View File

@ -228,15 +228,9 @@ class _HighworkListPageState extends State<HighworkListPage> {
default: default:
break; break;
} }
setState(() { LoadingDialogHelper.show();
_fetchSteps(); _fetchSteps();
_fetchData(); _fetchData();
});
// Navigator.pushNamed(
// context,
// routeName,
// arguments: {'HIGHWORK_ID': item['HIGHWORK_ID'], 'flow': widget.flow},
// );
} }
Widget _buildFlowStepItem({ Widget _buildFlowStepItem({

88
lib/pages/home/tap/tabList/special_wrok/gc_work/szaq_work_detail/highwork_set_safe_detail.dart
View File

@ -36,10 +36,6 @@ class HighworkSetSafeDetail extends StatefulWidget {
class _HighworkSetSafeDetailState extends State<HighworkSetSafeDetail> { class _HighworkSetSafeDetailState extends State<HighworkSetSafeDetail> {
late bool isEditable = false; late bool isEditable = false;
/// 详情
late Map<String, dynamic> pd = {};
late List<Map<String, dynamic>> measuresList = [];
/// 安全防护措施列表 /// 安全防护措施列表
late List<MeasureItem> measuresListCopy = []; late List<MeasureItem> measuresListCopy = [];
List<String> imagePaths = []; List<String> imagePaths = [];
@ -50,7 +46,70 @@ class _HighworkSetSafeDetailState extends State<HighworkSetSafeDetail> {
_getData(); _getData();
addMeasuresListCopy(); addMeasuresListCopy();
} }
late Map<String, dynamic> pd = {};
late Map<String, dynamic> signs = {};
late List<Map<String, dynamic>> measuresList = [];
/// 初始化拉取数据（并行获取 pd / signs / measures，最后一次 setState）
Future<void> _getData() async {
LoadingDialogHelper.show();
try {
// 并行发起三个请求，并在出错时返回安全的默认值（避免 Future.wait 因一个失败而中断）
final futurePd = ApiService.getHomeworkFindById('highwork', widget.HIGHWORK_ID)
.catchError((e) {
// 可加入日志记录 e
return <String, dynamic>{}; // 回退为空 map
});
final futureSigns = ApiService.listSignFinished('highwork', widget.HIGHWORK_ID)
.catchError((e) {
return <String, dynamic>{'signs': <String, dynamic>{}};
});
final futureMeasures = ApiService.listSignFinishAllMeasures('highwork')
.catchError((e) {
return <String, dynamic>{'measuresList': <Map<String, dynamic>>[]};
});
final results = await Future.wait([futurePd, futureSigns, futureMeasures]);
final pdResult = results[0] as Map<String, dynamic>? ?? <String, dynamic>{};
final signsResult = results[1] as Map<String, dynamic>? ?? <String, dynamic>{};
final measuresResult = results[2] as Map<String, dynamic>? ?? <String, dynamic>{};
// 从各自的结果里提取需要的字段，使用默认值以防字段缺失或类型不对
final newPd = (pdResult['pd'] is Map<String, dynamic>)
? Map<String, dynamic>.from(pdResult['pd'])
: <String, dynamic>{};
final newSigns = (signsResult['signs'] is Map<String, dynamic>)
? Map<String, dynamic>.from(signsResult['signs'])
: <String, dynamic>{};
final newMeasuresList = <Map<String, dynamic>>[];
final rawMeasures = measuresResult['measuresList'];
if (rawMeasures is List) {
for (final m in rawMeasures) {
if (m is Map) {
newMeasuresList.add(Map<String, dynamic>.from(m));
}
}
}
if (!mounted) return;
setState(() {
pd = newPd;
signs = newSigns;
measuresList = newMeasuresList;
});
} catch (e, st) {
debugPrint('[_getData] 未捕获异常: $e\n$st');
} finally {
LoadingDialogHelper.hide();
}
}
String measuresListToJson() { String measuresListToJson() {
final List<Map<String, dynamic>> jsonList = final List<Map<String, dynamic>> jsonList =
measuresListCopy.map((item) => item.toJson()).toList(); measuresListCopy.map((item) => item.toJson()).toList();
@ -333,27 +392,6 @@ class _HighworkSetSafeDetailState extends State<HighworkSetSafeDetail> {
} }
} }
/// 初始化拉取数据
Future<void> _getData() async {
final data = await ApiService.getHomeworkFindById(
'highwork',
widget.HIGHWORK_ID,
);
setState(() {
pd = data['pd'];
_getMeasures();
});
}
Future<void> _getMeasures() async {
final data = await ApiService.listSignFinishAllMeasures('highwork');
setState(() {
measuresList = List<Map<String, dynamic>>.from(
data['measuresList'] ?? <Map<String, dynamic>>[],
);
});
}
void removeMeasuresListCopy(int index) { void removeMeasuresListCopy(int index) {
setState(() { setState(() {
measuresListCopy.removeAt(index); measuresListCopy.removeAt(index);

7
lib/pages/home/tap/tabList/special_wrok/lsyd_work/electricity_list_page.dart
View File

@ -317,10 +317,9 @@ class _ElectricityListPageState extends State<ElectricityListPage> {
default: default:
break; break;
} }
setState(() { LoadingDialogHelper.show();
_fetchSteps(); _fetchSteps();
_fetchData(); _fetchData();
});
} }
Widget _buildFlowStepItem({ Widget _buildFlowStepItem({

357
lib/pages/home/tap/tabList/special_wrok/mbcd_work/BlindboardFormBaseWork.dart
View File

@ -55,11 +55,11 @@ class BlindboardFormBaseWork extends StatelessWidget {
} }
Widget signItemWidget( Widget signItemWidget(
String signKey, String signKey,
String nameKey, String nameKey,
String name, String name,
BuildContext context, BuildContext context,
) { ) {
return _itemContainer( return _itemContainer(
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -69,9 +69,7 @@ class BlindboardFormBaseWork extends StatelessWidget {
padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 10), padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 10),
child: Row( child: Row(
children: [ children: [
Expanded( Expanded(child: ListItemFactory.headerTitle(name)),
child: ListItemFactory.headerTitle(name),
),
if (FormUtils.hasValue(pd, nameKey)) if (FormUtils.hasValue(pd, nameKey))
Text( Text(
pd[nameKey]?.toString() ?? '', pd[nameKey]?.toString() ?? '',
@ -86,134 +84,162 @@ class BlindboardFormBaseWork extends StatelessWidget {
...((signs[signKey] as List<dynamic>) ...((signs[signKey] as List<dynamic>)
.cast<Map<String, dynamic>>() .cast<Map<String, dynamic>>()
.map((item) { .map((item) {
// 解析 SIGN_PATH // 解析 SIGN_PATH
List<String> signPaths = []; List<String> signPaths = [];
final rawSP = FormUtils.hasValue(item, 'SIGN_PATH') ? item['SIGN_PATH'] : null; final rawSP =
if (rawSP is String && rawSP.isNotEmpty) { FormUtils.hasValue(item, 'SIGN_PATH')
signPaths = rawSP.split(',').map((s) => s.trim()).toList(); ? item['SIGN_PATH']
} else if (rawSP is List) { : null;
signPaths = rawSP.cast<String>(); if (rawSP is String && rawSP.isNotEmpty) {
} signPaths = rawSP.split(',').map((s) => s.trim()).toList();
} else if (rawSP is List) {
signPaths = rawSP.cast<String>();
}
// 解析 SIGN_TIME 保留空格 // 解析 SIGN_TIME 保留空格
List<String> signTimes = []; List<String> signTimes = [];
final rawST = FormUtils.hasValue(item, 'SIGN_TIME') ? item['SIGN_TIME'] : null; final rawST =
if (rawST is String && rawST.isNotEmpty) { FormUtils.hasValue(item, 'SIGN_TIME')
signTimes = rawST.split(','); ? item['SIGN_TIME']
} else if (rawST is List) { : null;
signTimes = rawST.cast<String>(); if (rawST is String && rawST.isNotEmpty) {
} signTimes = rawST.split(',');
} else if (rawST is List) {
signTimes = rawST.cast<String>();
}
final pairCount = math.min(signPaths.length, signTimes.length); final pairCount = math.min(
signPaths.length,
signTimes.length,
);
// 解析 IMG_PATH, 最多 2 张 // 解析 IMG_PATH, 最多 2 张
List<String> imgPaths = []; List<String> imgPaths = [];
final rawIP = FormUtils.hasValue(item, 'IMG_PATH') ? item['IMG_PATH'] : null; final rawIP =
if (rawIP is String && rawIP.isNotEmpty) { FormUtils.hasValue(item, 'IMG_PATH')
imgPaths = rawIP.split(',').map((s) => s.trim()).take(2).toList(); ? item['IMG_PATH']
} else if (rawIP is List) { : null;
imgPaths = rawIP.cast<String>().take(2).toList(); if (rawIP is String && rawIP.isNotEmpty) {
} imgPaths =
rawIP.split(',').map((s) => s.trim()).take(2).toList();
} else if (rawIP is List) {
imgPaths = rawIP.cast<String>().take(2).toList();
}
return Padding( return Padding(
padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 10), padding: const EdgeInsets.symmetric(
child: Column( vertical: 8.0,
crossAxisAlignment: CrossAxisAlignment.start, horizontal: 10,
children: [ ),
if (imgPaths.isNotEmpty) ...[ child: Column(
Row( crossAxisAlignment: CrossAxisAlignment.start,
children: imgPaths.map((p) { children: [
final fullUrl = '$baseImgPath$p'; if (imgPaths.isNotEmpty) ...[
return GestureDetector( Row(
onTap: () => presentOpaque( children:
SingleImageViewer(imageUrl: fullUrl), imgPaths.map((p) {
context, final fullUrl = '$baseImgPath$p';
), return GestureDetector(
child: Padding( onTap:
padding: const EdgeInsets.only(right: 8.0), () => presentOpaque(
child: ClipRRect( SingleImageViewer(imageUrl: fullUrl),
borderRadius: BorderRadius.circular(2), context,
child: Image.network( ),
fullUrl, child: Padding(
width: 50, padding: const EdgeInsets.only(
height: 50, right: 8.0,
fit: BoxFit.fill, ),
errorBuilder: (_, __, ___) => const Icon( child: ClipRRect(
Icons.broken_image, borderRadius: BorderRadius.circular(2),
size: 40, child: Image.network(
), fullUrl,
), width: 50,
), height: 50,
), fit: BoxFit.fill,
); errorBuilder:
}).toList(), (_, __, ___) => const Icon(
), Icons.broken_image,
const SizedBox(height: 8), size: 40,
], ),
// 签名及时间
...List.generate(pairCount, (index) {
final imgPath = signPaths[index];
final timeLabel = signTimes[index];
final fullUrl = '$baseImgPath$imgPath';
const imageWidth = 200.0;
const imageHeight = 100.0;
return Padding(
padding: const EdgeInsets.symmetric(vertical: 8.0),
child: Column(
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
GestureDetector(
onTap: () => presentOpaque(
SingleImageViewer(imageUrl: fullUrl),
context,
),
child: ClipRRect(
borderRadius: BorderRadius.circular(4),
child: Image.network(
fullUrl,
width: imageWidth,
height: imageHeight,
fit: BoxFit.fill,
errorBuilder: (_, __, ___) =>
const Icon(Icons.broken_image, size: 60),
),
),
),
const SizedBox(width: 12),
Expanded(
child: SizedBox(
height: imageHeight,
child: Align(
alignment: Alignment.bottomRight,
child: Text(
timeLabel,
style: const TextStyle(
fontSize: 14,
color: Colors.black87,
), ),
), ),
), ),
), );
}).toList(),
),
const SizedBox(height: 8),
],
// 签名及时间
...List.generate(pairCount, (index) {
final imgPath = signPaths[index];
final timeLabel = signTimes[index];
final fullUrl = '$baseImgPath$imgPath';
const imageWidth = 200.0;
const imageHeight = 100.0;
return Padding(
padding: const EdgeInsets.symmetric(vertical: 8.0),
child: Column(
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
GestureDetector(
onTap:
() => presentOpaque(
SingleImageViewer(
imageUrl: fullUrl,
),
context,
),
child: ClipRRect(
borderRadius: BorderRadius.circular(4),
child: Image.network(
fullUrl,
width: imageWidth,
height: imageHeight,
fit: BoxFit.fill,
errorBuilder:
(_, __, ___) => const Icon(
Icons.broken_image,
size: 60,
),
),
),
),
const SizedBox(width: 12),
Expanded(
child: SizedBox(
height: imageHeight,
child: Align(
alignment: Alignment.bottomRight,
child: Text(
timeLabel,
style: const TextStyle(
fontSize: 14,
color: Colors.black87,
),
),
),
),
),
],
), ),
if (index < pairCount - 1)
const Padding(
padding: EdgeInsets.only(top: 8.0),
child: Divider(height: 1),
),
], ],
), ),
if (index < pairCount - 1) );
const Padding( }),
padding: EdgeInsets.only(top: 8.0), ],
child: Divider(height: 1), ),
), );
], })
), .toList()),
);
}),
],
),
);
}).toList()),
], ],
), ),
); );
@ -265,45 +291,46 @@ class BlindboardFormBaseWork extends StatelessWidget {
], ],
), ),
), ),
if (FormUtils.hasValue(signs, 'CONFESS'))
ConfirmWithSignWidget( ConfirmWithSignWidget(
signs: signs, signs: signs,
pd: pd, pd: pd,
baseImgPath: baseImgPath, baseImgPath: baseImgPath,
sectionKey: 'CONFESS', sectionKey: 'CONFESS',
nameKey: 'CONFESS_USER_NAME', nameKey: 'CONFESS_USER_NAME',
headerTitle: '安全交底人', headerTitle: '安全交底人',
roleTitle: '安全交底人', roleTitle: '安全交底人',
), ),
ConfirmWithSignWidget( if (FormUtils.hasValue(signs, 'ACCEPT_CONFESS'))
signs: signs, ConfirmWithSignWidget(
pd: pd, signs: signs,
baseImgPath: baseImgPath, pd: pd,
sectionKey: 'ACCEPT_CONFESS', baseImgPath: baseImgPath,
nameKey: 'ACCEPT_CONFESS_USER_NAME', sectionKey: 'ACCEPT_CONFESS',
headerTitle: '接受交底人', nameKey: 'ACCEPT_CONFESS_USER_NAME',
roleTitle: '', headerTitle: '接受交底人',
), roleTitle: '',
ConfirmWithSignWidget( ),
signs: signs, if (FormUtils.hasValue(signs, 'CONFIRM'))
pd: pd, ConfirmWithSignWidget(
baseImgPath: baseImgPath, signs: signs,
sectionKey: 'CONFIRM', pd: pd,
nameKey: 'CONFIRM_USER_NAME', baseImgPath: baseImgPath,
headerTitle: '作业负责人意见', sectionKey: 'CONFIRM',
roleTitle: '作业负责人', nameKey: 'CONFIRM_USER_NAME',
), headerTitle: '作业负责人意见',
ConfirmWithSignWidget( roleTitle: '作业负责人',
signs: signs, ),
pd: pd, if (FormUtils.hasValue(signs, 'LEADER'))
baseImgPath: baseImgPath, ConfirmWithSignWidget(
sectionKey: 'LEADER', signs: signs,
nameKey: 'LEADER_USER_NAME', pd: pd,
headerTitle: '所在单位负责人意见', baseImgPath: baseImgPath,
roleTitle: '所在单位负责人', sectionKey: 'LEADER',
), nameKey: 'LEADER_USER_NAME',
headerTitle: '所在单位负责人意见',
roleTitle: '所在单位负责人',
),
], ],
); );
} }

11
lib/pages/home/tap/tabList/special_wrok/mbcd_work/blindboard_list_page.dart
View File

@ -228,14 +228,9 @@ class _BlindboardListPageState extends State<BlindboardListPage> {
default: default:
break; break;
} }
setState(() { LoadingDialogHelper.show();
_fetchSteps(); _fetchSteps();
}); _fetchData();
// Navigator.pushNamed(
// context,
// routeName,
// arguments: {'BLINDBOARD_ID': item['BLINDBOARD_ID'], 'flow': widget.flow},
// );
} }
Widget _buildFlowStepItem({ Widget _buildFlowStepItem({

7
lib/pages/home/tap/tabList/special_wrok/sxkj_work/spacework_list_page.dart
View File

@ -339,10 +339,9 @@ class _SpaceworkListPageState extends State<SpaceworkListPage> {
default: default:
break; break;
} }
setState(() { LoadingDialogHelper.show();
_fetchSteps(); _fetchSteps();
_fetchData(); _fetchData();
});
} }
Widget _buildFlowStepItem({ Widget _buildFlowStepItem({

2
pubspec.yaml
View File

@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts # In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix. # of the product and file versions while build-number is used as the build suffix.
version: 2.1.2+6 version: 2.1.2+7
environment: environment:
sdk: ^3.7.0 sdk: ^3.7.0