diff --git a/src/api/dataSource/source.js b/src/api/dataSource/source.js
index 31127c3..068d28d 100644
--- a/src/api/dataSource/source.js
+++ b/src/api/dataSource/source.js
@@ -101,3 +101,9 @@ export function structureList(data){
data
})
}
+export function quantity(){
+ return request({
+ url:'/source/source/quantity',
+ method:'get'
+ })
+}
diff --git a/src/views/dataSource/assets/dashboard/OverallAssetStructure.vue b/src/views/dataSource/assets/dashboard/OverallAssetStructure.vue
index 614738d..e079f25 100644
--- a/src/views/dataSource/assets/dashboard/OverallAssetStructure.vue
+++ b/src/views/dataSource/assets/dashboard/OverallAssetStructure.vue
@@ -1,19 +1,5 @@
-
-
- 资产模型基本信息
-
-
-
- {{tableMessage.name}}
- {{ tableMessage.as }}
- {{ tableMessage.dataTotal }}
-
- 是
-
-
-
资产模型详细信息
@@ -25,7 +11,7 @@
-
+
{{scope.row.isPrimaryKey}}
@@ -36,7 +22,7 @@
-
+
{{scope.row.isNull}}
@@ -181,8 +167,10 @@ import bus from '@/views/dataSource/assets/dashboard/bus'
import { database, table } from '@/api/dataSource/source'
export default {
- props:['essential','tableMessage','itemTest','totalList',`childrenListModel`],
name: 'OverallAssetStructure',
+ props:{
+ 'itemTest':{}
+ },
data() {
return {
localEssential: null,
@@ -201,6 +189,7 @@ export default {
],
},
sendTest:[],
+ tableMessage:[],
}
},
beforeDestroy() {
@@ -215,29 +204,15 @@ export default {
this.sendTest=res.data
}
)
- console.log("aadasdas",val.databaseName)
- table(val.databaseName).then(
- res => {
- this.tableMessage = res.data
- console.log("one",this.tableMessage)
- }
- )
},
immediate:true,
},
- "childrenListModel":{
- handler(val){
- table(val.databaseName).then(
- res=>{
- this.tableMessage=res.data
- })
- }
- }
},
created() {
},
methods: {
updEssential(row){
+
this.form=row
this.formStatus=true
},
diff --git a/src/views/dataSource/assets/dashboard/OverallAssets.vue b/src/views/dataSource/assets/dashboard/OverallAssets.vue
index c30e769..9e30a75 100644
--- a/src/views/dataSource/assets/dashboard/OverallAssets.vue
+++ b/src/views/dataSource/assets/dashboard/OverallAssets.vue
@@ -3,6 +3,7 @@
+
@@ -12,7 +13,7 @@
数据接入
-
+
@@ -25,7 +26,7 @@
资产模型
-
+
数据模型
-
+
@@ -52,11 +53,23 @@ export default {
components: {
CountTo
},
+ props:{
+ totalNum: {},
+ assetsNum: {},
+ totalTable: {},
+ },
+ data() {
+ return {
+ num:null,
+ }
+ },
methods: {
handleSetLineChartData(type) {
this.$emit('handleSetLineChartData', type)
}
- }
+
+ },
+
}
diff --git a/src/views/dataSource/assets/dashboard/OverallSpecificAssets.vue b/src/views/dataSource/assets/dashboard/OverallSpecificAssets.vue
index 59a4408..33bc78b 100644
--- a/src/views/dataSource/assets/dashboard/OverallSpecificAssets.vue
+++ b/src/views/dataSource/assets/dashboard/OverallSpecificAssets.vue
@@ -3,15 +3,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{key}}
+ 新增
+
+
+
+
+ {{scope.row.label}}
+
+
+
+
+
+ {{scope.row.val}}
+
+
+
+
+
+ 修改
+ 确定
+
+
+
+
+
+
+
-
+
-
+
+
+ 资产模型基本信息
+
+
+
+ {{tableMessage.name}}
+ {{ tableMessage.as }}
+ {{ tableMessage.dataTotal }}
+
+ 是
+
+
+
+
@@ -34,11 +123,25 @@ export default {
}
},
title: null,
+ assetsNum:0,
+ totalTable:0,
},
data() {
return {
activeName: 'first',
childrenListModel:[],
+ tableMessage:{},
+ dictMap: {
+ "性别(system_sex)": [
+ { label: '男', val: '1', isEdit: false },
+ { label: '女', val: '2', isEdit: false },
+ { label: '未知', val: '0', isEdit: false },
+ ],
+ "开关(system_y_n)": [
+ { label: '是', val: '1', isEdit: false },
+ { label: '否', val: '0', isEdit: false }
+ ],
+ },
}
},
created() {
@@ -51,26 +154,18 @@ export default {
handleTabClick(tab, node,event ) {
// 通过当前激活的标签页的 name 在 childrenList 中找到对应的 item
this.selectedItem = this.childrenList.find(item => item.name === tab.name);
- console.log(this.selectedItem)
-
table(this.selectedItem.databaseName).then(
res => {
this.childrenListModel = res.data
- }
- )
-
- database(this.selectedItem.name).then(
- res => {
- this.essentialModel = res.data
- console.log("tow",this.essentialModel)
- this.childrenListModel.forEach(item => {
- if (item.name === this.selectedItem.name) {
- this.tableMessage = item
+ this.childrenListModel.forEach(res=>{
+ if (this.selectedItem.name == res.name) {
+ this.tableMessage=res
}
})
}
)
- bus.$emit('getEssential',this.essentialModel,this.tableMessage)
+
+ bus.$emit('getEssential',this.childrenListModel,this.tableMessage)
},
handleSetLineChartData(type) {
this.$emit('handleSetLineChartData', type)
diff --git a/src/views/dataSource/assets/index.vue b/src/views/dataSource/assets/index.vue
index 62ff5f9..efa1a84 100644
--- a/src/views/dataSource/assets/index.vue
+++ b/src/views/dataSource/assets/index.vue
@@ -16,34 +16,34 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
+