From 42726b70e761da50251a886d239c7d456b5044af Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 27 十二月 2023 16:41:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 4957ea4..4d87afc 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -3,10 +3,13 @@
<avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false"
:option="Treeoption" style="width: fit-content;" @node-click="nodeClick">
<template slot-scope="{ node }">
- <span v-html="node.label"></span>
+ <el-tooltip :content="$createElement('div', { domProps: { innerHTML: node.label } })" class="item" effect="dark"
+ open-delay="350" placement="right-start">
+ <span id="labelSize" v-html="node.label"></span>
+ </el-tooltip>
</template>
</avue-tree>
- <div style="position: absolute; right: 0px; top: -1px;">
+ <div style="position: absolute; right: 3px; top: -1px;">
<el-link class="refresh-icon" icon="el-icon-refresh" @click="getTreeLists"></el-link>
</div>
</div>
@@ -55,10 +58,6 @@
defaultExpandAll: false,
menu: false,
lazy: true,
- // treeLoad:function (node,resolve){
- // console.log(node)
- // console.log(resolve)
- // }
treeLoad: (node, resolve) => {
if (node.data != false) {
const parentId = (node.level === 0) ? 0 : node.data.oid;
@@ -102,15 +101,14 @@
getTreeLists() {
const index = this.$route.query.id.indexOf('@');
const result = this.$route.query.id.substring(0, index);
- this.idData = result
- // console.log(this.$route)
+ this.idData = result;
+ this.removeList();
getTreeList({'conditionMap[id]': this.idData}).then(res => {
if (res) {
if (res.data.length === 0) {
this.$message.error("涓绘暟鎹垎绫绘煡璇负绌猴紒");
} else {
this.Treedata = res.data;
-
const [firstProperty] = res.data;
this.ModifyProperties(this.Treedata, 'text', 'label');
this.referTreeId = firstProperty.attributes.btmTypeId;
@@ -124,15 +122,19 @@
});
this.$emit("coderuleoid", this.coderuleoid)
this.$emit('Treedata', this.Treedata)
- // console.log(this.Treedata)
}
}
}).catch(res => {
- // console.log(res)
this.$message.error(res)
});
},
-
+ removeList() {
+ this.$emit('tableHeadDataFateher', []);
+ this.$emit('tableHeadFindData', []);
+ this.$emit('tableHeadBttoms', []);
+ this.$emit('tableDataArray', [])
+ this.$emit('total', null)
+ },
//瀹氫箟涓�涓慨鏀规暟鎹睘鎬у悕鐨勬柟娉�
ModifyProperties(obj, oldName, newName) {
for (let key in obj) {
@@ -155,6 +157,7 @@
page: this.currentPage,
limit: this.pageSize,
}).then(res => {
+ // console.log('tab',res)
this.loading = false;
this.$emit('loading', this.loading)
this.tableDataArray = res.data.data;
@@ -185,10 +188,11 @@
List.forEach(item => {
let columnItem = {
label: item.title,
- prop: item.queryField,
+ prop: item.field,
// type: this.columnType[item.type],
sortable: item.sort,
- width: item.minWidth
+ width: item.minWidth,
+ query: item.queryField
};
this.tableHeadFindData.push(Object.assign(item, columnItem))
})
@@ -217,7 +221,6 @@
this.$emit("codeClassifyOid", this.nodeClickList.oid)
this.$emit("nodeClickList", this.nodeClickList)
} catch (error) {
- // 澶勭悊閿欒
this.$message.error(error)
}
}
@@ -252,4 +255,8 @@
margin-left: 6px;
font-size: 18px;
}
+
+#labelSize {
+ font-size: 14px !important;
+}
</style>
--
Gitblit v1.9.3