From 440a1bd252d5b4c0ff4518a7716de9c97efee6d2 Mon Sep 17 00:00:00 2001 From: LiuJiaNan Date: Wed, 31 Jan 2024 16:44:17 +0800 Subject: [PATCH] init --- src/components/electronic_fence_tree/index.vue | 2 +- src/views/enterprise_management/department/index.vue | 7 ++++++- .../enterprise_management/electronic_fence/index.vue | 11 +++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/components/electronic_fence_tree/index.vue b/src/components/electronic_fence_tree/index.vue index 54bad01..3e68dcd 100644 --- a/src/components/electronic_fence_tree/index.vue +++ b/src/components/electronic_fence_tree/index.vue @@ -24,7 +24,7 @@ import { ref, watch, watchEffect } from "vue"; import { layoutFnGetElectronicFenceTree } from "@/assets/js/data_dictionary.js"; defineOptions({ - name: "LayoutDepartmentTree", + name: "LayoutElectronicFenceTree", }); const props = defineProps({ refresh: { diff --git a/src/views/enterprise_management/department/index.vue b/src/views/enterprise_management/department/index.vue index ffde02d..91e61f8 100644 --- a/src/views/enterprise_management/department/index.vue +++ b/src/views/enterprise_management/department/index.vue @@ -106,7 +106,12 @@ :type="data.addOrEditDialog.type" :parent-name="DEPARTMENT_NAME" :parent-id="DEPARTMENT_ID" - @get-data="fnResetPaginationTransfer" + @get-data=" + () => { + fnResetPaginationTransfer(); + data.refreshTreeData = true; + } + " /> diff --git a/src/views/enterprise_management/electronic_fence/index.vue b/src/views/enterprise_management/electronic_fence/index.vue index 63a0222..9f7a021 100644 --- a/src/views/enterprise_management/electronic_fence/index.vue +++ b/src/views/enterprise_management/electronic_fence/index.vue @@ -117,7 +117,12 @@ :type="data.addOrEditDialog.type" :parent-name="ELECTRONIC_FENCE_AREA_NAME" :parent-id="ELECTRONIC_FENCE_AREA_ID" - @get-data="fnResetPaginationTransfer" + @get-data=" + () => { + fnResetPaginationTransfer(); + data.refreshTreeData = true; + } + " /> @@ -143,7 +148,7 @@ import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js"; const router = useRouter(); const route = useRoute(); const parentIdDefault = "0"; -const parentNameDefault = "(无)此项为顶级部门"; +const parentNameDefault = "(无)此项为顶级电子围栏"; const ELECTRONIC_FENCE_AREA_ID = ref( route.query.ELECTRONIC_FENCE_AREA_ID || parentIdDefault ); @@ -178,13 +183,11 @@ const data = reactive({ }); const buttonJurisdiction = await useButtonJurisdiction("department"); const fnGetDataTransfer = () => { - data.refreshTreeData = true; fnGetData({ ELECTRONIC_FENCE_AREA_ID: ELECTRONIC_FENCE_AREA_ID.value, }); }; const fnResetPaginationTransfer = () => { - data.refreshTreeData = true; fnResetPagination({ ELECTRONIC_FENCE_AREA_ID: ELECTRONIC_FENCE_AREA_ID.value, });