适配web前保存

2025.9.22 修改时间不对称bug
Merge branch 'main' of http://47.92.113.182:3000/hanshuang/flutter_integrated_whb
2025-09-23 10:31:41 +08:00 · 2025-09-22 09:24:17 +08:00 · 2025-09-19 18:02:13 +08:00 · 2025-09-19 18:01:23 +08:00
24 changed files with 362 additions and 87 deletions
--- a/.metadata
+++ b/.metadata
@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.

 version:
-  revision: "35c388afb57ef061d06a39b537336c87e0e3d1b1"
+  revision: "d7b523b356d15fb81e7d340bbe52b47f93937323"
  channel: "stable"

 project_type: app
@ -13,14 +13,11 @@ project_type: app
 migration:
  platforms:
    - platform: root
-      create_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1
-      base_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1
-    - platform: android
-      create_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1
-      base_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1
-    - platform: ios
-      create_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1
-      base_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1
+      create_revision: d7b523b356d15fb81e7d340bbe52b47f93937323
+      base_revision: d7b523b356d15fb81e7d340bbe52b47f93937323
+    - platform: web
+      create_revision: d7b523b356d15fb81e7d340bbe52b47f93937323
+      base_revision: d7b523b356d15fb81e7d340bbe52b47f93937323

  # User provided section

--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@ -493,7 +493,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 59;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8AKCJ9LW7D;
 				ENABLE_BITCODE = NO;
@ -503,7 +503,6 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = uni.UNI85F7A17;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@ -688,7 +687,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 59;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8AKCJ9LW7D;
 				ENABLE_BITCODE = NO;
@ -698,7 +697,6 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = uni.UNI85F7A17;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@ -720,7 +718,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 59;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8AKCJ9LW7D;
 				ENABLE_BITCODE = NO;
@ -730,7 +728,6 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = uni.UNI85F7A17;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@ -8,7 +8,7 @@
 	<string>智守安全</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
+	<key>CFBundleIdentifier</key>ƒ
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
@ -85,6 +85,7 @@
 	<key>com.apple.developer.nfc.readersession.formats</key>
 	<array>
 		<string>TAG</string>
+		<string>NDEF</string>
 	</array>
 </dict>
 </plist>
--- a/lib/customWidget/department_picker_hidden_type.dart
+++ b/lib/customWidget/department_picker_hidden_type.dart
@ -118,11 +118,55 @@ class _DepartmentPickerHiddenTypeState

  void _onSearchChanged() {
    final q = _searchController.text.toLowerCase().trim();
+    // setState(() {
+    //   filtered = q.isEmpty ? original : _filterCategories(original, q);
+    // });
+
+    //新加搜索展开子项
    setState(() {
-      filtered = q.isEmpty ? original : _filterCategories(original, q);
+      if (q.isEmpty) {
+        filtered = original;
+        expandedSet.clear(); // 清空展开状态
+      } else {
+        filtered = _filterCategories(original, q);
+        // 搜索时自动展开所有过滤后的节点
+        _expandAllMatchingNodes(filtered);
+      }
    });
+
  }

+
+  // 递归展开所有匹配的节点及其父节点
+  void _expandAllMatchingNodes(List<Category> categories) {
+    for (var category in categories) {
+      // 展开当前节点
+      expandedSet.add(category.id);
+
+      // 递归展开子节点
+      if (category.children.isNotEmpty) {
+        _expandAllMatchingNodes(category.children);
+      }
+
+      // 展开所有父节点直到根节点
+      _expandParentNodes(category.id);
+    }
+  }
+
+  // 展开指定节点的所有父节点
+  void _expandParentNodes(String id) {
+    var currentId = id;
+    var parent = parentMap[currentId];
+
+    while (parent != null) {
+      expandedSet.add(parent.id);
+      currentId = parent.id;
+      parent = parentMap[currentId];
+    }
+  }
+
+
+
  List<Category> _filterCategories(List<Category> list, String q) {
    final res = <Category>[];
    for (var cat in list) {
--- a/lib/customWidget/dotted_border_box.dart
+++ b/lib/customWidget/dotted_border_box.dart
@ -1,4 +1,3 @@
-import 'dart:ffi';

 import 'package:flutter/material.dart';
 import 'package:dotted_border/dotted_border.dart';
--- a/lib/http/ApiService.dart
+++ b/lib/http/ApiService.dart
@ -24,8 +24,8 @@ class ApiService {
  // static const String baseFacePath = "http://192.168.0.25:38199"; //王轩服务器

  /// 登录及其他管理后台接口
-  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 = "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.0.25:28199";//王轩服务器
  // static const String basePath = "http://192.168.0.45:28199";//长久服务器

@ -2052,6 +2052,7 @@ U6Hzm1ninpWeE+awIDAQAB
      String correctiveDepartment,
      String isIndex,
      String keyWord,
+      String laiYuanId,
      ) {
    return HttpManager().request(
      basePath,
@ -2063,7 +2064,7 @@ U6Hzm1ninpWeE+awIDAQAB
        "ENDTIME": endDate.isEmpty?"":"$endDate 23:59:59",
        "HIDDENLEVEL": level,
        "HIDDEN_RISKSTANDARD": riskStandard,
-        // "SOURCE": riskStandard,
+        // "SOURCE": laiYuanId,
        "STATE": state,
        "DEPARTMENT_ID": departmentId,
        "RECTIFICATIONDEPT": correctiveDepartment,
--- a/lib/pages/app/application_page.dart
+++ b/lib/pages/app/application_page.dart
@ -4,6 +4,7 @@ import 'package:qhd_prevention/http/ApiService.dart';
 import 'package:qhd_prevention/pages/app/Danger_paicha/check_record_page.dart';
 import 'package:qhd_prevention/pages/app/Danger_paicha/quick_report_page.dart';
 import 'package:qhd_prevention/pages/app/danger_wait_list_page.dart';
+import 'package:qhd_prevention/pages/app/gy_alarm/gy_alarm_page.dart';
 import 'package:qhd_prevention/pages/badge_manager.dart';
 import 'package:qhd_prevention/pages/home/work/risk_list_page.dart';

@ -25,7 +26,8 @@ enum AppItem {
  specialRecord,     // 专项检查中的隐患记录
  supervisionRectification, // 监管帮扶中的隐患整改
  supervisionRecord, // 监管帮扶中的隐患记录
-  aiAlarm, // 监管帮扶中的隐患记录
+  aiAlarm, // 检测预警-AI预警
+  gyAlarm // 检测预警-工艺报警优化
 }

 class ApplicationPage extends StatefulWidget {
@ -124,6 +126,10 @@ class _ApplicationPageState extends State<ApplicationPage> {
      case AppItem.aiAlarm:
      // ai
        pushPage(AiAlarmPage(), context);
+        break;
+      case AppItem.gyAlarm:
+        pushPage(GyAlarmPage(), context);
+
        break;
    }
  }
@ -164,11 +170,12 @@ class _ApplicationPageState extends State<ApplicationPage> {
          {'item': AppItem.acceptedRisk, 'icon': 'assets/icon-apps/icon-zl-1.png', 'title': '已验收隐患', 'num': 0},
        ],
      },
-
      {
        'title': '监测预警',
        'list': [
          {'item': AppItem.aiAlarm, 'icon': 'assets/icon-apps/icon-pc-1.png', 'title': 'AI报警', 'num': 0},
+          {'item': AppItem.gyAlarm, 'icon': 'assets/icon-apps/icon-pc-1.png', 'title': '工艺报警优化', 'num': 0},
+
        ],
      },
    ];
--- a/lib/pages/app/danger_wait_list_page.dart
+++ b/lib/pages/app/danger_wait_list_page.dart
@ -76,20 +76,20 @@ class _DangerWaitListPageState extends State<DangerWaitListPage> {
  void getListData(int type,bool addList,String keyWord){
    switch(widget.appItem  ){
      case 1://隐患记录
-        _getDangerRecord(-1,_page,"","","","","","","","",keyWord,addList);
+        _getDangerRecord(-1,_page,"","","","","","","","",keyWord,addList,"");
        // _getListTree();
        break;
      case 2://待整改隐患
-        _getDangerRecord(2,_page,"","","","","","","","",keyWord,addList);
+        _getDangerRecord(2,_page,"","","","","","","","",keyWord,addList,"");
        break;
      case 3://超期未整改
-        _getDangerRecord(5,_page,"","","","","-1","","","",keyWord,addList);
+        _getDangerRecord(5,_page,"","","","","-1","","","",keyWord,addList,"");
        break;
      case 4://隐患验收
-        _getDangerRecord(3,_page,"","","","","","3","","",keyWord,addList);
+        _getDangerRecord(3,_page,"","","","","","3","","",keyWord,addList,"");
        break;
      case 5://已验收隐患
-        _getDangerRecord(4,_page,"","","","","","4","","1",keyWord,addList);
+        _getDangerRecord(4,_page,"","","","","","4","","1",keyWord,addList,"");
        break;

    }
@ -133,11 +133,11 @@ class _DangerWaitListPageState extends State<DangerWaitListPage> {
          child:  DangerWaitDrawer(
             "",
                onClose: (String selectedCategoryId,String selectedDepartmentId,String investigationMethodOption,
-                    String hazardLevelOption,String dangerStatusOption,String startDate,String endDate) {
+                    String hazardLevelOption,String dangerStatusOption,String startDate,String endDate,String laiYuanId) {

                  _page=1;
                  _getDangerRecord(-1,_page,startDate,endDate,hazardLevelOption,investigationMethodOption,
-                      dangerStatusOption,selectedCategoryId,selectedDepartmentId,"",searchKey,false);
+                      dangerStatusOption,selectedCategoryId,selectedDepartmentId,"",searchKey,false,laiYuanId);

              },
          ),
@ -365,7 +365,7 @@ class _DangerWaitListPageState extends State<DangerWaitListPage> {
  Future<void> _getDangerRecord(int type, int currentPage,
      String startDate,String endDate,String level,String riskStandard,String state,
      String departmentId,String correctiveDepartment,
-        String isIndex,String keyWord,bool loadMore) async {
+        String isIndex,String keyWord,bool loadMore,String laiYuanId) async {
    try {
      if (_isLoading) return;
      _isLoading = true;
@ -373,7 +373,7 @@ class _DangerWaitListPageState extends State<DangerWaitListPage> {
      LoadingDialogHelper.show();
      final result = await ApiService.getHiddenTreatmentList( type,  currentPage,
           startDate, endDate, level, riskStandard, state,
-           departmentId, correctiveDepartment, isIndex, keyWord);
+           departmentId, correctiveDepartment, isIndex, keyWord,laiYuanId);
      LoadingDialogHelper.hide();
      if (result['result'] == 'success') {

@ -468,8 +468,10 @@ class _DangerWaitListPageState extends State<DangerWaitListPage> {
      return "隐患来源：标准排查";
    }else if("4"==type){
      return "隐患来源：专项检查";
-    }else{
+    }else if("5"==type){
      return "隐患来源：安全检查";
+    }else{
+      return "隐患来源：NFC设备巡检";
    }

  }
--- a/lib/pages/app/gy_alarm/gy_alarm_page.dart
+++ b/lib/pages/app/gy_alarm/gy_alarm_page.dart
@ -0,0 +1,130 @@
+import 'package:flutter/material.dart';
+import 'package:qhd_prevention/customWidget/ItemWidgetFactory.dart';
+import 'package:qhd_prevention/customWidget/toast_util.dart';
+import 'package:qhd_prevention/http/ApiService.dart';
+import 'package:qhd_prevention/pages/KeyProjects/Danger/danger_list_page.dart';
+import 'package:qhd_prevention/pages/KeyProjects/KeyProject/keyProject_list_page.dart';
+import 'package:qhd_prevention/pages/KeyProjects/SafeCheck/safeCheck_list_page.dart';
+import 'package:qhd_prevention/pages/home/SafeCheck/CheckPersonSign/safeCheck_sign_list_page.dart';
+import 'package:qhd_prevention/pages/home/SafeCheck/CheckPersonSure/check_person_list_page.dart';
+import 'package:qhd_prevention/pages/home/SafeCheck/DangeCheck/safeCheck_danger_list_page.dart';
+import 'package:qhd_prevention/pages/home/SafeCheck/Record/defend_record_list_page.dart';
+import 'package:qhd_prevention/pages/home/SafeCheck/Start/safeCheck_start_list_page.dart';
+import 'package:qhd_prevention/pages/home/tap/tabList/work_tab_icon_grid.dart';
+import 'package:qhd_prevention/pages/my_appbar.dart';
+import 'package:qhd_prevention/tools/tools.dart';
+
+
+class GyAlarmPage extends StatefulWidget {
+  const GyAlarmPage({super.key});
+
+  @override
+  State<GyAlarmPage> createState() => _GyAlarmPageState();
+}
+
+class _GyAlarmPageState extends State<GyAlarmPage> {
+  late List<Map<String, dynamic>> buttonInfos = [
+    {
+      "icon": "assets/icon-apps/icon-yxkj-1.png",
+      "title": "已检查",
+      "unreadCount": '0',
+    },
+    {
+      "icon": "assets/icon-apps/icon-yxkj-4.png",
+      "title": "未检查",
+      "unreadCount": '0',
+    },
+    {
+      "icon": "assets/icon-apps/icon-yxkj-2.png",
+      "title": "已完成",
+      "unreadCount":'0',
+    },
+
+  ];
+
+  @override
+  void initState() {
+    super.initState();
+    // _getData();
+  }
+  // Future<void> _getData() async {
+  //   final data = await ApiService.getSafeCheckCount();
+  //   setState(() {
+  //     final checkedCount = data['checkedCount']['checkedCount'] ?? '';
+  //     final repulseAndCheckCount = data['repulseAndCheckCount']['repulseAndCheckCount'] ?? '';
+  //     final confirmCount = data['confirmCount']['confirmCount'] ?? '';
+  //     final repulseCount = data['repulseCount']['repulseCount'] ?? '';
+  //
+  //     buttonInfos = [
+  //       {
+  //         "icon": "assets/icon-apps/icon-yxkj-1.png",
+  //         "title": "安全检查\n发起",
+  //         "unreadCount": repulseCount,
+  //       },
+  //       {
+  //         "icon": "assets/icon-apps/icon-yxkj-4.png",
+  //         "title": "检查人\n确认",
+  //         "unreadCount": confirmCount,
+  //       },
+  //       {
+  //         "icon": "assets/icon-apps/icon-yxkj-2.png",
+  //         "title": "被检查人\n签字/申辩",
+  //         "unreadCount":checkedCount,
+  //       },
+  //       {
+  //         "icon": "assets/icon-apps/icon-yxkj-2.png",
+  //         "title": "隐患指派\n及验收",
+  //         "unreadCount":repulseAndCheckCount,
+  //       },
+  //       {
+  //         "icon": "assets/icon-apps/icon-yxkj-2.png",
+  //         "title": "申辩记录",
+  //         "unreadCount":'0',
+  //       },
+  //
+  //     ];
+  //   });
+  // }
+  void _handleItemPressed(int index) async {
+    // 根据索引执行不同的导航逻辑
+    String title = '';
+    switch (index) {
+      case 0: {
+        title = '安全检查发起';
+        // await pushPage(SafecheckStartListPage(flow: title), context);
+      } break;
+      case 1: {
+        title = '安全检查核实';
+        // await pushPage(CheckPersonListPage(flow: title), context);
+
+      } break;
+      case 2: {
+        title = '安全检查确认';
+        // await pushPage(SafecheckSignListPage(flow: title), context);
+
+      } break;
+      default:
+        print("按钮 $index 被点击");
+    }
+    ToastUtil.showNormal(context, '开发中');
+    // _getData();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: MyAppbar(title: '工艺报警优化'),
+      body: SafeArea(
+          child: Column(
+            children: [
+              ListItemFactory.createBuildSimpleSection('工艺报警优化'),
+              WorkTabIconGrid(
+                buttonInfos: buttonInfos,
+                onItemPressed: _handleItemPressed,
+              ),
+            ],
+          )
+      ),
+    );
+  }
+}
--- a/lib/pages/app/hidden_danger_acceptance_page.dart
+++ b/lib/pages/app/hidden_danger_acceptance_page.dart
@ -690,8 +690,8 @@ class _HiddenDangerAcceptancePageState extends State<HiddenDangerAcceptancePage>
  String _getSourceText(String? source) {
    switch (source) {
      case '1': return '隐患快报';
-      case '2': return '隐患排查清单检查';
-      case '3': return '标准排查清单检查';
+      case '2': return '隐患排查';
+      case '3': return '标准排查';
      case '4': return '专项检查';
      case '5': return '安全检查';
      case '6': return 'NFC设备巡检';
--- a/lib/pages/app/hidden_record_detail_page.dart
+++ b/lib/pages/app/hidden_record_detail_page.dart
@ -496,8 +496,8 @@ class _HiddenRecordDetailPageState extends State<HiddenRecordDetailPage> {

    switch (source) {
      case '1': return '隐患快报';
-      case '2': return '隐患排查清单检查';
-      case '3': return '标准排查清单检查';
+      case '2': return '隐患排查';
+      case '3': return '标准排查';
      case '4': return '专项检查';
      case '5': return '安全检查';
      case '6': return 'NFC设备巡检';
--- a/lib/pages/app/pending_rectification_detail_page.dart
+++ b/lib/pages/app/pending_rectification_detail_page.dart
@ -787,8 +787,8 @@ class _PendingRectificationDetailPageState extends State<PendingRectificationDet
  String _getSourceText(String? source) {
    switch (source) {
      case '1': return '隐患快报';
-      case '2': return '隐患排查清单检查';
-      case '3': return '标准排查清单检查';
+      case '2': return '隐患排查';
+      case '3': return '标准排查';
      case '4': return '专项检查';
      case '5': return '安全检查';
      case '6': return 'NFC设备巡检';
--- a/lib/pages/home/NFC/home_nfc_add_page.dart
+++ b/lib/pages/home/NFC/home_nfc_add_page.dart
@ -1,15 +1,12 @@
 import 'dart:convert';
-import 'dart:ffi';

 import 'package:flutter/material.dart';
 import 'package:qhd_prevention/customWidget/bottom_picker.dart';
 import 'package:qhd_prevention/customWidget/custom_alert_dialog.dart';
 import 'package:qhd_prevention/customWidget/custom_button.dart';
-import 'package:qhd_prevention/customWidget/department_person_picker.dart';
 import 'package:qhd_prevention/customWidget/toast_util.dart';
 import 'package:qhd_prevention/http/ApiService.dart';
 import 'package:qhd_prevention/pages/home/tap/item_list_widget.dart';
-import 'package:qhd_prevention/pages/home/work_alert.dart';
 import 'package:qhd_prevention/pages/my_appbar.dart';
 import 'package:qhd_prevention/services/nfc_service.dart';
 import 'package:qhd_prevention/tools/tools.dart';
--- a/lib/pages/home/SafetyCommitment/safety_commitment_dh_list.dart
+++ b/lib/pages/home/SafetyCommitment/safety_commitment_dh_list.dart
@ -247,13 +247,16 @@ class _SafetyCommitmentDhListState extends State<SafetyCommitmentDhList> {
                ),
              ),
              const SizedBox(height: 8),
-              Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  Text('承诺时间: ${item['SIGN_TIME']??""}'),
+                   Text('承诺时间: ${item['START_TIME']??""}-${item['END_TIME']??""}'),
+              const SizedBox(height: 5),
                  Text('承诺人: ${item['SIGN_USER_NAME']??""}'),
-                ],
-              ),
+              // Row(
+              //   mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              //   children: [
+              //     Text('承诺时间: ${item['SIGN_TIME']??""}'),
+              //     Text('承诺人: ${item['SIGN_USER_NAME']??""}'),
+              //   ],
+              // ),
            ],
          ),
        ),
--- a/lib/pages/home/home_page.dart
+++ b/lib/pages/home/home_page.dart
@ -42,12 +42,14 @@ class HomePage extends StatefulWidget {
 class HomePageState extends State<HomePage> {
  int _eight_work_count = 0;
  int _safetyEnvironmentalInspection = 0;
+
  void startScan() {
    Navigator.push(
      context,
      MaterialPageRoute(builder: (_) => ScanPage(totalList: totalList)),
    );
  }
+
  // 缓存 key
  static const String _hiddenCacheKey = 'hidden_roll_cache';

@ -67,7 +69,9 @@ class HomePageState extends State<HomePage> {
        return '';
    }
  }
+
  List totalList = [];
+
  /// 按钮信息
  List<Map<String, dynamic>> buttonInfos = [
    {
@ -117,7 +121,7 @@ class HomePageState extends State<HomePage> {
      "title": "安全例会",
      "unreadCount": 0,
    },
-    // {"icon": "assets/icon-apps/home-xj.png", "title": "燃气巡检", "unreadCount": 0},
+    {"icon": "assets/icon-apps/home-xj.png", "title": "燃气巡检", "unreadCount": 0},
  ];

  /// 我的工作
@ -186,14 +190,12 @@ class HomePageState extends State<HomePage> {
    // 使用初始化加载：先恢复缓存（若存在则直接显示），然后再发起网络请求（成功则覆盖缓存）
    BadgeManager().initAllModules();
    _initialLoad();
-
  }

  /// 首次加载：先恢复缓存（如果有），然后在后台去刷新（只有当无缓存时才显示 loading）
  Future<void> _initialLoad() async {
    final result = await AuthService.checkUpdate();
-    try{
-
+    try {
      if (FormUtils.hasValue(result, 'pd')) {
        Map pd = result['pd'];
        final versionInfo = await getAppVersion();
@ -201,28 +203,28 @@ class HomePageState extends State<HomePage> {
        if (versionInfo.versionName != pd['VERSION']) {
          //有更新 提示更新
          final ok = await CustomAlertDialog.showConfirm(
-              context,
-              barrierDismissible:false,
-              title: '更新通知',
-              content: isWifi ? '发现新版本，是否更新？为了更好的体验，请更新到最新版本。' : '发现新版本，检查到您当前使用的是移动网络，是否更新？更新时请注意流量消耗。为了更好的体验，请更新到最新版本。',
-              cancelText: pd['ISUPDATE'] == '1' ? '' : '稍后更新',
-              confirmText: '立即更新'
+            context,
+            barrierDismissible: false,
+            title: '更新通知',
+            content:
+                isWifi
+                    ? '发现新版本，是否更新？为了更好的体验，请更新到最新版本。'
+                    : '发现新版本，检查到您当前使用的是移动网络，是否更新？更新时请注意流量消耗。为了更好的体验，请更新到最新版本。',
+            cancelText: pd['ISUPDATE'] == '1' ? '' : '稍后更新',
+            confirmText: '立即更新',
          );
          if (ok) {
            if (Platform.isIOS) {
              openAppStore();
-            }else{
+            } else {
              final apkUrl = pd['FILEURL'] ?? '';
              await showUpdateConfirm(context, apkUrl: apkUrl);
            }
-
          }
          return;
        }
-
      }
-    }catch(_){}
-
+    } catch (_) {}

    final corppromiseData = await ApiService.checkSafeCorppromise();
    if (corppromiseData['ISSIGN'] == 1) {
@ -232,7 +234,6 @@ class HomePageState extends State<HomePage> {
        title: '温馨提示',
        content: '有未签署的安全承诺，点击确认前往签署',
        force: true,
-
      );
      if (confirmed) {
        Navigator.pushReplacement(
@ -243,10 +244,11 @@ class HomePageState extends State<HomePage> {
      return;
    }

-     _loadHiddenCache();
+    _loadHiddenCache();
    // 拉取其他数据 + 隐患列表（当 hiddenList 为空时显示 loading，否则不显示）
    _fetchData();
-   _fetchHiddenList(showLoading: hiddenList.isEmpty);
+    _fetchHiddenList(showLoading: hiddenList.isEmpty);
+
    /// 清单列表
    final data = await ApiService.getListData();
    if (data['result'] == 'success') {
@ -578,7 +580,6 @@ class HomePageState extends State<HomePage> {
                      pushPage(HomeNfcListPage(), context);
                      break;
                  }
-
                },
              );
            }).toList(),
@ -719,9 +720,9 @@ class HomePageState extends State<HomePage> {
      onTap: () async {
        if (index == 1) {
          LoadingDialogHelper.show();
-          bool isRest= await _getIsRest();
+          bool isRest = await _getIsRest();
          LoadingDialogHelper.hide();
-          if(isRest){
+          if (isRest) {
            ToastUtil.showNormal(context, "您已经处于离岗状态中");
            return;
          }
@ -775,17 +776,16 @@ class HomePageState extends State<HomePage> {
    );
  }

-
-  Future<bool> _getIsRest( )async {
+  Future<bool> _getIsRest() async {
    try {
      final raw = await ApiService.getIsRest();
      if (raw['result'] == 'success') {
-        if(  raw['ISREST']=="1"){
+        if (raw['ISREST'] == "1") {
          return true;
-        }else{
+        } else {
          return false;
        }
-      }else{
+      } else {
        return false;
      }
    } catch (e) {
@ -794,5 +794,4 @@ class HomePageState extends State<HomePage> {
      return false;
    }
  }
-
 }
--- a/lib/pages/home/tap/tabList/special_wrok/MeasuresListWidget.dart
+++ b/lib/pages/home/tap/tabList/special_wrok/MeasuresListWidget.dart
@ -1623,7 +1623,7 @@ class ConfirmWithSignWidget extends StatelessWidget {
    this.isShowTime = true,
  }) : super(key: key);

-  // 允许外部传入 null（但构建内部会降级为 {}，避免空异常）
+  // 允许外部传入 null（{}但构建内部会降级为 ，避免空异常）
  final Map<String, dynamic>? signs;
  final Map<String, dynamic>? pd;
  final String baseImgPath;
--- a/lib/pages/home/tap/tabList/special_wrok/dl_work/jszy_work_detail/cutroad_jszy_detail.dart
+++ b/lib/pages/home/tap/tabList/special_wrok/dl_work/jszy_work_detail/cutroad_jszy_detail.dart
@ -322,7 +322,7 @@ spacing: 12,
                        if (picked != null) {
                          setState(() {
                            endTime = DateFormat(
-                              'yyyy-MM-dd HH:mm',
+                              'yyyy-MM-dd HH:mm:ss',
                            ).format(picked);
                          });
                        }
--- a/lib/pages/home/tap/tabList/special_wrok/dz_work/zyr_work_detail/hoistwork_zyr_detail.dart
+++ b/lib/pages/home/tap/tabList/special_wrok/dz_work/zyr_work_detail/hoistwork_zyr_detail.dart
@ -261,7 +261,7 @@ if (reasonText.isEmpty) {
  @override
  Widget build(BuildContext context) {
    return Scaffold(
-      appBar: MyAppbar(title: '作业人意见'),
+      appBar: MyAppbar(title: '吊装作业人意见'),
      body: SafeArea(
        child: SingleChildScrollView(
          padding: EdgeInsets.all(12),
@ -285,7 +285,7 @@ if (reasonText.isEmpty) {
                        Row(
                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
                          children: [
-                            ListItemFactory.headerTitle('作业人'),
+                            ListItemFactory.headerTitle('吊装作业人'),
                            CustomButton(
                              text: '新增手写签字',
                              height: 36,
--- a/lib/pages/home/work/danger_wait_deawer.dart
+++ b/lib/pages/home/work/danger_wait_deawer.dart
@ -31,6 +31,10 @@ class DangerWaitBean {
  final String itemNameOne;
  final String itemNameTwo;

+  final String laiYuanId;
+  final String laiYuanName;
+
+
  DangerWaitBean({
    required this.selectedCategoryId,
    required this.selectedDepartmentId,
@ -43,7 +47,8 @@ class DangerWaitBean {
    required this.endTime,
    required this.itemNameOne,
    required this.itemNameTwo,
-
+    required this.laiYuanId,
+    required this.laiYuanName,

  });

@ -54,6 +59,7 @@ class DangerWaitBean {

      String startTime,String endTime,
      String itemNameOne,String itemNameTwo,
+      String laiYuanId,String laiYuanName,
      ) {
    return DangerWaitBean(
      selectedCategoryId:selectedCategoryId,
@ -67,6 +73,8 @@ class DangerWaitBean {
      endTime:endTime,
      itemNameOne:itemNameOne,
      itemNameTwo:itemNameTwo,
+      laiYuanId:laiYuanId,
+      laiYuanName:laiYuanName,

    );
  }
@ -76,7 +84,7 @@ class DangerWaitBean {
    "investigationMethodOption":investigationMethodOption,"investigationMethodId":investigationMethodId,
    "hazardLevelOption":hazardLevelOption,"dangerStatusOption":dangerStatusOption,
    "startTime":startTime,"endTime":endTime,
-    "itemNameOne":itemNameOne,"itemNameTwo":itemNameTwo,};
+    "itemNameOne":itemNameOne,"itemNameTwo":itemNameTwo,"laiYuanId":laiYuanId,"laiYuanName":laiYuanName,};
  }

 }
@ -85,7 +93,7 @@ class DangerWaitBean {
 class DangerWaitDrawer extends StatefulWidget {
  const DangerWaitDrawer(this.treeJson,  {super.key,required this.onClose});

-  final Function(String,String,String,String,String,String,String) onClose; // 回调函数
+  final Function(String,String,String,String,String,String,String,String) onClose; // 回调函数
  final String treeJson;
  // final DangerWaitBean waitBean;

@ -123,6 +131,12 @@ class DangerWaitDrawerState extends State<DangerWaitDrawer> {
  String itemNameOne="请选择";
  String itemNameTwo="请选择";

+  //隐患来源：
+  List<WaitListBean> laiYuanList =[];
+
+  String laiYuanId="";
+  String laiYuanName="请选择";
+
  // 转换为List<Map<String, dynamic>>
  late List<Map<String, dynamic>> departmentList ;

@ -131,6 +145,7 @@ class DangerWaitDrawerState extends State<DangerWaitDrawer> {
  final List<String> investigationMethod = ["风险排查隐患", "隐患排查隐患"];
  final List<String> hazardLevel = ["    一般风险    ", "    重大风险    "];
  final List<String> dangerStatus = ["未整改", "已整改", "已验收", "已过期"];
+  final List<String> laiYuanStatus = ["隐患快报", "隐患排查", "标准排查", "专项检查", "安全检查", "NFC设备巡检"];

  @override
  void initState() {
@ -162,6 +177,8 @@ class DangerWaitDrawerState extends State<DangerWaitDrawer> {
          }
          itemNameOne= dangerWaitBean["itemNameOne"];
          itemNameTwo= dangerWaitBean["itemNameTwo"];
+          laiYuanId= dangerWaitBean["laiYuanId"];
+          laiYuanName= dangerWaitBean["laiYuanName"];
        }


@ -169,6 +186,16 @@ class DangerWaitDrawerState extends State<DangerWaitDrawer> {
        print("解析失败: $e");
      }

+
+      //隐患来源数据处理
+      // setState(() {
+      //   for(int i=0;i<laiYuanStatus.length;i++){
+      //     WaitListBean waitListBean=WaitListBean(id: "${i+1}", name: laiYuanStatus[i], parentId: "");
+      //     laiYuanList.add(waitListBean);
+      //   }
+      // });
+
+
      // // 解析JSON字符串
      // jsonList = json.decode(widget.treeJson);
      // departmentList = List<Map<String, dynamic>>.from(jsonList);
@ -261,6 +288,27 @@ class DangerWaitDrawerState extends State<DangerWaitDrawer> {
      );
    }

+    // 隐患来源显示分类选择器
+    void showCategoryPickerTwo() {
+      showModalBottomSheet(
+        context: context,
+        isScrollControlled: true,
+        barrierColor: Colors.black54,
+        backgroundColor: Colors.transparent,
+        builder: (ctx) => WaitListPicker(
+          data: laiYuanList,
+          onSelected: (item) {
+            setState(() {
+               laiYuanId=item!.id;
+               laiYuanName=item!.name;
+              setResult();
+            });
+          },
+        ),
+      );
+    }
+
+
    return SafeArea(
      child:
        SingleChildScrollView( // 添加这一行
@ -314,6 +362,18 @@ class DangerWaitDrawerState extends State<DangerWaitDrawer> {
              // },
            ),

+
+
+            // const SizedBox(height: 6),
+            // // 管控部门
+            // _buildDropdownBox(
+            //     "隐患来源",
+            //     display: laiYuanName ?? '请选择',
+            //     onTap: () {
+            //       showCategoryPickerTwo();
+            //     }
+            // ),
+
            const SizedBox(height: 12),
            const Text(
              "排查方式",
@ -335,6 +395,8 @@ class DangerWaitDrawerState extends State<DangerWaitDrawer> {
                itemCount: investigationMethod.length,
                itemBuilder: _itemGridviewItem
            ),
+
+
            // Row(
            //   mainAxisAlignment: MainAxisAlignment.spaceBetween,
            //   children: List.generate(investigationMethod.length, (idx) {
@ -508,6 +570,9 @@ class DangerWaitDrawerState extends State<DangerWaitDrawer> {
                        itemNameOne="请选择";
                        itemNameTwo="请选择";

+                        laiYuanId="";
+                        laiYuanName="请选择";
+
                        setResult();
                        // widget.onClose("","","","","","","");

@ -698,7 +763,9 @@ class DangerWaitDrawerState extends State<DangerWaitDrawer> {
        _selectedCategoryId ?? "", _selectedDepartmentId?? "",
        _investigationMethodOption,investigationMethodId,
        _hazardLevelOption, _dangerStatusOption,
-        startTime, endTime,itemNameOne, itemNameTwo);
+        startTime, endTime,itemNameOne, itemNameTwo,laiYuanId,laiYuanName);
+
+

    String jsonString = jsonEncode(waitBean.toJson());
    SessionService.instance.setDangerWaitInfo(jsonString);
@ -711,6 +778,7 @@ class DangerWaitDrawerState extends State<DangerWaitDrawer> {
      _dangerStatusOption!=-1?dangerStatusId[_dangerStatusOption]:"",
      _startDate!=null?startTime:"",
      _endDate!=null?endTime:"",
+      laiYuanId?? ""
    ); // 触发回调
  }

--- a/lib/pages/mine/mine_duty_detail.dart
+++ b/lib/pages/mine/mine_duty_detail.dart
@ -53,7 +53,7 @@ class _MineDutyDetailPage extends State<MineDutyDetailPage> {

            // 申请人信息
            if (widget.item["REVIEW_STATUS"] != '2')
-              _buildInfoRowTwo("审批人：",  "${FormUtils.hasValue(widget.item, "REVIEW_USER_NAME") ? widget.item["REVIEW_USER_NAME"] : "unfind"}[${FormUtils.hasValue(widget.item, "REVIEW_USER_DEPARTMENTNAME") ? widget.item["REVIEW_USER_DEPARTMENTNAME"] : "unfind"}]",),
+              _buildInfoRowTwo("审批人：",  "${FormUtils.hasValue(widget.item, "REVIEW_USER_NAME") ? widget.item["REVIEW_USER_NAME"] : "无"}${FormUtils.hasValue(widget.item, "REVIEW_USER_DEPARTMENTNAME") ? "[${widget.item["REVIEW_USER_DEPARTMENTNAME"]}]": ""}",),
              // Container(
              //   padding: const EdgeInsets.symmetric(
              //     horizontal: 5,
--- a/lib/rename_script.sh
+++ b/lib/rename_script.sh
--- a/lib/tools/SmallWidget.dart
+++ b/lib/tools/SmallWidget.dart
@ -1,5 +1,3 @@
-import 'dart:ffi';
-
 import 'package:flutter/material.dart';

 import 'h_colors.dart';
--- a/lib/tools/h_colors.dart
+++ b/lib/tools/h_colors.dart
@ -1,4 +1,3 @@
-import 'dart:ffi';
 import 'dart:ui';

 import 'package:flutter_baidu_mapapi_base/flutter_baidu_mapapi_base.dart';
--- a/lib/tools/platform_utils.dart
+++ b/lib/tools/platform_utils.dart
@ -0,0 +1,33 @@
+// lib/utils/platform_utils.dart
+import 'package:flutter/foundation.dart' show kIsWeb, defaultTargetPlatform, TargetPlatform;
+
+/// 简单的跨平台判断工具，避免在 web 上引用 dart:io
+class PlatformUtils {
+  /// 是否在浏览器
+  static bool get isWeb => kIsWeb;
+
+  /// 是否为 iOS（注意：在 web 上会返回 false）
+  static bool get isIOS => !kIsWeb && defaultTargetPlatform == TargetPlatform.iOS;
+
+  /// 是否为 Android（在 web 上会返回 false）
+  static bool get isAndroid => !kIsWeb && defaultTargetPlatform == TargetPlatform.android;
+
+  /// 返回一个简单的操作系统标识字符串（web 会返回 'web'）
+  static String get operatingSystem {
+    if (kIsWeb) return 'web';
+    switch (defaultTargetPlatform) {
+      case TargetPlatform.android:
+        return 'android';
+      case TargetPlatform.iOS:
+        return 'ios';
+      case TargetPlatform.macOS:
+        return 'macos';
+      case TargetPlatform.linux:
+        return 'linux';
+      case TargetPlatform.windows:
+        return 'windows';
+      case TargetPlatform.fuchsia:
+        return 'fuchsia';
+    }
+  }
+}
Author	SHA1	Message	Date
hs	545321d5e1	适配web前保存	2025-09-23 10:31:41 +08:00
xufei	0621ff1e2a	2025.9.22 修改时间不对称bug	2025-09-22 09:24:17 +08:00
xufei	2582a547c3	Merge branch 'main' of http://47.92.113.182:3000/hanshuang/flutter_integrated_whb # Conflicts: # ios/Runner.xcodeproj/project.pbxproj	2025-09-19 18:02:13 +08:00
xufei	0b0f7c9eff	2025.9.19 修改bug	2025-09-19 18:01:23 +08:00