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

@@ -91,6 +91,18 @@ export function getDrawLessonsAdminDetail(id: number) {
   });
 }
 
+/**
+ * 2.2 查询举一反三详情
+ * GET /api/drawLessons/admin/queryMainDetail?id=xxx
+ */
+export function getDrawLessonsAdminTowDetail(id: number) {
+  return http.request<DrawLessonsItem>({
+    url: '/drawLessons/admin/queryDetail',
+    method: 'get',
+    params: { id },
+  });
+}
+
 /**
  * 2.2 查询举一反三详情
  * GET /api/drawLessons/admin/queryMainDetail?id=xxx
@@ -384,7 +396,7 @@ export function exportTheDocumentPost() {
  */
 export function exportDrawLessonsAdminPage() {
   return http.request({
-    url: '/inventory/exportInventory',
+    url: '/drawLessons/admin/export',
     method: 'post',
     responseType: 'blob',
   }, {

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

@@ -131,7 +131,7 @@
   import { ElMessage } from 'element-plus';
   import { Document } from '@element-plus/icons-vue';
   import PreviewOnline from '@/views/disaster/components/PreviewOnline.vue';
-  import { getDrawLessonsAdminDetail, approveDrawLessons } from '@/api/drawLessons';
+  import { getDrawLessonsAdminTowDetail, approveDrawLessons } from '@/api/drawLessons';
   import { FILE_TYPE_ICON } from '@/components/UploadFiles/constants';
   import DownloadIcon from '@/views/disaster/disaster-control/src/svg/download.svg';
   import { downloadFile } from '@/views/disaster/utils';
@@ -204,7 +204,7 @@
   const getDetail = async () => {
     if (!id.value) return;
     try {
-      const res = await getDrawLessonsAdminDetail(id.value);
+      const res = await getDrawLessonsAdminTowDetail(id.value);
       const data = (res as any)?.data ?? res;
       if (data && typeof data === 'object') {
         const records = Array.isArray(data.issueRecords) ? data.issueRecords : [];
@@ -213,7 +213,7 @@
           creatorName: data.creatorName,
           createdAt: data.createdAt,
           statusName: data.statusName,
-          issueCount: records.length ?? data.issueCount,
+          issueCount: data.issueCount,
           feedbackCount: data.feedbackCount ?? records.filter((r: any) => r.statusId === 5 || r.statusName === '已完成' || r.feedbackAt).length,
           planStartDate: data.planStartDate,
           dangerProposeDate: data.dangerProposeDate,

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

@@ -26,7 +26,7 @@
         <header>
           <div class="act-search">
             <section class="select-box">
-              <div class="select-box--item" v-if="activeTab === 'ALL'">
+              <!-- <div class="select-box--item" v-if="activeTab === 'ALL'">
                 <span>状态：</span>
                 <el-select
                   v-model="searchStatus"
@@ -41,7 +41,7 @@
                     :value="item.value"
                   />
                 </el-select>
-              </div>
+              </div> -->
               <div class="select-box--item">
                 <span>部门名称：</span>
                 <el-input
@@ -99,6 +99,7 @@
             <template #action="scope">
               <div class="action-container--div" style="justify-content: left">
                 <ActionButton
+                  v-if="scope.row.statusName !== '待审核'"
                   text="查看"
                   @click="handleView(scope.row)"
                 />
@@ -332,7 +333,7 @@
     router.push({
       name: 'oneByOneManagementItem',
       query: {
-        id: String(row.id),
+        id: String(row.associationOtId),
         operate: 'one-by-one-view',
       },
     });

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

@@ -20,7 +20,7 @@
               <div class="select-box--item">
                 <span>隐患问题：</span>
                 <el-input
-                  v-model="tableQuery.queryParam.problem"
+                  v-model="tableQuery.queryParam.keyword"
                   placeholder="请输入隐患问题"
                   class="act-search-input"
                 />
@@ -234,7 +234,7 @@
     pageNumber: pagination.pageNumber,
     pageSize: pagination.pageSize,
     queryParam: {
-      problem: '',
+      keyword: '',
       statusId: undefined,
       startTime: undefined,
       endTime: undefined,
@@ -303,7 +303,7 @@
   };
 
   const handleReset = () => {
-    tableQuery.queryParam.problem = '';
+    tableQuery.queryParam.keyword = '';
     tableQuery.queryParam.statusId = undefined;
     tableQuery.queryParam.startTime = undefined;
     tableQuery.queryParam.endTime = undefined;

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

@@ -72,12 +72,12 @@
           </el-radio-group>
         </div>
 
-        <h4 class="section-title">
+        <h4 class="section-title" v-if="hasProblem">
           <el-icon class="section-title__icon"><Document /></el-icon>
           <span>材料上传</span>
         </h4>
-        <div class="detail-ct detail-ct--table attachment-row">
-          <div class="row">
+        <div class="detail-ct detail-ct--table attachment-row" v-if="hasProblem">
+          <div class="row" v-if="isViewMode">
             <div class="col">
               <div class="label">上传附件：</div>
               <div class="value value--attachment">
@@ -109,11 +109,12 @@
               </div>
             </div>
           </div>
-          <div v-if="hasProblem" class="row row--upload">
+          <div class="row row--upload" v-if="!isViewMode">
             <div class="col col--full">
               <div class="label">选择附件：</div>
               <div class="value value--attachment">
                 <UploadFiles
+                  v-if="!isViewMode"
                   label="选择附件"
                   :file-list="materialAttachmentList"
                   @uploadSuccess="handleMaterialUploadSuccess"

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

@@ -17,7 +17,7 @@
               <div class="select-box--item">
                 <span>隐患问题：</span>
                 <el-input
-                  v-model="tableQuery.queryParam.problem"
+                  v-model="tableQuery.queryParam.keyword"
                   placeholder="请输入隐患问题"
                   class="act-search-input"
                 />
@@ -130,7 +130,7 @@
     pageNumber: pagination.pageNumber,
     pageSize: pagination.pageSize,
     queryParam: {
-      problem: '',
+      keyword: '',
       statusId: undefined,
       startTime: undefined,
       endTime: undefined,
@@ -196,7 +196,7 @@
   };
 
   const handleReset = () => {
-    tableQuery.queryParam.problem = '';
+    tableQuery.queryParam.keyword = '';
     tableQuery.queryParam.statusId = undefined;
     tableQuery.queryParam.startTime = undefined;
     tableQuery.queryParam.endTime = undefined;

src/views/production-safety/safety-culture/safetyCultureActivityManagement/components/safetyCultureActivityManagementDetail.vue

@@ -63,7 +63,6 @@
         <el-date-picker
           v-model="ruleFormData.startTime"
           type="date"
-          value-format="yyyy-MM-dd"
           placeholder="暂无内容"
           :disabled="isViewMode"
         />
@@ -72,7 +71,6 @@
         <el-date-picker
           v-model="ruleFormData.endTime"
           type="date"
-          value-format="yyyy-MM-dd"
           placeholder="暂无内容"
           :disabled="isViewMode"
         />

src/views/production-safety/safety-culture/safetyCultureActivityManagementExecutor/components/safetyCultureActivityManagementDetail.vue

@@ -70,9 +70,9 @@
               <el-button link type="primary" @click="previewOnline(file.fileUrl, file.fileType)"
                 >预览</el-button
               >
-              <!-- <el-button link type="primary" @click.stop="downloadFile(file.fileUrl, file.fileName)"
+              <el-button link type="primary" @click.stop="downloadFile(file.fileUrl, file.fileName)"
                 >下载</el-button
-              > -->
+              >
             </div>
           </div>
         </div>
@@ -115,6 +115,7 @@
   import PreviewOnline from '@/views/disaster/components/PreviewOnline.vue';
   import UploadFiles from '@/components/UploadFiles/UploadFiles.vue';
   import { formatAttachmentList } from '@/components/UploadFiles/utils';
+  import { downloadFile } from '@/views/disaster/utils';
 
   const router = useRouter();
   const route = useRoute();