diff --git a/src/views/etl/construction/AssetsBasic.vue b/src/views/etl/construction/AssetsBasic.vue
index a9ffa49..3df2de0 100644
--- a/src/views/etl/construction/AssetsBasic.vue
+++ b/src/views/etl/construction/AssetsBasic.vue
@@ -57,6 +57,13 @@ export default {
structureNum: null,
}
},
+
+ watch:{
+ infoOpen(newName, oldName){
+ console.log(newName)
+ console.log(oldName)
+ }
+ },
name: 'AssetsBasic',
components: {
CountTo
@@ -143,7 +150,7 @@ export default {
float: right;
font-weight: bold;
margin: 26px;
- margin-left: 0px;
+ margin-left: 0;
.card-panel-text {
line-height: 18px;
diff --git a/src/views/etl/construction/AssetsModel.vue b/src/views/etl/construction/AssetsModel.vue
index ec2e9e2..addbc38 100644
--- a/src/views/etl/construction/AssetsModel.vue
+++ b/src/views/etl/construction/AssetsModel.vue
@@ -1,8 +1,54 @@
-
+ {{tableInfo}}
+
+
+
+
+
+
+
+ 资产模型基本信息
+
+
+
+
+
+
+
+ 表名称
+
+ {{tableInfo.info.tableName}}
+
+
+
+
+
+ 表备注
+
+ {{tableInfo.info.tableRemark}}
+
+
+
+
+
+ 表备注
+
+ {{tableInfo.info.tableRemark}}
+
+
+
+
+
+
+
@@ -11,11 +57,8 @@ import CountTo from 'vue-count-to'
export default {
props:{
- fundDataNum: {
- basicNum: null,
- tableNum: null,
- structureNum: null,
- }
+ info:{},
+ list:[],
},
name: 'AssetsModel',
components: {
diff --git a/src/views/etl/construction/index.vue b/src/views/etl/construction/index.vue
index 0f20b2e..31430fd 100644
--- a/src/views/etl/construction/index.vue
+++ b/src/views/etl/construction/index.vue
@@ -11,7 +11,7 @@
-
+
@@ -21,12 +21,15 @@
import {getTableTree} from "@/api/etl/etl";
import AssetsBasic from "@/views/etl/construction/AssetsBasic.vue";
+import AssetsModel from "@/views/etl/construction/AssetsModel.vue";
export default {
name:'construction',
- components:{ AssetsBasic },
+ components:{AssetsModel, AssetsBasic },
data() {
return {
+ //结构标题
+ title: null,
//查看详细资产结构
infoOpen: false,
//资产结构与数据结构载体
@@ -90,21 +93,23 @@ export default {
},
//获取具体表相关数据
handleNodeClick(data) {
- console.log(data);
+ //获取asserstureList中的对象
+ let info = this.assetStructureList.find(
+ assent => assent.info.id === data.info.id
+ )
this.infoOpen = true
- if (data.length()===3){
- this.tableInfoList = data
- this.tableInfoForm = data.children[0]
+
+ //先将对象存入infoform
+ this.tableInfoForm = data
+ //如果判断对象不存在,重新给form 和listfuhi
+ if (info !==undefined){
+ this.tableInfoList = data.children
+ this.tableInfoForm = data.constructor=[0]
}else {
- this.tableInfoForm = data
- let info = this.assetStructureList.stream.filter(assent =>
- assent.info.id===data.basicId
- )
- console.log(info)
- this.tableInfoList = info[0].children
+ info = this.assetStructureList.find(assent=>
+ assent.info.id === this.tableInfoForm.info.basicId)
+ this.tableInfoList = info.children
}
- console.log(this.tableInfoList)
- console.log(this.tableInfoForm)
},
}
};