diff --git a/src/api/dataSource/source.js b/src/api/dataSource/source.js index 3135880..31127c3 100644 --- a/src/api/dataSource/source.js +++ b/src/api/dataSource/source.js @@ -31,6 +31,20 @@ export function getSource(id) { }) } +export function database(data) { + return request({ + url: '/source/source/database?name='+data, + method: 'post', + data + }) +} +export function table(table) { + return request({ + url: '/source/source/table?databaseName='+table, + method: 'post', + table + }) +} // 新增数据源 export function addSource(data) { return request({ @@ -72,3 +86,18 @@ export function findStructure(){ method:'get' }) } + +export function findDataBaseTable(data){ + return request({ + url:'/source/source/findDataBaseTable', + method:'post', + data + }) +} +export function structureList(data){ + return request({ + url:'/source/source/structureList?id='+data, + method:'post', + data + }) +} diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 4529f99..085c06e 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -63,7 +63,7 @@ - + diff --git a/src/views/dataSource/assets/OverallAssetStructure.vue b/src/views/dataSource/assets/OverallAssetStructure.vue deleted file mode 100644 index 9c365c4..0000000 --- a/src/views/dataSource/assets/OverallAssetStructure.vue +++ /dev/null @@ -1,157 +0,0 @@ - - - diff --git a/src/views/dataSource/assets/dashboard/OverallAssetStructure.vue b/src/views/dataSource/assets/dashboard/OverallAssetStructure.vue new file mode 100644 index 0000000..614738d --- /dev/null +++ b/src/views/dataSource/assets/dashboard/OverallAssetStructure.vue @@ -0,0 +1,249 @@ + + + diff --git a/src/views/dataSource/assets/OverallAssets.vue b/src/views/dataSource/assets/dashboard/OverallAssets.vue similarity index 96% rename from src/views/dataSource/assets/OverallAssets.vue rename to src/views/dataSource/assets/dashboard/OverallAssets.vue index 1d75a9f..c30e769 100644 --- a/src/views/dataSource/assets/OverallAssets.vue +++ b/src/views/dataSource/assets/dashboard/OverallAssets.vue @@ -12,7 +12,7 @@
数据接入
- + @@ -25,7 +25,7 @@
资产模型
- + diff --git a/src/views/dataSource/assets/OverallSpecificAssets.vue b/src/views/dataSource/assets/dashboard/OverallSpecificAssets.vue similarity index 61% rename from src/views/dataSource/assets/OverallSpecificAssets.vue rename to src/views/dataSource/assets/dashboard/OverallSpecificAssets.vue index 232aff8..59a4408 100644 --- a/src/views/dataSource/assets/OverallSpecificAssets.vue +++ b/src/views/dataSource/assets/dashboard/OverallSpecificAssets.vue @@ -3,38 +3,17 @@
{{title}} - 资产结构概述
- -
-
- -
-
-
- 资产模型 -
- -
-
-
- -
-
- -
-
-
- 数据模型 -
- -
-
-
- - - + + + + - sys_dept(部门表) @@ -43,28 +22,59 @@ diff --git a/src/views/dataSource/assets/dashboard/bus.js b/src/views/dataSource/assets/dashboard/bus.js new file mode 100644 index 0000000..fda1395 --- /dev/null +++ b/src/views/dataSource/assets/dashboard/bus.js @@ -0,0 +1,2 @@ +import Vue from 'vue' +export default new Vue diff --git a/src/views/dataSource/assets/index.vue b/src/views/dataSource/assets/index.vue index dd62f10..62ff5f9 100644 --- a/src/views/dataSource/assets/index.vue +++ b/src/views/dataSource/assets/index.vue @@ -3,33 +3,45 @@ - -
-
{{ data. accessSourceName + '('+data.databaseName + '-' + data.dataSourceSystemName+')' }}
+
+
{{ data.accessSourceName + '(' + data.databaseName + '-' + data.dataSourceSystemName + ')' }}
{{ data.name + '-'+data.as + '(' + data.dataTotal+'条)' }}
- - - - - - - + + + + + + + + + + + + + + +