Merge branch 'fix/production-safety' into 'dev'

Fix/production safety

See merge request product-group-fe/sfy-safety-group/sfy-safety!383

src/views/production-safety/hiddenTroubleInvestigationAndGovernance/employeeReportHiddenTroubleManagement/components/employeeReportHiddenTroubleManagementDetail.vue

@@ -449,4 +449,11 @@
 
 <style scoped lang="scss">
   @use '@/styles/page-details-layout.scss' as *;
+  
+  :deep(.preview-img){
+    overflow: auto;
+    img {
+        max-height: 90vh;
+    }
+  }
 </style>

src/views/production-safety/hiddenTroubleInvestigationAndGovernance/employeeReportHiddenTroubleManagement/configs/form.ts

@@ -2,7 +2,7 @@
  * @Author: liuJie
  * @Date: 2026-03-22 16:06:38
  * @LastEditors: liuJie
- * @LastEditTime: 2026-04-01 12:08:03
+ * @LastEditTime: 2026-04-08 14:48:51
  * @Describe: file describe
  */
 import { FormConfig } from '@/types/basic-form';
@@ -38,10 +38,10 @@ export const ACADEMY_FILE_FORM_CONFIG: FormConfig[] = [
     componentProps: {
       placeholder: '请选择上报时间',
       type: 'datetime',
-      format: 'YYYY-MM-DD HH:mm',
+      format: 'YYYY-MM-DD HH:mm:ss',
       dateFormat: 'MMM DD, YYYY',
-      timeFormat: 'HH:mm',
-      valueFormat: 'YYYY-MM-DD HH:mm',
+      timeFormat: 'HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
       disabled: true,
     },
   },

src/views/production-safety/risk-identification-and-control/hazard-approval-manage/audit.vue

@@ -51,7 +51,7 @@
       <div class="table-content">
         <el-table :data="tableData.data">
           <el-table-column type="index" label="序号" width="80" />
-          <el-table-column label="申请单号" width="150" prop="code" />
+          <el-table-column label="申请单号" width="160" prop="code" />
           <el-table-column label="申请单位" width="180" prop="applicationUnitName" />
           <el-table-column label="申请人" width="180" prop="applicantName" />
           <el-table-column label="申请部门" width="180" prop="applicationDepartment" />

src/views/production-safety/risk-identification-and-control/hazard-approval-manage/list.vue

@@ -55,7 +55,7 @@
       <div class="table-content">
         <el-table :data="tableData.data">
           <el-table-column type="index" label="序号" width="80" />
-          <el-table-column label="申请单号" width="150" prop="code" />
+          <el-table-column label="申请单号" width="160" prop="code" />
           <el-table-column label="申请单位" width="180" prop="applicationUnitName" />
           <el-table-column label="申请人" width="180" prop="applicantName" />
           <el-table-column label="申请部门" width="180" prop="applicationDepartment" />

src/views/production-safety/risk-identification-and-control/hazard-approval-manage/view.vue

@@ -1207,7 +1207,7 @@ const rules = reactive({
       });
     } catch (err) {
       console.error('详情加载失败:', err);
-      ElMessage.error('详情回显失败');
+    //   ElMessage.error('详情回显失败');
     }
   };
   // 预览
@@ -1336,4 +1336,10 @@ const rules = reactive({
     cursor: pointer;
     font-size: 12px;
   }
+  :deep(.preview-img){
+    overflow: auto;
+    img {
+        max-height: 90vh;
+    }
+  }
 </style>

src/views/production-safety/safety-culture/safetyPublicityBoardManagement/components/safetyPublicityBoardManagementDetail.vue

@@ -322,13 +322,15 @@
         ruleFormData.description = res.description || '';
         ruleFormData.attachmentUrl = JSON.parse(res.attachmentUrl || res.fileUrl || '');
         ruleFormData.status = res.status ?? 1;
-        ruleFormData.imageUrls = JSON.parse(res.imageUrls || '');
-        imageList.value = JSON.parse(res.imageUrls || '') || [];
+        // 判断如果 imageUrls 不为空且是字符串类型，则进行转换
+        if (res.imageUrls && typeof res.imageUrls === 'string') {
+            ruleFormData.imageUrls = res.imageUrls || '';
+            imageList.value = JSON.parse(res.imageUrls) || [];
+        }
       }
       cloneRuleFormData();
     } catch (e) {
       console.error('获取院级文件详情失败:', e);
-      ElMessage.error('获取详情失败');
     }
   };