feat开发

src/api/hiddenDanger/index.ts

@@ -280,7 +280,7 @@ export interface HiddenDangerDeductPointsRequest {
   deductionReason?: string;
   remark?: string;
   /** 扣分部门，多个用逗号分隔 */
-  department_ids?: string;
+  departmentIds?: string;
 }
 
 export function deductHiddenDangerPoints(data: HiddenDangerDeductPointsRequest) {

src/api/production-safety-system/index.ts

@@ -1231,7 +1231,6 @@ export function cancelAreaCheckPlanManage(id: number) {
   return http.request({
     url: `${ADMIN_BASE}/updateStatusAreaCheckPlanManage?id=${id}`,
     method: 'post',
-    // data: { id },
   });
 }
 
@@ -1281,18 +1280,16 @@ export function queryAreaCheckPlanDetailDeptPage(planId: number, query: Paramete
 /** 删除区域检查计划记录（管理员） */
 export function deleteAreaCheckPlanDetail(id: number) {
   return http.request({
-    url: `${ADMIN_BASE}/deleteAreaCheckPlanDetail`,
+    url: `${ADMIN_BASE}/deleteAreaCheckPlanDetail?id=${id}`,
     method: 'delete',
-    params: { id },
   });
 }
 
 /** 删除区域检查计划记录（部门） */
 export function deleteAreaCheckPlanDetailDept(id: number) {
   return http.request({
-    url: `${DEPT_BASE}/deleteAreaCheckPlanDetail`,
+    url: `${DEPT_BASE}/deleteAreaCheckPlanDetail?id=${id}`,
     method: 'delete',
-    params: { id },
   });
 }
 

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

@@ -166,15 +166,13 @@
       >
         <template #unqualifiedItemNum="scope">
           <el-button
-            v-if="Number(scope.row.unqualifiedItemNum) > 0"
             type="primary"
             link
             size="small"
             @click="openUnqualifiedDialog(scope.row)"
           >
-            {{ scope.row.unqualifiedItemNum }}
+            {{ scope.row.unqualifiedItemNum ?? 0 }}
           </el-button>
-          <span v-else>{{ scope.row.unqualifiedItemNum ?? 0 }}</span>
         </template>
         <template #sign="scope">
           <template v-if="parseSignFiles(scope.row.checkedPersonSign || scope.row.signFile).length">
@@ -320,15 +318,15 @@
     >
       <template #action="scope">
         <el-button
-          v-if="Number(scope.row.isSand) === 0"
+          v-if="Number(scope.row.IsSand) == 0"
           type="primary"
           link
           size="small"
           @click="handleSandToHiddenDanger(scope.row)"
         >
-          下入账
+          入账
         </el-button>
-        <span v-else-if="Number(scope.row.isSand) === 1" style="color: #999999">已入账</span>
+        <span v-else-if="Number(scope.row.IsSand) == 1" style="color: #999999">已入账</span>
         <span v-else>-</span>
       </template>
     </BasicTable>

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

@@ -167,15 +167,13 @@
       >
         <template #unqualifiedItemNum="scope">
           <el-button
-
             type="primary"
             link
             size="small"
             @click="openUnqualifiedDialog(scope.row)"
           >
-            {{ scope.row.unqualifiedItemNum }}
+            {{ scope.row.unqualifiedItemNum ?? 0 }}
           </el-button>
-          <!-- <span v-else>{{ scope.row.unqualifiedItemNum ?? 0 }}</span> -->
         </template>
         <template #sign="scope">
           <template v-if="parseSignFiles(scope.row.checkedPersonSign || scope.row.signFile).length">
@@ -234,7 +232,7 @@
         >
           入账
         </el-button>
-        <span v-else-if="Number(scope.row.IsSand) === 1" style="color: #999999">已入账</span>
+        <span v-else-if="Number(scope.row.IsSand) == 1" style="color: #999999">已入账</span>
         <span v-else>-</span>
       </template>
     </BasicTable>

src/views/production-safety/hiddenTroubleInvestigationAndGovernance/hiddenTroubleAccountManagement/components/hiddenTroubleAccountManagementDetail.vue

@@ -2,7 +2,7 @@
   <main class="safety-platform-container__main">
     <el-alert
       v-if="isRectifyMode && detailReviewRejectReason"
-      type="warning"
+      type="error"
       :title="'不通过原因：' + detailReviewRejectReason"
       show-icon
       class="detail-reject-alert"
@@ -613,7 +613,7 @@
     }
     try {
       deductForm.value.dangerId = currentId.value;
-      deductForm.value.department_ids =
+      deductForm.value.departmentIds =
         deductDeptIdsArray.value.length > 0 ? deductDeptIdsArray.value.join(',') : undefined;
       await deductHiddenDangerPoints(deductForm.value);
       ElMessage.success('扣分记录成功');

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

@@ -560,7 +560,7 @@
     }
     try {
       deductForm.value.dangerId = deductDangerId.value;
-      deductForm.value.department_ids =
+      deductForm.value.departmentIds =
         deductDeptIdsArray.value.length > 0 ? deductDeptIdsArray.value.join(',') : undefined;
       await deductHiddenDangerPoints(deductForm.value);
       ElMessage.success('扣分记录成功');

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

@@ -9,6 +9,13 @@
     </header>
     <main class="safety-platform-container__main">
       <div v-if="detailData" class="audit-content">
+        <el-alert
+          v-if="detailData.reviewReason"
+          type="error"
+          :title="'不通过原因：' + detailData.reviewReason"
+          show-icon
+          class="detail-reject-alert"
+        />
         <h4 class="section-title">
           <el-icon class="section-title__icon"><Document /></el-icon>
           <span>基本信息</span>
@@ -220,6 +227,8 @@
     attachmentList?: Array<{ fileName?: string; fileUrl?: string; fileNameOrUrl?: string; url?: string }>;
     statusName?: string;
     statusId?: number;
+    /** 不通过原因（审核不通过时由后端返回） */
+    reviewReason?: string;
     issueRecords?: Array<{
       id: number;
       associationOtObligationDeptName?: string;
@@ -382,6 +391,10 @@
     font-size: 14px;
   }
 
+  .detail-reject-alert {
+    margin-bottom: 16px;
+  }
+
   .audit-content {
     padding: 0 16px;