diff --git a/.env b/.env index fa793de..47e37c9 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -VITE_BASE_URL=http://192.168.0.42:8099/ +VITE_BASE_URL=http://192.168.0.49:8099/ VITE_PROXY=/api/ VITE_FILE_URL=https://file.zcloudchina.com/YTHFile VITE_TEMPLATE_URL=https://qaaq.qhdsafety.com/file/ diff --git a/src/assets/js/asyncRouter.js b/src/assets/js/asyncRouter.js index 8397bcb..f6c5332 100644 --- a/src/assets/js/asyncRouter.js +++ b/src/assets/js/asyncRouter.js @@ -997,6 +997,88 @@ export default [ }, ], }, + { + path: "/safety_environmental_management/inspectors_verify_management", + meta: { title: "检查人核实管理", isSubMenu: false }, + component: "children", + children: [ + { + path: "", + component: + "safety_environmental_management/inspectors_verify_management/index", + }, + { + path: "/safety_environmental_management/inspectors_verify_management/view", + meta: { + title: "查看", + activeMenu: + "/safety_environmental_management/inspectors_verify_management", + }, + component: + "safety_environmental_management/inspectors_verify_management/view", + }, + ], + }, + { + path: "/safety_environmental_management/inspected_person_confirm", + meta: { title: "被检查人确认", isSubMenu: false }, + component: "children", + children: [ + { + path: "", + component: + "safety_environmental_management/inspected_person_confirm/index", + }, + { + path: "/safety_environmental_management/inspected_person_confirm/view", + meta: { + title: "查看", + activeMenu: + "/safety_environmental_management/inspected_person_confirm", + }, + component: + "safety_environmental_management/inspected_person_confirm/view", + }, + ], + }, + { + path: "/safety_environmental_management/hazard_assignment_acceptance", + meta: { title: "隐患指派与验收", isSubMenu: false }, + component: "children", + children: [ + { + path: "", + component: + "safety_environmental_management/hazard_assignment_acceptance/index", + }, + { + path: "/safety_environmental_management/hazard_assignment_acceptance/view", + meta: { + title: "查看", + activeMenu: + "/safety_environmental_management/hazard_assignment_acceptance", + }, + component: + "safety_environmental_management/hazard_assignment_acceptance/view", + }, + { + path: "/safety_environmental_management/hazard_assignment_acceptance/assign", + meta: { + title: "指派", + activeMenu: + "/safety_environmental_management/hazard_assignment_acceptance", + }, + component: "children", + children: [ + { + path: "", + component: + "safety_environmental_management/hazard_assignment_acceptance/hidden_list", + }, + ], + }, + ], + }, ], }, { diff --git a/src/components/hidden_view/index.vue b/src/components/hidden_view/index.vue index 95539ba..cb9e976 100644 --- a/src/components/hidden_view/index.vue +++ b/src/components/hidden_view/index.vue @@ -273,6 +273,7 @@ const fnGetData = async () => { data.info = resData.pd; data.hs = resData.hs; data.checkList = resData.checkList; + data.hImgs = []; for (let i = 0; i < resData.hImgs.length; i++) { if (getFileSuffix(resData.hImgs[i].FILEPATH) === "mp4") { data.videoDialog.src = resData.hImgs[i].FILEPATH; diff --git a/src/request/safety_environmental_management.js b/src/request/safety_environmental_management.js index 2bc20c0..05c0951 100644 --- a/src/request/safety_environmental_management.js +++ b/src/request/safety_environmental_management.js @@ -1,4 +1,4 @@ -import { post } from "@/request/axios.js"; +import { post, upload } from "@/request/axios.js"; export const getSafetyEnvironmentalList = (params) => post("/safetyenvironmental/list", params); // 安全环保管理列表 @@ -10,7 +10,25 @@ export const setSafetyEnvironmentalDefense = (params) => post("/safetyenvironmental/explain", params); // 安全环保管理申辩 export const setSafetyEnvironmentalAdd = (params) => post("/safetyenvironmental/add", params); // 安全环保管理新增 -export const getSafetyEnvironmentalView = (params) => +export const setSafetyEnvironmentalEdit = (params) => + post("/safetyenvironmental/edit", params); // 安全环保管理编辑 +export const getSafetyEnvironmentalViewInfo = (params) => post("/safetyenvironmental/goShow", params); // 安全环保管理查看 +export const getSafetyEnvironmentalView = (params) => + post("/safetyenvironmental/goEdit", params); // 安全环保管理查看 export const getSafetyEnvironmentalViewFlowChart = (params) => post("/safetyenvironmental/getFlowChart", params); // 安全环保管理查看流程图 +export const getInspectorsVerifyManagementList = (params) => + post("/safetyenvironmentalinspector/list", params); // 检查人核实列表 +export const setInspectorsVerifyManagementVerify = (params) => + post("/safetyenvironmentalinspector/verify", params); // 检查人核实管理核实 +export const getInspectedPersonConfirmList = (params) => + post("/safetyenvironmentalexplain/list", params); // 被检查人确认列表 +export const getInspectedPersonConfirmHiddenCount = (params) => + post("/safetyenvironmentalexplain/hiddencount", params); // 被检查人确认获取隐患数量 +export const setInspectedPersonConfirmSubmit = (params) => + upload("/safetyenvironmentalexplain/add", params); // 被检查人确认提交 +export const getHazardAssignmentAcceptanceList = (params) => + post("/safetyenvironmental/checkList", params); // 隐患指派与验收列表 +export const getHazardAssignmentAcceptanceHiddenList = (params) => + post("/hidden/listForAhZp", params); // 隐患指派与验收隐患列表 diff --git a/src/views/hidden_danger_government/acceptance/acceptance.vue b/src/views/hidden_danger_government/acceptance/acceptance.vue index f1fcd66..dbc32f4 100644 --- a/src/views/hidden_danger_government/acceptance/acceptance.vue +++ b/src/views/hidden_danger_government/acceptance/acceptance.vue @@ -31,9 +31,9 @@ diff --git a/src/views/hidden_danger_government/rectification/rectification.vue b/src/views/hidden_danger_government/rectification/rectification.vue index c613075..194e8b4 100644 --- a/src/views/hidden_danger_government/rectification/rectification.vue +++ b/src/views/hidden_danger_government/rectification/rectification.vue @@ -62,9 +62,9 @@ diff --git a/src/views/safety_environmental_management/hazard_assignment_acceptance/hidden_list.vue b/src/views/safety_environmental_management/hazard_assignment_acceptance/hidden_list.vue new file mode 100644 index 0000000..9f13a3a --- /dev/null +++ b/src/views/safety_environmental_management/hazard_assignment_acceptance/hidden_list.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/views/safety_environmental_management/hazard_assignment_acceptance/index.vue b/src/views/safety_environmental_management/hazard_assignment_acceptance/index.vue new file mode 100644 index 0000000..3ad4f41 --- /dev/null +++ b/src/views/safety_environmental_management/hazard_assignment_acceptance/index.vue @@ -0,0 +1,225 @@ + + + + + diff --git a/src/views/safety_environmental_management/hazard_assignment_acceptance/view.vue b/src/views/safety_environmental_management/hazard_assignment_acceptance/view.vue new file mode 100644 index 0000000..0cf462d --- /dev/null +++ b/src/views/safety_environmental_management/hazard_assignment_acceptance/view.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/views/safety_environmental_management/inspected_person_confirm/components/confirm.vue b/src/views/safety_environmental_management/inspected_person_confirm/components/confirm.vue new file mode 100644 index 0000000..08eeccf --- /dev/null +++ b/src/views/safety_environmental_management/inspected_person_confirm/components/confirm.vue @@ -0,0 +1,116 @@ + + + + + diff --git a/src/views/safety_environmental_management/inspected_person_confirm/index.vue b/src/views/safety_environmental_management/inspected_person_confirm/index.vue new file mode 100644 index 0000000..a8d73e0 --- /dev/null +++ b/src/views/safety_environmental_management/inspected_person_confirm/index.vue @@ -0,0 +1,223 @@ + + + + + diff --git a/src/views/safety_environmental_management/inspected_person_confirm/view.vue b/src/views/safety_environmental_management/inspected_person_confirm/view.vue new file mode 100644 index 0000000..0cf462d --- /dev/null +++ b/src/views/safety_environmental_management/inspected_person_confirm/view.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/views/safety_environmental_management/inspectors_verify_management/components/verify.vue b/src/views/safety_environmental_management/inspectors_verify_management/components/verify.vue new file mode 100644 index 0000000..2a5f55c --- /dev/null +++ b/src/views/safety_environmental_management/inspectors_verify_management/components/verify.vue @@ -0,0 +1,88 @@ + + + + + diff --git a/src/views/safety_environmental_management/inspectors_verify_management/index.vue b/src/views/safety_environmental_management/inspectors_verify_management/index.vue new file mode 100644 index 0000000..5c662fa --- /dev/null +++ b/src/views/safety_environmental_management/inspectors_verify_management/index.vue @@ -0,0 +1,214 @@ + + + + + diff --git a/src/views/safety_environmental_management/inspectors_verify_management/view.vue b/src/views/safety_environmental_management/inspectors_verify_management/view.vue new file mode 100644 index 0000000..0cf462d --- /dev/null +++ b/src/views/safety_environmental_management/inspectors_verify_management/view.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/views/safety_environmental_management/safety_environmental/add.vue b/src/views/safety_environmental_management/safety_environmental/add.vue index ce6ed4b..c6ed018 100644 --- a/src/views/safety_environmental_management/safety_environmental/add.vue +++ b/src/views/safety_environmental_management/safety_environmental/add.vue @@ -248,13 +248,19 @@ import { useUserStore } from "@/pinia/user.js"; import { debounce } from "throttle-debounce"; import useFormValidate from "@/assets/js/useFormValidate.js"; import { ElMessage } from "element-plus"; -import { useRouter } from "vue-router"; -import { setSafetyEnvironmentalAdd } from "@/request/safety_environmental_management.js"; +import { useRoute, useRouter } from "vue-router"; +import { + getSafetyEnvironmentalView, + setSafetyEnvironmentalAdd, + setSafetyEnvironmentalEdit, +} from "@/request/safety_environmental_management.js"; import { setUploadImg, setUploadVideo } from "@/request/api.js"; import dayjs from "dayjs"; +const route = useRoute(); const router = useRouter(); const userStore = useUserStore(); +const { INSPECTION_ID } = route.query; const rules = { INSPECTION_SUBJECT: [ { required: true, message: "请选择检查题目", trigger: "change" }, @@ -291,6 +297,8 @@ const rules = { const formRef = ref(null); const data = reactive({ form: { + INSPECTION_SOURCE: "5", + INSPECTION_STATUS: "0", INSPECTION_SUBJECT: "安全", INSPECTED_DEPARTMENT_ID: "", INSPECTED_SITEUSER_ID: "", @@ -318,14 +326,28 @@ const fnAddInspectorList = () => { id: Math.random(), }); }; -fnAddInspectorList(); const fnAddSituationList = () => { data.form.situationList.push({ SITUATION: "", id: Math.random(), }); }; -fnAddSituationList(); +const fnGetData = async () => { + if (!INSPECTION_ID) { + fnAddInspectorList(); + fnAddSituationList(); + return; + } + const resData = await getSafetyEnvironmentalView({ INSPECTION_ID }); + data.form = resData.pd; + for (let i = 0; i < resData.pd.inspectorList.length; i++) { + await fnGetInspectionSitUserList( + resData.pd.inspectorList[i].INSPECTION_DEPARTMENT_ID, + i + ); + } +}; +fnGetData(); const fnInspectedDepartmentChange = () => { data.inspectedSiteUserList = []; data.form.INSPECTED_SITEUSER_ID = ""; @@ -375,15 +397,39 @@ const fnSubmit = debounce( 1000, async () => { await useFormValidate(formRef); - const resData = await setSafetyEnvironmentalAdd({ - ...data.form, - HIDDENFINDDEPT: userStore.getUserInfo.DEPARTMENT_ID, - INSPECTORJSON: JSON.stringify(data.form.inspectorList), - SITUATIONJSON: JSON.stringify(data.form.situationList), - HIDDENJSON: JSON.stringify(data.form.hiddenList), - CONFIRM_MESSAGE_TIME: dayjs().format("YYYY-MM-DD HH:mm"), - }); - const hiddenList = resData.pd.hiddenList; + const inspectorList = [...data.form.inspectorList]; + if ( + !inspectorList.some( + (item) => userStore.getUserInfo.USER_ID === item.INSPECTION_USER_ID + ) + ) { + inspectorList.push({ + INSPECTION_INSPECTOR_ID: "", + INSPECTION_DEPARTMENT_ID: userStore.getUserInfo.DEPARTMENT_ID, + INSPECTION_USER_ID: userStore.getUserInfo.USER_ID, + }); + } + let hiddenList = []; + if (!INSPECTION_ID) { + const resData = await setSafetyEnvironmentalAdd({ + ...data.form, + HIDDENFINDDEPT: userStore.getUserInfo.DEPARTMENT_ID, + INSPECTORJSON: JSON.stringify(inspectorList), + SITUATIONJSON: JSON.stringify(data.form.situationList), + HIDDENJSON: JSON.stringify(data.form.hiddenList), + CONFIRM_MESSAGE_TIME: dayjs().format("YYYY-MM-DD HH:mm"), + }); + hiddenList = resData.pd.hiddenList; + } else { + const resData = await setSafetyEnvironmentalEdit({ + ...data.form, + INSPECTORJSON: JSON.stringify(inspectorList), + SITUATIONJSON: JSON.stringify(data.form.situationList), + HIDDENJSON: JSON.stringify(data.form.hiddenList), + CONFIRM_MESSAGE_TIME: dayjs().format("YYYY-MM-DD HH:mm"), + }); + hiddenList = resData.pd.hiddenList; + } for (let i = 0; i < hiddenList.length; i++) { await fnUploadImage( hiddenList[i].HIDDEN_ID, diff --git a/src/views/safety_environmental_management/safety_environmental/components/hidden_add.vue b/src/views/safety_environmental_management/safety_environmental/components/hidden_add.vue index 1b34641..746a0f9 100644 --- a/src/views/safety_environmental_management/safety_environmental/components/hidden_add.vue +++ b/src/views/safety_environmental_management/safety_environmental/components/hidden_add.vue @@ -43,7 +43,10 @@ - + @@ -133,12 +136,13 @@ const form = ref({ DISCOVERYTIME: "", HIDDENPART: "", HIDDENLEVEL: "", - HIDDENTYPE: "", + HIDDENTYPE: [], hiddenImgs: [], videoFiles: [], CREATOR: "", }); const formRef = ref(null); +const hiddenDangerTypeRef = ref(null); const fnClose = () => { formRef.value.resetFields(); visible.value = false; @@ -158,7 +162,13 @@ const fnSubmit = async () => { if (form.value.videoFiles[i].raw) throwForm.videoFiles.push(form.value.videoFiles[i].raw); } - emits("submit", throwForm); + emits("submit", { + ...throwForm, + HIDDENTYPE1: form.value.HIDDENTYPE[0], + HIDDENTYPE2: form.value.HIDDENTYPE[1], + HIDDENTYPE3: form.value.HIDDENTYPE[2], + HIDDENTYPE_NAME: hiddenDangerTypeRef.value.getCheckedNodes(), + }); fnClose(); }; diff --git a/src/views/safety_environmental_management/safety_environmental/index.vue b/src/views/safety_environmental_management/safety_environmental/index.vue index bc17423..c7c0f65 100644 --- a/src/views/safety_environmental_management/safety_environmental/index.vue +++ b/src/views/safety_environmental_management/safety_environmental/index.vue @@ -99,10 +99,7 @@ :data="list" @get-data="fnGetDataTransfer" v-model:pagination="pagination" - ref="tableRef" - row-key="INSPECTION_ID" > -