From f09e05514d9a9e2623cfa73c4de1ffa98bb30bf8 Mon Sep 17 00:00:00 2001 From: xiejun <xiejun@vci-tech.com> Date: 星期二, 23 一月 2024 10:09:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS-WEB/src/components/Master/MasterTree.vue | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue index 4d87afc..4f8c904 100644 --- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue +++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue @@ -103,7 +103,13 @@ const result = this.$route.query.id.substring(0, index); this.idData = result; this.removeList(); - getTreeList({'conditionMap[id]': this.idData}).then(res => { + let conditionMaps = {}; + conditionMaps["conditionMap[id]"] = this.idData; + conditionMaps["conditionMap[authType]"] = "data_auth"; + conditionMaps["conditionMap[buttonCode]"] = this.idData; + // 鏁版嵁鎺堟潈涓槸鍚﹀叿澶囨煡鐪嬫潈闄� + conditionMaps["conditionMap[menuCode]"] = "data_view"; + getTreeList(conditionMaps).then(res => { if (res) { if (res.data.length === 0) { this.$message.error("涓绘暟鎹垎绫绘煡璇负绌猴紒"); @@ -231,7 +237,7 @@ <style lang="scss" scoped> .app { overflow: auto; - height: calc(100vh - 150px); + height: calc(100vh - 145px); } .app::-webkit-scrollbar { -- Gitblit v1.9.3