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

Feat/production safety

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

src/views/production-safety/hiddenTroubleInvestigationAndGovernance/checkTemplateManagement/components/checkTemplateManagementDetail.vue

@@ -50,16 +50,16 @@
       </el-form-item>
       <el-form-item label="状态：" prop="status">
         <el-radio-group v-model="ruleFormData.status" :disabled="isViewMode">
-          <el-radio :label="1">启用</el-radio>
-          <el-radio :label="0">禁用</el-radio>
+          <el-radio label="启用" :value="1">启用</el-radio>
+          <el-radio label="禁用" :value="0">禁用</el-radio>
         </el-radio-group>
       </el-form-item>
     </el-form>
 
     <div class="check-items-section">
-      <el-button plain @click="TemplateDownload">
+      <!-- <el-button plain @click="TemplateDownload">
         模板下载
-      </el-button>
+      </el-button> -->
       <el-button plain @click="handleeDownload" v-if="isCreateMode || isEditMode">
         导入
       </el-button>
@@ -67,7 +67,6 @@
         导出
       </el-button>
     </div>
-
     <div>
       <!-- <div class="section-header">
         <el-upload
@@ -139,8 +138,7 @@
     :visible="batchImportVisible"
     :import-api-url="importApiUrl"
     :template-url="templateUrl"
-    template-name="下载模板"
-    :show-template="false"
+    template-name="检查单模版导入模版"
     @close="batchImportVisible = false"
     @update="handleUpdate"
   />
@@ -401,7 +399,7 @@
   const batchImportVisible = ref(false);
   const { urlPrefix } = useGlobSetting();
   const importApiUrl = ref(urlJoin(urlPrefix, '/areaCheckPlanManageAdmin/importCheckList'));
-  const templateUrl = ref('./skyeye-file-upload/sfysecurity/TEMPLATE/import-hidden-danger-template.xlsx');
+  const templateUrl = ref('./skyeye-file-upload/sfysecurity/TEMPLATE/检查单导入模版 2.xlsx');
 
   const handleeDownload = () => {
     batchImportVisible.value = true;

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

@@ -32,13 +32,13 @@ export const CHECK_TEMPLATE_TABLE_COLUMNS: TableColumnProps[] = [
     label: '类别名称',
     prop: 'categoryName',
     align: 'left',
-    minWidth: '120px',
+    minWidth: '140px',
   },
   {
     label: '使用次数',
     prop: 'useCount',
     align: 'center',
-    minWidth: '100px',
+    minWidth: '120px',
   },
   // {
   //   label: '备注',
@@ -50,7 +50,7 @@ export const CHECK_TEMPLATE_TABLE_COLUMNS: TableColumnProps[] = [
     label: '修改用户名称',
     prop: 'updateUserName',
     align: 'left',
-    minWidth: '120px',
+    minWidth: '160px',
   },
   {
     label: '修改时间',

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

@@ -358,10 +358,9 @@
   };
   const params = ref()
   const handleSubmit = async () => {
-    // const ok = await handleValidate();
-    // if (!ok) return;
+    const ok = await handleValidate();
+    if (!ok) return;
     try {
-        console.log(ruleFormData, '提交参数')
       params.value = {
         categoryId: ruleFormData.categoryId ?? 0,
         hazardDesc: ruleFormData.hazardDesc || '',
@@ -422,40 +421,12 @@
         console.log(payload)
         await saveEmployeeHazardReport(payload);
         ElMessage.success('提交成功');
-        // if(isCreateMode.value){
-          
-        // }else{
-        //   const payload = buildSubmitPayload({
-        //     approvalInfoList,
-        //     approvalDescription: '',
-        //     templateId: form.approvalTemplateId,
-        //   });
-        //   await doSubmit(payload);
-        // }
         basicDialogRef.value.closeDialog();
         router.back();
       }
     });
   };
 
-//   const handleSubmitApproval = async ()=>{
-//     try {
-//        if (
-//         operate.value === 'employee-report-hidden-trouble-create' ||
-//         operate.value === 'hidden-trouble-review-create'
-//       ) {
-//         await saveEmployeeHazardReport(params.value);
-//         ElMessage.success('提交成功');
-//       } else if (currentId.value) {
-//         await updateEmployeeHazardReport({ id: currentId.value, ...params.value });
-//         ElMessage.success('保存成功');
-//       }
-//       router.back();
-//     } catch (e:any) {
-//       console.error('提交失败:', e);
-//       ElMessage.error(e?.message || e?.data || '提交失败，请重试');
-//     }
-//   }
 
   const previewOnline = (url: string | undefined, type) => {
     if (url) {

src/views/production-safety/implement-safety-duty/non-public-list-responsibilities/list.vue

@@ -226,7 +226,7 @@
     :importApiUrl="importApiUrl"
     :templateUrl="templateUrl"
     :show-template="true"
-    :templateName="'责任清单(非区域管理员)-批量导入模版'"
+    :templateName="'责任清单-非公共区域导入模版'"
     @close="() => (batchImportVisible = false)"
     @update="handleUpdate"
   />

src/views/production-safety/implement-safety-duty/public-list-responsibilities/list.vue

@@ -221,7 +221,7 @@
     :importApiUrl="importApiUrl"
     :templateUrl="templateUrl"
     :show-template="true"
-    :templateName="'责任清单-批量导入模版'"
+    :templateName="'责任清单-公共区域导入模版'"
     @close="() => (batchImportVisible = false)"
     @update="handleUpdate"
   />

src/views/production-safety/productionSafetySystem/safetySystemConstructionWorkPlanManagement/safetySystemConstructionWorkPlanManagement.vue

@@ -480,7 +480,7 @@
     // 批量导入
   const batchImportVisible = ref(false);
   const { urlPrefix } = useGlobSetting();
-  const importApiUrl = ref(urlJoin(urlPrefix, '/safety-culture/importProductionEducationTrainingPlan'));
+  const importApiUrl = ref(urlJoin(urlPrefix, '/safetyWorkPlan/workPlan/import'));
   const templateUrl = ref('./skyeye-file-upload/sfysecurity/TEMPLATE/安全体系建设工作计划导入模版.xlsx');
   // 导入
   const handleImport = () => {

src/views/production-safety/safety-culture/safetyCultureActivityManagement/configs/activityTargetTables.ts

@@ -164,6 +164,7 @@ export const ACTIVITY_REGISTRATION_ADVANCED_PERSON_TABLE_COLUMNS: TableColumnPro
     prop: 'remark',
     align: 'left',
     minWidth: '160px',
+    showOverflowTooltip: true,
   },
   {
     label: '报名日期',

src/views/production-safety/safety-culture/safetyCultureActivityManagement/configs/tables.ts

@@ -37,7 +37,7 @@ export const INVENTORY_TABLE_COLUMNS: TableColumnProps[] = [
     label: '安全文化活动计划名称',
     prop: 'actionContent',
     align: 'left',
-    minWidth: '120px',
+    minWidth: '200px',
     // showOverflowTooltip: true,
   },
   {

src/views/production-safety/safety-culture/safetyCultureActivityManagementExecutor/configs/tables.ts

@@ -37,7 +37,7 @@ export const INVENTORY_TABLE_COLUMNS: TableColumnProps[] = [
     label: '安全文化活动计划名称',
     prop: 'actionContent',
     align: 'left',
-    minWidth: '120px',
+    minWidth: '200px',
     // showOverflowTooltip: true,
   },
   {