From 7c8e69e1f696dfaec70c63ae41af786891f578d0 Mon Sep 17 00:00:00 2001
From: Yueng <14617246+YuengMeYuuer@user.noreply.gitee.com>
Date: Mon, 2 Sep 2024 20:12:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B5=84=E4=BA=A7=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/property/asDisplay.js          |  4 ++--
 src/views/property/asDisplay/index.vue | 24 ++++++++++++------------
 src/views/property/asauth/index.vue    |  2 +-
 src/views/property/astr/index.vue      |  4 ++--
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/api/property/asDisplay.js b/src/api/property/asDisplay.js
index eba5419..e16425d 100644
--- a/src/api/property/asDisplay.js
+++ b/src/api/property/asDisplay.js
@@ -7,9 +7,9 @@ export function getExtractDataTableNameList() {
   })
 }
 
-export function findTableValueList(data) {
+export function findTableValueList(basicId,dataId,tableName) {
   return request({
-    url: '/property/dataSource/findTableValueList',
+    url: '/property/dataSource/findTableValueList?basicId='+basicId+"&dataId="+dataId+"&tableName="+tableName,
     method: 'post',
     data: data
   })
diff --git a/src/views/property/asDisplay/index.vue b/src/views/property/asDisplay/index.vue
index 427e934..d18c24f 100644
--- a/src/views/property/asDisplay/index.vue
+++ b/src/views/property/asDisplay/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <h1>测试4()- 资产展示</h1>
+    <h1>资产展示</h1>
 
     <el-container>
       <el-aside width="400px">
@@ -26,7 +26,7 @@
               <el-descriptions class="margin-top" title="资产模型基本信息" :column="2"  border>
                 <el-descriptions-item>
                   <template slot="label">表名称</template>
-                  {{ tableBasic.tableName }}
+                  {{ tableBasic.name }}
                 </el-descriptions-item>
                 <el-descriptions-item>
                   <template slot="label">表备注</template>
@@ -34,7 +34,7 @@
                 </el-descriptions-item>
                 <el-descriptions-item>
                   <template slot="label">数据量</template>
-                  {{ tableBasic.dataNum }}
+                  {{ dataNum }}
                 </el-descriptions-item>
                 <el-descriptions-item>
                   <template slot="label">是否核心</template>
@@ -112,10 +112,10 @@ export default {
     return {
       data:[],
       defaultProps: {
-        children: 'children',
-        label: 'tableName'
+        children: 'tableNames',
+        label: 'name'
       },
-      tableBasic:{},
+      tableBasic:[],
       tableStructure:[],
       assetShowList: [
         // {key: "测试.sys_user.id", type: "String", value: 1},
@@ -124,9 +124,8 @@ export default {
         // {key: "测试.sys_user.email", type: "String", value: "123@136.com"},
         // {key: "测试.sys_user.sex", type: "String", value: "Y"},
       ],
-      kvtList: [],
       DataValue:[],
-
+      dataNum:'',
     };
   },
   //计算属性 类似于data概念",
@@ -145,16 +144,17 @@ export default {
     handleNodeClick(data){
       console.log("...."+data)
       this.tableBasic=data
-
+      console.log(this.tableBasic)
+      dataNum=this.tableBasic.tableFie.length
       // findStructureByTableId(data.id).then((res)=>{
       //   this.tableStructure=res.data
       // })
-      if (data.children==null){
-        findTableValueList(data.basicId,data.tableName).then(res=>{
+
+        findTableValueList(data.id,data.dataId,data.tableName).then(res=>{
           this.assetShowList=res.data;
           this.DataValue=res.data;
         })
-      }
+
       console.log("-----"+this.DataValue);
       console.log("...."+data.basicId)
 
diff --git a/src/views/property/asauth/index.vue b/src/views/property/asauth/index.vue
index 8626673..4825611 100644
--- a/src/views/property/asauth/index.vue
+++ b/src/views/property/asauth/index.vue
@@ -136,7 +136,7 @@ export default {
       console.log(this.tableBasic.length)
       if (this.tableBasic.length === undefined){
         selectBasicList().then(ress=>{
-          this.tableBasic.ress.data
+          this.tableBasic = ress.data
           this.tableBasics.data
         })
         this.dataNum=data.tableFie.length
diff --git a/src/views/property/astr/index.vue b/src/views/property/astr/index.vue
index 9d606df..c4d07b0 100644
--- a/src/views/property/astr/index.vue
+++ b/src/views/property/astr/index.vue
@@ -130,7 +130,7 @@ export default {
       this.tableStructure=data.tableFie
       // console.log(this.tableStructure)
         findTableValue(data.dataId,data.name).then(res=>{
-          let tableMapping=res.data
+          let tableMapping = res.data
           // console.log(res.data)
 
           for (const index in tableMapping) {
@@ -140,7 +140,7 @@ export default {
                 this.tableStructure[i].types.push(tableMapping[index].type)
 
                 console.log(this.tableStructure[i].types)
-                if (i!== 0&& this.tableStructure[i].types==this.tableStructure[0].types){
+                if (i !== 0&& this.tableStructure[i].types==this.tableStructure[0].types){
 
                   alert("dawdwadad")
                   return