From 4b2284f17dcdf85bf6a851be4826affe8d6ac1d0 Mon Sep 17 00:00:00 2001
From: TreeWish <1131093754@qq.com>
Date: 星期四, 02 三月 2023 17:49:38 +0800
Subject: [PATCH] Merge branch 'master' of http://103.85.165.99:8989/r/LFWEB_NEW

---
 src/views/datamanage/dictionaryManage.vue |   87 ++++++++++++++++++++++++-------------------
 1 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/src/views/datamanage/dictionaryManage.vue b/src/views/datamanage/dictionaryManage.vue
index 9b1e90b..845acae 100644
--- a/src/views/datamanage/dictionaryManage.vue
+++ b/src/views/datamanage/dictionaryManage.vue
@@ -102,6 +102,7 @@
           <el-table
             :data="tableData"
             style="width: 100%"
+            border
             @selection-change="handleSelectionChange"
             height="calc(100% - 57px)"
           >
@@ -606,20 +607,7 @@
         insert: false,
         update: false,
       },
-      domainData: [
-        {
-          val: "鍩虹鏁版嵁",
-          children: [],
-        },
-        {
-          val: "涓氬姟鏁版嵁",
-          children: [],
-        },
-        {
-          val: "鍏冩暟鎹�",
-          children: [],
-        },
-      ],
+      domainData: [],
       defaultProps: {
         children: "children",
         label: "val",
@@ -786,31 +774,52 @@
       if (data.code != 200) {
         this.$message.error("涓嬫媺璋冪敤澶辫触");
       }
-      let bdres = data.result.filter((item) => item.ns == "bd");
-      let bsres = data.result.filter((item) => item.ns == "bs");
-      let mdres = data.result.filter((item) => item.ns == "md");
-      for (var i in bdres) {
-        // bdres[i].val = bdres[i].tabDesc + '(' + bdres[i].tab + ')';
-        bdres[i].val = bdres[i].tabDesc;
-      }
-      for (var i in bsres) {
-        // bsres[i].val = bsres[i].tabDesc + '(' + bsres[i].tab + ')';
-        bsres[i].val = bsres[i].tabDesc;
-      }
-      for (var i in mdres) {
-        // bsres[i].val = bsres[i].tabDesc + '(' + bsres[i].tab + ')';
-        mdres[i].val = mdres[i].tabDesc;
-      }
-      this.domainData[0].children = bdres;
-      this.domainData[1].children = bsres;
-      this.domainData[2].children = mdres;
-      var val = this.domainData[0].children;
-      this.insertform.tab = val[0].tab;
-      this.insertform.tabDesc = val[0].tabDesc;
-      this.insertform.ns = val[0].ns;
-      this.listData.tab = val[0].tab;
-      this.listData.ns = val[0].ns;
-      this.activeName = val[0].tab;
+      var val = data.result;
+      var std = [];
+      val.filter((item) => {
+        if (std.indexOf(item.bak) == -1) {
+          std.push(item.bak);
+          this.domainData.push(
+            {
+              val: item.bak,
+              children: [],
+            }
+          )
+        }
+      });
+      this.domainData.filter((item) => {
+        val.filter((res) => {
+          if (item.val === res.bak) {
+            res.val = res.tabDesc
+            item.children.push(res)
+          }
+        })
+      })
+      // let bdres = data.result.filter((item) => item.ns == "bd");
+      // let bsres = data.result.filter((item) => item.ns == "bs");
+      // let mdres = data.result.filter((item) => item.ns == "md");
+      // for (var i in bdres) {
+      //   // bdres[i].val = bdres[i].tabDesc + '(' + bdres[i].tab + ')';
+      //   bdres[i].val = bdres[i].tabDesc;
+      // }
+      // for (var i in bsres) {
+      //   // bsres[i].val = bsres[i].tabDesc + '(' + bsres[i].tab + ')';
+      //   bsres[i].val = bsres[i].tabDesc;
+      // }
+      // for (var i in mdres) {
+      //   // bsres[i].val = bsres[i].tabDesc + '(' + bsres[i].tab + ')';
+      //   mdres[i].val = mdres[i].tabDesc;
+      // }
+      // this.domainData[0].children = bdres;
+      // this.domainData[1].children = bsres;
+      // this.domainData[2].children = mdres;
+      var result = this.domainData[0].children;
+      this.insertform.tab = result[0].tab;
+      this.insertform.tabDesc = result[0].tabDesc;
+      this.insertform.ns = result[0].ns;
+      this.listData.tab = result[0].tab;
+      this.listData.ns = result[0].ns;
+      this.activeName = result[0].tab;
       this.startQueryNameData();
     },
   },

--
Gitblit v1.9.3