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-08 18:04:48 +08:00
parent f0ecc31e27 e727730f0c
commit e86a91fc19
20 changed files with 143 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -343,6 +343,7 @@ class _SafeDrawerPageState extends State<SafeDrawerPage> {
// ),
// ),
// ),
const SizedBox(height: 10),
ItemListWidget.itemContainer(horizontal: 15,ListItemFactory.createRowSpaceBetweenItem(
leftText: '整改部门',
rightText:hiddenForm['RECTIFICATIONDEPT_NAME'] ?? '',

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

@ -61,12 +61,15 @@ class _SafecheckDetailState extends State<SafecheckDetail> {
{'name': 'UNITS_ID', 'message': '请选择被检查单位'},
{'name': 'PERSONNELMANAGEMENT_ID', 'message': '请选择被检查单位现场负责人'},
{'name': 'INSPECTION_PLACE', 'message': '请输入检查场所'},
{'name': 'INSPECTION_TYPE', 'message': '请选择检查类型不能为空'},
{'name': 'INSPECTION_TYPE', 'message': '请选择检查类型'},
{'name': 'INSPECTION_TIME_START', 'message': '请选择检查开始时间'},
{'name': 'INSPECTION_TIME_END', 'message': '请选择作业结束时间'},
{'name': 'INSPECTION_USERS', 'message': '请输入检查人员'},
];
Map<String, dynamic> form = {
'INSPECTION_USERS': '',
'KEYPROJECTCHECK_ID': '', // 检查ID
@ -448,6 +451,18 @@ class _SafecheckDetailState extends State<SafecheckDetail> {
}
}
// {'name': 'INSPECTION_USERS', 'message': '请输入检查人员'},
final name2 = 'INSPECTION_USERS';
final message2 ='请输入检查人员';
final v = form[name2];
if (v == null || v.toString().isEmpty || v.toString() == '请选择') {
LoadingDialogHelper.hide();
ToastUtil.showNormal(context, message2);
return;
}
// 检查 inspectorList 中是否有重复 INSPECTION_USER_ID
final List<Map<String, String>> inspectors = form['inspectorList'] ?? [];
final seenIds = <String>{};

2
lib/pages/app/checking_information_one_page.dart
View File

@ -431,6 +431,7 @@ class _CheckingInformationOnePageState extends State<CheckingInformationOnePage>
borderRadius: BorderRadius.circular(5),
),
child: ListItemFactory.createRowSpaceBetweenItem(
isRequired:true,
leftText: "整改部门",
rightText: departments[index].department.isNotEmpty?departments[index].department:"请选择",
isRight: true,
@ -472,6 +473,7 @@ class _CheckingInformationOnePageState extends State<CheckingInformationOnePage>
borderRadius: BorderRadius.circular(5),
),
child: ListItemFactory.createRowSpaceBetweenItem(
isRequired:true,
leftText: "整改负责人",
rightText: departments[index].responsible.isNotEmpty?departments[index].responsible:"请选择",
isRight: true,

2
lib/pages/app/danner_repair.dart
View File

@ -439,6 +439,7 @@ class DannerRepairState extends State<DannerRepair> {
borderRadius: BorderRadius.circular(5),
),
child: ListItemFactory.createRowSpaceBetweenItem(
isRequired:true,
leftText: "验收部门",
rightText: departments[index].department.isNotEmpty?departments[index].department:"请选择",
isRight: true,
@ -480,6 +481,7 @@ class DannerRepairState extends State<DannerRepair> {
borderRadius: BorderRadius.circular(5),
),
child: ListItemFactory.createRowSpaceBetweenItem(
isRequired:true,
leftText: "验收部门负责人",
rightText: departments[index].responsible.isNotEmpty?departments[index].responsible:"请选择",
isRight: true,

24
lib/pages/app/pending_rectification_detail_page.dart
View File

@ -112,7 +112,17 @@ class _PendingRectificationDetailPageState extends State<PendingRectificationDet
files5 = data['pImgs'] ?? [];
files6 = data['yImgs'] ?? [];
checkList = data['checkList'] ?? [];
});
// 拉取该单位的人员列表并缓存
final result = await ApiService.getListTreePersonList(buMenId);
setState(() {
_personCache=List<Map<String, dynamic>>.from(
result['userList'] as List,
);
});
}
} catch (e) {
@ -155,6 +165,15 @@ class _PendingRectificationDetailPageState extends State<PendingRectificationDet
files6 = data['yImgs'] ?? [];
checkList = data['checkList'] ?? [];
});
// 拉取该单位的人员列表并缓存
final result = await ApiService.getListTreePersonList(buMenId);
setState(() {
_personCache=List<Map<String, dynamic>>.from(
result['userList'] as List,
);
});
}
} catch (e) {
@ -402,9 +421,12 @@ class _PendingRectificationDetailPageState extends State<PendingRectificationDet
});
// 拉取该单位的人员列表并缓存
final result = await ApiService.getListTreePersonList(id);
setState(() {
_personCache=List<Map<String, dynamic>>.from(
result['userList'] as List,
);
});
}),
@ -429,7 +451,7 @@ class _PendingRectificationDetailPageState extends State<PendingRectificationDet
),
GestureDetector(
onTap: () {
if ( renYuanId.isEmpty) {
if ( buMenId.isEmpty) {
ToastUtil.showNormal(context, '请先选择部门');
return;
}

9
lib/pages/home/EquipmentInspection/immediately_inspection.dart
View File

@ -48,7 +48,7 @@ class _ImmediatelyInspectionState extends State<ImmediatelyInspection> {
ItemListWidget.singleLineTitleText(
label: '巡检人：',
isEditable: true,
isRequired: false,
isRequired: true,
controller: _xunController,
hintText: '请输入巡检人',
text: '',
@ -61,7 +61,7 @@ class _ImmediatelyInspectionState extends State<ImmediatelyInspection> {
label: '巡检日期',
text: dataTime.isEmpty ? '请选择' : dataTime ?? '',
isEditable: true,
isRequired: false,
isRequired: true,
horizontalnum: 0,
),
onTap: () async {
@ -100,7 +100,7 @@ class _ImmediatelyInspectionState extends State<ImmediatelyInspection> {
child: ItemListWidget.multiLineTitleTextField(
label: '巡检内容：',
isEditable: true,
isRequired: false,
isRequired: true,
controller: _neiRongController,
hintText: "(必填)",
text: '',
@ -123,6 +123,7 @@ class _ImmediatelyInspectionState extends State<ImmediatelyInspection> {
// SizedBox(height: 15,),
if (_isFault)
RepairedPhotoSection(
isRequired: true,
horizontalPadding: 15,
title: "故障照片",
maxCount: 4,
@ -140,6 +141,7 @@ class _ImmediatelyInspectionState extends State<ImmediatelyInspection> {
SizedBox(height: _isFault ? 15 : 0),
if (_isFault)
RepairedPhotoSection(
isRequired: true,
horizontalPadding: 15,
title: "故障处理后照片",
maxCount: 4,
@ -156,6 +158,7 @@ class _ImmediatelyInspectionState extends State<ImmediatelyInspection> {
SizedBox(height: _isFault ? 15 : 0),
RepairedPhotoSection(
isRequired: true,
horizontalPadding: 15,
title: "巡检照片",
maxCount: 4,

2
lib/pages/home/SafeCheck/CheckPersonSign/safeCheck_sign_list_page.dart
View File

@ -419,7 +419,7 @@ class _SafecheckSignListPageState extends State<SafecheckSignListPage> {
flex: 2,
child: SearchBarWidget(
showResetButton: false,
hintText: "请输入关键字",
hintText: "输入被检查单位部门关键字",
// isClickableOnly: true,
onSearch: (text) {
_search();

2
lib/pages/home/SafeCheck/CheckPersonSure/check_person_list_page.dart
View File

@ -418,7 +418,7 @@ class _CheckPersonListPageState extends State<CheckPersonListPage> {
flex: 2,
child: SearchBarWidget(
showResetButton: false,
hintText: "请输入关键字",
hintText: "输入被检查单位部门关键字",
// isClickableOnly: true,
onSearch: (text) {
_search();

2
lib/pages/home/SafeCheck/DangeCheck/safeCheck_danger_list_page.dart
View File

@ -450,7 +450,7 @@ class _SafecheckDangerListPageState extends State<SafecheckDangerListPage> {
flex: 2,
child: SearchBarWidget(
showResetButton: false,
hintText: "请输入关键字",
hintText: "输入被检查单位部门关键字",
// isClickableOnly: true,
onSearch: (text) {
_search();

2
lib/pages/home/SafeCheck/Record/defend_record_list_page.dart
View File

@ -426,7 +426,7 @@ class _DefendRecordListPageState extends State<DefendRecordListPage> {
flex: 2,
child: SearchBarWidget(
showResetButton: false,
hintText: "请输入关键字",
hintText: "输入被检查单位部门关键字",
// isClickableOnly: true,
onSearch: (text) {
_search();

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

@ -75,7 +75,7 @@ class _SafecheckStartDetailState extends State<SafecheckStartDetail> {
{'name': 'INSPECTED_DEPARTMENT_ID', 'message': '请选择被检查单位'},
{'name': 'INSPECTED_SITEUSER_ID', 'message': '请选择被检查单位现场负责人'},
{'name': 'INSPECTION_PLACE', 'message': '请输入检查场所'},
{'name': 'INSPECTION_TYPE', 'message': '请选择检查类型不能为空'},
{'name': 'INSPECTION_TYPE', 'message': '请选择检查类型'},
{'name': 'INSPECTION_TIME_START', 'message': '请选择检查开始时间'},
{'name': 'INSPECTION_TIME_END', 'message': '请选择作业结束时间'},
];
@ -335,6 +335,7 @@ class _SafecheckStartDetailState extends State<SafecheckStartDetail> {
}
// 基于 rules 验证
bool isRulesTrue=true;
for (final r in rules) {
final name = r['name'] ?? '';
final message = r['message'] ?? '请完善表单';
@ -342,9 +343,15 @@ class _SafecheckStartDetailState extends State<SafecheckStartDetail> {
if (v == null || v.toString().isEmpty || v.toString() == '请选择') {
LoadingDialogHelper.hide();
ToastUtil.showNormal(context, message);
isRulesTrue=false;
break;
}
}
if(!isRulesTrue){
return;
}
// situationList 每项 SITUATION 非空
final situations = (form['situationList'] as List<dynamic>?) ?? [];
for (var i = 0; i < situations.length; i++) {

9
lib/pages/home/SafeCheck/Start/safeCheck_start_list_page.dart
View File

@ -112,9 +112,12 @@ class _SafecheckStartListPageState extends State<SafecheckStartListPage> {
}
/// 申请
void _handleApply() {
Future<void> _handleApply() async {
// 处理申请按钮点击逻辑
pushPage(SafecheckStartDetail(INSPECTION_ID: '', type: 'add',), context);
await pushPage(SafecheckStartDetail(INSPECTION_ID: '', type: 'add',), context);
_search();
}
/// 打开流程图
@ -506,7 +509,7 @@ class _SafecheckStartListPageState extends State<SafecheckStartListPage> {
flex: 2,
child: SearchBarWidget(
showResetButton: false,
hintText: "请输入关键字",
hintText: "输入被检查单位部门关键字",
// isClickableOnly: true,
onSearch: (text) {
_search();

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

@ -264,10 +264,10 @@ class _RiskControlPageState extends State<RiskControlPage> {
if (_isLoading) return;
_isLoading = true;
LoadingDialogHelper.show();
final result = await ApiService.getRiskRecordList( currentPage,
riskId, dept, level, keyWord);
LoadingDialogHelper.hide();
if (result['result'] == 'success') {
_totalPage =result["page"]['totalPage'] ?? 1;
@ -291,6 +291,7 @@ class _RiskControlPageState extends State<RiskControlPage> {
}
} catch (e) {
LoadingDialogHelper.hide();
// 出错时可以 Toast 或者在页面上显示错误状态
print('加载数据失败：$e');
} finally {

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

@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:qhd_prevention/pages/my_appbar.dart';
import 'package:qhd_prevention/tools/tools.dart';
import '../../http/ApiService.dart';
@ -24,8 +25,9 @@ class _UserinfoPageState extends State<UserinfoPage> {
Future<void> _getUserInfo() async {
try {
LoadingDialogHelper.show();
final result = await ApiService.getUserInfo();
LoadingDialogHelper.hide();
if (result['result'] == 'success') {
setState(() {
user= result['pd'];
@ -35,6 +37,7 @@ class _UserinfoPageState extends State<UserinfoPage> {
_showMessage('加载数据失败');
}
} catch (e) {
LoadingDialogHelper.hide();
// 出错时可以 Toast 或者在页面上显示错误状态
print('加载数据失败：$e');
}

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

@ -348,7 +348,9 @@ class _DangerProjectPageState extends State<DangerProjectPage> {
Future<void> _getAlreadyUpImages(Map item) async {
try {
LoadingDialogHelper.show();
final result = await ApiService.getAlreadyUpImages(item["RECORDITEM_ID"]);
LoadingDialogHelper.hide();
if (result['result'] == 'success') {
final List<dynamic> newList = result['imgs'] ?? [];
List<PhotoItem> imgList = [];
@ -369,6 +371,7 @@ class _DangerProjectPageState extends State<DangerProjectPage> {
ToastUtil.showNormal(context, "加载数据失败");
}
} catch (e) {
LoadingDialogHelper.hide();
print('加载数据失败：$e');
}
}

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

@ -45,7 +45,9 @@ class _LawsRegulationsPage extends State<LawsRegulationsPage> {
try {
_accordionList.clear();
_fileList.clear();
LoadingDialogHelper.show();
final result = await ApiService.getLowList(keyWord);
LoadingDialogHelper.hide();
if (result['result'] == 'success') {
final List<dynamic> newList = result['varList'] ?? [];
setState(() {
@ -60,6 +62,7 @@ class _LawsRegulationsPage extends State<LawsRegulationsPage> {
_showMessage('加载数据失败');
}
} catch (e) {
LoadingDialogHelper.hide();
// 出错时可以 Toast 或者在页面上显示错误状态
print('加载数据失败：$e');
}

9
lib/pages/mine/mine_duty_management.dart
View File

@ -156,8 +156,8 @@ class _MineDutyManagementPageState extends State<MineDutyManagementPage> {
// ),
// ),
// 记录列表
Expanded(
child:
// Expanded(
// child:
_list.isEmpty
? NoDataWidget.show()
: ListView.builder(
@ -170,7 +170,7 @@ class _MineDutyManagementPageState extends State<MineDutyManagementPage> {
),
// ),
// ],
),
// ),
),
);
}
@ -353,7 +353,9 @@ class _MineDutyManagementPageState extends State<MineDutyManagementPage> {
Future<void> _getListData() async {
try {
LoadingDialogHelper.show();
final result = await ApiService.getDutyManagement(showCount, currentPage);
LoadingDialogHelper.hide();
if (result['result'] == 'success') {
final List<dynamic> newList = result['varList'] ?? [];
setState(() {
@ -361,6 +363,7 @@ class _MineDutyManagementPageState extends State<MineDutyManagementPage> {
});
}
} catch (e) {
LoadingDialogHelper.hide();
print('加载出错: $e');
}
}

2
lib/pages/mine/mine_set_page.dart
View File

@ -59,7 +59,7 @@ class _MineSetPageState extends State<MineSetPage> {
GestureDetector(
child: _setItemWidget("修改密码"),
onTap: () {
pushPage(const MineSetPwdPage(), context);
pushPage(const MineSetPwdPage("0"), context);
},
),
const Divider(height: 1, color: Colors.black12),

62
lib/pages/mine/mine_set_pwd_page.dart
View File

@ -13,8 +13,9 @@ import '../../http/ApiService.dart';
import '../login_page.dart';
class MineSetPwdPage extends StatefulWidget {
const MineSetPwdPage({super.key});
const MineSetPwdPage(this.type, {super.key});
final String type;
@override
State<MineSetPwdPage> createState() => _MineSetPwdPageState();
}
@ -38,19 +39,19 @@ class _MineSetPwdPageState extends State<MineSetPwdPage> {
final confirmPwd = _confirmPwdController.text.trim();
if (oldPwd.isEmpty) {
ToastUtil.showNormal(context, '请填写旧密码');
// _showMessage('请填写旧密码');
ToastUtil.showNormal(context, '请输入当前密码');
// _showMessage('请填写当前密码');
return;
}
if (newPwd.isEmpty) {
ToastUtil.showNormal(context, '请填写新密码');
ToastUtil.showNormal(context, '请输入新密码');
// _showMessage('请填写新密码');
return;
}
if (confirmPwd.isEmpty) {
ToastUtil.showNormal(context, '请填写确认新密码');
ToastUtil.showNormal(context, '请输入确认密码');
// _showMessage('请填写确认新密码');
return;
}
@ -62,32 +63,50 @@ class _MineSetPwdPageState extends State<MineSetPwdPage> {
// }
if (newPwd != confirmPwd) {
ToastUtil.showNormal(context, '新密码与确认密码不一致');
ToastUtil.showNormal(context, '两次输入的密码不一致');
// _showMessage('新密码与确认密码不一致');
return;
}
final RegExp regex = RegExp(r'^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{6,18}$');
if (regex.hasMatch(newPwd)) {
ToastUtil.showNormal(context, '密码长度为6-18位，必须包含大小字母，小写字母数字和特殊符号。');
// _showMessage('密码长度为6-18位，必须包含大小字母，小写字母数字和特殊符号。');
return;
}
// 示例验证：密码复杂度（实际可用正则加强）
if (newPwd.length < 8 || newPwd.length > 18) {
ToastUtil.showNormal(context, '密码长度需在8-18位之间');
if (newPwd.length < 8 ) {
ToastUtil.showNormal(context, '密码需要大于8位');
// _showMessage('密码长度需在8-18位之间');
return;
}
if ( newPwd.length > 18) {
ToastUtil.showNormal(context, '密码需要小于18位');
// _showMessage('密码长度需在8-18位之间');
return;
}
// final RegExp regex = RegExp(r'^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{6,18}$');
if (!isPasswordValid(newPwd)) {
ToastUtil.showNormal(context, '必须包含大小字母，小写字母数字和特殊符号。');
// _showMessage('密码长度为6-18位，必须包含大小字母，小写字母数字和特殊符号。');
return;
}
_changePass(oldPwd,newPwd);
}
bool isPasswordValid(String password) {
// 定义各个规则的正则表达式
final hasUpperCase = RegExp(r'[A-Z]');
final hasLowerCase = RegExp(r'[a-z]');
final hasNumber = RegExp(r'[0-9]');
final hasSpecialChar = RegExp(r'[!@#$%^&*(),.?":{}|<>]'); // 根据需要调整特殊符号
// 检查是否同时满足所有条件
return hasUpperCase.hasMatch(password) &&
hasLowerCase.hasMatch(password) &&
hasNumber.hasMatch(password) &&
hasSpecialChar.hasMatch(password);
}
void _showMessage(String msg) {
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(msg)));
}
@ -125,14 +144,14 @@ class _MineSetPwdPageState extends State<MineSetPwdPage> {
style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
),
const SizedBox(height: 30),
_buildPwdField('旧密码', _oldPwdController),
_buildPwdField('当前密码', _oldPwdController),
const SizedBox(height: 20),
_buildPwdField('新密码', _newPwdController),
const SizedBox(height: 20),
_buildPwdField('确认新密码', _confirmPwdController),
const SizedBox(height: 15),
const Text(
'需8-18位字母大小写、数字、字符混合',
'为了您的账户安全，请确保密码长度为 8-18 位，必须包含大小写字母+数字+特殊字符，例如:Aa@123456',
style: TextStyle(color: Colors.grey, fontSize: 13),
),
const SizedBox(height: 30,),
@ -161,7 +180,7 @@ class _MineSetPwdPageState extends State<MineSetPwdPage> {
// final hidCount = raw['hidCount'] as Map<String, dynamic>;
// print(hidCount);
if (raw['result'] == 'success') {
ToastUtil.showNormal(context, '密码修改成功');
ToastUtil.showNormal(context, '新密码修改成功!');
// _showMessage('密码修改成功'); // 这里换成实际调用接口逻辑
Navigator.pop(context,true);
@ -174,15 +193,18 @@ class _MineSetPwdPageState extends State<MineSetPwdPage> {
(Route<dynamic> route) => false, // 移除所有历史路由
);
}else if (raw['result'] == 'usererror'){
ToastUtil.showNormal(context, '当前密码密码有误');
// _showMessage('密码修改失败');
}else{
ToastUtil.showNormal(context, '密码修改失败');
ToastUtil.showNormal(context, '登录错误！请联系管理员');
// _showMessage('密码修改失败');
}
} catch (e) {
// 出错时可以 Toast 或者在页面上显示错误状态
print('加载首页数据失败：$e');
ToastUtil.showNormal(context, '密码修改失败');
ToastUtil.showNormal(context, '登录错误！请联系管理员');
// _showMessage('密码修改失败');
}
}

9
lib/services/auth_service.dart
View File

@ -1,6 +1,7 @@
import 'dart:convert';
import 'package:encrypt/encrypt.dart' as encrypt;
import 'package:pointycastle/asymmetric/api.dart' show RSAPublicKey;
import 'package:qhd_prevention/pages/mine/mine_set_pwd_page.dart';
import 'package:qhd_prevention/tools/tools.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:fluttertoast/fluttertoast.dart';
@ -36,6 +37,14 @@ class AuthService {
return false;
}
// if(data['result']['WEAK_PASSWORD']=='1'){
// pushPage(const MineSetPwdPage("1"), context);
// return false;
// }else if(data['result']['LONG_TERM_PASSWORD_NOT_CHANGED']=='1'){
// pushPage(const MineSetPwdPage("2"), context);
// return false;
// }
final prefs = await SharedPreferences.getInstance();
await prefs.setString(_keyUser, json.encode(data));
await prefs.setStringList(_keyRemember, [username, password]);