From 1e31ff174840798e61aba8c0fa813f46ed08e654 Mon Sep 17 00:00:00 2001 From: lwj <3529558005@qq.com> Date: Fri, 23 Aug 2024 08:43:38 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E5=8F=B0?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/etl/switch/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/etl/switch/index.vue b/src/views/etl/switch/index.vue index 2420ea2..8a65308 100644 --- a/src/views/etl/switch/index.vue +++ b/src/views/etl/switch/index.vue @@ -295,7 +295,10 @@ export default { }) }, findSelectSourceExport(){ - selectSourceExport(this.SourceReq).then(); + this.download('source/source/export', { + ...this.SourceReq + }, `type_${new Date().getTime()}.xlsx`) + // selectSourceExport(this.SourceReq).then(); }, handleSelectionChange(row){ this.ids=[]; From 54bcb9a836034feca8eb8bd9d15ffc4e01a41ab2 Mon Sep 17 00:00:00 2001 From: lwj <3529558005@qq.com> Date: Fri, 23 Aug 2024 08:53:19 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E5=8F=B0?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/etl/switch/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/etl/switch/index.vue b/src/views/etl/switch/index.vue index 8a65308..333665c 100644 --- a/src/views/etl/switch/index.vue +++ b/src/views/etl/switch/index.vue @@ -28,10 +28,10 @@ 导出 From 2bd182b3eb1bd0c3fea80ea7ca31d1545c9089dd Mon Sep 17 00:00:00 2001 From: lwj <3529558005@qq.com> Date: Fri, 23 Aug 2024 08:57:31 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E5=8F=B0?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/etl/switch.js | 16 ++++++++-------- src/views/etl/switch/index.vue | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/api/etl/switch.js b/src/api/etl/switch.js index 783ed6b..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){ diff --git a/src/views/etl/switch/index.vue b/src/views/etl/switch/index.vue index 333665c..cf9080b 100644 --- a/src/views/etl/switch/index.vue +++ b/src/views/etl/switch/index.vue @@ -297,7 +297,7 @@ export default { findSelectSourceExport(){ this.download('source/source/export', { ...this.SourceReq - }, `type_${new Date().getTime()}.xlsx`) + }, `source_${new Date().getTime()}.xlsx`) // selectSourceExport(this.SourceReq).then(); }, handleSelectionChange(row){ From e64462cc9f8907ccac8e58df673b2ebf27ccc0ef Mon Sep 17 00:00:00 2001 From: Qin Dong Ming <2720806930@qq.com> Date: Fri, 23 Aug 2024 09:26:23 +0800 Subject: [PATCH 04/10] =?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/api/engine/engine.js | 36 ++++---- src/views/engine/engine/index.vue | 145 ++++++++++++++---------------- 2 files changed, 86 insertions(+), 95 deletions(-) diff --git a/src/api/engine/engine.js b/src/api/engine/engine.js index 96cae7a..689fb64 100644 --- a/src/api/engine/engine.js +++ b/src/api/engine/engine.js @@ -9,33 +9,35 @@ export function selectEngineList(data){ }) } -//导出 -export function selectSourceExport(data){ + + + +export function insert(data){ return request({ - url: "/source/source/export", - method: "POST", + url: "/engine/engine/insert", + method: "post", + data:data + }) +} + +export function update(data){ + return request({ + url: "/engine/engine/update", + method: "post", data:data }) } -//新增 -export function insertAdd(data){ - return request({ - url: "/source/source/insert", - method: "get", - data:data - }) -} - -//获取基本信息 -export function getInfo(id){ +export function del(id){ return request({ - url: "/source/source/id", - method: "get", + url: "/engine/engine/delete/" + id, + method: "post", + data:id }) } + diff --git a/src/views/engine/engine/index.vue b/src/views/engine/engine/index.vue index c4b0cd9..c8064a6 100644 --- a/src/views/engine/engine/index.vue +++ b/src/views/engine/engine/index.vue @@ -20,16 +20,6 @@ - - - - - - - - - - @@ -41,61 +31,42 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - +
+ 取 消 + 确 定 +
+ @@ -146,23 +117,27 @@ @@ -182,8 +157,8 @@ //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）, //例如：import 《组件名称》 from '《组件路径》, import {insertAdd} from "@/api/etl/switch"; -import {selectEngineList} from "@/api/engine/engine"; -import {selectList} from "@/api/pay/customer"; +import {insert, selectEngineList} from "@/api/engine/engine"; +import {del, selectList, update} from "@/api/pay/customer"; export default { //import引入的组件需要注入到对象中才能使用" components: {}, @@ -192,14 +167,12 @@ export default { //这里存放数据" return { - // dialogFormVisible:false, - // SourceReq:{ - // - // }, + engine:{ }, arr:[], + dialogFormVisible:false }; }, //计算属性 类似于data概念", @@ -208,15 +181,31 @@ export default { watch: {}, //方法集合", methods: { - selectList, - // insertAdd(){ - // this.dialogFormVisible=true - // }, + insert(){ + insert(this.engine).then(res =>{ + this.$message.success(res.msg || "添加成功") + }) + }, findSelectSourceList(){ selectEngineList().then(res=>{ this.arr=res.data; }) }, + handleDelete(id){ + del(id).then(res =>{ + this.$message.success(res.msg || "删除成功") + }) + }, + handUpdate(){ + update(this.engine).then(res =>{ + this.$message.success(res.msg || "修改成功") + }) + }, + findSelectSourceExport(){ + selectEngineList().then(res=>{ + this.arr=res.data; + }) + } }, //生命周期 - 创建完成（可以访问当前this实例）", created() { From b425a52a67ba9b0ce0e88e3dd561d90b9c1b191f Mon Sep 17 00:00:00 2001 From: Qin Dong Ming <2720806930@qq.com> Date: Fri, 23 Aug 2024 09:27:05 +0800 Subject: [PATCH 05/10] =?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 c8064a6..808e327 100644 --- a/src/views/engine/engine/index.vue +++ b/src/views/engine/engine/index.vue @@ -138,6 +138,7 @@ @click="findSelectSourceExport" v-hasPermi="['source:data:export']" >导出 + From 36af1f7c60c11d1076f40ed8c77ba33ebbc3c102 Mon Sep 17 00:00:00 2001 From: chaiyapeng <3535863041@qq.com> Date: Fri, 23 Aug 2024 09:28:42 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=B0=8F?= =?UTF-8?q?=E5=8D=A1=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/port/port/index.vue | 77 +++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 src/views/port/port/index.vue diff --git a/src/views/port/port/index.vue b/src/views/port/port/index.vue new file mode 100644 index 0000000..398b474 --- /dev/null +++ b/src/views/port/port/index.vue @@ -0,0 +1,77 @@ + + + + From e394da3966508fe0cc8f57b14c4bc72834a44904 Mon Sep 17 00:00:00 2001 From: Qin Dong Ming <2720806930@qq.com> Date: Fri, 23 Aug 2024 09:36:05 +0800 Subject: [PATCH 07/10] =?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 | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/views/engine/engine/index.vue b/src/views/engine/engine/index.vue index 808e327..1ee7e5c 100644 --- a/src/views/engine/engine/index.vue +++ b/src/views/engine/engine/index.vue @@ -21,6 +21,17 @@ + 导出 + + + @@ -130,15 +141,7 @@ type="text" @click="handUpdate(scope.row.id)">规则维护 - 导出 - + From ea63405fd58381463e8292a49aba2df1b339f2ec Mon Sep 17 00:00:00 2001 From: chaiyapeng <3535863041@qq.com> Date: Fri, 23 Aug 2024 09:38:54 +0800 Subject: [PATCH 08/10] =?UTF-8?q?IP=E5=B0=8F=E5=8D=A1=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/port/port/index.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/views/port/port/index.vue b/src/views/port/port/index.vue index 398b474..28389c3 100644 --- a/src/views/port/port/index.vue +++ b/src/views/port/port/index.vue @@ -3,7 +3,17 @@
手机号查询归属地 - 查看 + 查看   + 购买 +
+
+ {{'列表内容 ' + o }} +
+ + +
+ IP查询归属地 + 查看   购买
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 09/10] =?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 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 10/10] =?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`) }