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

Merge remote-tracking branch 'origin/main'

main
hs 2025-09-10 15:50:43 +08:00
parent dbda372f5a fd20e9bcd5
commit 6318206baa
13 changed files with 95 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pages/KeyProjects/Danger/danger_manager_detail_page.dart
View File

@ -28,6 +28,7 @@ class _DangerManagerDetailPageState extends State<DangerManagerDetailPage> {
Map<String, dynamic> hiddenForm = {};
Map<String, dynamic> punishForm = {};
List<File> ysImages = [];
List<String> imagesList = [];
@override
void initState() {
@ -48,6 +49,7 @@ class _DangerManagerDetailPageState extends State<DangerManagerDetailPage> {
hiddenForm = result['pd'] ?? {};
if (FormUtils.hasValue(hiddenForm, 'punishForm')) {
punishForm = hiddenForm['punishForm'];
imagesList.add(punishForm['HANDLE_IMG']);
}
print(hiddenForm);
});
@ -118,12 +120,12 @@ class _DangerManagerDetailPageState extends State<DangerManagerDetailPage> {
presentOpaque(
SingleImageViewer(
imageUrl:
'${ApiService.baseImgPath}${_getServerPath(punishForm['HANDLE_IMG'])[index]}',
'${ApiService.baseImgPath}${imagesList[index]}',
),
context,
);
},
imageUrls: punishForm['HANDLE_IMG'],
imageUrls: imagesList,
),
const Divider(),
ItemListWidget.multiLineTitleTextField(

44
lib/pages/app/danger_wait_list_page.dart
View File

@ -48,7 +48,7 @@ class _DangerWaitListPageState extends State<DangerWaitListPage> {
bool _isLoading = false;
bool _hasMore = true;
String treeJson="";
// String treeJson="";
// late DangerWaitBean waitBean;
@ -77,7 +77,7 @@ class _DangerWaitListPageState extends State<DangerWaitListPage> {
switch(widget.appItem ){
case 1://隐患记录
_getDangerRecord(-1,_page,"","","","","","","","",keyWord,addList);
_getListTree();
// _getListTree();
break;
case 2://待整改隐患
_getDangerRecord(2,_page,"","","","","","","","",keyWord,addList);
@ -131,7 +131,7 @@ class _DangerWaitListPageState extends State<DangerWaitListPage> {
width: screenWidth * 3 / 5,
color: Colors.white,
child: DangerWaitDrawer(
treeJson,
"",
onClose: (String selectedCategoryId,String selectedDepartmentId,String investigationMethodOption,
String hazardLevelOption,String dangerStatusOption,String startDate,String endDate) {
@ -394,7 +394,8 @@ class _DangerWaitListPageState extends State<DangerWaitListPage> {
});
}else{
_showMessage('加载数据失败');
ToastUtil.showNormal(context, "加载数据失败");
// _showMessage('加载数据失败');
}
} catch (e) {
@ -438,23 +439,24 @@ class _DangerWaitListPageState extends State<DangerWaitListPage> {
}
Future<void> _getListTree() async {
try {
final result = await ApiService.getHiddenTreatmentListTree();
if (result['result'] == 'success') {
setState(() {
treeJson= result['zTreeNodes'];
});
}else{
_showMessage('加载数据失败');
}
} catch (e) {
// 出错时可以 Toast 或者在页面上显示错误状态
print('加载数据失败：$e');
}
}
// Future<void> _getListTree() async {
// try {
//
// final result = await ApiService.getHiddenTreatmentListTree();
// if (result['result'] == 'success') {
// setState(() {
// treeJson= result['zTreeNodes'];
// });
//
// }else{
// ToastUtil.showNormal(context, "加载数据失败");
// // _showMessage('加载数据失败');
// }
// } catch (e) {
// // 出错时可以 Toast 或者在页面上显示错误状态
// print('加载数据失败：$e');
// }
// }
String _getSourceDangers(final item) {
String type = item["SOURCE"];

6
lib/pages/home/NFC/home_nfc_detail_page.dart
View File

@ -111,10 +111,12 @@ class _HomeNfcDetailPageState extends State<HomeNfcDetailPage> {
});
} else {
final msg = result['message'] ?? result['msg'] ?? '加载失败';
_showMessage('请求出错：$msg');
ToastUtil.showNormal(context,'请求出错：$msg');
// _showMessage('请求出错：$msg');
}
} catch (e) {
_showMessage('请求异常：$e');
ToastUtil.showNormal(context,'请求异常：$e');
// _showMessage('请求异常：$e');
} finally {
if (mounted) {
setState(() {

4
lib/pages/home/low_page.dart
View File

@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:qhd_prevention/customWidget/toast_util.dart';
import 'package:qhd_prevention/pages/my_appbar.dart';
import 'package:qhd_prevention/tools/tools.dart';
import '../../http/ApiService.dart';
@ -40,7 +41,8 @@ class _LowPagePageState extends State<LowPage> {
});
}else{
_showMessage('加载数据失败');
ToastUtil.showNormal(context, "加载数据失败");
// _showMessage('加载数据失败');
}
} catch (e) {
// 出错时可以 Toast 或者在页面上显示错误状态

7
lib/pages/home/risk/riskControl_page.dart
View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:qhd_prevention/customWidget/custom_button.dart';
import 'package:qhd_prevention/customWidget/toast_util.dart';
import 'package:qhd_prevention/pages/home/work/custom_driver_drawer.dart';
import 'package:qhd_prevention/pages/home/risk/risk_detail_page.dart';
import 'package:qhd_prevention/pages/my_appbar.dart';
@ -287,7 +288,8 @@ class _RiskControlPageState extends State<RiskControlPage> {
});
}else{
_showMessage('加载数据失败');
ToastUtil.showNormal(context, "加载数据失败");
// _showMessage('加载数据失败');
}
} catch (e) {
@ -322,7 +324,8 @@ class _RiskControlPageState extends State<RiskControlPage> {
});
}else{
_showMessage('加载数据失败');
ToastUtil.showNormal(context, "加载数据失败");
// _showMessage('加载数据失败');
}
} catch (e) {
// 出错时可以 Toast 或者在页面上显示错误状态

5
lib/pages/home/risk/risk_detail_page.dart
View File

@ -54,7 +54,8 @@ class _RiskDetailPageState extends State<RiskDetailPage> {
}else{
_showMessage('加载数据失败');
ToastUtil.showNormal(context, "加载数据失败");
// _showMessage('加载数据失败');
}
} catch (e) {
@ -84,7 +85,7 @@ class _RiskDetailPageState extends State<RiskDetailPage> {
}else{
ToastUtil.showNormal(context, "提交失败");
_showMessage('加载数据失败');
// _showMessage('加载数据失败');
}
} catch (e) {
LoadingDialogHelper.hide();

4
lib/pages/home/userInfo_page.dart
View File

@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:qhd_prevention/customWidget/toast_util.dart';
import 'package:qhd_prevention/pages/my_appbar.dart';
import 'package:qhd_prevention/tools/tools.dart';
@ -34,7 +35,8 @@ class _UserinfoPageState extends State<UserinfoPage> {
});
}else{
_showMessage('加载数据失败');
ToastUtil.showNormal(context, "加载数据失败");
// _showMessage('加载数据失败');
}
} catch (e) {
LoadingDialogHelper.hide();

4
lib/pages/home/work/custom_driver_drawer.dart
View File

@ -2,6 +2,7 @@ import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:qhd_prevention/customWidget/department_picker.dart';
import 'package:qhd_prevention/customWidget/toast_util.dart';
import 'package:qhd_prevention/pages/home/work/risk_list_picker.dart';
import 'package:qhd_prevention/pages/home/work/wait_list_picker.dart';
import '../../../customWidget/bottom_picker.dart';
@ -332,7 +333,8 @@ class _CustomDriverDrawerState extends State<CustomDriverDrawer> {
}else{
_showMessage('加载数据失败');
ToastUtil.showNormal(context, "加载数据失败");
// _showMessage('加载数据失败');
}
} catch (e) {

14
lib/pages/home/work/danger_project_page.dart
View File

@ -265,7 +265,7 @@ class _DangerProjectPageState extends State<DangerProjectPage> {
Widget _itemCell(final screenWidth, final item) {
final TextEditingController _controller = TextEditingController();
_controller.text=item["CHECK_QUALIFIED"];
_controller.text=item["CHECK_QUALIFIED"]??"";
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 10),
child: Column(
@ -420,10 +420,12 @@ class _DangerProjectPageState extends State<DangerProjectPage> {
return GestureDetector(
onTap: () {
if(item["HASHIDDEN"]> 0){
ToastUtil.showNormal(context, "此检查内容存在未处理隐患，无法检查");
return;
}
// bool i=FormUtils.hasValue(item, "HASHIDDEN");
if (FormUtils.hasValue(item, "HASHIDDEN")&&item["HASHIDDEN"] > 0) {
ToastUtil.showNormal(context, "此检查内容存在未处理隐患，无法检查");
return;
}
setState(() {
if (value != "option2") {
@ -591,7 +593,7 @@ class _DangerProjectPageState extends State<DangerProjectPage> {
String ids = "";
for (int i = 0; i < listDates.length; i++) {
final item = listDates[i];
if(item["HASHIDDEN"]> 0){
if(FormUtils.hasValue(item, "HASHIDDEN")&&item["HASHIDDEN"]> 0){
upDataItemList.add({
"CUSTOM_ITEM_ID": item["CUSTOM_ITEM_ID"],
"LISTCHECKITEM_ID": item["LISTCHECKITEM_ID"],

32
lib/pages/home/work/danger_wait_deawer.dart
View File

@ -3,6 +3,7 @@ import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:qhd_prevention/customWidget/department_picker.dart';
import 'package:qhd_prevention/http/ApiService.dart';
import 'package:qhd_prevention/pages/home/work/wait_list_picker.dart';
import 'package:webview_flutter/webview_flutter.dart';
import '../../../customWidget/bottom_picker.dart';
@ -136,6 +137,7 @@ class DangerWaitDrawerState extends State<DangerWaitDrawer> {
// TODO: implement initState
super.initState();
_getListTree();
setState(() {
try {
@ -151,14 +153,18 @@ class DangerWaitDrawerState extends State<DangerWaitDrawer> {
_dangerStatusOption= dangerWaitBean["dangerStatusOption"];
startTime= dangerWaitBean["startTime"];
_startDate = DateTime.parse(startTime);
if(startTime.isNotEmpty) {
_startDate = DateTime.parse(startTime);
}
endTime= dangerWaitBean["endTime"];
_endDate = DateTime.parse(endTime);
if(startTime.isNotEmpty) {
_endDate = DateTime.parse(endTime);
}
itemNameOne= dangerWaitBean["itemNameOne"];
itemNameTwo= dangerWaitBean["itemNameTwo"];
}
jsonList = parseDepartments(widget.treeJson);
} catch (e) {
print("解析失败: $e");
}
@ -181,6 +187,26 @@ class DangerWaitDrawerState extends State<DangerWaitDrawer> {
}
Future<void> _getListTree() async {
try {
final result = await ApiService.getHiddenTreatmentListTree();
if (result['result'] == 'success') {
setState(() {
String treeJson= result['zTreeNodes'];
jsonList = parseDepartments(treeJson);
});
}else{
// _showMessage('加载数据失败');
}
} catch (e) {
// 出错时可以 Toast 或者在页面上显示错误状态
print('加载数据失败：$e');
}
}
@override
Widget build(BuildContext context) {

3
lib/pages/home/work/laws_regulations_page.dart
View File

@ -59,7 +59,8 @@ class _LawsRegulationsPage extends State<LawsRegulationsPage> {
}
});
} else {
_showMessage('加载数据失败');
ToastUtil.showNormal(context, "加载数据失败");
// _showMessage('加载数据失败');
}
} catch (e) {
LoadingDialogHelper.hide();

3
lib/pages/home/work/laws_regulations_two_page.dart
View File

@ -53,7 +53,8 @@ class _LawsRegulationsTwoPage extends State<LawsRegulationsTwoPage> {
});
} else {
_showMessage('加载数据失败');
ToastUtil.showNormal(context, "加载数据失败");
// _showMessage('加载数据失败');
}
} catch (e) {
// 出错时可以 Toast 或者在页面上显示错误状态

9
lib/pages/home/workSet_page.dart
View File

@ -47,7 +47,8 @@ class _WorkSetPageState extends State<WorkSetPage> {
});
}else{
_showMessage('加载数据失败');
ToastUtil.showNormal(context, "加载数据失败");
// _showMessage('加载数据失败');
}
} catch (e) {
// 出错时可以 Toast 或者在页面上显示错误状态
@ -79,7 +80,8 @@ class _WorkSetPageState extends State<WorkSetPage> {
}
}
}else{
_showMessage('加载数据失败');
ToastUtil.showNormal(context, "加载数据失败");
// _showMessage('加载数据失败');
}
} catch (e) {
@ -111,7 +113,8 @@ class _WorkSetPageState extends State<WorkSetPage> {
});
}else{
_showMessage('加载数据失败');
ToastUtil.showNormal(context, "加载数据失败");
// _showMessage('加载数据失败');
}
} catch (e) {
// 出错时可以 Toast 或者在页面上显示错误状态