From 3097645a2562da3484ce93b3280085123e8cc5db Mon Sep 17 00:00:00 2001 From: chenxinying <1039655633@qq.com> Date: Sat, 3 Feb 2024 17:04:07 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=88=AA=E9=99=A4=E6=B8=85=E5=96=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=9A=B1=E6=82=A3=E6=8E=92=E6=9F=A5=E6=B8=85?= =?UTF-8?q?=E5=96=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../delete_inventory_management/components/list.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/hazard_investigation/delete_inventory_management/components/list.vue b/src/views/hazard_investigation/delete_inventory_management/components/list.vue index 6f5176b..326d756 100644 --- a/src/views/hazard_investigation/delete_inventory_management/components/list.vue +++ b/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("恢复成功"); From 2dfe2e9ee7a72a40d67138074403380a89e879c0 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Sun, 4 Feb 2024 11:42:56 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=8E=92=E6=9F=A5=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/qualified.vue | 18 ++- .../components/un_qualified.vue | 4 +- .../inspect_custom.vue | 111 ++++++++++-------- 3 files changed, 78 insertions(+), 55 deletions(-) diff --git a/src/views/hazard_investigation/inventory_troubleshooting/components/qualified.vue b/src/views/hazard_investigation/inventory_troubleshooting/components/qualified.vue index db61a4b..29612a3 100644 --- a/src/views/hazard_investigation/inventory_troubleshooting/components/qualified.vue +++ b/src/views/hazard_investigation/inventory_troubleshooting/components/qualified.vue @@ -2,6 +2,11 @@ + + + + + { @@ -65,6 +80,7 @@ const fnSubmit = debounce( formData.append("FOREIGN_KEY", props.id); formData.append("TYPE", 14); await setUploadImg(formData); + emits("submit", form.value.CHECK_RESULT, props.index); fnClose(); ElMessage.success("保存成功"); }, diff --git a/src/views/hazard_investigation/inventory_troubleshooting/components/un_qualified.vue b/src/views/hazard_investigation/inventory_troubleshooting/components/un_qualified.vue index 4fffa7a..c4e08a8 100644 --- a/src/views/hazard_investigation/inventory_troubleshooting/components/un_qualified.vue +++ b/src/views/hazard_investigation/inventory_troubleshooting/components/un_qualified.vue @@ -97,7 +97,7 @@ const fnSubmit = debounce( if (props.hiddenType === "unqualified") { if (!props.longitude && !props.latitude) { ElMessage.error("正在获取当前位置中，请等待"); - return; + // return; } params = { ...params, @@ -144,7 +144,7 @@ const fnSubmit = debounce( if (form.value.rectifyImgs[i].raw) await fnUploadImage(currentHiddenId, form.value.rectifyImgs[i].raw, 4); } - emits("submit", currentHiddenId); + emits("submit", currentHiddenId, form.value.HIDDENDESCR); ElMessage.success("保存成功"); fnClose(); }, diff --git a/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue b/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue index f4d0a67..1b61746 100644 --- a/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue +++ b/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue @@ -44,16 +44,8 @@ 隐患快报 隐患排查 隐患排查 + 安全环保检查 + 安全环保检查 { }; const fnRectificationDepartmentChange = async (event) => { data.form.RECTIFICATIONOR = ""; + data.rectifierUserList = []; const resData = await getUserListAll({ DEPARTMENT_ID: event, }); diff --git a/src/views/safety_environmental_management/hazard_assignment_acceptance/acceptance.vue b/src/views/safety_environmental_management/hazard_assignment_acceptance/acceptance.vue new file mode 100644 index 0000000..592ab42 --- /dev/null +++ b/src/views/safety_environmental_management/hazard_assignment_acceptance/acceptance.vue @@ -0,0 +1,113 @@ + + + + + diff --git a/src/views/safety_environmental_management/hazard_assignment_acceptance/assign.vue b/src/views/safety_environmental_management/hazard_assignment_acceptance/assign.vue new file mode 100644 index 0000000..bcafee2 --- /dev/null +++ b/src/views/safety_environmental_management/hazard_assignment_acceptance/assign.vue @@ -0,0 +1,108 @@ + + + + + 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 index 9f13a3a..b18ab27 100644 --- a/src/views/safety_environmental_management/hazard_assignment_acceptance/hidden_list.vue +++ b/src/views/safety_environmental_management/hazard_assignment_acceptance/hidden_list.vue @@ -19,17 +19,7 @@ @@ -70,6 +80,8 @@ import { serialNumber, translationStatus } from "@/assets/js/utils"; import useListData from "@/assets/js/useListData.js"; import { getHazardAssignmentAcceptanceHiddenList } from "@/request/safety_environmental_management.js"; import { useUserStore } from "@/pinia/user.js"; +import ViewHidden from "../safety_environmental/components/view_hidden.vue"; +import { reactive } from "vue"; const stateList = [ { ID: "101", NAME: "待整改" }, @@ -83,15 +95,24 @@ const stateList = [ ]; const router = useRouter(); const route = useRoute(); +console.log(route); const { INSPECTION_ID } = route.query; const userStore = useUserStore(); const USER_ID = userStore.getUserInfo.USER_ID; const { list, pagination, fnGetData } = useListData( getHazardAssignmentAcceptanceHiddenList, - { - otherParams: { INSPECTION_ID }, - } + { otherParams: { INSPECTION_ID } } ); +const data = reactive({ + viewDialog: { + visible: false, + HIDDEN_ID: "", + }, +}); +const fnView = (HIDDEN_ID) => { + data.viewDialog.visible = true; + data.viewDialog.HIDDEN_ID = HIDDEN_ID; +}; diff --git a/src/views/safety_environmental_management/hazard_assignment_acceptance/index.vue b/src/views/safety_environmental_management/hazard_assignment_acceptance/index.vue index 3ad4f41..2e2ae5b 100644 --- a/src/views/safety_environmental_management/hazard_assignment_acceptance/index.vue +++ b/src/views/safety_environmental_management/hazard_assignment_acceptance/index.vue @@ -7,24 +7,22 @@ @submit.prevent="fnResetPaginationTransfer" > - - - + + + - - - + + + - + - + @@ -40,8 +38,8 @@ /> - - + + - + - + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + + 重置 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + diff --git a/src/views/safety_environmental_management/inspected_person_confirm/index.vue b/src/views/safety_environmental_management/inspected_person_confirm/index.vue index a8d73e0..00b2ba4 100644 --- a/src/views/safety_environmental_management/inspected_person_confirm/index.vue +++ b/src/views/safety_environmental_management/inspected_person_confirm/index.vue @@ -7,24 +7,22 @@ @submit.prevent="fnResetPaginationTransfer" > - - - + + + - - - + + + - + - + @@ -40,7 +38,7 @@ /> - + - + - - + + - - + + @@ -157,7 +155,6 @@ import { useRouter } from "vue-router"; import { serialNumber, translationStatus } from "@/assets/js/utils"; import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js"; import useListData from "@/assets/js/useListData.js"; -import LayoutDepartment from "@/components/department/index.vue"; import LayoutInspectionType from "@/components/inspection_type/index.vue"; import { getInspectorsVerifyManagementList } from "@/request/safety_environmental_management.js"; import { reactive } from "vue"; @@ -170,8 +167,8 @@ const stateList = [ { ID: "3", NAME: "待指派整改人" }, { ID: "4", NAME: "指派中" }, { ID: "5", NAME: "指派完成" }, - { ID: "6", NAME: "检查待验收" }, - { ID: "7", NAME: "检查已验收" }, + { ID: "6", NAME: "待验收" }, + { ID: "7", NAME: "已验收" }, { ID: "8", NAME: "已归档" }, { ID: "-1", NAME: "检查人核实打回" }, { ID: "-2", NAME: "被检查人申辩" }, diff --git a/src/views/safety_environmental_management/safety_environmental/add.vue b/src/views/safety_environmental_management/safety_environmental/add.vue index c6ed018..c17cd54 100644 --- a/src/views/safety_environmental_management/safety_environmental/add.vue +++ b/src/views/safety_environmental_management/safety_environmental/add.vue @@ -254,12 +254,15 @@ import { setSafetyEnvironmentalAdd, setSafetyEnvironmentalEdit, } from "@/request/safety_environmental_management.js"; -import { setUploadImg, setUploadVideo } from "@/request/api.js"; +import { setUploadImg } from "@/request/api.js"; import dayjs from "dayjs"; const route = useRoute(); const router = useRouter(); const userStore = useUserStore(); +const USER_ID = userStore.getUserInfo.USER_ID; +const NAME = userStore.getUserInfo.NAME; +const DEPARTMENT_ID = userStore.getUserInfo.DEPARTMENT_ID; const { INSPECTION_ID } = route.query; const rules = { INSPECTION_SUBJECT: [ @@ -371,12 +374,7 @@ watchEffect(() => { }); const fnAddHidden = () => { data.addHiddenDialog.visible = true; - data.addHiddenDialog.hazardDiscovererList = [ - { - NAME: userStore.getUserInfo.NAME, - USER_ID: userStore.getUserInfo.USER_ID, - }, - ]; + data.addHiddenDialog.hazardDiscovererList = []; const inspectorList = data.form.inspectorList; for (let i = 0; i < inspectorList.length; i++) { const inspectionUserList = inspectorList[i].inspectionUserList; @@ -389,6 +387,13 @@ const fnAddHidden = () => { } } } + if ( + !data.addHiddenDialog.hazardDiscovererList.some( + (item) => USER_ID === item.USER_ID + ) + ) { + data.addHiddenDialog.hazardDiscovererList.unshift({ NAME, USER_ID }); + } }; const fnAddHiddenSubmit = (item) => { data.form.hiddenList.push(item); @@ -398,22 +403,18 @@ const fnSubmit = debounce( async () => { await useFormValidate(formRef); const inspectorList = [...data.form.inspectorList]; - if ( - !inspectorList.some( - (item) => userStore.getUserInfo.USER_ID === item.INSPECTION_USER_ID - ) - ) { + if (!inspectorList.some((item) => 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, + INSPECTION_DEPARTMENT_ID: DEPARTMENT_ID, + INSPECTION_USER_ID: USER_ID, }); } let hiddenList = []; if (!INSPECTION_ID) { const resData = await setSafetyEnvironmentalAdd({ ...data.form, - HIDDENFINDDEPT: userStore.getUserInfo.DEPARTMENT_ID, + HIDDENFINDDEPT: DEPARTMENT_ID, INSPECTORJSON: JSON.stringify(inspectorList), SITUATIONJSON: JSON.stringify(data.form.situationList), HIDDENJSON: JSON.stringify(data.form.hiddenList), @@ -435,7 +436,7 @@ const fnSubmit = debounce( hiddenList[i].HIDDEN_ID, data.form.hiddenList[i].hiddenImgs ); - await fnUploadVideo( + await fnUploadImage( hiddenList[i].HIDDEN_ID, data.form.hiddenList[i].videoFiles ); @@ -454,15 +455,6 @@ const fnUploadImage = async (HIDDEN_ID, files) => { formData.append("TYPE", 3); await setUploadImg(formData); }; -const fnUploadVideo = async (HIDDEN_ID, files) => { - const formData = new FormData(); - for (let i = 0; i < files.length; i++) { - formData.append("FFILE", files[i]); - } - formData.append("FOREIGN_KEY", HIDDEN_ID); - formData.append("TYPE", 102); - await setUploadVideo(formData); -}; diff --git a/src/views/safety_environmental_management/safety_environmental/components/flow_chart.vue b/src/views/safety_environmental_management/safety_environmental/components/flow_chart.vue index 6a0cdbf..343dcf5 100644 --- a/src/views/safety_environmental_management/safety_environmental/components/flow_chart.vue +++ b/src/views/safety_environmental_management/safety_environmental/components/flow_chart.vue @@ -71,12 +71,12 @@ const graphOptions = ref({ defaultNodeWidth: 200, }); const fnGetData = async () => { - if (props.type === "list") { + if (props.type === "inspect") { const { nodes, from } = await getSafetyEnvironmentalListFlowChart({ INSPECTION_ID: props.id, }); fnSeeksGraph(nodes, from); - } else if (props.type === "view") { + } else if (props.type === "hidden") { const { nodes, from } = await getSafetyEnvironmentalViewFlowChart({ HIDDEN_ID: props.id, }); diff --git a/src/views/safety_environmental_management/safety_environmental/index.vue b/src/views/safety_environmental_management/safety_environmental/index.vue index c7c0f65..69cda81 100644 --- a/src/views/safety_environmental_management/safety_environmental/index.vue +++ b/src/views/safety_environmental_management/safety_environmental/index.vue @@ -215,7 +215,7 @@ Date: Sun, 4 Feb 2024 13:56:28 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=8E=92=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory_troubleshooting/inspect.vue | 41 ++++++++----------- .../identifying_parts/components/add.vue | 2 +- 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue b/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue index 0cc216c..a7a7647 100644 --- a/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue +++ b/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue @@ -262,7 +262,6 @@ import { setHiddenDangerDelete, setInventoryTroubleshootingSubmit, setChecklistInspectionStatusRecordSupplementaryRecordingSubmit, - getCheckStandardManagementView, } from "@/request/hazard_investigation.js"; import { useRoute, useRouter } from "vue-router"; import useListData from "@/assets/js/useListData.js"; @@ -284,7 +283,7 @@ import { WarningFilled } from "@element-plus/icons-vue"; const route = useRoute(); const router = useRouter(); -const { LIST_ID, CHECKRECORD_ID, DATEEND, DATESTART, LIST_TYPE } = route.query; +const { ID, CHECKRECORD_ID, DATEEND, DATESTART } = route.query; // entrance: supplementaryRecording是补录，空值是正常录入 const props = defineProps({ entrance: { @@ -338,32 +337,24 @@ const data = reactive({ }, }, }); -const { list: inspectionList } = useListData( - LIST_TYPE === "1" - ? getInventoryManagementView - : getCheckStandardManagementView, - { - otherParams: - LIST_TYPE === "1" ? { LISTMANAGER_ID: LIST_ID } : { ID: LIST_ID }, - usePagination: false, - callbackFn: (list, resData) => { - if (LIST_TYPE === "1") { - for (let i = 0; i < list.length; i++) { - if (list[i].HASHIDDEN <= 0) list[i].ISNORMAL = 0; - if (list[i].ELECTRONIC_FENCE_ID) { - // 存在电子围栏禁止清单排查 - data.canDoCheck = false; - } - } +const { list: inspectionList } = useListData(getInventoryManagementView, { + otherParams: { LISTMANAGER_ID: ID }, + usePagination: false, + callbackFn: (list, resData) => { + for (let i = 0; i < list.length; i++) { + if (list[i].HASHIDDEN <= 0) list[i].ISNORMAL = 0; + if (list[i].ELECTRONIC_FENCE_ID) { + // 存在电子围栏禁止清单排查 + data.canDoCheck = false; } - info.value = resData.pd; - }, - } -); + } + info.value = resData.pd; + }, +}); const { list: otherHiddenList, fnGetData: fnGetOtherHidden } = useListData( getInventoryTroubleshootingOtherHiddenList, { - otherParams: { LIST_ID }, + otherParams: { LISTMANAGER_ID: ID }, usePagination: false, key: "hiddenList", } @@ -510,7 +501,7 @@ const fnSubmit = debounce( const inspectedList = cloneDeep(data.form.inspectedList); if (inspectedList.length > 0) inspectedList.splice(0, 1); const params = { - LIST_ID, + LISTMANAGER_ID: ID, LIST_NAME: info.value.NAME, CHECK_TIME: data.form.CHECK_TIME, DESCR: data.form.DESCR, diff --git a/src/views/risk_control/identifying_parts/components/add.vue b/src/views/risk_control/identifying_parts/components/add.vue index fbf75c1..67d8708 100644 --- a/src/views/risk_control/identifying_parts/components/add.vue +++ b/src/views/risk_control/identifying_parts/components/add.vue @@ -124,7 +124,7 @@ const fnClose = () => { const fnRemoveRegName = debounce( 1000, async () => { - form.value.ELECTRONIC_FENCE = ""; + form.value.ELECTRONIC_FENCE_NAME = ""; form.value.ELECTRONIC_FENCE_ID = ""; }, { atBegin: true } From 76af1d175e98900d45384c8e82fb99d05620af56 Mon Sep 17 00:00:00 2001 From: zhangyanli Date: Sun, 4 Feb 2024 14:02:30 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=8E=92=E6=9F=A5?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/asyncRouter.js | 9 + src/request/hazard_investigation.js | 14 +- ...{check_standard_add.vue => add_custom.vue} | 53 +-- .../components/checkstandard_add.vue | 40 +- .../components/import_custom.vue | 290 +++++++++++++ .../insurance_coverage_select_custom.vue | 59 +++ .../inventory_management/components/list.vue | 83 +++- .../components/list_qr_code.vue | 9 +- ...ct_checkstandard.vue => select_custom.vue} | 116 ++++-- .../components/standard_list.vue | 385 ------------------ .../insurance_coverage_custom.vue | 127 ++++++ .../inventory_management/print_custom.vue | 136 +++++++ 12 files changed, 835 insertions(+), 486 deletions(-) rename src/views/hazard_investigation/inventory_management/{check_standard_add.vue => add_custom.vue} (93%) create mode 100644 src/views/hazard_investigation/inventory_management/components/import_custom.vue create mode 100644 src/views/hazard_investigation/inventory_management/components/insurance_coverage_select_custom.vue rename src/views/hazard_investigation/inventory_management/components/{select_checkstandard.vue => select_custom.vue} (60%) delete mode 100644 src/views/hazard_investigation/inventory_management/components/standard_list.vue create mode 100644 src/views/hazard_investigation/inventory_management/insurance_coverage_custom.vue create mode 100644 src/views/hazard_investigation/inventory_management/print_custom.vue diff --git a/src/assets/js/asyncRouter.js b/src/assets/js/asyncRouter.js index 070ed2d..eab67c3 100644 --- a/src/assets/js/asyncRouter.js +++ b/src/assets/js/asyncRouter.js @@ -330,6 +330,15 @@ export default [ component: "hazard_investigation/inventory_management/insurance_coverage", }, + { + path: "/hazard_investigation/inventory_management/insurance_coverage_custom", + meta: { + title: "设置包保责任类型", + activeMenu: "/hazard_investigation/inventory_management", + }, + component: + "hazard_investigation/inventory_management/insurance_coverage_custom", + }, { path: "/hazard_investigation/inventory_management/add", meta: { diff --git a/src/request/hazard_investigation.js b/src/request/hazard_investigation.js index cbb36bf..17da5d1 100644 --- a/src/request/hazard_investigation.js +++ b/src/request/hazard_investigation.js @@ -1,4 +1,4 @@ -import { post } from "@/request/axios.js"; +import { post, upload } from "@/request/axios.js"; export const getInventoryManagementList = (params) => post("/listmanager/list", params); // 清单管理列表 @@ -21,7 +21,7 @@ export const setInventoryManagementInsuranceCoverageList = (params) => export const setInventoryManagementInsuranceCoverageSave = (params) => post("/listmanager/saveBaoBaoType", params); // 清单管理设置包保责任类型提交 export const getInventoryManagementInspectionItems = (params) => - post("/richeckitem/itemlistAllsk", params); // 清单管理检查项列表 + post("/richeckitem/itemlistAll", params); // 清单管理检查项列表 export const getInventoryManagementOtherRiskList = (params) => post("/riskcheckitem/list", params); // 清单管理选择其他存在风险列表 export const setInventoryManagementAdd = (params) => @@ -86,7 +86,7 @@ export const getCheckstandardCommonList = (params) => export const setCheckStandardManagementAdd = (params) => post("/hiddenstandardCustom/add", params); // 隐患排查清单管理新增 export const setCheckStandardManagementEdit = (params) => - post("/listmanager/hiddencheckedit", params); // 隐患排查清单管理修改 + post("/hiddenstandardCustom/edit", params); // 隐患排查清单管理修改 export const getCheckStandardManagementView = (params) => post("/hiddenstandardCustom/goEdit", params); // 隐患排查清单管理查看 export const getCheckStandardOtherHiddenList = (params) => @@ -95,6 +95,10 @@ export const setCheckStandardSupplementaryRecordingSubmit = (params) => post("/customCheckrecord/recording", params); // 隐患排查清单检查情况检查记录补录提交 export const setCheckStandardSubmit = (params) => post("/customCheckrecord/add", params); // 清单排查提交 +export const setCommonItemEdit = (params) => + post("/hiddenstandardCommon/edit", params); // 隐患排查检查标准修改 +export const setCustomImport = (params) => + upload("/hiddenstandardCustom/readExcel", params); // 导入隐患排查清单 export const getDeleteCustomList = (params) => post("/customStop/list", params); // 删除清单管理列表 export const setDeleteCustomRecovery = (params) => post("/customStop/restore", params); // 删除清单管理恢复 @@ -107,3 +111,7 @@ export const getCustomCheckRecordView = (params) => post("/customCheckrecord/goEdit", params); // 隐患清单排查查询单个 export const setDeleteCustommCheckrecord = (params) => post("/customCheckrecord/delete", params); // 删除隐患清单排查记录 +export const setCustomInsuranceCoverageList = (params) => + post("/customLabelFactory/termList", params); // 隐患排查清单管理设置包保责任类型选择列表 +export const setCustomInsuranceCoverageSave = (params) => + post("/hiddenstandardCustom/saveBaoBaoType", params); // 清单管理设置包保责任类型提交 diff --git a/src/views/hazard_investigation/inventory_management/check_standard_add.vue b/src/views/hazard_investigation/inventory_management/add_custom.vue similarity index 93% rename from src/views/hazard_investigation/inventory_management/check_standard_add.vue rename to src/views/hazard_investigation/inventory_management/add_custom.vue index 5f6c1a8..de774fa 100644 --- a/src/views/hazard_investigation/inventory_management/check_standard_add.vue +++ b/src/views/hazard_investigation/inventory_management/add_custom.vue @@ -66,7 +66,7 @@ - + - + - - - - - + + + + + + diff --git a/src/views/hazard_investigation/inventory_management/components/list_qr_code.vue b/src/views/hazard_investigation/inventory_management/components/list_qr_code.vue index 38f1489..b25dddb 100644 --- a/src/views/hazard_investigation/inventory_management/components/list_qr_code.vue +++ b/src/views/hazard_investigation/inventory_management/components/list_qr_code.vue @@ -22,7 +22,9 @@ {{ info.TYPENAME }} - + APP-待排查-清单扫描 diff --git a/src/views/hazard_investigation/inventory_management/components/standard_list.vue b/src/views/hazard_investigation/inventory_management/components/standard_list.vue deleted file mode 100644 index 82deb9d..0000000 --- a/src/views/hazard_investigation/inventory_management/components/standard_list.vue +++ /dev/null @@ -1,385 +0,0 @@ - - - - - diff --git a/src/views/hazard_investigation/inventory_management/insurance_coverage_custom.vue b/src/views/hazard_investigation/inventory_management/insurance_coverage_custom.vue new file mode 100644 index 0000000..ca0c50e --- /dev/null +++ b/src/views/hazard_investigation/inventory_management/insurance_coverage_custom.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/src/views/hazard_investigation/inventory_management/print_custom.vue b/src/views/hazard_investigation/inventory_management/print_custom.vue new file mode 100644 index 0000000..db0fa59 --- /dev/null +++ b/src/views/hazard_investigation/inventory_management/print_custom.vue @@ -0,0 +1,136 @@ + + + + + From 35d912e7078f09426b52424c0b18fb6bfd47372b Mon Sep 17 00:00:00 2001 From: zhangyanli Date: Sun, 4 Feb 2024 14:03:35 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=8E=92=E6=9F=A5?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/request/hazard_investigation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/request/hazard_investigation.js b/src/request/hazard_investigation.js index 17da5d1..ecc2d81 100644 --- a/src/request/hazard_investigation.js +++ b/src/request/hazard_investigation.js @@ -21,7 +21,7 @@ export const setInventoryManagementInsuranceCoverageList = (params) => export const setInventoryManagementInsuranceCoverageSave = (params) => post("/listmanager/saveBaoBaoType", params); // 清单管理设置包保责任类型提交 export const getInventoryManagementInspectionItems = (params) => - post("/richeckitem/itemlistAll", params); // 清单管理检查项列表 + post("/riskcheckitem/itemlistAll", params); // 清单管理检查项列表 export const getInventoryManagementOtherRiskList = (params) => post("/riskcheckitem/list", params); // 清单管理选择其他存在风险列表 export const setInventoryManagementAdd = (params) => From c91e38adb92636ed34f70d0f8d3255340107cd30 Mon Sep 17 00:00:00 2001 From: LiuJiaNan Date: Sun, 4 Feb 2024 14:06:09 +0800 Subject: [PATCH 07/13] init --- .../safety_environmental/components/hidden_add.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 746a0f9..6e8c32b 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 @@ -87,7 +87,7 @@ From 2da5e720d33514d8289a618e368810f8c2f72fd4 Mon Sep 17 00:00:00 2001 From: LiuJiaNan Date: Sun, 4 Feb 2024 16:18:49 +0800 Subject: [PATCH 08/13] init --- package-lock.json | 27 ++ package.json | 1 + src/assets/css/common.scss | 6 + .../identifying_parts/hidden_danger_view.vue | 216 +++++++++++++++ src/mobile/identifying_parts/index.vue | 117 +++++++++ .../identifying_parts/inspection_record.vue | 133 ++++++++++ src/mobile/information/index.vue | 246 ++++++++++++++++++ src/mobile/risk_point/checklist.vue | 53 ++++ src/mobile/risk_point/hidden_danger_view.vue | 9 + src/mobile/risk_point/index.vue | 74 ++++++ src/mobile/risk_point/inspection_record.vue | 9 + src/request/mobile.js | 19 ++ src/router/index.js | 57 +++- .../information/components/qr_code.vue | 10 +- .../identifying_parts/components/qr_code.vue | 12 +- .../risk_point/components/qr_code.vue | 10 +- 16 files changed, 992 insertions(+), 7 deletions(-) create mode 100644 src/mobile/identifying_parts/hidden_danger_view.vue create mode 100644 src/mobile/identifying_parts/index.vue create mode 100644 src/mobile/identifying_parts/inspection_record.vue create mode 100644 src/mobile/information/index.vue create mode 100644 src/mobile/risk_point/checklist.vue create mode 100644 src/mobile/risk_point/hidden_danger_view.vue create mode 100644 src/mobile/risk_point/index.vue create mode 100644 src/mobile/risk_point/inspection_record.vue create mode 100644 src/request/mobile.js diff --git a/package-lock.json b/package-lock.json index 487fd27..271a460 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,6 +33,7 @@ "relation-graph": "^2.1.24", "throttle-debounce": "^5.0.0", "v-viewer": "^3.0.11", + "vant": "^4.8.4", "vue": "^3.4.3", "vue-countup-v3": "^1.4.1", "vue-draggable-plus": "^0.3.4", @@ -1421,6 +1422,19 @@ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" } }, + "node_modules/@vant/popperjs": { + "version": "1.3.0", + "resolved": "https://registry.npmmirror.com/@vant/popperjs/-/popperjs-1.3.0.tgz", + "integrity": "sha512-hB+czUG+aHtjhaEmCJDuXOep0YTZjdlRR+4MSmIFnkCQIxJaXLQdSsR90XWvAI2yvKUI7TCGqR8pQg2RtvkMHw==" + }, + "node_modules/@vant/use": { + "version": "1.6.0", + "resolved": "https://registry.npmmirror.com/@vant/use/-/use-1.6.0.tgz", + "integrity": "sha512-PHHxeAASgiOpSmMjceweIrv2AxDZIkWXyaczksMoWvKV2YAYEhoizRuk/xFnKF+emUIi46TsQ+rvlm/t2BBCfA==", + "peerDependencies": { + "vue": "^3.0.0" + } + }, "node_modules/@vitejs/plugin-basic-ssl": { "version": "1.1.0", "resolved": "https://registry.npmmirror.com/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz", @@ -5695,6 +5709,19 @@ "vue": "^3.0.0" } }, + "node_modules/vant": { + "version": "4.8.4", + "resolved": "https://registry.npmmirror.com/vant/-/vant-4.8.4.tgz", + "integrity": "sha512-2ompmogS76pFWUDrQGYNXAENWxisJXqv0+eIqt7mGo1TJJXcUikQ5sfRjX8W3HTkTe1FxV7lzuI3QrW01i043g==", + "dependencies": { + "@vant/popperjs": "^1.3.0", + "@vant/use": "^1.6.0", + "@vue/shared": "^3.0.0" + }, + "peerDependencies": { + "vue": "^3.0.0" + } + }, "node_modules/viewerjs": { "version": "1.11.6", "resolved": "https://registry.npmmirror.com/viewerjs/-/viewerjs-1.11.6.tgz", diff --git a/package.json b/package.json index 7405f6e..422b29d 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "relation-graph": "^2.1.24", "throttle-debounce": "^5.0.0", "v-viewer": "^3.0.11", + "vant": "^4.8.4", "vue": "^3.4.3", "vue-countup-v3": "^1.4.1", "vue-draggable-plus": "^0.3.4", diff --git a/src/assets/css/common.scss b/src/assets/css/common.scss index 0e9f5aa..32c94e5 100644 --- a/src/assets/css/common.scss +++ b/src/assets/css/common.scss @@ -316,3 +316,9 @@ div::-webkit-scrollbar-track { display: none; } } + +.mobile { + padding: 10px; + background-color: #fafafa; + min-height: 100vh; +} diff --git a/src/mobile/identifying_parts/hidden_danger_view.vue b/src/mobile/identifying_parts/hidden_danger_view.vue new file mode 100644 index 0000000..3048dd3 --- /dev/null +++ b/src/mobile/identifying_parts/hidden_danger_view.vue @@ -0,0 +1,216 @@ + + + + + diff --git a/src/mobile/identifying_parts/index.vue b/src/mobile/identifying_parts/index.vue new file mode 100644 index 0000000..6e57aca --- /dev/null +++ b/src/mobile/identifying_parts/index.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/src/mobile/identifying_parts/inspection_record.vue b/src/mobile/identifying_parts/inspection_record.vue new file mode 100644 index 0000000..11cbe0c --- /dev/null +++ b/src/mobile/identifying_parts/inspection_record.vue @@ -0,0 +1,133 @@ + + + + + diff --git a/src/mobile/information/index.vue b/src/mobile/information/index.vue new file mode 100644 index 0000000..1d92678 --- /dev/null +++ b/src/mobile/information/index.vue @@ -0,0 +1,246 @@ + + + + + diff --git a/src/mobile/risk_point/checklist.vue b/src/mobile/risk_point/checklist.vue new file mode 100644 index 0000000..4fda425 --- /dev/null +++ b/src/mobile/risk_point/checklist.vue @@ -0,0 +1,53 @@ + + + + + diff --git a/src/mobile/risk_point/hidden_danger_view.vue b/src/mobile/risk_point/hidden_danger_view.vue new file mode 100644 index 0000000..53601f2 --- /dev/null +++ b/src/mobile/risk_point/hidden_danger_view.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/mobile/risk_point/index.vue b/src/mobile/risk_point/index.vue new file mode 100644 index 0000000..0bf8d3c --- /dev/null +++ b/src/mobile/risk_point/index.vue @@ -0,0 +1,74 @@ + + + + + diff --git a/src/mobile/risk_point/inspection_record.vue b/src/mobile/risk_point/inspection_record.vue new file mode 100644 index 0000000..c1ae205 --- /dev/null +++ b/src/mobile/risk_point/inspection_record.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/request/mobile.js b/src/request/mobile.js new file mode 100644 index 0000000..1cb0d28 --- /dev/null +++ b/src/request/mobile.js @@ -0,0 +1,19 @@ +import { post } from "@/request/axios.js"; + +export const getInformationView = (params) => + post("/app/corpinfo/goEdit", params); // 企业信息 +export const getIdentifyingPartsInfo = (params) => + post("/app/identificationparts/goEdit", params); // 辨识部位详情 +export const getIdentifyingPartsInspectionRecordList = (params) => + post("/app/checkrecord/recordByIde", params); // 辨识部位检查记录列表 +export const getIdentifyingPartsInfoList = (params) => + post("/app/riskpoint/getForIdentification", params); // 辨识部位存在风险、主要管控措施列表 +export const getInspectionRecordInfo = (params) => + post("/app/checkrecord/goEditWeui", params); // 检查记录详情 +export const getInspectionRecordMapInfo = (params) => + post("/app/checkrecord/goMapWeui", params); // 检查记录地图 +export const geHiddenDangerView = (params) => + post("/app/hidden/goEditWeui", params); // 隐患详情 +export const getRiskPointList = (params) => post("/app/riskpoint/list", params); // 风险点单元列表 +export const getRiskPointCheckList = (params) => + post("/app/checkrecord/recordByIde", params); // 风险点单元检查清单列表 diff --git a/src/router/index.js b/src/router/index.js index e6ba9cb..85167e2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,6 +1,6 @@ import { createRouter, createWebHashHistory } from "vue-router"; import layout from "../layout/index.vue"; -// import children from "../components/children/index.vue"; +import children from "../components/children/index.vue"; const routes = [ { @@ -35,6 +35,61 @@ const routes = [ meta: { title: "BI", isBreadcrumb: false, isMenu: false }, component: () => import("@/views/BI/index"), }, + { + path: "/mobile", + meta: { isBreadcrumb: false, isMenu: false, isLogin: false }, + component: children, + children: [ + { + path: "information", + component: () => import("@/mobile/information/index"), + }, + { + path: "identifying_parts", + component: children, + children: [ + { + path: "index", + component: () => import("@/mobile/identifying_parts/index.vue"), + }, + { + path: "inspection_record", + component: () => + import("@/mobile/identifying_parts/inspection_record.vue"), + }, + { + path: "hidden_danger_view", + component: () => + import("@/mobile/identifying_parts/hidden_danger_view.vue"), + }, + ], + }, + { + path: "risk_point", + component: children, + children: [ + { + path: "index", + component: () => import("@/mobile/risk_point/index.vue"), + }, + { + path: "checklist", + component: () => import("@/mobile/risk_point/checklist.vue"), + }, + { + path: "inspection_record", + component: () => + import("@/mobile/risk_point/inspection_record.vue"), + }, + { + path: "hidden_danger_view", + component: () => + import("@/mobile/risk_point/hidden_danger_view.vue"), + }, + ], + }, + ], + }, { path: "/404", name: "/404", diff --git a/src/views/enterprise_management/information/components/qr_code.vue b/src/views/enterprise_management/information/components/qr_code.vue index 4e09852..bde028b 100644 --- a/src/views/enterprise_management/information/components/qr_code.vue +++ b/src/views/enterprise_management/information/components/qr_code.vue @@ -4,8 +4,13 @@

{{ info.CORP_NAME }}

- - +