diff --git a/src/request/safety_production_related.js b/src/request/safety_production_related.js index 2000a2e..0aff50f 100644 --- a/src/request/safety_production_related.js +++ b/src/request/safety_production_related.js @@ -29,6 +29,10 @@ export const layoutFnGetNotificationsClassification = async () => { return ref(resData); }; +// 获取交通处罚从业人员列表 +export const getTrafficPenaltyUserList = (params) => + post("/user/getTrafficPenaltyUserList", params); + // 从业类型(人员类型) export const layoutFnGetSIGNEDSTATUSClassification = async () => { const resData = await getLevelsByObject({ @@ -36,4 +40,6 @@ export const layoutFnGetSIGNEDSTATUSClassification = async () => { BIANMA: "TRAFFIC_EMPLOYMENT", }); return ref(resData); + + }; diff --git a/src/request/traffic_occupational_hazards.js b/src/request/traffic_occupational_hazards.js index 83647d8..c59dbda 100644 --- a/src/request/traffic_occupational_hazards.js +++ b/src/request/traffic_occupational_hazards.js @@ -14,3 +14,6 @@ export const infoOccupationalHazardsView = (params) => export const deleteOccupationalHazardsView = (params) => post("/occupationalhazards/delete", params); // 删除 岗位安全责任书 + +export const getSafetyOccupationalHazardsEdit = (params) => + upload("/occupationalhazards/getSafetyOccupationalHazardsEdit", params); // 详情 职业危害告知书 diff --git a/src/request/traffic_safety_production.js b/src/request/traffic_safety_production.js index aee9169..656998e 100644 --- a/src/request/traffic_safety_production.js +++ b/src/request/traffic_safety_production.js @@ -11,3 +11,7 @@ export const infoProductionView = (params) => export const deleteProductionView = (params) => upload("/production/delete", params); // 删除 安全生产目标 + + +export const getSafetyProductionEdit = (params) => + upload("/production/getSafetyProductionEdit", params); // 详情 安全生产目标 diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue index a06223a..42815c3 100644 --- a/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue +++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue @@ -550,7 +550,7 @@ const fnSubmit = debounce( await fnUploadImage( currentOperatingVehicleId, form.value.DRIVINGLICENSE_PHOTO[i].raw, - 131 + 121 ); } } @@ -559,7 +559,7 @@ const fnSubmit = debounce( await fnUploadImage( currentOperatingVehicleId, form.value.OPERATING_CERTIFICATE_PHOTO[i].raw, - 132 + 122 ); } } diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue index aec1834..2cb94e4 100644 --- a/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue +++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue @@ -521,7 +521,7 @@ const fnSubmit = debounce( await fnUploadImage( currentOperatingVehicleId, form.value.DRIVINGLICENSE_PHOTO[i].raw, - 131 + 121 ); } } @@ -530,7 +530,7 @@ const fnSubmit = debounce( await fnUploadImage( currentOperatingVehicleId, form.value.OPERATING_CERTIFICATE_PHOTO[i].raw, - 132 + 122 ); } } diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue index 28b6d3d..41f3023 100644 --- a/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue +++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue @@ -160,12 +160,8 @@ const fnGetData = async () => { const resData = await findByIdOperatingVehicleInfo({ OPERATING_ID }); info.value = resData.pd; info.value.HEADSTOCK_PHOTO = addingPrefixToFile(resData.headstockphoto); - info.value.DRIVINGLICENSE_PHOTO = addingPrefixToFile( - resData.drivinglicensephoto - ); - info.value.OPERATING_CERTIFICATE_PHOTO = addingPrefixToFile( - resData.operatingcertificatephoto - ); + info.value.DRIVINGLICENSE_PHOTO = addingPrefixToFile(resData.drivinglicensephoto); + info.value.OPERATING_CERTIFICATE_PHOTO = addingPrefixToFile(resData.operatingcertificatephoto); }; fnGetData(); diff --git a/src/views/occupational_hazards/details.vue b/src/views/occupational_hazards/details.vue index 7b67e84..0b9307f 100644 --- a/src/views/occupational_hazards/details.vue +++ b/src/views/occupational_hazards/details.vue @@ -111,7 +111,7 @@ import Add from "@/views/occupational_hazards/components/add.vue"; import LayoutPdf from "@/components/pdf/index.vue"; import { deleteOccupationalHazardsView, - getSafetyOccupationalHazardsList, + getSafetyOccupationalHazardsEdit, getSafetyOccupationalHazardsUserList, } from "@/request/traffic_occupational_hazards.js"; @@ -155,7 +155,7 @@ const fnAddOrEdit = async ( data.addOrEditDialog.type = type; data.addOrEditDialog.form = {}; if (type === "edit" && OCCUPATIONALHAZARDS_ID) { - const resData = await getSafetyOccupationalHazardsList({ + const resData = await getSafetyOccupationalHazardsEdit({ OCCUPATIONALHAZARDS_ID, }); if (resData && resData.varList && resData.varList.length > 0) { diff --git a/src/views/production_course_regulate/firefighting_equipment_facility/firefightingmaintain.vue b/src/views/production_course_regulate/firefighting_equipment_facility/firefightingmaintain.vue index f456c03..0974d35 100644 --- a/src/views/production_course_regulate/firefighting_equipment_facility/firefightingmaintain.vue +++ b/src/views/production_course_regulate/firefighting_equipment_facility/firefightingmaintain.vue @@ -2,6 +2,9 @@ 基本信息 + + {{ data.FACILITY_NUMBER }} + {{ data.FACILITY_NAME }} @@ -20,6 +23,18 @@ {{ data.REGISTRATION_TIME }} + + + 保养记录 @@ -84,15 +99,17 @@ import useListData from "@/assets/js/useListData.js"; import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js"; import { debounce } from "throttle-debounce"; import { ElMessage, ElMessageBox } from "element-plus"; +import { addingPrefixToFile } from "@/assets/js/utils.js"; const route = useRoute(); const router = useRouter(); const { FIREFIGHTINGFACILITY_ID } = route.query; const data = ref({}); const getData = async () => { - const { pd } = await getFirefightingEquipmentFacilityView({ + const resData = await getFirefightingEquipmentFacilityView({ FIREFIGHTINGFACILITY_ID, }); - data.value = pd; + data.value = resData.pd; + data.value.Images = addingPrefixToFile(resData.firefightingequipmentImg); }; getData(); const { list, fnResetPagination } = useListData(getMaintainFindFirefightingId, { diff --git a/src/views/production_course_regulate/management_agreement/components/add.vue b/src/views/production_course_regulate/management_agreement/components/add.vue index e8cdb28..66a9980 100644 --- a/src/views/production_course_regulate/management_agreement/components/add.vue +++ b/src/views/production_course_regulate/management_agreement/components/add.vue @@ -6,7 +6,6 @@ > diff --git a/src/views/production_course_regulate/management_agreement/index.vue b/src/views/production_course_regulate/management_agreement/index.vue index ffdbfee..75a26af 100644 --- a/src/views/production_course_regulate/management_agreement/index.vue +++ b/src/views/production_course_regulate/management_agreement/index.vue @@ -65,8 +65,8 @@ diff --git a/src/views/production_course_regulate/violation_registration/add.vue b/src/views/production_course_regulate/violation_registration/add.vue index 2eb8290..e904303 100644 --- a/src/views/production_course_regulate/violation_registration/add.vue +++ b/src/views/production_course_regulate/violation_registration/add.vue @@ -107,7 +107,7 @@