feat:数据展示

src/views/dataSource/assetShow/index.vue

@@ -1,7 +1,7 @@
 <template>
   <el-container :style="{height: mainHeight + 'px'}">
     <el-aside>
-      <el-tree style="background-color: white" :data="sourceList" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
+      <el-tree lazy :load="expandTable" style="background-color: white" :data="sourceList" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
     </el-aside>
     <el-container>
       <el-main>
@@ -54,9 +54,11 @@
 
 <script>
 
-import {dataAssetList, listSource, structureList} from "@/api/dataSource/source";
+
-import DataSourceShow from "@/views/dataSource/assetShow/modules/dataSourceShow.vue";
+
 import DataAssetShow from "@/views/dataSource/assetShow/modules/dataAssetShow.vue";
+import DataSourceShow from "@/views/dataSource/assetShow/modules/dataSourceShow.vue";
+import {dataAssetList, listSource} from "@/api/dataSource/source";
 
 export default {
   name: "AssetShow",
@@ -81,27 +83,39 @@ export default {
         {key: "测试.sys_user.sex", type: "String", value: "Y"},
       ],
       kvtList: [],
-      structure: []
+      structure: [],
+      childrenList: []
     }
   },
   created() {
     this.getList()
   },
   methods: {
+    expandTable( node, resolve){
+      if (node.level === 0) return resolve(this.sourceList);
+      const {data} = node;
+      this.showAssets = data.dataType;
+      if (data.dataType === 'dataTable') {
+        return resolve([])
+      }
+      setTimeout(() => {
+        resolve(this.childrenList)
+      }, 500);
+    },
     getList() {
       listSource({}).then(response => {
         this.sourceList = response.data.rows;
         this.sourceList.forEach(source => {
           if (source.type=='PostGreSql'){
-            source.label=source.dataSourceName+'('+source.databaseName+'-'+source.modeName+'-'+source.systemName+')'
+            source.label=source.name+'('+source.databaseName+'-'+source.modeName+'-'+source.systemName+')'
           }else{
-            source.label=source.dataSourceName+'('+source.databaseName+'-'+source.systemName+')'
+            source.label=source.name+'('+source.databaseName+'-'+source.systemName+')'
           }
 
           source.dataType = 'dataSource'
           if (source.tableList!=null){
             source.tableList.forEach(table => {
-              table.label = table.tableName+'-'+table.tableComment+'('+table.tableCount+'条)'
+              table.label= table.name+'-'+table.nameAs+"("+table.dataTotal+"条)"
               table.dataType = 'dataTable'
             })
           }
@@ -118,15 +132,16 @@ export default {
     // },
     handleNodeClick(data) {
       if (data.dataType === 'dataSource') {
-        this.source = data
         dataAssetList(data).then(res => {
           res.data.forEach(table => {
             table.dataType = "dataTable"
-            table.label=table.tableName+"-"+table.tableComment+"("+table.tableCount+"条)"
+            table.label = table.name + "-" + table.nameAs + "(" + table.dataTotal + "条)"
           })
           data.tableList = res.data
           this.sourceList[this.sourceList.indexOf(data)].tableList = res.data
+          this.childrenList = res.data
           this.title = data
+          this.source = data
         })
 
       } else {
@@ -147,18 +162,7 @@ export default {
         // }, 50);
 
       }
-      this.showAssets = data.dataType
     },
-    expandTable( node, resolve){
-      if (node.level === 0) return resolve(this.assetStructureList);
-      const {data} = node;
-      if (data.type === 'dataTable') {
-        return resolve([])
-      }
-      setTimeout(() => {
-        resolve(this.childrenList)
-      }, 500);
-    }
   }
 }
 </script>
@@ -170,12 +174,15 @@ export default {
   width: 400px;
   background-color: white;
 }
+
 .el-main {
   background-color: #f1f1f1;
 }
+
 .custom-tree-node {
   height: 30px;
 }
+
 .el-descriptions-row > th {
   width: 200px;
 }

src/views/dataSource/assetShow/modules/dataAssetShow.vue

@@ -5,9 +5,9 @@
         <span>资产模型基本信息</span>
       </div>
       <el-descriptions border :column="2">
-        <el-descriptions-item label="表名称">{{asset.tableName}}</el-descriptions-item>
+        <el-descriptions-item label="表名称">{{asset.name}}</el-descriptions-item>
-        <el-descriptions-item label="表备注">{{asset.tableComment}}</el-descriptions-item>
+        <el-descriptions-item label="表备注">{{asset.nameAs}}</el-descriptions-item>
-        <el-descriptions-item label="数据量">{{asset.tableCount}}</el-descriptions-item>
+        <el-descriptions-item label="数据量">{{asset.dataTotal}}</el-descriptions-item>
         <el-descriptions-item label="是否核心">
           <el-tag size="small">是</el-tag>
         </el-descriptions-item>

src/views/dataSource/assetShow/modules/dataSourceShow.vue

@@ -3,7 +3,7 @@
   <el-row :gutter="40" class="panel-group">
     <el-col :span="24">
       <el-tabs v-model="activeName" type="border-card">
-        <el-tab-pane v-for="tableAsset in source.tableList" :label="tableAsset.tableName+'('+tableAsset.tableComment+')'" :name="tableAsset.tableName">
+        <el-tab-pane v-for="tableAsset in source.tableList" :label="tableAsset.name+'('+tableAsset.nameAs+')'" :name="tableAsset.name">
           <data-asset-show v-if="activeName == tableAsset.tableName" :asset="tableAsset" :source="source"/>
         </el-tab-pane>
       </el-tabs>

src/views/ruleEngine/engineVersion/index.vue

@@ -6,11 +6,8 @@
           更多操作
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="add">版本添加</el-dropdown-item>
-            <el-dropdown-item command="activate">
+            <el-dropdown-item command="activate">{{ (ruleEngineInfo.isActivate === 'no-activate' ? "激活" : "禁用") + '引擎' }}</el-dropdown-item>
-              {{ (ruleEngineInfo.isActivate === 'no-activate' ? "激活" : "禁用") + '引擎' }}
+            <el-dropdown-item command="status">{{ (ruleEngineInfo.status === '0' ? "关闭" : "开启") + '引擎' }}</el-dropdown-item>
-            </el-dropdown-item>
-            <el-dropdown-item command="status">{{ (ruleEngineInfo.status === '0' ? "关闭" : "开启") + '引擎' }}
-            </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>