From 608ba76865266795b4b43bc7d9c8ab68ac0bb83d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 31 十月 2023 16:36:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/Master/MasterTree.vue |   51 +++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index a14ba8d..17a4f13 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="app" style="display: flex;">
-    <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false" :option="Treeoption" @node-click="nodeClick" style="width: fit-content;">
+    <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 style="display: inline-block;">{{ node.label }}</span>
+        <span v-html="node.label"></span>
       </template>
     </avue-tree>
     <div style="display: inline-block;"><i class="el-icon-refresh refresh-icon" @click="getTreeLists"></i></div>
@@ -31,7 +32,7 @@
   },
   data() {
     return {
-      TreeValue:'',
+      TreeValue: '',
       idData: '',
       masterVrBtnList: [],
       tableHeadFindData: [],
@@ -63,7 +64,8 @@
               resolve(res.data.map(item => {
                 return {
                   ...item,
-                  label: item.text
+                  label: `<span style="color:#409EFF">${item.count}</span> ${item.text}`,
+                  count: item.count
                 }
               }))
             })
@@ -75,7 +77,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() {
@@ -84,10 +98,10 @@
       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');
@@ -95,6 +109,12 @@
             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 => {
@@ -170,9 +190,9 @@
     async nodeClick(data) {
       try {
         // console.log(data)
-        this.TreeValue=data.label.split(" ")[0].trim();
+        this.TreeValue = data.label.split(" ")[0].trim();
         // console.log('TreeValue',this.TreeValue)
-        this.$emit('TreeValue',this.TreeValue)
+        this.$emit('TreeValue', this.TreeValue)
         this.nodeClickList = data;
         this.tableHeadDataFateher = []
         this.tableHeadFindData = []
@@ -190,23 +210,26 @@
 </script>
 
 <style lang="scss" scoped>
-.app{
+.app {
   overflow: auto;
   height: calc(100vh - 150px);
 }
- .app::-webkit-scrollbar {
-  height: 15px ; // 绾靛悜婊氬姩鏉� 蹇呭啓
+
+.app::-webkit-scrollbar {
+  height: 15px; // 绾靛悜婊氬姩鏉� 蹇呭啓
   background: white;
   border: white;
   width: 10px;
 
 }
+
 // 婊氬姩鏉$殑婊戝潡
- .app::-webkit-scrollbar-thumb {
+.app::-webkit-scrollbar-thumb {
   background-color: #ececec;
   border-radius: 20px;
   border: #ececec;
 }
+
 .refresh-icon {
   color: #409EFF;
   margin-top: 8px;

--
Gitblit v1.9.3