From 143c0e5c96cf879cfb6a423827d66216f4960826 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Mon, 22 Apr 2024 17:56:27 +0800 Subject: [PATCH] =?UTF-8?q?BUG=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/request/safety_production_related.js | 10 ++++- .../driving_commitment/index.vue | 4 +- .../waybill_registration/index.vue | 14 +++--- .../mechanical_files/maintenance/add.vue | 1 + src/views/occupational_hazards/details.vue | 4 +- src/views/occupational_hazards/index.vue | 12 ++--- .../add.vue | 7 +-- .../edit.vue | 2 +- .../index.vue | 6 +-- .../entrench_thing_grant/index.vue | 2 +- .../firefighting_equipment_facility/index.vue | 14 ++---- .../management_agreement/index.vue | 4 +- .../reported_incident_dispose/index.vue | 2 +- .../violation_registration/add.vue | 21 +++++++-- .../violation_registration/edit.vue | 36 +++++++++++++-- .../safety_activities/index.vue | 12 ++--- .../safety_culture/safety_manual/index.vue | 16 ++++--- .../safety_meeting/details.vue | 8 +++- .../safety_meeting/index.vue | 10 +++-- .../security_notice/index.vue | 45 +++---------------- src/views/safety_responsibility/details.vue | 4 +- src/views/safety_responsibility/index.vue | 12 ++--- src/views/security_commitment/details.vue | 4 +- src/views/security_commitment/index.vue | 12 ++--- src/views/security_investment/plan/index.vue | 4 +- .../security_investment/plan_review/index.vue | 4 +- 26 files changed, 153 insertions(+), 117 deletions(-) diff --git a/src/request/safety_production_related.js b/src/request/safety_production_related.js index d8af733..7e8a81b 100644 --- a/src/request/safety_production_related.js +++ b/src/request/safety_production_related.js @@ -1,7 +1,8 @@ import { post, upload } from "@/request/axios.js"; import { + getLevels, getLevelsByObject, - getLevelsByParentId, + getLevelsByParentId } from "@/request/data_dictionary.js"; import { ref } from "vue"; @@ -34,6 +35,13 @@ export const layoutFnGetNotificationsClassification = async () => { return ref(resData); }; +export const layoutFnGetMicrosoftSecurityEstate = async () => { + const resData = await getLevels({ + DICTIONARIES_ID: "aaaecb47d95524b84904809671e48a656", + }); + return ref(resData); +}; + // 获取交通处罚从业人员列表 export const getTrafficPenaltyUserList = (params) => post("/user/getTrafficPenaltyUserList", params); diff --git a/src/views/driving_inspections/driving_commitment/index.vue b/src/views/driving_inspections/driving_commitment/index.vue index 25b816c..6f2a04d 100644 --- a/src/views/driving_inspections/driving_commitment/index.vue +++ b/src/views/driving_inspections/driving_commitment/index.vue @@ -9,7 +9,9 @@ - + diff --git a/src/views/electronic_waybill_management/waybill_registration/index.vue b/src/views/electronic_waybill_management/waybill_registration/index.vue index 26c2ff7..a1dc9ef 100644 --- a/src/views/electronic_waybill_management/waybill_registration/index.vue +++ b/src/views/electronic_waybill_management/waybill_registration/index.vue @@ -9,7 +9,11 @@ - + @@ -45,7 +49,7 @@ {{ serialNumber(pagination, $index) }} - + @@ -168,50 +163,20 @@ import useListData from "@/assets/js/useListData.js"; import { ref } from "vue"; import { getSecurityNoticeList, - layoutFnGetNotificationsClassification, - dateteSecurityAllNotice, + layoutFnGetMicrosoftSecurityEstate, dateteSecurityNotice, issueSecurityNotice, } from "@/request/safety_production_related.js"; import { ElMessageBox, ElMessage } from "element-plus"; -import { debounce } from "throttle-debounce"; -import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js"; import { useRouter } from "vue-router"; const router = useRouter(); -const buttonJurisdiction = await useButtonJurisdiction("riskunit"); const tableRef = ref(null); const { list, pagination, searchForm, fnGetData, fnResetPagination } = useListData(getSecurityNoticeList); -const fnResetPaginationTransfer = () => { - fnResetPagination({ - DEPTIDS: searchForm.value.DEPTIDS?.join(","), - }); -}; const relatedClassificationTempList = - await layoutFnGetNotificationsClassification(); - -const fnBatchDelete = debounce( - 1000, - async () => { - // eslint-disable-next-line no-undef - const selectionData = tableRef.value.getSelectionRows(); - if (selectionData.length === 0) { - ElMessage.warning("请选中要删除的项"); - return; - } - await ElMessageBox.confirm("确定要删除选中的数据吗？", { type: "warning" }); - const DATA_IDS = selectionData - .map((item) => item.NOTIFICATION_ID) - .join(","); - await dateteSecurityAllNotice({ DATA_IDS }); - ElMessage.success("删除成功"); - fnResetPaginationTransfer(); - }, - { atBegin: true } -); - + await layoutFnGetMicrosoftSecurityEstate(); // 删除事件 const deleteItem = async (value) => { await ElMessageBox.confirm(`确定要删除吗？`, { diff --git a/src/views/safety_responsibility/details.vue b/src/views/safety_responsibility/details.vue index 456e1eb..a594651 100644 --- a/src/views/safety_responsibility/details.vue +++ b/src/views/safety_responsibility/details.vue @@ -40,8 +40,8 @@ > diff --git a/src/views/safety_responsibility/index.vue b/src/views/safety_responsibility/index.vue index dc799f8..0b541d6 100644 --- a/src/views/safety_responsibility/index.vue +++ b/src/views/safety_responsibility/index.vue @@ -13,7 +13,9 @@ prop="RESPONSIBILITYNAME" label-width="120px" > - + @@ -63,14 +65,14 @@ />