From 028c24574dd48200c1dab9ef671fa82bacf43d90 Mon Sep 17 00:00:00 2001 From: Qin Dong Ming <2720806930@qq.com> Date: Fri, 23 Aug 2024 09:42:14 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/engine/engine/index.vue | 8 +++++--- src/views/etl/switch/index.vue | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/engine/engine/index.vue b/src/views/engine/engine/index.vue index 1ee7e5c..29c3ae4 100644 --- a/src/views/engine/engine/index.vue +++ b/src/views/engine/engine/index.vue @@ -171,7 +171,9 @@ export default { //这里存放数据" return { + engineReq:{ + }, engine:{ }, @@ -206,9 +208,9 @@ export default { }) }, findSelectSourceExport(){ - selectEngineList().then(res=>{ - this.arr=res.data; - }) + this.download('source/source/export', { + ...this.engineReq + }, `source_${new Date().getTime()}.xlsx`) } }, //生命周期 - 创建完成（可以访问当前this实例）", diff --git a/src/views/etl/switch/index.vue b/src/views/etl/switch/index.vue index cf9080b..863d19a 100644 --- a/src/views/etl/switch/index.vue +++ b/src/views/etl/switch/index.vue @@ -298,7 +298,6 @@ export default { this.download('source/source/export', { ...this.SourceReq }, `source_${new Date().getTime()}.xlsx`) - // selectSourceExport(this.SourceReq).then(); }, handleSelectionChange(row){ this.ids=[]; From d000e9be5253d3bb1cdc014fb6cc607f87f48cc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com> Date: Fri, 23 Aug 2024 09:44:37 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E5=89=8D?= =?UTF-8?q?=E5=8F=B0=E4=BB=BB=E5=8A=A1=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/task/task.js | 6 ++--- src/views/task/task/index.vue | 43 ++++++++++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/src/api/task/task.js b/src/api/task/task.js index 2acc627..e96bf54 100644 --- a/src/api/task/task.js +++ b/src/api/task/task.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -//查询规则引擎列表 +//查询任务列表 export function selectTaskList(data){ return request({ url: "/task/task/list", @@ -10,9 +10,9 @@ export function selectTaskList(data){ } //导出 -export function selectSourceExport(data){ +export function addTask(data){ return request({ - url: "/source/source/export", + url: "/task/task/addTask", method: "POST", data:data }) diff --git a/src/views/task/task/index.vue b/src/views/task/task/index.vue index 33b30cd..32f5479 100644 --- a/src/views/task/task/index.vue +++ b/src/views/task/task/index.vue @@ -156,6 +156,33 @@ + + + + + + + + + + + + + + +
+ 取 消 + 确 定 +
+ + @@ -175,7 +202,7 @@ import {selectSourceExport} from "@/api/etl/switch"; import {connectionTest} from "@/api/etl/switch"; import {insertAdd} from "@/api/etl/switch"; import {getInfo} from "@/api/etl/switch"; -import { selectTaskList } from '@/api/task/task' +import { addTask, selectTaskList } from '@/api/task/task' export default { //import引入的组件需要注入到对象中才能使用" @@ -189,6 +216,7 @@ export default { taskReq:{ }, + taskAddReq:{}, taskList:[], }; }, @@ -198,6 +226,19 @@ export default { watch: {}, //方法集合", methods: { + + + //添加任务 + addTask(){ + addTask(this.taskAddReq).then(res=>{ + alert(res.msg) + if(res.code == 200){ + location.reload(); + } + }); + }, + + //根据条件查询列表 findSelectTaskList(){ selectTaskList(this.taskReq).then(res=>{ console.log(res.data); From e60717b7868fe0c21281de1c4e838576da8c9763 Mon Sep 17 00:00:00 2001 From: Qin Dong Ming <2720806930@qq.com> Date: Fri, 23 Aug 2024 09:48:24 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/engine/engine/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/engine/engine/index.vue b/src/views/engine/engine/index.vue index 29c3ae4..fb4a21b 100644 --- a/src/views/engine/engine/index.vue +++ b/src/views/engine/engine/index.vue @@ -208,7 +208,7 @@ export default { }) }, findSelectSourceExport(){ - this.download('source/source/export', { + this.download('engine/engine/export', { ...this.engineReq }, `source_${new Date().getTime()}.xlsx`) } From 7071eb175f1f10b34a4ae01f439e12941d551112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com> Date: Fri, 23 Aug 2024 09:51:03 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E5=89=8D?= =?UTF-8?q?=E5=8F=B0=E4=BB=BB=E5=8A=A1=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/task/task/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/task/task/index.vue b/src/views/task/task/index.vue index 32f5479..8ba100f 100644 --- a/src/views/task/task/index.vue +++ b/src/views/task/task/index.vue @@ -164,6 +164,7 @@ + From 99d2d853a59c96e4a4fcfe8ff4ac2f52381bfdab Mon Sep 17 00:00:00 2001 From: Qin Dong Ming <2720806930@qq.com> Date: Fri, 23 Aug 2024 09:54:26 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/engine/engine/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/engine/engine/index.vue b/src/views/engine/engine/index.vue index fb4a21b..552bee8 100644 --- a/src/views/engine/engine/index.vue +++ b/src/views/engine/engine/index.vue @@ -94,6 +94,7 @@ 基本类型 时间类型 普通类型 + 介入类型 From 16c329af4cd25df9a22f64d8ed9b6cdc337d58c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com> Date: Fri, 23 Aug 2024 09:55:59 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E5=89=8D?= =?UTF-8?q?=E5=8F=B0=E4=BB=BB=E5=8A=A1=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/task/task/index.vue | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/src/views/task/task/index.vue b/src/views/task/task/index.vue index 8ba100f..5e3fe77 100644 --- a/src/views/task/task/index.vue +++ b/src/views/task/task/index.vue @@ -28,24 +28,18 @@ - - - - - - - - - - 新增 - + + 新增 + + @@ -227,7 +221,10 @@ export default { watch: {}, //方法集合", methods: { - + //添加页面展示 + handleAdd(){ + this.dialogFormVisible = true; + }, //添加任务 addTask(){ From 868a7e1a8b76a2d39ca3ae7e43aaa5fda7fa877c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com> Date: Fri, 23 Aug 2024 10:04:52 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E5=89=8D?= =?UTF-8?q?=E5=8F=B0=E4=BB=BB=E5=8A=A1=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/task/task.js | 21 +++++---------------- src/views/task/task/index.vue | 5 +++-- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/api/task/task.js b/src/api/task/task.js index e96bf54..84f4202 100644 --- a/src/api/task/task.js +++ b/src/api/task/task.js @@ -9,7 +9,7 @@ export function selectTaskList(data){ }) } -//导出 +//添加 export function addTask(data){ return request({ url: "/task/task/addTask", @@ -18,24 +18,13 @@ export function addTask(data){ }) } - -//新增 -export function insertAdd(data){ +//修改 +export function updateById(data){ return request({ - url: "/source/source/insert", - method: "get", + url: "/task/task/updateById", + method: "POST", data:data }) } -//获取基本信息 -export function getInfo(id){ - return request({ - url: "/source/source/id", - method: "get", - }) -} - - - diff --git a/src/views/task/task/index.vue b/src/views/task/task/index.vue index 5e3fe77..c0e2a79 100644 --- a/src/views/task/task/index.vue +++ b/src/views/task/task/index.vue @@ -159,6 +159,7 @@ + @@ -197,7 +198,7 @@ import {selectSourceExport} from "@/api/etl/switch"; import {connectionTest} from "@/api/etl/switch"; import {insertAdd} from "@/api/etl/switch"; import {getInfo} from "@/api/etl/switch"; -import { addTask, selectTaskList } from '@/api/task/task' +import { addTask, selectTaskList, updateById } from '@/api/task/task' export default { //import引入的组件需要注入到对象中才能使用" @@ -245,7 +246,7 @@ export default { }) }, - insertAdd(){ + updateById(){ }, From 3fbc2e27038b3daf5b490f3b6bbf3b54713f96f1 Mon Sep 17 00:00:00 2001 From: Qin Dong Ming <2720806930@qq.com> Date: Fri, 23 Aug 2024 10:07:00 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/engine/engine/index.vue | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/views/engine/engine/index.vue b/src/views/engine/engine/index.vue index 552bee8..7b9f305 100644 --- a/src/views/engine/engine/index.vue +++ b/src/views/engine/engine/index.vue @@ -32,17 +32,17 @@ - - - - - - - - + 新增 + - + @@ -75,7 +75,7 @@
取 消 - 确 定 + 确 定
@@ -150,11 +150,6 @@ - - - - - @@ -162,8 +157,7 @@ //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）, //例如：import 《组件名称》 from '《组件路径》, import {insertAdd} from "@/api/etl/switch"; -import {insert, selectEngineList} from "@/api/engine/engine"; -import {del, selectList, update} from "@/api/pay/customer"; +import {del, insert, selectEngineList, update} from "@/api/engine/engine"; export default { //import引入的组件需要注入到对象中才能使用" components: {}, From ee74916ebb55d23567a5b04f2e20a93260900245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com> Date: Fri, 23 Aug 2024 10:23:46 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E5=89=8D?= =?UTF-8?q?=E5=8F=B0=E4=BB=BB=E5=8A=A1=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/task/task/index.vue | 60 +++++++++++++++++------------------ 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/src/views/task/task/index.vue b/src/views/task/task/index.vue index c0e2a79..08e6aac 100644 --- a/src/views/task/task/index.vue +++ b/src/views/task/task/index.vue @@ -15,7 +15,7 @@ - + @@ -149,38 +149,36 @@ - - - - - - - - - - - - - - - - - -
- 取 消 - 确 定 -
- - + + + + + + + + + + + + + + + + +
+ 取 消 + 确 定 +
+ From 9054fe8741f5b35ec8101f9833b7ab145cf87885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com> Date: Fri, 23 Aug 2024 10:24:14 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E5=89=8D?= =?UTF-8?q?=E5=8F=B0=E4=BB=BB=E5=8A=A1=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/task/task/index.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/task/task/index.vue b/src/views/task/task/index.vue index 08e6aac..f56e42e 100644 --- a/src/views/task/task/index.vue +++ b/src/views/task/task/index.vue @@ -183,8 +183,6 @@ - - From eeaac843f49298333917f8e9d85f3a5c9ab5212e Mon Sep 17 00:00:00 2001 From: Qin Dong Ming <2720806930@qq.com> Date: Fri, 23 Aug 2024 11:23:12 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/engine/engine/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/engine/engine/index.vue b/src/views/engine/engine/index.vue index 7b9f305..8ec4a56 100644 --- a/src/views/engine/engine/index.vue +++ b/src/views/engine/engine/index.vue @@ -183,9 +183,11 @@ export default { //方法集合", methods: { insert(){ + this.dialogFormVisible = true insert(this.engine).then(res =>{ this.$message.success(res.msg || "添加成功") }) + this.engine = {} }, findSelectSourceList(){ selectEngineList().then(res=>{ From c5fd91eb575e7757c0d88b2b7937d65aaa78c872 Mon Sep 17 00:00:00 2001 From: Qin Dong Ming <2720806930@qq.com> Date: Fri, 23 Aug 2024 11:26:36 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/engine/engine/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/engine/engine/index.vue b/src/views/engine/engine/index.vue index 8ec4a56..43ebece 100644 --- a/src/views/engine/engine/index.vue +++ b/src/views/engine/engine/index.vue @@ -75,7 +75,7 @@
取 消 - 确 定 + 确 定
From a6ec7c7ff7da9c242c1365b6360333331b1e29af Mon Sep 17 00:00:00 2001 From: Qin Dong Ming <2720806930@qq.com> Date: Fri, 23 Aug 2024 11:33:02 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/engine/engine/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/engine/engine/index.vue b/src/views/engine/engine/index.vue index 43ebece..f8e7002 100644 --- a/src/views/engine/engine/index.vue +++ b/src/views/engine/engine/index.vue @@ -42,7 +42,7 @@ - + From 2e49cd9977848575a553e4b5f4e7ec0df552e724 Mon Sep 17 00:00:00 2001 From: Qin Dong Ming <2720806930@qq.com> Date: Fri, 23 Aug 2024 11:42:11 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/engine/engine/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/engine/engine/index.vue b/src/views/engine/engine/index.vue index f8e7002..8ec4a56 100644 --- a/src/views/engine/engine/index.vue +++ b/src/views/engine/engine/index.vue @@ -42,7 +42,7 @@ - + @@ -75,7 +75,7 @@
取 消 - 确 定 + 确 定