From c0e4323f851c5216d1b020bc4177a8566e77bfd2 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 30 十一月 2023 18:32:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 99 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 82 insertions(+), 17 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index f485dbe..b34e705 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -1,9 +1,15 @@
<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 class="app" style="position: relative;">
+ <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>
+ </template>
+ </avue-tree>
+ <div style="position: absolute; right: 0px; top: -1px;">
+ <el-link class="refresh-icon" icon="el-icon-refresh" @click="getTreeLists"></el-link>
+ </div>
+ </div>
</template>
<script>
@@ -15,7 +21,7 @@
props: {
pageSize: {
type: String,
- default: "10"
+ default: "100"
},
currentPage: {
type: String,
@@ -28,7 +34,9 @@
},
data() {
return {
+ TreeValue: '',
idData: '',
+ referTreeId: '',
masterVrBtnList: [],
tableHeadFindData: [],
tableHeadDataFateher: [],
@@ -51,15 +59,20 @@
// console.log(node)
// console.log(resolve)
// }
- treeLoad: function (node, resolve) {
+ treeLoad: (node, resolve) => {
if (node.data != false) {
const parentId = (node.level === 0) ? 0 : node.data.oid;
- const parentBtmName = node.data.attributes.btmname
- getTreeList({parentOid: parentId, parentBtmName: parentBtmName}).then(res => {
+ const parentBtmName = node.data.attributes.btmname;
+ getTreeList({
+ parentOid: parentId,
+ parentBtmName: parentBtmName,
+ 'conditionMap[btmTypeId]': this.referTreeId
+ }).then(res => {
resolve(res.data.map(item => {
return {
...item,
- label: item.text
+ label: `<span style="color:#409EFF">${item.count}</span> ${item.text}`,
+ count: item.count
}
}))
})
@@ -71,7 +84,19 @@
created() {
this.getTreeLists()
},
- computed: {},
+ mounted() {
+
+ },
+ computed: {
+ formatCount() {
+ return (label) => {
+ const countIndex = label.indexOf('</span>') + '</span>'.length;
+ const count = label.slice(countIndex);
+ const coloredCount = `<span class="count">${count}</span>`;
+ return `${label.slice(0, countIndex)}${coloredCount}`;
+ };
+ },
+ },
methods: {
//鑾峰彇鏁版嵁
getTreeLists() {
@@ -80,21 +105,30 @@
this.idData = result
// console.log(this.$route)
getTreeList({'conditionMap[id]': this.idData}).then(res => {
- if(res){
- if(res.data.length === 0){
+ if (res) {
+ if (res.data.length === 0) {
this.$message.error("涓绘暟鎹垎绫绘煡璇负绌猴紒");
- }else{
+ } else {
this.Treedata = res.data;
+
const [firstProperty] = res.data;
this.ModifyProperties(this.Treedata, 'text', 'label');
+ this.referTreeId = firstProperty.attributes.btmTypeId;
+ // console.log(this.referTreeId)
this.codeClassifyOid = firstProperty.oid;
this.coderuleoid = firstProperty.attributes.coderuleoid;
this.$emit("coderuleoid", this.coderuleoid)
this.$emit('Treedata', this.Treedata)
+ this.Treedata.forEach((item, index) => {
+ item.label = `<span style="color:#409EFF">${item.count}</span> ${item.label}`;
+ });
+ this.$emit("coderuleoid", this.coderuleoid)
+ this.$emit('Treedata', this.Treedata)
+ // console.log(this.Treedata)
}
}
}).catch(res => {
- console.log(res)
+ // console.log(res)
this.$message.error(res)
});
},
@@ -128,6 +162,7 @@
TableHeadRend() {
const index = this.$route.query.id.indexOf('@');
const result = this.$route.query.id.substring(0, index);
+ // console.log(this.$route)
return new Promise((resolve, reject) => {
MasterTable({
codeClassifyOid: this.nodeClickList.oid,
@@ -146,7 +181,7 @@
List.forEach(item => {
let columnItem = {
label: item.title,
- prop: item.field,
+ prop: item.queryField,
// type: this.columnType[item.type],
sortable: item.sort,
width: item.minWidth
@@ -165,6 +200,10 @@
//鏍戠偣鍑讳簨浠�
async nodeClick(data) {
try {
+ // console.log(data)
+ this.TreeValue = data.label.split("</span>")[1].trim();
+ // console.log('TreeValue',this.TreeValue)
+ this.$emit('TreeValue', this.TreeValue)
this.nodeClickList = data;
this.tableHeadDataFateher = []
this.tableHeadFindData = []
@@ -172,6 +211,7 @@
this.TableRend(); // TableHeadRend() 鏂规硶瀹屾垚鍚庡啀鎵ц TableRend()
this.$emit('nodeClick', this.templateOids)
this.$emit("codeClassifyOid", this.nodeClickList.oid)
+ this.$emit("nodeClickList", this.nodeClickList)
} catch (error) {
// 澶勭悊閿欒
this.$message.error(error)
@@ -181,6 +221,31 @@
}
</script>
-<style scoped>
+<style lang="scss" scoped>
+.app {
+ overflow: auto;
+ height: calc(100vh - 150px);
+}
+.app::-webkit-scrollbar {
+ height: 15px; // 绾靛悜婊氬姩鏉� 蹇呭啓
+ background: white;
+ border: white;
+ width: 10px;
+
+}
+
+// 婊氬姩鏉＄殑婊戝潡
+.app::-webkit-scrollbar-thumb {
+ background-color: #ececec;
+ border-radius: 20px;
+ border: #ececec;
+}
+
+.refresh-icon {
+ color: #409EFF;
+ margin-top: 8px;
+ margin-left: 6px;
+ font-size: 18px;
+}
</style>
--
Gitblit v1.9.3