Merge branch 'feat/production-safety' of http://192.168.6.110/product-group-fe/sfy-safety-group/sfy-safety into feat/production-safety

src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagement/areaCheckPlanManagement.vue

@@ -7,7 +7,7 @@
       <div class="search-table-container">
         <header>
           <div style="position: relative">
-            <el-button type="primary" class="search-table-container--button" @click="handleCreate"> 添加 </el-button>
+            <el-button type="primary" class="search-table-container--button" @click="handleCreate" :icon="Plus"> 添加 </el-button>
             <el-button plain class="search-table-container--button" @click="handleImport"> 导入 </el-button>
           </div>
 
@@ -83,14 +83,20 @@
             </template>
             <template #needOverallDesc="scope">
               <span>{{
-                scope.row.needOverallDesc === true ? '是' : scope.row.needOverallDesc === false ? '否' : '-'
+               scope.row.status === 0 ? '-' : scope.row.needOverallDesc === true ? '是' : scope.row.needOverallDesc === false ? '否' : '-'
               }}</span>
             </template>
             <template #needSigneeSign="scope">
               <span>{{
-                scope.row.needSigneeSign === true ? '是' : scope.row.needSigneeSign === false ? '否' : '-'
+                scope.row.status === 0 ? '-' : scope.row.needSigneeSign === true ? '是' : scope.row.needSigneeSign === false ? '否' : '-'
               }}</span>
             </template>
+            <template #planStartTime="scope">
+              <span>{{ scope.row.planStartTime ?? '-' }}</span>
+            </template>
+            <template #planEndTime="scope">
+              <span>{{ scope.row.planEndTime ?? '-' }}</span>
+            </template>
             <template #action="scope">
               <div class="action-container--div" style="justify-content: left">
                 <!-- 未下发(0)：编辑、删除、查看、下发 -->
@@ -279,6 +285,7 @@
   import BasicTable from '@/components/BasicTable.vue';
   import useTableConfig from '@/hooks/useTableConfigHook';
   import ActionButton from '@/components/ActionButton.vue';
+  import { Plus } from '@element-plus/icons-vue';
   import {
     TABLE_OPTIONS,
     AREA_CHECK_PLAN_TABLE_COLUMNS,
@@ -622,14 +629,14 @@
 
         // 安全应急部门
         safetyEmergencyDeptName,
-        safetyEmergencyDeptId: issueForm.safetyEmergencyDeptId,
+        SafetyEmergencyDeptCode: issueForm.safetyEmergencyDeptId,
         safetyEmergencyExecutorGroupName: findGroupNameById(issueForm.safetyEmergencyGroupId),
         safetyEmergencyExecGroupCode:
           issueForm.safetyEmergencyGroupId != null ? String(issueForm.safetyEmergencyGroupId) : undefined,
 
         // 院领导部门
         hospitalLeaderDeptName,
-        hospitalLeaderDeptId: issueForm.hospitalLeaderDeptId,
+        hospitalLeaderDeptCode: issueForm.hospitalLeaderDeptId,
         hospitalLeaderExecutorGroupName: findGroupNameById(issueForm.hospitalLeaderGroupId),
         hospitalLeaderExecGroupCode:
           issueForm.hospitalLeaderGroupId != null ? String(issueForm.hospitalLeaderGroupId) : undefined,
@@ -646,7 +653,7 @@
       showIssueDialog.value = false;
       getTableData();
     } catch (e) {
-      console.error('下发失败:', e);
+      ElMessage.error(e.message);
     }
   };
 

src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagement/configs/tables.ts

@@ -167,14 +167,14 @@ export const AREA_CHECK_PLAN_TABLE_COLUMNS: TableColumnProps[] = [
   {
     label: '计划开始时间',
     prop: 'planStartTime',
-    align: 'left',
-    minWidth: '160px',
+    minWidth: '240px',
+    slot: 'planStartTime',
   },
   {
     label: '计划结束时间',
     prop: 'planEndTime',
-    align: 'left',
-    minWidth: '160px',
+    minWidth: '240px',
+    slot: 'planEndTime',
   },
   {
     label: '操作',

src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagementDept/components/areaCheckPlanManagementDeptDetail.vue

@@ -507,7 +507,7 @@
   const currentRowForUnqualified = ref<Record<string, unknown> | null>(null);
   const unqualifiedList = ref<UnqualifiedItemNumRecord[]>([]);
   const UNQUALIFIED_TABLE_COLUMNS: TableColumnProps[] = [
-    { label: '编号', type: 'index', align: 'center', width: '60px' },
+    { label: '编号', type: 'index', align: 'center', width: '80px' },
     { label: '检查场所', prop: 'checkPlace', minWidth: '200px' },
     { label: '发现问题', prop: 'checkProblem', minWidth: '220px' },
     { label: '检查时间', prop: 'checkTime', minWidth: '180px' },

src/views/production-safety/productionSafetySystem/safetySystemConstructionWorkPlanManagement/configs/tables.ts

@@ -63,45 +63,49 @@ export const WORK_PLAN_TABLE_COLUMNS: TableColumnProps[] = [
     label: '分类名称',
     prop: 'categoryName',
     align: 'left',
-    minWidth: '120px',
+    minWidth: '200px',
   },
   {
     label: '培训计划名称',
     prop: 'trainingPlanName',
     align: 'left',
-    minWidth: '150px',
+    minWidth: '200px',
     showOverflowTooltip: true,
   },
   {
     label: '责任部门',
     prop: 'responsibleDeptNames',
     align: 'left',
-    minWidth: '120px',
+    minWidth: '200px',
   },
   {
     label: '配合部门',
     prop: 'cooperateDeptNames',
     align: 'left',
-    minWidth: '120px',
+    minWidth: '200px',
   },
   {
     label: '下发数',
     prop: 'issuedCount',
+    minWidth: '150px',
     slot: 'issuedCount',
   },
   {
     label: '反馈数',
+    minWidth: '150px',
     prop: 'feedbackCount',
     slot: 'feedbackCount',
   },
   {
     label: '反馈比例',
     prop: 'feedbackRatio',
+    minWidth: '150px',
     slot: 'feedbackRatio',
   },
   {
     label: '计划完成时间',
     prop: 'plannedEndTime',
+    minWidth: '150px',
     slot: 'plannedEndTime',
   },
   {

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

@@ -5,7 +5,7 @@
     </header>
     <main class="safety-platform-container__main">
         <div>
-            <el-button class="search-table-container--button" type="primary" @click="$router.push({ name: 'riskManageAdd' })">添加 </el-button>
+            <el-button class="search-table-container--button" type="primary" :icon="Plus" @click="$router.push({ name: 'riskManageAdd' })">添加 </el-button>
             <el-button plain class="search-table-container--button" @click="handleImport">
               导入
             </el-button>
@@ -159,6 +159,7 @@
   import { onMounted, reactive, ref } from 'vue';
   import dayjs from 'dayjs';
   import { ElMessage } from 'element-plus';
+  import { Plus } from '@element-plus/icons-vue';
   import { useRouter } from 'vue-router';
   import {
     safetyRiskListQueryPage,