diff --git a/src/api/etl/switch.js b/src/api/etl/switch.js index 5285931..c299886 100644 --- a/src/api/etl/switch.js +++ b/src/api/etl/switch.js @@ -9,14 +9,14 @@ export function selectSourceList(data){ }) } -//导出 -export function selectSourceExport(data){ - return request({ - url: "/source/source/export", - method: "POST", - data:data - }) -} +// //导出 +// export function selectSourceExport(data){ +// return request({ +// url: "/source/source/export", +// method: "POST", +// data:data +// }) +// } //新增 export function insertAdd(data){ @@ -31,7 +31,7 @@ export function insertAdd(data){ //获取基本信息 export function getInfo(id){ return request({ - url: "/source/source/id", + url: "/source/source/"+id, method: "get", }) } @@ -47,4 +47,13 @@ export function connectionTest(data){ } +//删除 +export function deleteSource(ids){ + return request({ + url: "/source/source/"+ids, + method: "delete", + + }) +} + diff --git a/src/api/task/task.js b/src/api/task/task.js index 23b48d2..2acc627 100644 --- a/src/api/task/task.js +++ b/src/api/task/task.js @@ -1,10 +1,10 @@ import request from '@/utils/request' //查询规则引擎列表 -export function selectEngineList(data){ +export function selectTaskList(data){ return request({ url: "/task/task/list", - method: "get", + method: "post", data:data }) } diff --git a/src/views/etl/switch/index.vue b/src/views/etl/switch/index.vue index 77411c8..cf9080b 100644 --- a/src/views/etl/switch/index.vue +++ b/src/views/etl/switch/index.vue @@ -28,10 +28,10 @@ 导出 @@ -46,6 +46,15 @@ >新增 + 删除 + + @@ -208,6 +217,7 @@ import {selectSourceList} 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"; export default { @@ -218,6 +228,7 @@ export default { //这里存放数据" return { + ids:[], dialogFormVisible:false, SourceReq:{ @@ -234,6 +245,20 @@ export default { watch: {}, //方法集合", methods: { + deleteSourceByIds(){ + deleteSource(this.ids).then(res=>{ + if(res.code===200){ + alert("删除成功"); + } + }) + }, + handleDelete(row){ + deleteSource(row.id).then(res=>{ + if(res.code===200){ + alert("删除成功"); + } + }) + }, textP(){ connectionTest(this.sourceAddReq).then(res=>{ if (res.code===200){ @@ -245,7 +270,9 @@ export default { }, addSource(){ insertAdd(this.sourceAddReq).then(res=>{ - + if(res.code===200){ + location.reload(); + } }) }, //测试连接 @@ -268,10 +295,16 @@ export default { }) }, findSelectSourceExport(){ - selectSourceExport(this.SourceReq).then(); + this.download('source/source/export', { + ...this.SourceReq + }, `source_${new Date().getTime()}.xlsx`) + // selectSourceExport(this.SourceReq).then(); }, handleSelectionChange(row){ - + this.ids=[]; + for (let rowKey in row) { + this.ids.push(row[rowKey].id) + } }, }, //生命周期 - 创建完成（可以访问当前this实例）", diff --git a/src/views/task/task/index.vue b/src/views/task/task/index.vue index 7839729..33b30cd 100644 --- a/src/views/task/task/index.vue +++ b/src/views/task/task/index.vue @@ -1,186 +1,165 @@