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

src/api/drawLessons/index.ts

@@ -392,7 +392,7 @@ export function exportTheDocumentPost() {
 }
 
 /**
- * 导出举一反三子记录
+ * 管理导出举一反三子记录
  */
 export function exportDrawLessonsAdminPage() {
   return http.request({
@@ -403,3 +403,17 @@ export function exportDrawLessonsAdminPage() {
     isTransformResponse: false,
   });
 }
+
+/**
+ * 部门导出举一反三子记录
+ */
+export function exportDrawLessonsAdminPageDept() {
+  return http.request({
+    url: '/drawLessons/dept/export',
+    method: 'post',
+    responseType: 'blob',
+  }, {
+    isTransformResponse: false,
+  });
+}
+

src/api/production-safety/responsibility-implementation/index.ts

@@ -978,8 +978,11 @@ export function dangerWorkSaveApproval(params) {
  */
 export function exportRiskList () {
   return http.request({
-    url: `/safetyRisk/list/exportRiskList`,
+    url: '/safetyRisk/list/exportRiskList',
     method: 'post',
+    responseType: 'blob',
+  }, {
+    isTransformResponse: false,
   });
 }
 

src/views/production-safety/hiddenTroubleInvestigationAndGovernance/oneByOneManagement/components/OneByOneAuditDetail.vue

@@ -96,8 +96,8 @@
     </main>
     <footer class="safety-platform-container__footer">
       <el-button @click="router.back()">返回</el-button>
-      <el-button type="primary" @click="handleReject">审核不通过</el-button>
-      <el-button type="primary" @click="handleApprove">审核通过</el-button>
+      <el-button type="primary" @click="handleReject" v-if="!isViewMode">审核不通过</el-button>
+      <el-button type="primary" @click="handleApprove" v-if="!isViewMode">审核通过</el-button>
     </footer>
 
     <el-dialog
@@ -139,6 +139,8 @@
   const router = useRouter();
   const route = useRoute();
   const id = computed(() => Number(route.query.id));
+  const operate = computed(() => (route.query.operate as string) || 'one-by-one-audit-detail');
+  const isViewMode = computed(() => operate.value === 'one-by-one-audit-view');
 
   const detailData = ref<{
     problem?: string;

src/views/production-safety/hiddenTroubleInvestigationAndGovernance/oneByOneManagement/components/OneByOneNotifyTarget.vue

@@ -333,8 +333,9 @@
     router.push({
       name: 'oneByOneManagementItem',
       query: {
-        id: String(row.associationOtId),
-        operate: 'one-by-one-view',
+        id: String(row.id),
+        // operate: 'one-by-one-view',
+        operate: 'one-by-one-audit-view',
       },
     });
   };

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

@@ -10,9 +10,6 @@
             <el-button type="primary" class="search-table-container--button" @click="handleCreate">
               新增举一反三
             </el-button>
-            <el-button plain class="search-table-container--button" @click="handleDownload">
-              导出
-            </el-button>
           </div>
 
           <div class="act-search">
@@ -56,6 +53,9 @@
             <section class="search-btn">
               <el-button type="primary" @click="handleSearch">查询</el-button>
               <el-button @click="handleReset">重置</el-button>
+              <el-button plain @click="handleDownload">
+                导出
+              </el-button>
             </section>
           </div>
         </header>

src/views/production-safety/hiddenTroubleInvestigationAndGovernance/oneByOneManagement/oneByOneManagementItem.vue

@@ -28,6 +28,8 @@
         return '通知对象';
       case 'one-by-one-audit-detail':
         return '审核';
+      case 'one-by-one-audit-view':
+        return '审核查看';
       default:
         return '未知操作';
     }
@@ -39,6 +41,8 @@
         return defineAsyncComponent(() => import('./components/OneByOneNotifyTarget.vue'));
       case 'one-by-one-audit-detail':
         return defineAsyncComponent(() => import('./components/OneByOneAuditDetail.vue'));
+      case 'one-by-one-audit-view':
+        return defineAsyncComponent(() => import('./components/OneByOneAuditDetail.vue'));
       default:
         return defineAsyncComponent(() => import('./components/oneByOneManagementDetail.vue'));
     }

src/views/production-safety/hiddenTroubleInvestigationAndGovernance/oneByOneManagementDept/components/oneByOneManagementDeptDetail.vue

@@ -344,6 +344,7 @@
       if (data && typeof data === 'object') {
         detailData.value = data;
         hasProblem.value = Number(data.feedbackHasIssue) === 1 ? true : false;
+        materialAttachmentList.value = JSON.parse(data.attachments || '[]');
       }
     } catch (e) {
       console.error('获取举一反三详情失败:', e);

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

@@ -6,11 +6,6 @@
     <main class="safety-platform-container__main">
       <div class="search-table-container">
         <header>
-          <div style="position: relative">
-            <el-button plain class="search-table-container--button" @click="handleDownload">
-              导出
-            </el-button>
-          </div>
 
           <div class="act-search">
             <section class="select-box">
@@ -52,6 +47,9 @@
             <section class="search-btn">
               <el-button type="primary" @click="handleSearch">查询</el-button>
               <el-button @click="handleReset">重置</el-button>
+              <el-button plain @click="handleDownload">
+                导出
+              </el-button>
             </section>
           </div>
         </header>
@@ -108,7 +106,7 @@
   import type { QueryPageRequest } from '@/types/basic-query';
   import {
     queryDrawLessonsAdminDeptPage,
-    exportDrawLessonsAdminPage,
+    exportDrawLessonsAdminPageDept,
     type DrawLessonsQueryParam,
   } from '@/api/drawLessons';
   import { downloadByData } from '@/utils/file/download';
@@ -209,7 +207,7 @@
 
   const handleDownload = async () => {
     try {
-      const response = await exportDrawLessonsAdminPage();
+      const response = await exportDrawLessonsAdminPageDept();
       if (response) {
         const fileName = `举一反三_${new Date().toISOString().split('T')[0]}.xlsx`;
         downloadByData(response, fileName);

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

@@ -9,9 +9,6 @@
             <el-button plain class="search-table-container--button" @click="handleImport">
               导入
             </el-button>
-            <el-button plain class="search-table-container--button" @click="handleDownload">
-              导出
-            </el-button>
         </div>
       <div class="search-form">
         <el-form :inline="true">
@@ -71,6 +68,9 @@
         <div>
           <el-button type="primary" @click="queryTableList">查询</el-button>
           <el-button @click="handleRestParams">重置</el-button>
+          <el-button plain  @click="handleDownload">
+            导出
+          </el-button>
         </div>
       </div>