From 68a22f37023e2e529fa5576535d3cfd1d1b704ef Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Wed, 13 Mar 2024 18:05:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E5=AE=89=E5=85=A8=E6=89=BF?= =?UTF-8?q?=E8=AF=BA=E4=B9=A6=E3=80=81=E8=B4=A3=E4=BB=BB=E4=B9=A6=EF=BC=8C?= =?UTF-8?q?=E8=81=8C=E4=B8=9A=E5=8D=B1=E5=AE=B3=E5=91=8A=E7=9F=A5=E4=B9=A6?= =?UTF-8?q?=EF=BC=8C=E7=AE=A1=E7=90=86=E4=BA=BA=E5=91=98=E9=85=8D=E5=A4=87?= =?UTF-8?q?=EF=BC=8C=E5=AE=89=E5=85=A8=E7=94=9F=E4=BA=A7=E7=9B=AE=E6=A0=87?= =?UTF-8?q?=EF=BC=8C=E5=AE=89=E5=85=A8=E8=B4=A3=E4=BB=BB=E5=88=B6=E8=80=83?= =?UTF-8?q?=E6=A0=B8=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/request/traffic_occupational_hazards.js | 5 + src/request/traffic_safety_assessment.js | 10 + src/request/traffic_safety_commitment.js | 6 + src/request/traffic_safety_contract.js | 8 +- src/request/traffic_safety_production.js | 10 + src/request/traffic_safety_responsibility.js | 5 + src/request/traffic_safety_staffing.js | 11 +- src/views/labor_contract/components/add.vue | 12 +- src/views/labor_contract/components/view.vue | 70 +++++++ src/views/labor_contract/details.vue | 177 +++++++++++++++-- src/views/labor_contract/index.vue | 69 ++++--- .../management_staffing/components/add.vue | 25 ++- .../management_staffing/components/view.vue | 70 +++++++ src/views/management_staffing/index.vue | 33 +++- .../occupational_hazards/components/add.vue | 16 +- .../occupational_hazards/components/view.vue | 70 +++++++ src/views/occupational_hazards/details.vue | 182 +++++++++++++++--- src/views/occupational_hazards/index.vue | 67 ++++--- .../safety_assessment/components/add.vue | 155 +++++++++++++++ .../safety_assessment/components/view.vue | 70 +++++++ src/views/safety_assessment/details.vue | 38 ++++ src/views/safety_assessment/index.vue | 158 +++++++++++++++ .../safety_production/components/add.vue | 155 +++++++++++++++ .../safety_production/components/view.vue | 70 +++++++ src/views/safety_production/details.vue | 38 ++++ src/views/safety_production/index.vue | 158 +++++++++++++++ .../safety_responsibility/components/add.vue | 16 +- .../safety_responsibility/components/view.vue | 70 +++++++ src/views/safety_responsibility/details.vue | 179 +++++++++++++++-- src/views/safety_responsibility/index.vue | 67 ++++--- .../security_commitment/components/add.vue | 13 +- .../security_commitment/components/view.vue | 70 +++++++ src/views/security_commitment/details.vue | 182 ++++++++++++++++-- src/views/security_commitment/index.vue | 67 +++---- .../components/list.vue | 1 + .../index.vue | 11 -- 36 files changed, 2078 insertions(+), 286 deletions(-) create mode 100644 src/request/traffic_safety_assessment.js create mode 100644 src/request/traffic_safety_production.js create mode 100644 src/views/labor_contract/components/view.vue create mode 100644 src/views/management_staffing/components/view.vue create mode 100644 src/views/occupational_hazards/components/view.vue create mode 100644 src/views/safety_assessment/components/add.vue create mode 100644 src/views/safety_assessment/components/view.vue create mode 100644 src/views/safety_assessment/details.vue create mode 100644 src/views/safety_assessment/index.vue create mode 100644 src/views/safety_production/components/add.vue create mode 100644 src/views/safety_production/components/view.vue create mode 100644 src/views/safety_production/details.vue create mode 100644 src/views/safety_production/index.vue create mode 100644 src/views/safety_responsibility/components/view.vue create mode 100644 src/views/security_commitment/components/view.vue diff --git a/src/request/traffic_occupational_hazards.js b/src/request/traffic_occupational_hazards.js index 21b43a4..83647d8 100644 --- a/src/request/traffic_occupational_hazards.js +++ b/src/request/traffic_occupational_hazards.js @@ -2,6 +2,8 @@ import { post, upload } from "@/request/axios.js"; export const getSafetyOccupationalHazardsList = (params) => post("/occupationalhazards/listForSecurityOccupationalHazards", params); // 职业危害告知书列表 +export const getSafetyOccupationalHazardsUserList = (params) => + post("/occupationalhazards/listForSafetyOccupationalHazardsUser", params); // 用户 职业危害告知书列表 export const addOccupationalHazardsView = (params) => upload("/occupationalhazards/add", params); // 添加 职业危害告知书 @@ -9,3 +11,6 @@ export const editOccupationalHazardsView = (params) => upload("/occupationalhazards/edit", params); // 修改 职业危害告知书 export const infoOccupationalHazardsView = (params) => upload("/occupationalhazards/goEdit", params); // 详情 职业危害告知书 + +export const deleteOccupationalHazardsView = (params) => + post("/occupationalhazards/delete", params); // 删除 岗位安全责任书 diff --git a/src/request/traffic_safety_assessment.js b/src/request/traffic_safety_assessment.js new file mode 100644 index 0000000..5a8ff6c --- /dev/null +++ b/src/request/traffic_safety_assessment.js @@ -0,0 +1,10 @@ +import { post, upload } from "@/request/axios.js"; +export const getSafetyAssessmentList = (params) => + post("/assessment/listForSafetyAssessmentlist", params); // 安全责任制考核列表 + +export const addAssessmentView = (params) => upload("/assessment/add", params); // 添加 安全责任制考核 + +export const editAssessmentView = (params) => + upload("/assessment/edit", params); // 修改 安全责任制考核 +export const infoAssessmentView = (params) => + upload("/assessment/goEdit", params); // 详情 安全责任制考核 diff --git a/src/request/traffic_safety_commitment.js b/src/request/traffic_safety_commitment.js index 1a2713f..1d28e25 100644 --- a/src/request/traffic_safety_commitment.js +++ b/src/request/traffic_safety_commitment.js @@ -2,6 +2,9 @@ import { post, upload } from "@/request/axios.js"; export const getSafetyCommitmentList = (params) => post("/commitment/listForSecurityCommitment", params); // 承诺书列表 +export const getSafetyCommitmentUserList = (params) => + post("/commitment/listForSecurityCommitmentUser", params); // 用户承诺书列表 + export const addCommitmentView = (params) => upload("/commitment/add", params); // 添加 承诺书 export const editCommitmentView = (params) => @@ -9,3 +12,6 @@ export const editCommitmentView = (params) => export const infoCommitmentView = (params) => upload("/commitment/goEdit", params); // 详情 承诺书 + +export const deleteCommitmentView = (params) => + post("/commitment/delete", params); // 删除 承诺书 diff --git a/src/request/traffic_safety_contract.js b/src/request/traffic_safety_contract.js index efdc9e3..121edbb 100644 --- a/src/request/traffic_safety_contract.js +++ b/src/request/traffic_safety_contract.js @@ -1,6 +1,9 @@ import { post, upload } from "@/request/axios.js"; export const getSafetyContractList = (params) => - post("/laborcontract/listForSecurityStaffing", params); // 合同列表 + post("/laborcontract/listForLaborContract", params); // 合同列表 + +export const getSafetyContractUserList = (params) => + post("/laborcontract/listForLaborContractUser", params); // 用户合同列表 export const addContractView = (params) => upload("/laborcontract/add", params); // 添加 合同 @@ -8,3 +11,6 @@ export const editContractView = (params) => upload("/laborcontract/edit", params); // 修改 合同 export const infoContractView = (params) => upload("/laborcontract/goEdit", params); // 详情 合同 + +export const deleteContractView = (params) => + post("/laborcontract/delete", params); // 删除 合同 diff --git a/src/request/traffic_safety_production.js b/src/request/traffic_safety_production.js new file mode 100644 index 0000000..573ba40 --- /dev/null +++ b/src/request/traffic_safety_production.js @@ -0,0 +1,10 @@ +import { post, upload } from "@/request/axios.js"; +export const getSafetyProductionList = (params) => + post("/production/listForSafetyProductionlist", params); // 安全生产目标列表 + +export const addProductionView = (params) => upload("/production/add", params); // 添加 安全生产目标 + +export const editProductionView = (params) => + upload("/production/edit", params); // 修改 安全生产目标 +export const infoProductionView = (params) => + upload("/production/goEdit", params); // 详情 安全生产目标 diff --git a/src/request/traffic_safety_responsibility.js b/src/request/traffic_safety_responsibility.js index 9dd4f36..145086a 100644 --- a/src/request/traffic_safety_responsibility.js +++ b/src/request/traffic_safety_responsibility.js @@ -2,6 +2,8 @@ import { post, upload } from "@/request/axios.js"; export const getSafetyResponsibilityList = (params) => post("/responsibility/listForSecurityResponsibility", params); // 岗位安全责任书列表 +export const getSafetyResponsibilityUserList = (params) => + post("/responsibility/listForSafetyResponsibilityUser", params); // 用户岗位安全责任书列表 export const addResponsibilityView = (params) => upload("/responsibility/add", params); // 添加 岗位安全责任书 @@ -9,3 +11,6 @@ export const editResponsibilityView = (params) => upload("/responsibility/edit", params); // 修改 岗位安全责任书 export const infoResponsibilityView = (params) => upload("/responsibility/goEdit", params); // 详情 岗位安全责任书 + +export const deleteResponsibilityView = (params) => + post("/responsibility/delete", params); // 删除 岗位安全责任书 diff --git a/src/request/traffic_safety_staffing.js b/src/request/traffic_safety_staffing.js index 42f13ad..249db22 100644 --- a/src/request/traffic_safety_staffing.js +++ b/src/request/traffic_safety_staffing.js @@ -1,8 +1,11 @@ import { post, upload } from "@/request/axios.js"; export const getSafetyStaffingList = (params) => - post("/staffing/listForSecurityStaffing", params); // 管理人员配备列表 + post("/managementstaffing/listForManagementStaffing", params); // 管理人员配备列表 -export const addStaffingView = (params) => upload("/staffing/add", params); // 添加 管理人员配备 +export const addStaffingView = (params) => + upload("/managementstaffing/add", params); // 添加 管理人员配备 -export const editStaffingView = (params) => upload("/staffing/edit", params); // 修改 管理人员配备 -export const infoStaffingView = (params) => upload("/staffing/goEdit", params); // 详情 管理人员配备 +export const editStaffingView = (params) => + upload("/managementstaffing/edit", params); // 修改 管理人员配备 +export const infoStaffingView = (params) => + upload("/managementstaffing/goEdit", params); // 详情 管理人员配备 diff --git a/src/views/labor_contract/components/add.vue b/src/views/labor_contract/components/add.vue index f1de426..dfcbda7 100644 --- a/src/views/labor_contract/components/add.vue +++ b/src/views/labor_contract/components/add.vue @@ -9,6 +9,7 @@ - + - - + + style="width: 300px" + > @@ -113,6 +106,11 @@ :type="data.addOrEditDialog.type" @get-data="fnResetPagination" /> + @@ -120,11 +118,14 @@ import { serialNumber } from "@/assets/js/utils"; import useListData from "@/assets/js/useListData.js"; import Add from "./components/add.vue"; -import { nextTick, reactive, watchEffect } from "vue"; +import { reactive, watchEffect } from "vue"; +import ViewInfo from "./components/view.vue"; +import { + getSafetyContractList, + infoContractView, +} from "@/request/traffic_safety_contract.js"; import router from "@/router/index.js"; -import { getSafetyContractList } from "@/request/traffic_safety_contract.js"; - const { list, pagination, searchForm, fnGetData, fnResetPagination } = useListData(getSafetyContractList); const data = reactive({ @@ -133,6 +134,10 @@ const data = reactive({ type: "", form: {}, }, + viewDialog: { + visible: false, + info: {}, + }, }); watchEffect(() => { @@ -142,21 +147,15 @@ watchEffect(() => { }); } }); -const fnAddOrEdit = async ( - LABORCONTRACT_ID = "", - USER_ID = "", - type = "add" -) => { - data.addOrEditDialog.visible = true; - data.addOrEditDialog.type = type; - data.addOrEditDialog.form = {}; - if (type === "edit" && LABORCONTRACT_ID) { - data.addOrEditDialog.form.LABORCONTRACT_ID = LABORCONTRACT_ID; - } else { - data.addOrEditDialog.form = { USER_ID }; - } - await nextTick(); +const fnView = async (LABORCONTRACT_ID) => { + const resData = await infoContractView({ + LABORCONTRACT_ID, + }); + if (resData && resData.pd) { + data.viewDialog.info = resData.pd; + data.viewDialog.visible = true; + } }; diff --git a/src/views/management_staffing/components/add.vue b/src/views/management_staffing/components/add.vue index d3be5dd..9979339 100644 --- a/src/views/management_staffing/components/add.vue +++ b/src/views/management_staffing/components/add.vue @@ -5,10 +5,11 @@ :before-close="fnClose" > - + --> - + - + - - + + style="width: 300px" + > @@ -118,8 +116,11 @@ import { serialNumber } from "@/assets/js/utils"; import useListData from "@/assets/js/useListData.js"; import Add from "./components/add.vue"; import { nextTick, reactive } from "vue"; -import router from "@/router/index.js"; -import { getSafetyStaffingList } from "@/request/traffic_safety_staffing.js"; +import { + getSafetyStaffingList, + infoStaffingView, +} from "@/request/traffic_safety_staffing.js"; +import ViewInfo from "./components/view.vue"; const { list, pagination, searchForm, fnGetData, fnResetPagination } = useListData(getSafetyStaffingList); @@ -129,6 +130,10 @@ const data = reactive({ type: "", form: {}, }, + viewDialog: { + visible: false, + info: {}, + }, }); const fnAddOrEdit = async (STAFFING_ID = "", type = "add") => { data.addOrEditDialog.visible = true; @@ -141,6 +146,14 @@ const fnAddOrEdit = async (STAFFING_ID = "", type = "add") => { await nextTick(); }; + +const fnView = async (STAFFING_ID) => { + const resData = await infoStaffingView({ + STAFFING_ID, + }); + data.viewDialog.info = resData.pd; + data.viewDialog.visible = true; +}; diff --git a/src/views/occupational_hazards/components/add.vue b/src/views/occupational_hazards/components/add.vue index 8ce168a..c986b7f 100644 --- a/src/views/occupational_hazards/components/add.vue +++ b/src/views/occupational_hazards/components/add.vue @@ -13,6 +13,7 @@ - + - - + + style="width: 300px" + > @@ -117,6 +110,11 @@ :type="data.addOrEditDialog.type" @get-data="fnResetPagination" /> + @@ -124,9 +122,13 @@ import { serialNumber } from "@/assets/js/utils"; import useListData from "@/assets/js/useListData.js"; import Add from "./components/add.vue"; -import { nextTick, reactive, watchEffect } from "vue"; +import { reactive, watchEffect } from "vue"; +import { + getSafetyOccupationalHazardsList, + infoOccupationalHazardsView, +} from "@/request/traffic_occupational_hazards.js"; +import ViewInfo from "./components/view.vue"; import router from "@/router/index.js"; -import { getSafetyOccupationalHazardsList } from "@/request/traffic_occupational_hazards.js"; const { list, pagination, searchForm, fnGetData, fnResetPagination } = useListData(getSafetyOccupationalHazardsList); @@ -136,6 +138,10 @@ const data = reactive({ type: "", form: {}, }, + viewDialog: { + visible: false, + info: {}, + }, }); watchEffect(() => { @@ -145,21 +151,14 @@ watchEffect(() => { }); } }); -const fnAddOrEdit = async ( - OCCUPATIONALHAZARDS_ID = "", - USER_ID = "", - type = "add" -) => { - data.addOrEditDialog.visible = true; - data.addOrEditDialog.type = type; - data.addOrEditDialog.form = {}; - if (type === "edit" && OCCUPATIONALHAZARDS_ID) { - data.addOrEditDialog.form.OCCUPATIONALHAZARDS_ID = OCCUPATIONALHAZARDS_ID; - } else { - data.addOrEditDialog.form = { USER_ID }; +const fnView = async (OCCUPATIONALHAZARDS_ID) => { + const resData = await infoOccupationalHazardsView({ + OCCUPATIONALHAZARDS_ID, + }); + if (resData && resData.pd) { + data.viewDialog.info = resData.pd; + data.viewDialog.visible = true; } - - await nextTick(); }; diff --git a/src/views/safety_assessment/components/add.vue b/src/views/safety_assessment/components/add.vue new file mode 100644 index 0000000..34d8ca6 --- /dev/null +++ b/src/views/safety_assessment/components/add.vue @@ -0,0 +1,155 @@ + + + + + diff --git a/src/views/safety_assessment/components/view.vue b/src/views/safety_assessment/components/view.vue new file mode 100644 index 0000000..cc10fb0 --- /dev/null +++ b/src/views/safety_assessment/components/view.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/src/views/safety_assessment/details.vue b/src/views/safety_assessment/details.vue new file mode 100644 index 0000000..4a13f01 --- /dev/null +++ b/src/views/safety_assessment/details.vue @@ -0,0 +1,38 @@ + + + + + diff --git a/src/views/safety_assessment/index.vue b/src/views/safety_assessment/index.vue new file mode 100644 index 0000000..d74a54c --- /dev/null +++ b/src/views/safety_assessment/index.vue @@ -0,0 +1,158 @@ + + + + + diff --git a/src/views/safety_production/components/add.vue b/src/views/safety_production/components/add.vue new file mode 100644 index 0000000..5598116 --- /dev/null +++ b/src/views/safety_production/components/add.vue @@ -0,0 +1,155 @@ + + + + + diff --git a/src/views/safety_production/components/view.vue b/src/views/safety_production/components/view.vue new file mode 100644 index 0000000..cc10fb0 --- /dev/null +++ b/src/views/safety_production/components/view.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/src/views/safety_production/details.vue b/src/views/safety_production/details.vue new file mode 100644 index 0000000..7507c58 --- /dev/null +++ b/src/views/safety_production/details.vue @@ -0,0 +1,38 @@ + + + + + diff --git a/src/views/safety_production/index.vue b/src/views/safety_production/index.vue new file mode 100644 index 0000000..3a74ef2 --- /dev/null +++ b/src/views/safety_production/index.vue @@ -0,0 +1,158 @@ + + + + + diff --git a/src/views/safety_responsibility/components/add.vue b/src/views/safety_responsibility/components/add.vue index 6370328..ac1e7de 100644 --- a/src/views/safety_responsibility/components/add.vue +++ b/src/views/safety_responsibility/components/add.vue @@ -8,11 +8,12 @@ - + - - + + style="width: 300px" + > @@ -117,6 +110,11 @@ :type="data.addOrEditDialog.type" @get-data="fnResetPagination" /> + @@ -124,9 +122,13 @@ import { serialNumber } from "@/assets/js/utils"; import useListData from "@/assets/js/useListData.js"; import Add from "./components/add.vue"; -import { nextTick, reactive, watchEffect } from "vue"; +import { reactive, watchEffect } from "vue"; +import { + getSafetyResponsibilityList, + infoResponsibilityView, +} from "@/request/traffic_safety_responsibility.js"; +import ViewInfo from "./components/view.vue"; import router from "@/router/index.js"; -import { getSafetyResponsibilityList } from "@/request/traffic_safety_responsibility.js"; const { list, pagination, searchForm, fnGetData, fnResetPagination } = useListData(getSafetyResponsibilityList); @@ -136,6 +138,10 @@ const data = reactive({ type: "", form: {}, }, + viewDialog: { + visible: false, + info: {}, + }, }); watchEffect(() => { @@ -145,21 +151,14 @@ watchEffect(() => { }); } }); -const fnAddOrEdit = async ( - SAFETYRESPONSIBILITY_ID = "", - USER_ID = "", - type = "add" -) => { - data.addOrEditDialog.visible = true; - data.addOrEditDialog.type = type; - data.addOrEditDialog.form = {}; - if (type === "edit" && SAFETYRESPONSIBILITY_ID) { - data.addOrEditDialog.form.SAFETYRESPONSIBILITY_ID = SAFETYRESPONSIBILITY_ID; - } else { - data.addOrEditDialog.form = { USER_ID }; +const fnView = async (SAFETYRESPONSIBILITY_ID) => { + const resData = await infoResponsibilityView({ + SAFETYRESPONSIBILITY_ID, + }); + if (resData && resData.pd) { + data.viewDialog.info = resData.pd; + data.viewDialog.visible = true; } - - await nextTick(); }; diff --git a/src/views/security_commitment/components/add.vue b/src/views/security_commitment/components/add.vue index eadd6e3..c5147d1 100644 --- a/src/views/security_commitment/components/add.vue +++ b/src/views/security_commitment/components/add.vue @@ -13,6 +13,7 @@ - + - - + + style="width: 300px" + > @@ -117,16 +110,25 @@ :type="data.addOrEditDialog.type" @get-data="fnResetPagination" /> + diff --git a/src/views/three_institutional_libraries/safety_production_responsibility_system/components/list.vue b/src/views/three_institutional_libraries/safety_production_responsibility_system/components/list.vue index f430c75..784856d 100644 --- a/src/views/three_institutional_libraries/safety_production_responsibility_system/components/list.vue +++ b/src/views/three_institutional_libraries/safety_production_responsibility_system/components/list.vue @@ -336,6 +336,7 @@ const fnView = async (BUS_TEXT_LIBRARY_ID) => { data.viewDialog.info = resData.data; data.viewDialog.info.TEXT_INFO = info.TEXT_INFO; data.viewDialog.visible = true; + console.log(data, 7979); }; const fnAddOrEdit = async (BUS_TEXT_LIBRARY_ID, type) => { data.addOrEditDialog.visible = true; diff --git a/src/views/three_institutional_libraries/safety_production_responsibility_system/index.vue b/src/views/three_institutional_libraries/safety_production_responsibility_system/index.vue index 17e08ab..8b6b22e 100644 --- a/src/views/three_institutional_libraries/safety_production_responsibility_system/index.vue +++ b/src/views/three_institutional_libraries/safety_production_responsibility_system/index.vue @@ -8,17 +8,6 @@ :label-name="labelName[pathName] + '名称'" /> - - -