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

2025.9.10 改bug

main
xufei 2025-09-10 13:48:52 +08:00
parent 0dc4773324
commit a77758104e
5 changed files with 57 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -495,7 +495,7 @@ class DannerRepairState extends State<DannerRepair> {
/// 整改计划
Widget _acceptPlan() {
return Padding(
padding: EdgeInsets.symmetric(horizontal: 10),
padding: EdgeInsets.symmetric(horizontal: 15),
child: MediaPickerRow(
maxCount: 4,
onChanged: (List<File> files) {

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

@ -189,7 +189,7 @@ class _CheckPersonDetailState extends State<CheckPersonDetail> {
inspectorForm['OPERATOR'] = SessionService.instance.loginUserId;
inspectorForm['ACTION_USER'] = SessionService.instance.username;
inspectorForm['INSPECTION_USER_SIGN_TIME'] = DateFormat('yyyy-MM-dd HH:mm:ss').format(DateTime.now());
try {
// 准备上传文件路径（兼容多种 signImgList 存法）
String filePath = signImages.first;

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

@ -240,9 +240,12 @@ class _CheckPersonListPageState extends State<CheckPersonListPage> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
"检查时间: ${item['INSPECTION_TIME_START'] ?? ''}至${item['INSPECTION_TIME_END'] ?? ''}",
Expanded(
child: Text(
"检查时间: ${item['INSPECTION_TIME_START'] ?? ''}至${item['INSPECTION_TIME_END'] ?? ''}",
),
),
],
),
const SizedBox(height: 8),

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

@ -265,6 +265,7 @@ class _DangerProjectPageState extends State<DangerProjectPage> {
Widget _itemCell(final screenWidth, final item) {
final TextEditingController _controller = TextEditingController();
_controller.text=item["CHECK_QUALIFIED"];
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 10),
child: Column(
@ -334,17 +335,35 @@ class _DangerProjectPageState extends State<DangerProjectPage> {
color: const Color(0xFFF1F1F1),
child: Container(
width: screenWidth,
padding: const EdgeInsets.all(10),
child:
// TextField(
// controller: _controller,
// decoration: InputDecoration(
// labelText: '输入框',
// hintText: '请输入内容',
// ),
// ),
child:Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (item["OPERATION_TYPE"] != 1 )
TextField(
onChanged: (value) {
item["CHECK_QUALIFIED"]=value;
print('当前输入内容: $value');
// 在这里处理文字改变逻辑
},
decoration: InputDecoration(
hintText: '检查详细描述(必填项)',
),
style: TextStyle(
fontSize: 12.0, // 输入文字的大小
color: Colors.black,
),
controller: _controller,
),
if (item["OPERATION_TYPE"] == 1 )
Padding(
padding: EdgeInsets.all(10),
child: Text(item["CHECK_QUALIFIED"], style: const TextStyle(color: Colors.black, fontSize: 12)),
)
],
)
Text(item["CHECK_QUALIFIED"], style: const TextStyle(color: Colors.black, fontSize: 12)),
)),
],
),
@ -401,6 +420,11 @@ class _DangerProjectPageState extends State<DangerProjectPage> {
return GestureDetector(
onTap: () {
if(item["HASHIDDEN"]> 0){
ToastUtil.showNormal(context, "此检查内容存在未处理隐患，无法检查");
return;
}
setState(() {
if (value != "option2") {
SessionService.instance.setUnqualifiedInspectionItemIDJson("");
@ -555,6 +579,7 @@ class _DangerProjectPageState extends State<DangerProjectPage> {
}
Future<void> _submitInvestigationItems() async {
try {
//获取定位
await fetchAndSaveBd09(context);
final prefs = await SharedPreferences.getInstance();
@ -566,7 +591,16 @@ class _DangerProjectPageState extends State<DangerProjectPage> {
String ids = "";
for (int i = 0; i < listDates.length; i++) {
final item = listDates[i];
if (item["REFERENCE_BASIS"] == "option1") {
if(item["HASHIDDEN"]> 0){
upDataItemList.add({
"CUSTOM_ITEM_ID": item["CUSTOM_ITEM_ID"],
"LISTCHECKITEM_ID": item["LISTCHECKITEM_ID"],
"RECORDITEM_ID": item["RECORDITEM_ID"],
"ISNORMAL": null,
"CHECK_RESULT": item["CHECK_QUALIFIED"],
});
}else if (item["REFERENCE_BASIS"] == "option1") {
upDataItemList.add({
"CUSTOM_ITEM_ID": item["CUSTOM_ITEM_ID"],
"LISTCHECKITEM_ID": item["LISTCHECKITEM_ID"],
@ -603,6 +637,7 @@ class _DangerProjectPageState extends State<DangerProjectPage> {
}
}
if (hasNoSelectItem) {
ToastUtil.showNormal(context, "还有未选择的排查项");
LoadingDialogHelper.hide();
@ -610,7 +645,7 @@ class _DangerProjectPageState extends State<DangerProjectPage> {
}
String itemsString = jsonEncode(upDataItemList);
String CHECKRECORD_ID = widget.checkrecordId ?? "";
try {
final Map<String, dynamic> result;
if (widget.type == 1) {
result = await ApiService.submitInvestigationItemsYinHuan(widget.item, longitude, latitude, itemsString, ids, CHECKRECORD_ID);

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

@ -476,6 +476,8 @@ class DangerWaitDrawerState extends State<DangerWaitDrawer> {
_startDate = null;
_endDate = null;
startTime="";
endTime="";
itemNameOne="请选择";
itemNameTwo="请选择";
@ -521,6 +523,7 @@ class DangerWaitDrawerState extends State<DangerWaitDrawer> {
color: Colors.white,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(title, style: const TextStyle(fontSize: 14)),
const SizedBox(height: 20),