Merge remote-tracking branch 'origin/main'

# Conflicts:
#	android/app/src/main/res/drawable-v21/background.png
#	ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png

android/app/build.gradle.kts

@@ -36,27 +36,27 @@ android {
         versionName = flutter.versionName
     }
 
-    // ✅ 添加 release 签名配置
+//    // ✅ 添加 release 签名配置
-    signingConfigs {
+//    signingConfigs {
-        create("release") {
+//        create("release") {
-            storeFile = file(keystoreProperties["storeFile"] as String)
+//            storeFile = file(keystoreProperties["storeFile"] as String)
-            storePassword = keystoreProperties["storePassword"] as String
+//            storePassword = keystoreProperties["storePassword"] as String
-            keyAlias = keystoreProperties["keyAlias"] as String
+//            keyAlias = keystoreProperties["keyAlias"] as String
-            keyPassword = keystoreProperties["keyPassword"] as String
+//            keyPassword = keystoreProperties["keyPassword"] as String
-        }
+//        }
-    }
+//    }
-
+//
-    buildTypes {
+//    buildTypes {
-        release {
+//        release {
-            // ✅ 替换成 release 签名
+//            // ✅ 替换成 release 签名
-            signingConfig = signingConfigs.getByName("release")
+//            signingConfig = signingConfigs.getByName("release")
-            isMinifyEnabled = false
+//            isMinifyEnabled = false
-            isShrinkResources = false
+//            isShrinkResources = false
-        }
+//        }
-        debug {
+//        debug {
-            signingConfig = signingConfigs.getByName("debug")
+//            signingConfig = signingConfigs.getByName("debug")
-        }
+//        }
-    }
+//    }
 }
 
 flutter {

lib/customWidget/bottom_picker_two.dart

@@ -23,13 +23,14 @@ class BottomPickerTwo {
   /// [itemExtent]: 列表行高
   /// [height]: 弹窗总高度
   static Future<dynamic> show<T>(
-      BuildContext context, {
+    BuildContext context, {
-        required List<dynamic> items,
+    required List<dynamic> items,
-        required Widget Function(dynamic item) itemBuilder,
+    required Widget Function(dynamic item) itemBuilder,
-        int initialIndex = 0,
+    int initialIndex = 0,
-        double itemExtent = 40.0,
+    double itemExtent = 40.0,
-        double height = 250,
+    double height = 250,
-      }) {
+    double desiredSpacing = 16.0,
+  }) {
     // 当前选中项
     dynamic selected = items[initialIndex];
 
@@ -46,7 +47,10 @@ class BottomPickerTwo {
             children: [
               // 按钮行
               Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 16,
+                  vertical: 8,
+                ),
                 child: Row(
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
@@ -65,13 +69,39 @@ class BottomPickerTwo {
               // 滚动选择器
               Expanded(
                 child: CupertinoPicker(
-                  scrollController:
+                  scrollController: FixedExtentScrollController(
-                  FixedExtentScrollController(initialItem: initialIndex),
+                    initialItem: initialIndex,
-                  itemExtent: 30,
+                  ),
+                  itemExtent: 35,
                   onSelectedItemChanged: (index) {
                     selected = items[index];
                   },
-                  children: items.map(itemBuilder).toList(),
+                  // children: items.map(itemBuilder).toList(),
+                  children: List<Widget>.generate(items.length, (int index) {
+                    return Padding(
+                      // 通过Padding调整项间距
+                      padding: EdgeInsets.symmetric(
+                        vertical: desiredSpacing / 2,
+                      ),
+                      child: Center(
+                        child: Text(
+                          // '选项 $index',
+                          items[index]["NAME"],
+                          style: TextStyle(
+                            fontSize: 18,
+                            color:
+                                index == selected
+                                    ? CupertinoColors.activeBlue
+                                    : CupertinoColors.inactiveGray,
+                            fontWeight:
+                                index == selected
+                                    ? FontWeight.bold
+                                    : FontWeight.normal,
+                          ),
+                        ),
+                      ),
+                    );
+                  }),
                 ),
               ),
             ],

lib/pages/app/Danger_paicha/check_information_one_item.dart

@@ -152,7 +152,7 @@ class _CheckInformationOneItemState extends State<CheckInformationOneItem> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: MyAppbar(title: "隐患登记"),
+      appBar: MyAppbar(title: "隐患等级"),
       body: Column(
         children: [
           // 详情滚动区域

lib/pages/app/Danger_paicha/hazard_registration_page.dart

@@ -151,7 +151,7 @@ class _HazardRegistrationPageState extends State<HazardRegistrationPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: MyAppbar(title: "隐患登记"),
+      appBar: MyAppbar(title: "隐患等级"),
       body: Column(
         children: [
           // 详情滚动区域

lib/pages/app/checking_information_one_page.dart

@@ -311,7 +311,7 @@ class _CheckingInformationOnePageState extends State<CheckingInformationOnePage>
           // 确认按钮
           // const Spacer(),
           _buildTrueButton(),
-
+          SizedBox(height: 10,),
 
         ],
       ),

lib/pages/home/SafetyCommitment/safety_commitment_dh_list.dart

@@ -152,53 +152,54 @@ class _SafetyCommitmentDhListState extends State<SafetyCommitmentDhList> {
   Future<void> _handleApply() async {
     // 处理申请按钮点击逻辑
 
-    setState(() async {
+    // setState(() async {
+    //   if(widget.type==1) {
+    //     await pushPage(CompanySafetyCommitmentApply(), context);
+    //   }else if(widget.type==2){
+    //     await pushPage(WorkShopSafetyCommitmentApply(), context);
+    //   }else {
+    //     await pushPage(TeamSafetyCommitmentApply(), context);
+    //   }
+    //
+    //   searchKeywords = "";
+    //   currentPage = 1;
+    //   list.clear();
+    //   _fetchData();
+    // });
+
+    try {
+      final Map<String, dynamic> response;
       if(widget.type==1) {
-        await pushPage(CompanySafetyCommitmentApply(), context);
+        response = await ApiService.getCompanySafetyCommitmentPermission( id);
       }else if(widget.type==2){
-        await pushPage(WorkShopSafetyCommitmentApply(), context);
+        response = await ApiService.getWorkshopSafetyCommitmentPermission(id);
       }else {
-        await pushPage(TeamSafetyCommitmentApply(), context);
+        response = await ApiService.getTeamSafetyCommitmentPermission(id);
       }
 
-      searchKeywords = "";
+      if (response['result'] == 'success') {
-      currentPage = 1;
-      list.clear();
-      _fetchData();
-    });
 
-    // try {
+            if(widget.type==1) {
-    //   final Map<String, dynamic> response;
+              await pushPage(CompanySafetyCommitmentApply(), context);
-    //   if(widget.type==1) {
+            }else if(widget.type==2){
-    //     response = await ApiService.getCompanySafetyCommitmentPermission( id);
+              await pushPage(WorkShopSafetyCommitmentApply(), context);
-    //   }else if(widget.type==2){
+            }else {
-    //     response = await ApiService.getWorkshopSafetyCommitmentPermission(id);
+              await pushPage(TeamSafetyCommitmentApply(), context);
-    //   }else {
+            }
-    //     response = await ApiService.getTeamSafetyCommitmentPermission(id);
+
-    //   }
+      setState(()  {
-    //
+          searchKeywords = "";
-    //   if (response['result'] == 'success') {
+          currentPage = 1;
-    //     setState(() async {
+          list.clear();
-    //       if(widget.type==1) {
+          _fetchData();
-    //         await pushPage(CompanySafetyCommitmentApply(), context);
+        });
-    //       }else if(widget.type==2){
+      }else{
-    //
+        ToastUtil.showNormal(context, response['msg']);
-    //       }else {
+      }
-    //
+    } catch (e) {
-    //       }
+      ToastUtil.showNormal(context,'$e');
-    //
+      print('Error fetching data: $e');
-    //       searchKeywords = "";
+    }
-    //       currentPage = 1;
-    //       list.clear();
-    //       _fetchData();
-    //     });
-    //   }else{
-    //     ToastUtil.showNormal(context, response['msg']);
-    //   }
-    // } catch (e) {
-    //   ToastUtil.showNormal(context,'$e');
-    //   print('Error fetching data: $e');
-    // }
 
 
   }

lib/pages/home/SafetyCommitment/safety_commitment_tab_list.dart

@@ -35,7 +35,7 @@ class _SafetyCommitmentTabListState extends State<SafetyCommitmentTabList> {
       buttonInfos = [
         {
           "icon": "assets/icon-apps/icon_101.png",
-          "title": "动火作业",
+          "title": "公司安全承诺",
           "unreadCount": 0,
         },
         {

lib/pages/home/risk/risk_detail_page.dart

@@ -153,6 +153,7 @@ class _RiskDetailPageState extends State<RiskDetailPage> {
                 Spacer(),
                 // 底部按钮固定
                 _buildBottomButton(),
+                SizedBox(height: 10,)
               ],
             );
           },

lib/pages/home/tap/tabList/special_wrok/dh_work/HotWorkDetailFormWidget.dart

@@ -13,6 +13,8 @@ class HotWorkDetailFormWidget extends StatefulWidget {
   final VoidCallback onChooseHotworkUser;
   final VoidCallback onAnalyzeTap;
 
+
+
   // 新增
   final VoidCallback? onChooseVideoManager;
   /// 选择摄像头
@@ -55,6 +57,7 @@ class HotWorkDetailFormWidget extends StatefulWidget {
     this.hotworkPersonController,
     this.relatedController,
     this.riskController,
+
   }) : assert(
          !isEditable ||
              (contentController != null &&

lib/pages/home/tap/tabList/special_wrok/dh_work/dh_work_detai/hotwork_apply_detail.dart

@@ -100,7 +100,7 @@ class _HotworkApplyDetailState extends State<HotworkApplyDetail> {
       _getData();
     } else {
       isEditable = true;
-      pd['ANALYZE_TIME'] = 1;
+      // pd['ANALYZE_TIME'] = 1;
       pd['APPLY_DEPARTMENT_ID'] = SessionService.instance.deptId;
       pd['APPLY_DEPARTMENT_NAME'] =
           SessionService.instance.loginUser!['DEPARTMENT_NAME'] ?? '';
@@ -731,6 +731,7 @@ class _HotworkApplyDetailState extends State<HotworkApplyDetail> {
                   onWorkAreaHandle: _getWorkArea,
                   onWorkAreaLocationHandle: _showLocationHandle,
 
+
                   onAnalyzeTap: () {
                     pushPage(
                       HotworkGasList(HOTWORK_ID: widget.HOTWORK_ID),

lib/pages/home/userInfo_page.dart

@@ -53,13 +53,13 @@ class _UserinfoPageState extends State<UserinfoPage> {
             Divider(height: 1),
             _userItemCell("部门", user["DEPARTMENT_NAME"]??"", false),
             Divider(height: 1),
-            _userItemCell("岗位", user["DUTIES_NAME"]??"", true),
+            _userItemCell("岗位(工种)", user["POST_NAME"]??"", true),
             Divider(height: 1),
             _userItemCell("人员类型", user["PERSONNEL_TYPE_NAME"]??"", false),
             Divider(height: 1),
             _userItemCell("入职时间", user["ENTRY_DATE"]??"", false),
             Divider(height: 1),
-            _userItemCell("工种", user["TYPE_OF_WORK_NAME"]??"", false),
+            // _userItemCell("工种", user["TYPE_OF_WORK_NAME"]??"", false),
           ],
         ),
       ),

lib/pages/home/work/danger_project_page.dart

@@ -263,7 +263,7 @@ class _DangerProjectPageState extends State<DangerProjectPage> {
           Card(
             color: Colors.white,
             child: Container(
-              padding: const EdgeInsets.all(16),
+              padding: const EdgeInsets.all(10),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
@@ -375,7 +375,7 @@ class _DangerProjectPageState extends State<DangerProjectPage> {
     VoidCallback? onImageTap,
   }) {
     final isSelected = item["REFERENCE_BASIS"] == value;
-    final buttonWidth = (screenWidth - 60) / 3 - 10; // 计算按钮宽度
+    final buttonWidth = (screenWidth - 30) / 3 - 10; // 计算按钮宽度
 
     return GestureDetector(
       onTap: () {
@@ -395,15 +395,15 @@ class _DangerProjectPageState extends State<DangerProjectPage> {
         // 不要在这里放 Expanded（非 Flex 父组件）
         child: Row(
           mainAxisSize: MainAxisSize.min,
-          mainAxisAlignment: MainAxisAlignment.start,
+          mainAxisAlignment: MainAxisAlignment.center,
           children: [
             SizedBox(
               height: 30,
-              width: 90,
+              width: 100,
               child: Row(
                 children: [
                   Icon(icon, color: isSelected ? color : Colors.grey, size: 30),
-                  const SizedBox(width: 8),
+                  const SizedBox(width: 3),
                   Flexible(
                     child: Text(
                       label,
@@ -415,31 +415,34 @@ class _DangerProjectPageState extends State<DangerProjectPage> {
                       ),
                     ),
                   ),
+
+                  const SizedBox(width: 3),
+                  if ((value == "option1" && item["REFERENCE_BASIS"] == "option1") ||
+                      (value == "option2" &&
+                          item["REFERENCE_BASIS"] == "option2" &&
+                          item.containsKey("ids") &&
+                          item["ids"].toString().isNotEmpty))
+                    GestureDetector(
+                      onTap: () {
+                        if (onImageTap != null) {
+                          onImageTap();
+                        }
+                      },
+                      behavior: HitTestBehavior.opaque,
+                      child: Transform.translate(
+                        offset: const Offset(0, -6),
+                        child: Image.asset(
+                          "assets/images/gantan-blue.png",
+                          width: 15,
+                          height: 15,
+                        ),
+                      ),
+                    ),
+
                 ],
               ),
             ),
-            const SizedBox(width: 6),
+
-            if ((value == "option1" && item["REFERENCE_BASIS"] == "option1") ||
-                (value == "option2" &&
-                    item["REFERENCE_BASIS"] == "option2" &&
-                    item.containsKey("ids") &&
-                    item["ids"].toString().isNotEmpty))
-              GestureDetector(
-                onTap: () {
-                  if (onImageTap != null) {
-                    onImageTap();
-                  }
-                },
-                behavior: HitTestBehavior.opaque,
-                child: Transform.translate(
-                  offset: const Offset(0, -6),
-                  child: Image.asset(
-                    "assets/images/gantan-blue.png",
-                    width: 15,
-                    height: 15,
-                  ),
-                ),
-              ),
           ],
         ),
       ),

lib/pages/home/work/risk_list_page.dart

@@ -206,8 +206,9 @@ class _riskListPageState extends State<RiskListPage> {
                 height: 50,
                 child: TextButton(
                     onPressed: () => _nextHandle(), child: Text("下一步", style: TextStyle(color: Colors.white),)),
-              )
+              ),
 
+              SizedBox(height: 20,),
             ],
           )),
     );