From 459d1639ebe2521e5d675fcf6d864eb5470c973a Mon Sep 17 00:00:00 2001 From: Qin Dong Ming <2720806930@qq.com> Date: Tue, 27 Aug 2024 11:34:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B5=8B=E8=AF=951?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/engine/engine.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/api/engine/engine.js b/src/api/engine/engine.js index 82276a3..7388bbd 100644 --- a/src/api/engine/engine.js +++ b/src/api/engine/engine.js @@ -10,8 +10,6 @@ export function selectEngineList(data){ } - - export function insert(data){ return request({ url: "/engine/engine/insert", @@ -19,6 +17,13 @@ export function insert(data){ data:data }) } +export function inserts(data){ + return request({ + url: "/engine/engine/insert", + method: "post", + data:data + }) +} export function update(data){ return request({ From 9e3fb286cd01f08564575383ee1754f126ff6cd0 Mon Sep 17 00:00:00 2001 From: lwj <3529558005@qq.com> Date: Tue, 27 Aug 2024 11:36:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/etl/switch.js | 24 +++++ src/views/etl/assets/index.vue | 151 ++++++++++++++++++++++++++++++++ src/views/etl/switch/index.vue | 100 ++++++++++++--------- src/views/system/menu/index.vue | 2 + 4 files changed, 234 insertions(+), 43 deletions(-) create mode 100644 src/views/etl/assets/index.vue diff --git a/src/api/etl/switch.js b/src/api/etl/switch.js index f9af91c..ad91a25 100644 --- a/src/api/etl/switch.js +++ b/src/api/etl/switch.js @@ -75,3 +75,27 @@ export function update(data){ } +//查询数据库名称 表名称 字段名称 类型等 + +export function findTableInfo(){ + return request({ + url: "/source/tableInfo/findTableInfo", + method: "get", + }) +} + +export function findTableInfoList(){ + return request({ + url: "/source/tableInfo/findTableInfoList", + method: "get", + }) +} + +export function findStructureByTableId(id){ + return request({ + url: "/source/tableInfo/findStruceure/"+id, + method: "get", + }) +} + + diff --git a/src/views/etl/assets/index.vue b/src/views/etl/assets/index.vue new file mode 100644 index 0000000..7537570 --- /dev/null +++ b/src/views/etl/assets/index.vue @@ -0,0 +1,151 @@ + + + + diff --git a/src/views/etl/switch/index.vue b/src/views/etl/switch/index.vue index 8b8a81a..79e8667 100644 --- a/src/views/etl/switch/index.vue +++ b/src/views/etl/switch/index.vue @@ -58,7 +58,7 @@ - + @@ -112,9 +112,9 @@
连接池配置
- + - + @@ -123,7 +123,7 @@ - + @@ -135,11 +135,11 @@
其他信息
- + {{ dict.label }} @@ -154,11 +154,13 @@ +
测试 取 消 确 定
+ @@ -208,14 +210,20 @@ prop="databaseName"> - + + + + + + + + + @@ -266,43 +274,43 @@ //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）, //例如：import 《组件名称》 from '《组件路径》, import {selectSourceList, update} from "@/api/etl/switch"; -import {selectSourceExport} from "@/api/etl/switch"; import {connectionTest} from "@/api/etl/switch"; import {insertAdd} from "@/api/etl/switch"; import {deleteSource} from "@/api/etl/switch"; import {getInfo} from "@/api/etl/switch"; import {structure} from "@/api/etl/switch"; +import "@riophae/vue-treeselect/dist/vue-treeselect.css"; export default { - dicts: ['sys_normal_disable','ys_yes_no'], + + + + + dicts: ['yes_no', 'sys_normal_disable'], //import引入的组件需要注入到对象中才能使用" - components: {}, + components: { + + }, props: {}, data() { //这里存放数据" return { - dicts: ['sys_normal_disable','ys_yes_no'], + sourceAddReq:{ + + }, rules: { - dataResourceName: [ - {required: true, message: "接入源名称不能为空", trigger: "blur"} - ], - dataSourcesSystemName: [ - {required: true, message: "数据来源系统名称不能为空", trigger: "blur"} - ], - host: [ - {required: true, message: "主机地址不能为空", trigger: "blur"} - ] + dataResourceName: [{required: true, message: "接入源名称不能为空", trigger: "blur"}], + dataSourcesSystemName: [{required: true, message: "数据来源系统名称不能为空", trigger: "blur"}], + host: [{required: true, message: "主机地址不能为空", trigger: "blur"}] }, ids:[], dialogFormVisible:false, SourceReq:{ }, - sourceAddReq:{ - }, source:[], }; }, @@ -328,8 +336,8 @@ export default { }, struceure(row){ structure(row).then(res=>{ - if (res ===200){ - alert("同步资产成功") + if (res.code ===200){ + alert("同步资产成功,请查询数据库") } }) }, @@ -340,6 +348,7 @@ export default { } }) }, + handleDelete(row){ deleteSource(row.id).then(res=>{ if (res.code===200){ @@ -356,22 +365,27 @@ export default { } }) }, - addSource(){ - if (this.sourceAddReq.id!=undefined){ - update(this.sourceAddReq).then(res=>{ - if (res.code===200){ - alert("修改成功") - location.reload(); - } - }) - }else { - insertAdd(this.sourceAddReq).then(res=>{ - if(res.code===200){ - alert("添加成功") - location.reload(); - } - }) - } + addSource: function (){ + this.$refs["sourceAddReq"].validate(valid=> { + if (valid){ + if (this.sourceAddReq.id!=undefined){ + update(this.sourceAddReq).then(res=>{ + if (res.code===200){ + alert("修改成功") + location.reload(); + } + }) + }else { + insertAdd(this.sourceAddReq).then(res=>{ + if(res.code===200){ + alert("添加成功") + location.reload(); + } + }) + } + } + }); + }, //测试连接 textConnect(row){ diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 89c5059..a07948c 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -429,6 +429,7 @@ export default { /** 提交按钮 */ submitForm: function () { this.$refs["form"].validate(valid => { + if (valid) { if (this.form.menuId != undefined) { updateMenu(this.form).then(response => { @@ -444,6 +445,7 @@ export default { }); } } + }); }, /** 删除按钮操作 */ From 7905d9c4f2b974eb6d1aace8b32c6cacf54f4cce Mon Sep 17 00:00:00 2001 From: Qin Dong Ming <2720806930@qq.com> Date: Tue, 27 Aug 2024 11:50:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B5=8B=E8=AF=951?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/engine/engine.js | 37 ++++-- src/views/engine/engine/index.vue | 20 ++-- src/views/engine/engine/list.vue | 193 +++++++++++++----------------- 3 files changed, 121 insertions(+), 129 deletions(-) diff --git a/src/api/engine/engine.js b/src/api/engine/engine.js index 7388bbd..48b9a8f 100644 --- a/src/api/engine/engine.js +++ b/src/api/engine/engine.js @@ -10,6 +10,8 @@ export function selectEngineList(data){ } + + export function insert(data){ return request({ url: "/engine/engine/insert", @@ -17,13 +19,6 @@ export function insert(data){ data:data }) } -export function inserts(data){ - return request({ - url: "/engine/engine/insert", - method: "post", - data:data - }) -} export function update(data){ return request({ @@ -44,6 +39,25 @@ export function del(id){ } +//开启 +export function onEngine(id){ + return request({ + url: "/engine/engine/onEngine/" + id, + method: "post", + data:id + }) +} + + +//禁用 +export function forbiddenEngine(id){ + return request({ + url: "/engine/engine/forbiddenEngine/" + id, + method: "post", + data:id + }) +} + export function selectLevel(){ return request({ url: "/engine/level/selectLevelList", @@ -60,3 +74,12 @@ export function getRuleEngineInfo(id) { } +// 通过id查询 +export function findById(id) { + return request({ + url: '/engine/engine/findById/' + id, + method: 'get' + }) +} + + diff --git a/src/views/engine/engine/index.vue b/src/views/engine/engine/index.vue index de89a74..1cf4b33 100644 --- a/src/views/engine/engine/index.vue +++ b/src/views/engine/engine/index.vue @@ -27,7 +27,7 @@ >导出 - + - + { - this.arr=res.data.list; - this.total=res.data.total; + this.arr=res.data.list; + this.total=res.data.total; }) }, handleDelete(id){ if (confirm("是否删除这条数据？")){ - del(id).then(res =>{ + del(id).then(res =>{ //判断删除是否成功 - this.$message.success(res.msg || "删除成功") - }) + this.$message.success(res.msg || "删除成功") + }) } }, findSelectSourceExport(){ this.download('engine/engine/export', { - ...this.engineReq - }, + ...this.engineReq + }, `source_${new Date().getTime()}.xlsx`) }, select(){ diff --git a/src/views/engine/engine/list.vue b/src/views/engine/engine/list.vue index d34105f..5d9cdec 100644 --- a/src/views/engine/engine/list.vue +++ b/src/views/engine/engine/list.vue @@ -1,117 +1,72 @@ + + + +