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

...

main
hs 2025-09-06 20:17:54 +08:00
parent 05d4934568
commit f94802ce2e
12 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/customWidget/ItemWidgetFactory.dart
View File

@ -420,7 +420,7 @@ class ListItemFactory {
title, title,
maxLines: 5, maxLines: 5,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: const TextStyle(fontSize: 13, fontWeight: FontWeight.bold), style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
) )
], ],
), ),

8
lib/http/ApiService.dart
View File

@ -25,8 +25,8 @@ class ApiService {
/// 登录及其他管理后台接口 /// 登录及其他管理后台接口
// static const String basePath = "http://192.168.20.240:8500/integrated_whb";//测试服务器 // static const String basePath = "http://192.168.20.240:8500/integrated_whb";//测试服务器
// static const String basePath = "https://qaaqwh.qhdsafety.com/integrated_whb"; // static const String basePath = "https://qaaqwh.qhdsafety.com/integrated_whb";
// static const String basePath = "http://192.168.20.240:8500/integrated_whb"; static const String basePath = "http://192.168.20.240:8500/integrated_whb";
static const String basePath = "http://192.168.0.45:28199";//长久服务器 // static const String basePath = "http://192.168.0.45:28199";//长久服务器
// static const String basePath = "http://192.168.0.37:8099/api"; // static const String basePath = "http://192.168.0.37:8099/api";
@ -1578,8 +1578,8 @@ U6Hzm1ninpWeE+awIDAQAB
// 安全检查隐患指派 // 安全检查隐患指派
static Future<Map<String, dynamic>> safeCheckDangerConfirm(Map data) { static Future<Map<String, dynamic>> safeCheckDangerConfirm(Map data) {
return HttpManager().request( return HttpManager().request(
// basePath, basePath,
'http://192.168.0.45:28199', // 'http://192.168.0.45:28199',
'/app/hidden/confirm', '/app/hidden/confirm',
method: Method.post, method: Method.post,
data: { data: {

12
lib/pages/KeyProjects/SafeCheck/check_list_page.dart
View File

@ -24,7 +24,12 @@ class _CheckListPageState extends State<CheckListPage> {
bool isLoading = false; bool isLoading = false;
final TextEditingController _searchController = TextEditingController(); final TextEditingController _searchController = TextEditingController();
List<Map<String, dynamic>> stepList = []; Map<String, dynamic> state = {
'-1': '检查人驳回',
'0': '待被检查人确认',
'1': '被检查人已确认',
'2': '已归档',
};
int sindex = 0; int sindex = 0;
String searchKeywords = ''; String searchKeywords = '';
@ -81,7 +86,10 @@ class _CheckListPageState extends State<CheckListPage> {
setState(() => isLoading = false); setState(() => isLoading = false);
} }
} }
String _checkStatusWithId(String id) {
return state[id] ?? '';
}
void _search() { void _search() {
searchKeywords = _searchController.text.trim(); searchKeywords = _searchController.text.trim();
currentPage = 1; currentPage = 1;
@ -128,7 +136,7 @@ class _CheckListPageState extends State<CheckListPage> {
), ),
const SizedBox(height: 8), const SizedBox(height: 8),
Text( Text(
"检查状态：${item['INSPECTION_STATUS']}", "检查状态: ${_checkStatusWithId(item['INSPECTION_STATUS'].toString())}",
), ),
Text( Text(
"检查类型：${item['INSPECTION_TYPE_NAME']}", "检查类型：${item['INSPECTION_TYPE_NAME']}",

2
lib/pages/KeyProjects/SafeCheck/safeCheck_detail.dart
View File

@ -60,8 +60,8 @@ class _SafecheckDetailState extends State<SafecheckDetail> {
{'name': 'INSPECTION_CATEGORY', 'message': '请选择检查题目'}, {'name': 'INSPECTION_CATEGORY', 'message': '请选择检查题目'},
{'name': 'UNITS_ID', 'message': '请选择被检查单位'}, {'name': 'UNITS_ID', 'message': '请选择被检查单位'},
{'name': 'PERSONNELMANAGEMENT_ID', 'message': '请选择被检查单位现场负责人'}, {'name': 'PERSONNELMANAGEMENT_ID', 'message': '请选择被检查单位现场负责人'},
{'name': 'INSPECTION_TYPE', 'message': '请选择检查类型不能为空'},
{'name': 'INSPECTION_PLACE', 'message': '请输入检查场所'}, {'name': 'INSPECTION_PLACE', 'message': '请输入检查场所'},
{'name': 'INSPECTION_TYPE', 'message': '请选择检查类型不能为空'},
{'name': 'INSPECTION_TIME_START', 'message': '请选择检查开始时间'}, {'name': 'INSPECTION_TIME_START', 'message': '请选择检查开始时间'},
{'name': 'INSPECTION_TIME_END', 'message': '请选择作业结束时间'}, {'name': 'INSPECTION_TIME_END', 'message': '请选择作业结束时间'},
{'name': 'INSPECTION_USERS', 'message': '请输入检查人员'}, {'name': 'INSPECTION_USERS', 'message': '请输入检查人员'},

1
lib/pages/home/SafeCheck/Record/defend_record_detail_page.dart
View File

@ -51,6 +51,7 @@ class _DefendRecordDetailPageState extends State<DefendRecordDetailPage> {
color: Colors.white, color: Colors.white,
child: Column( child: Column(
children: [ children: [
const SizedBox(height: 10,),
ItemListWidget.itemContainer( ItemListWidget.itemContainer(
ListItemFactory.headerTitle( ListItemFactory.headerTitle(
'申辩意见：${item['INSPECTED_EXPLAIN'] ?? ''}', '申辩意见：${item['INSPECTED_EXPLAIN'] ?? ''}',

2
lib/pages/home/SafeCheck/Start/safeCheck_start_detail.dart
View File

@ -74,8 +74,8 @@ class _SafecheckStartDetailState extends State<SafecheckStartDetail> {
{'name': 'INSPECTION_SUBJECT', 'message': '请选择检查题目'}, {'name': 'INSPECTION_SUBJECT', 'message': '请选择检查题目'},
{'name': 'INSPECTED_DEPARTMENT_ID', 'message': '请选择被检查单位'}, {'name': 'INSPECTED_DEPARTMENT_ID', 'message': '请选择被检查单位'},
{'name': 'INSPECTED_SITEUSER_ID', 'message': '请选择被检查单位现场负责人'}, {'name': 'INSPECTED_SITEUSER_ID', 'message': '请选择被检查单位现场负责人'},
{'name': 'INSPECTION_TYPE', 'message': '请选择检查类型不能为空'},
{'name': 'INSPECTION_PLACE', 'message': '请输入检查场所'}, {'name': 'INSPECTION_PLACE', 'message': '请输入检查场所'},
{'name': 'INSPECTION_TYPE', 'message': '请选择检查类型不能为空'},
{'name': 'INSPECTION_TIME_START', 'message': '请选择检查开始时间'}, {'name': 'INSPECTION_TIME_START', 'message': '请选择检查开始时间'},
{'name': 'INSPECTION_TIME_END', 'message': '请选择作业结束时间'}, {'name': 'INSPECTION_TIME_END', 'message': '请选择作业结束时间'},
]; ];

2
lib/pages/home/study/strengthen_video_study_page.dart
View File

@ -182,7 +182,7 @@ class _StrengthenStudyPageState extends State<StrengthenStudyPage> {
width: double.infinity, width: double.infinity,
height: 250, height: 250,
child: VideoPlayerWidget( child: VideoPlayerWidget(
allowSeek: false, allowSeek: true,
controller: _videoController, controller: _videoController,
coverUrl:'', coverUrl:'',
aspectRatio: _videoController?.value.aspectRatio ?? 16 / 9, aspectRatio: _videoController?.value.aspectRatio ?? 16 / 9,

2
lib/pages/home/study/study_detail_page.dart
View File

@ -855,6 +855,8 @@ class _StudyDetailPageState extends State<StudyDetailPage>
const SizedBox(width: 20), const SizedBox(width: 20),
const Icon(Icons.play_circle, color: Colors.blue), const Icon(Icons.play_circle, color: Colors.blue),
], ],
if (m['IS_VIDEO'] != 0)
Row(mainAxisAlignment: MainAxisAlignment.spaceBetween,children: [Text('-'),const SizedBox(width: 50,)],),
SizedBox(width: 20), SizedBox(width: 20),
CustomButton( CustomButton(
onPressed: () => pushPage( onPressed: () => pushPage(

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

@ -863,11 +863,14 @@ class _SelectionPopupState extends State<SelectionPopup> {
}); });
} else { } else {
final result = await ApiService.getEightWorkInfo(params); final result = await ApiService.getEightWorkInfo(params);
LoadingDialogHelper.hide();
setState(() { setState(() {
list = (result['accidentType'] as List).cast<Map<String, dynamic>>(); list = (result['accidentType'] as List).cast<Map<String, dynamic>>();
}); });
} }
} catch (e) { } catch (e) {
LoadingDialogHelper.hide();
ToastUtil.showError(context, '$e'); ToastUtil.showError(context, '$e');
} }
} }

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

@ -127,17 +127,27 @@ class _DangerousOptionsPageState extends State<DangerousOptionsPage> {
for (Map<String, dynamic> img in signList) { for (Map<String, dynamic> img in signList) {
String imgName = 'file${data.key}'; String imgName = 'file${data.key}';
if (data.filePath!.contains('uploadFiles')) { if (data.filePath!.contains('uploadFiles')) {
// final idata = {
// 'filePath': data.filePath,
// 'SIGNER_TIME': data.SIGNER_TIME,
// 'key': data.key,
// };
final idata = { final idata = {
'filePath': data.filePath, 'SIGN_PATH': data.filePath,
'SIGNER_TIME': data.SIGNER_TIME, 'SIGN_TIME': data.SIGNER_TIME,
'key': data.key, 'key': data.key,
}; };
sineImageList.add(idata); sineImageList.add(idata);
} }
if (imgName == img['key']) { if (imgName == img['key']) {
// final idata = {
// 'filePath': img['filePath'] ?? '',
// 'SIGNER_TIME': data.SIGNER_TIME,
// 'key': data.key,
// };
final idata = { final idata = {
'filePath': img['filePath'] ?? '', 'SIGN_PATH': img['filePath'] ?? '',
'SIGNER_TIME': data.SIGNER_TIME, 'SIGN_TIME': data.SIGNER_TIME,
'key': data.key, 'key': data.key,
}; };
sineImageList.add(idata); sineImageList.add(idata);

4
lib/pages/home/tap/tabList/special_wrok/dz_work/SpecialWorkFormBaseWork.dart
View File

@ -245,8 +245,8 @@ class SpecialWorkFormBaseWork extends StatelessWidget {
], ],
), ),
), ),
if (FormUtils.hasValue(signs, 'SISUO')) // if (FormUtils.hasValue(signs, 'SISUO'))
signItemWidget('SISUO', 'SISUO_USER_NAME', '司索人', context), // signItemWidget('SISUO', 'SISUO_USER_NAME', '司索人', context),
// 其他安全防护措施 // 其他安全防护措施
if (FormUtils.hasValue(signs, 'MEASURES_CONFIRM')) if (FormUtils.hasValue(signs, 'MEASURES_CONFIRM'))

2
lib/pages/home/tap/tabList/special_wrok/mbcd_work/mbcd_work_detai/blindboard_apply_detail.dart
View File

@ -426,7 +426,7 @@ class _BlindboardApplyDetailState extends State<BlindboardApplyDetail> {
// 通用文本字段校验规则 // 通用文本字段校验规则
final textRules = <Map<String, dynamic>>[ final textRules = <Map<String, dynamic>>[
{'value': _nameController.text.trim(), 'message': '请输入设备管线名'}, {'value': _nameController.text.trim(), 'message': '请输入设备管线名'},
{'value': pd['WORK_TYPE'], 'message': '请选择作业方式'}, {'value': pd['WORK_TYPE'] ?? '', 'message': '请选择作业方式'},
{'value': _mediumController.text.trim(), 'message': '请输入介质'}, {'value': _mediumController.text.trim(), 'message': '请输入介质'},
{'value': _temperatureController.text.trim(), 'message': '请输入温度'}, {'value': _temperatureController.text.trim(), 'message': '请输入温度'},
{'value': _pressureController.text.trim(), 'message': '请输入压力'}, {'value': _pressureController.text.trim(), 'message': '请输入压力'},