From 84b83aca7adb18249ea5bd5c7d35ced4b056c98a Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 14 九月 2023 10:05:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 0b217db..eb35b74 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -1,9 +1,11 @@
<template>
- <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false"
- :option="Treeoption"
- style="height: calc(100vh - 150px);"
- @node-click=" nodeClick"
- ></avue-tree>
+ <div style="overflow: auto; height: calc(100vh - 150px);">
+ <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false" :option="Treeoption" @node-click="nodeClick" style="width: fit-content;">
+ <template slot-scope="{ node }">
+ <span style="display: inline-block;">{{ node.label }}</span>
+ </template>
+ </avue-tree>
+ </div>
</template>
<script>
@@ -15,7 +17,7 @@
props: {
pageSize: {
type: String,
- default: "10"
+ default: "100"
},
currentPage: {
type: String,
@@ -28,6 +30,7 @@
},
data() {
return {
+ TreeValue:'',
idData: '',
masterVrBtnList: [],
tableHeadFindData: [],
@@ -82,7 +85,7 @@
getTreeList({'conditionMap[id]': this.idData}).then(res => {
if(res){
if(res.data.length === 0){
- this.$message.error("宸︿晶鑿滃崟鏌ヨ涓虹┖");
+ this.$message.error("涓绘暟鎹垎绫绘煡璇负绌猴紒");
}else{
this.Treedata = res.data;
const [firstProperty] = res.data;
@@ -165,6 +168,9 @@
//鏍戠偣鍑讳簨浠�
async nodeClick(data) {
try {
+ console.log(data)
+ this.TreeValue=data.label.split(" ")[0].trim();
+ this.$emit('TreeValue',this.TreeValue)
this.nodeClickList = data;
this.tableHeadDataFateher = []
this.tableHeadFindData = []
--
Gitblit v1.9.3