Merge remote-tracking branch 'origin/dev' into dev

src/request/hazard_investigation.js

@@ -69,7 +69,7 @@ export const getChecklistInspectionStatusRecordMap = (params) =>
 export const getInspectionRecordList = (params) =>
   post("/checkrecord/allList", params); // 检查记录管理列表
 export const getTroubleshootingPlanList = (params) =>
-  post("/listmanager/checkPlan", params); // 排查计划列表
+  post("/listmanager/mergeCheckPlan", params); // 排查计划列表
 
 export const getCustomList = (params) =>
   post("/hiddenstandardCustom/list", params); // 隐患排查清单管理列表

src/views/hazard_investigation/delete_inventory_management/components/list.vue

@@ -235,9 +235,9 @@ const fnRecovery = debounce(
   async (ID) => {
     await ElMessageBox.confirm("确定要恢复吗？", { type: "warning" });
     if (tabName.name === "risk") {
-      await setDeleteInventoryManagementRecovery({ ID });
+      await setDeleteInventoryManagementRecovery({ LISTMANAGER_ID: ID });
     } else {
-      await setDeleteCustomRecovery({ ID });
+      await setDeleteCustomRecovery({ CUSTOM_ID: ID });
     }
 
     ElMessage.success("恢复成功");

src/views/high/job_data/index.vue

@@ -133,7 +133,7 @@
     </layout-card>
     <flow-chart
       v-model:visible="data.flowChartDialog.visible"
-      :flowList="data.flowChartDialog.flowList"
+      :flow-list="data.flowChartDialog.flowList"
     />
   </div>
 </template>