From 678dc9420c40c8dbb4af6a329a52a288dab3c1dc Mon Sep 17 00:00:00 2001 From: lwj <3529558005@qq.com> Date: Sat, 24 Aug 2024 19:58:08 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E5=8F=B0?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=92=8C=E5=88=A0=E9=99=A4=E5=92=8C=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/etl/switch.js | 13 ++++++-- src/views/etl/switch/index.vue | 55 +++++++++++++++++++++++++++++----- 2 files changed, 59 insertions(+), 9 deletions(-) diff --git a/src/api/etl/switch.js b/src/api/etl/switch.js index 1a9c51f..f9af91c 100644 --- a/src/api/etl/switch.js +++ b/src/api/etl/switch.js @@ -46,7 +46,7 @@ export function structure(data){ }) } -//测试连接 +//同步资产结构 export function connectionTest(data){ return request({ url: "/source/source/connectionTest", @@ -61,7 +61,16 @@ export function deleteSource(ids){ return request({ url: "/source/source/"+ids, method: "delete", - + }) +} + + +//修改 +export function update(data){ + return request({ + url: "/source/source/update", + method: "post", + data:data }) } diff --git a/src/views/etl/switch/index.vue b/src/views/etl/switch/index.vue index dadf2a0..eb3c9b1 100644 --- a/src/views/etl/switch/index.vue +++ b/src/views/etl/switch/index.vue @@ -56,9 +56,9 @@ - + - + @@ -262,7 +262,7 @@ - - From c97d580d1fe2a9cd0e830832f840c03a3e957136 Mon Sep 17 00:00:00 2001 From: lwj <3529558005@qq.com> Date: Sat, 24 Aug 2024 22:31:36 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E5=8F=B0?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=92=8C=E5=88=A0=E9=99=A4=E5=92=8C=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=A0=A1=E9=AA=8C?= 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, 4 deletions(-) diff --git a/src/views/etl/switch/index.vue b/src/views/etl/switch/index.vue index eb3c9b1..6d7ff59 100644 --- a/src/views/etl/switch/index.vue +++ b/src/views/etl/switch/index.vue @@ -351,8 +351,6 @@ export default { }) }, addSource(){ - this.$refs["sourceAddReq"].validate(valid => { - if (valid){ if (this.sourceAddReq.id!=undefined){ update(this.sourceAddReq).then(res=>{ if (res.code===200){ @@ -368,8 +366,6 @@ export default { } }) } - } - }); }, //测试连接 textConnect(row){ From 1ed86b73627fb93b26d27acf0391d52ee29d89e9 Mon Sep 17 00:00:00 2001 From: wxy <14293288+zysysys@user.noreply.gitee.com> Date: Sun, 25 Aug 2024 09:07:26 +0800 Subject: [PATCH 04/10] =?UTF-8?q?```feat(user):=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=B9=B6=E6=98=BE=E7=A4=BA=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BD=99=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在用户页面展示当前用户的余额信息，通过调用用户余额接口获取数据。优化界面布局，确保余额信息 清晰呈现给用户。同时，修复了潜在的token解析问题，保证用户数据准确无误。 修复了用户余额展示的bug，优化了用户界面体验。 ``` --- src/store/modules/user.js | 1 + src/views/money/user/index.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 6c109a6..19b32d2 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -69,6 +69,7 @@ const user = { commit('SET_ROLES', ['ROLE_DEFAULT']) } commit('SET_ID', user.userId) + localStorage.setItem('userId', user.userId) commit('SET_NAME', user.userName) commit('SET_AVATAR', avatar) resolve(res) diff --git a/src/views/money/user/index.vue b/src/views/money/user/index.vue index 320d9a7..6ed1897 100644 --- a/src/views/money/user/index.vue +++ b/src/views/money/user/index.vue @@ -23,7 +23,7 @@ export default { async fetchUserBalance() { try { const userId = localStorage.getItem('userId'); - console.log(userId)// 假设你登录后把userId存到了localStorage + console.log(userId)// 登录后把userId存到了localStorage if (!userId) { this.userBalanceData = {userBalance: '未登录'}; return; From 280d8cb968afe7079f60e816287e4aaf9dd35241 Mon Sep 17 00:00:00 2001 From: chaiyapeng <3535863041@qq.com> Date: Sun, 25 Aug 2024 09:08:56 +0800 Subject: [PATCH 05/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 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/port/port/index.vue b/src/views/port/port/index.vue index 62c0401..b0c41ae 100644 --- a/src/views/port/port/index.vue +++ b/src/views/port/port/index.vue @@ -10,6 +10,7 @@ + 查询 省份：{{this.formLabelAlign.province}}
城市：{{this.formLabelAlign.city}}
From 8f8c58967977309d206b6ae376bbe32a634b7ae9 Mon Sep 17 00:00:00 2001 From: chaiyapeng <3535863041@qq.com> Date: Sun, 25 Aug 2024 09:17:00 +0800 Subject: [PATCH 06/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 | 58 +++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/src/views/port/port/index.vue b/src/views/port/port/index.vue index b0c41ae..134a963 100644 --- a/src/views/port/port/index.vue +++ b/src/views/port/port/index.vue @@ -1,32 +1,38 @@ From 34f1c4406e5e02c9c3fac78d285c89ed20b82685 Mon Sep 17 00:00:00 2001 From: chaiyapeng <3535863041@qq.com> Date: Sun, 25 Aug 2024 09:26:14 +0800 Subject: [PATCH 07/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 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/port/port/index.vue b/src/views/port/port/index.vue index 134a963..766aa5c 100644 --- a/src/views/port/port/index.vue +++ b/src/views/port/port/index.vue @@ -64,6 +64,7 @@ export default { //方法集合", methods: { getPhonePlace(){ + alert("111") getPhonePlace(this.formLabelAlign.tel).then((res)=>{ this.formLabelAlign.province=res.data.province; this.formLabelAlign.city=res.data.city; From fe4de82d2372a48476368a8d493283fb8fe93999 Mon Sep 17 00:00:00 2001 From: chaiyapeng <3535863041@qq.com> Date: Sun, 25 Aug 2024 09:30:33 +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/api/port/port/index.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/api/port/port/index.js b/src/api/port/port/index.js index f12fec6..c2b8844 100644 --- a/src/api/port/port/index.js +++ b/src/api/port/port/index.js @@ -1,9 +1,8 @@ import request from '@/utils/request' -export function getPhonePlace(data) { +export function getPhonePlace(tel) { return request({ - url: '/mart/list/getPhonePlace', - method: 'get', - data:data + url: '/mart/list/getPhonePlace?tel='+tel, + method: 'get' }) } From aa5edcd52da2899e8c750e19f4e251be9008be7e Mon Sep 17 00:00:00 2001 From: wxy <14293288+zysysys@user.noreply.gitee.com> Date: Sun, 25 Aug 2024 09:36:18 +0800 Subject: [PATCH 09/10] =?UTF-8?q?```=E5=9C=A8=E7=94=A8=E6=88=B7=E4=BD=99?= =?UTF-8?q?=E9=A2=9D=E7=95=8C=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=8D=A1=E7=89=87?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=EF=BC=8C=E5=A2=9E=E5=BC=BA=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E7=9A=84=E8=A7=86=E8=A7=89=E5=90=B8=E5=BC=95=E5=8A=9B=20```?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/money/user/index.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/money/user/index.vue b/src/views/money/user/index.vue index 6ed1897..d2035df 100644 --- a/src/views/money/user/index.vue +++ b/src/views/money/user/index.vue @@ -1,10 +1,13 @@ +