From d5f65a731126e37bd3d1498b54db7d6093fec5b2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 25 一月 2024 11:00:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index c891337..59a9275 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -49,7 +49,7 @@
:defaultExpandAll="false"
:option="Treeoption"
class="classifyTree"
- style="height: 690px"
+ style="height: 610px"
@node-click="nodeClick"
>
<template slot-scope="{ node, data }" class="el-tree-node__label">
@@ -123,6 +123,7 @@
</el-dialog>
<!-- 鍒嗙被鎺堟潈瀵硅瘽妗�-->
<classify-auth-dialog
+ :TreeNode="TreeEditObj"
:classifyData="classifyData"
:visible.sync="classifyAuthVisible"
></classify-auth-dialog>
@@ -709,7 +710,7 @@
},
treeStyle() {
return {
- height: this.btnAuthList.length > 0 ? '620px' : '785px',
+ height: this.allButtons ? '610px' : '690px',
};
},
crudTreeOption() {
@@ -779,7 +780,7 @@
this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒')
return;
}
- this.classifyData = this.nodeClickList;
+ // this.classifyData = this.nodeClickList;
this.classifyAuthVisible = true;
},
// 鏁版嵁鎺堟潈瀵硅瘽妗嗘墦寮�
@@ -788,7 +789,7 @@
this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒')
return;
}
- this.classifyData = this.nodeClickList;
+ // this.classifyData = this.nodeClickList;
this.dataAuthVisible = true;
},
flowingDependHandler() {
@@ -1153,8 +1154,9 @@
//鏍戠偣鍑讳簨浠�
async nodeClick(data) {
const response = this.findTheTopLevelNode(data,this.Treedata)
- console.log(response)
- console.log('response',response.attributes.id)
+ this.classifyData = response;
+ // console.log(response)
+ // console.log('response',response.attributes.id)
this.allButtons = true;
getAuthButtonList({classifyId: data.oid, code: "classifyTree", authType: "classify_auth"}).then(res => {
this.btnAuthList = res.data.data;
--
Gitblit v1.9.3