diff --git a/src/api/kvt/jdbc.js b/src/api/kvt/jdbc.js
index 2f755a6..d5fb700 100644
--- a/src/api/kvt/jdbc.js
+++ b/src/api/kvt/jdbc.js
@@ -10,97 +10,109 @@ export function listJdbc(query) {
}
// 查询数据资源管理详细
-export function getJdbc(id) {
- return request({
- url: '/kvt/jdbc/' + id,
- method: 'get'
- })
-}
-
-// 新增数据资源管理
-export function addJdbc(data) {
- return request({
- url: '/kvt/jdbc',
- method: 'post',
- data: data
- })
-}
-
-// 测试连接
-export function textConn(data) {
+export function listSource(query) {
return request({
- url: '/kvt/jdbc/TestConn',
+ url: '/kvt/jdbc/list',
+ method: 'get',
+ params: query
+ })
+}
+
+export function dataAssetList(data) {
+ return request({
+ url: '/kvt/jdbc/DataAssetList',
+ method: 'post',
+ data
+ })
+}
+
+export function assetModelList(data) {
+ return request({
+ url: '/kvt/jdbc/AssetModelList',
+ method: 'post',
+ data
+ })
+}
+
+export function assetsList(data) {
+ return request({
+ url: '/kvt/jdbc/AssetsList',
+ method: 'post',
+ data
+ })
+}
+
+export function synchronousData(data) {
+ return request({
+ url: '/kvt/jdbc/SynchronousData',
+ method: 'post',
+ data
+ })
+}
+
+export function structureList(data) {
+ return request({
+ url: '/kvt/jdbc/StructureList',
+ method: 'post',
+ data
+ })
+}
+
+// 查询【请填写功能名称】详细
+export function getSource(id) {
+ return request({
+ url: '/kvt/jdbc/' + id,
+ method: 'get'
+ })
+}
+
+// 新增【请填写功能名称】
+export function addSource(data) {
+ return request({
+ url: '/kvt/jdbc',
method: 'post',
data: data
})
}
-// 修改数据资源管理
-export function updateJdbc(data) {
- return request({
- url: '/kvt/jdbc/'+data.id,
- method: 'put',
- data: data
- })
-}
-
-// 删除数据资源管理
-export function delJdbc(id) {
- return request({
- url: '/kvt/jdbc/' + id,
- method: 'delete'
- })
-}
-
-
-export function assetsList(data) {
- return request({
- url: '/kvt/jdbc/AssetsList',
- method: 'post',
- data
- })
-}
-
-
-export function structureList(data) {
- return request({
- url: '/kvt/jdbc/StructureList',
- method: 'post',
- data
- })
-}
-
-export function structure(data) {
- return request({
- url: '/kvt/jdbc/getDataBig',
- method: 'post',
- data
- })
-
-
- export function dataAssetList(data) {
+// 测试连接
+export function testConnection(data) {
return request({
- url: '/kvt/jdbc/dataAsseList',
- method: 'post',
- data
+ url: '/kvt/jdbc/TestConnection',
+ method: 'post',
+ data: data
})
- }
-
-
- export function assetModelList(data) {
- return request({
- url: '/kvt/jdbc/assrtModelList',
- method: 'post',
- data
- })
- }
-
- export function synchronousData(data) {
- return request({
- url: '/etl/source/SynchronousData',
- method: 'post',
- data
- })
- }
}
+// 修改【请填写功能名称】
+export function updateSource(data) {
+ return request({
+ url: '/kvt/jdbc/source',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除【请填写功能名称】
+export function delSource(id) {
+ return request({
+ url: '/kvt/jdbc/source/' + id,
+ method: 'delete'
+ })
+}
+
+
+
+// 删除【请填写功能名称】
+export function statistics() {
+ return request({
+ url: '/kvt/jdbc/Statistics' ,
+ method: 'get'
+ })
+}
+
+
+
+
+
+
diff --git a/src/views/kvt/assets/index.vue b/src/views/kvt/assets/index.vue
index 0ca542d..163e105 100644
--- a/src/views/kvt/assets/index.vue
+++ b/src/views/kvt/assets/index.vue
@@ -1,137 +1,8 @@
-<<<<<<< HEAD
-
-
-
-
-
- {{source.dataSourceName}}
-
- 连接失败或数据库中没有表
- {{tableName}}
-
-
-
-
-
-
-
-
-
-
- 查询语句
-
-
- 查询
-
-
-
-
- 数据资产
-
-
-
-
- {{scope.row[index].value}}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/kvt/jdbc/index.vue b/src/views/kvt/jdbc/index.vue
index c3efaa0..5431d5e 100644
--- a/src/views/kvt/jdbc/index.vue
+++ b/src/views/kvt/jdbc/index.vue
@@ -86,9 +86,6 @@
type="text"
icon="el-icon-edit"
@click="testConnection(scope.row)"
-<<<<<<< HEAD
- >测试连接测试连接
同步资产
>>>>>> f5eb707 (feat:(初级) 同步数据结构)
size="mini"
type="text"
icon="el-icon-edit"
@@ -159,7 +155,7 @@
MySql
- Oracle
+ PostGre
@@ -169,6 +165,13 @@
+
+
+
+
+
+
+
@@ -268,13 +271,20 @@
-
->>>>>>> f5eb707 (feat:(初级) 同步数据结构)
diff --git a/src/views/tool/gen/importTable.vue b/src/views/tool/gen/importTable.vue
index 44f569e..dceb33d 100644
--- a/src/views/tool/gen/importTable.vue
+++ b/src/views/tool/gen/importTable.vue
@@ -66,7 +66,8 @@ export default {
pageNum: 1,
pageSize: 10,
tableName: undefined,
- tableComment: undefined
+ tableComment: undefined,
+ tableCount: undefined
}
};
},