From c7317121adfb1f129f3272851aa38fdc20008053 Mon Sep 17 00:00:00 2001
From: lwj <3529558005@qq.com>
Date: Sat, 24 Aug 2024 01:51:12 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/etl/switch.js          | 9 +++++++++
 src/views/etl/switch/index.vue | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/api/etl/switch.js b/src/api/etl/switch.js
index c299886..1a9c51f 100644
--- a/src/api/etl/switch.js
+++ b/src/api/etl/switch.js
@@ -37,6 +37,15 @@ export function getInfo(id){
 }
 
 
+//测试连接
+export function structure(data){
+  return request({
+    url: "/source/source/structure",
+    method: "post",
+    data:data
+  })
+}
+
 //测试连接
 export function connectionTest(data){
   return request({
diff --git a/src/views/etl/switch/index.vue b/src/views/etl/switch/index.vue
index 741386b..dadf2a0 100644
--- a/src/views/etl/switch/index.vue
+++ b/src/views/etl/switch/index.vue
@@ -268,6 +268,7 @@ 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";
 
 export default {
   //import引入的组件需要注入到对象中才能使用"
@@ -294,6 +295,13 @@ export default {
   watch: {},
   //方法集合",
   methods: {
+    struceure(row){
+      structure(row).then(res=>{
+          if (res ===200){
+            alert("同步资产成功")
+          }
+      })
+    },
     deleteSourceByIds(){
       deleteSource(this.ids).then(res=>{
         if(res.code===200){

From 242afa5176261bcf560c568ed68c92aae7a31322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com>
Date: Sat, 24 Aug 2024 19:08:30 +0800
Subject: [PATCH 2/7] =?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=E8=AE=BE=E8=AE=A1=E9=9B=8F=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/task/index.vue | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/task/task/index.vue b/src/views/task/task/index.vue
index 22f6b11..5a0956e 100644
--- a/src/views/task/task/index.vue
+++ b/src/views/task/task/index.vue
@@ -144,6 +144,12 @@
             size="mini"
             type="text"
             @click="handleDelete(scope.row)">删除</el-button>
+
+          <el-button
+            icon="el-icon-update"
+            size="mini"
+            type="text"
+            @click="updateById(scope.row)">修改</el-button>
         </template>
 
       </el-table-column>
@@ -269,9 +275,9 @@
           width="180">
           <template slot-scope="scope">
             <span style="margin-left: 10px" v-if="scope.row.weigh ==1 ">非空规则</span>
-            <span style="margin-left: 10px" v-if="scope.row.weigh ==2 ">非空规则</span>
-            <span style="margin-left: 10px" v-if="scope.row.weigh ==3 ">非空规则</span>
-            <span style="margin-left: 10px" v-if="scope.row.weigh ==4 ">非空规则</span>
+            <span style="margin-left: 10px" v-if="scope.row.weigh ==2 ">aa规则</span>
+            <span style="margin-left: 10px" v-if="scope.row.weigh ==3 ">我啊规则</span>
+            <span style="margin-left: 10px" v-if="scope.row.weigh ==4 ">收到规则</span>
           </template>
         </el-table-column>
 
@@ -279,7 +285,7 @@
           label="表别名"
           width="180">
           <template slot-scope="scope">
-            <input type="text">
+            <el-input v-model="scope.row.fieldAsEngineId"></el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -336,6 +342,7 @@ export default {
   watch: {},
   //方法集合",
   methods: {
+
     executeTask(){
       this.taskInputAdd = true;
     },
@@ -374,7 +381,7 @@ export default {
     },
 
     handleDelete(row){
-      deleteByTaskId(row.getId).then(res=>{
+      deleteByTaskId(row.id).then(res=>{
         alert(res.msg);
         if(res.code == 200){
           location.reload();

From 3312b972b2812717c4b3b1d8bb6bc47590724da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com>
Date: Sat, 24 Aug 2024 19:11:18 +0800
Subject: [PATCH 3/7] =?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=E8=AE=BE=E8=AE=A1=E9=9B=8F=E5=BD=A2?=
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 5a0956e..1bf4a14 100644
--- a/src/views/task/task/index.vue
+++ b/src/views/task/task/index.vue
@@ -357,6 +357,7 @@ export default {
       this.dialogFormVisible = true;
     },
 
+
     //添加任务
     addTask(){
       addTask(this.taskAddReq).then(res=>{

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 4/7] =?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 @@
     </el-button>
 
 
-    <el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible" append-to-body width="60%">
+    <el-dialog title="title" :visible.sync="dialogFormVisible" append-to-body width="60%">
 
-      <el-form  ref="form" :model="sourceAddReq"  label-width="140px" :inline="true" class="demo-form-inline">
+      <el-form  ref="form" :model="sourceAddReq" :rules="rules" label-width="140px" :inline="true" class="demo-form-inline">
         <el-form-item label="接入源名称">
           <el-input v-model="sourceAddReq.dataResourceName"></el-input>
         </el-form-item>
@@ -262,7 +262,7 @@
 <script>
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 //例如：import 《组件名称》 from '《组件路径》,
-import {selectSourceList} from "@/api/etl/switch";
+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";
@@ -278,6 +278,17 @@ export default {
     //这里存放数据"
 
     return {
+      rules: {
+        dataResourceName: [
+          {required: true, message: "接入源名称不能为空", trigger: "blur"}
+        ],
+        dataSourcesSystemName: [
+          {required: true, message: "数据来源系统名称不能为空", trigger: "blur"}
+        ],
+        host: [
+          {required: true, message: "主机地址不能为空", trigger: "blur"}
+        ]
+      },
       ids:[],
       dialogFormVisible:false,
       SourceReq:{
@@ -295,6 +306,20 @@ export default {
   watch: {},
   //方法集合",
   methods: {
+    reset() {
+      this.sourceAddReq = {
+      };
+      this.resetForm("sourceAddReq");
+    },
+    //修改
+    update(row){
+      this.reset();
+       getInfo(row.id).then(res=>{
+         this.sourceAddReq=res.data;
+         this.dialogFormVisible=true;
+         this.title="修改岗位"
+       })
+    },
     struceure(row){
       structure(row).then(res=>{
           if (res ===200){
@@ -326,11 +351,25 @@ export default {
       })
     },
     addSource(){
-      insertAdd(this.sourceAddReq).then(res=>{
-          if(res.code===200){
-            location.reload();
+      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){
@@ -343,7 +382,9 @@ export default {
       })
     },
 
+    //新增
     insertAdd(){
+      this.reset();
       this.dialogFormVisible=true
     },
     findSelectSourceList(){

From 44c7e479fabd04465f12964431b06d247d7b370d Mon Sep 17 00:00:00 2001
From: wxy <14293288+zysysys@user.noreply.gitee.com>
Date: Sat, 24 Aug 2024 20:54:55 +0800
Subject: [PATCH 5/7] =?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/api/system/user.js         |  4 +--
 src/views/money/user/index.vue | 45 ++++++++++++++++++++++------------
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/api/system/user.js b/src/api/system/user.js
index e591071..9669f26 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -14,7 +14,7 @@ export function listUser(query) {
 // 用户余额
 export function userRecharge(data) {
   return request({
-    url: '/money/alipay/recharge',
+    url: '/system/alipay/recharge',
     method: 'post',
     params: data
   })
@@ -23,7 +23,7 @@ export function userRecharge(data) {
 // 查询用户余额
 export function userBalance(userId) {
   return request({
-    url: '/money/balance/' + userId,
+    url: '/system/user/balance/' + userId,
     method: 'get',
   })
 }
diff --git a/src/views/money/user/index.vue b/src/views/money/user/index.vue
index afa3c3f..320d9a7 100644
--- a/src/views/money/user/index.vue
+++ b/src/views/money/user/index.vue
@@ -1,30 +1,45 @@
 <template>
   <div>
-    <span style="text-align: center">账户余额: {{ balance }}</span>
+    <h1>用户余额</h1>
+    <p>余额：{{ userBalanceData.userBalance || '加载中...' }}</p>
   </div>
 </template>
 
 <script>
-import {userBalance} from "@/api/system/user";
+import { userBalance } from "@/api/system/user"; // 假设你的userBalance函数在@/api/money目录下
 
 export default {
   data() {
     return {
-      balance: null, // 用于存储用户余额
+      userBalanceData: {
+        userBalance: '加载中...'
+      }
     };
   },
-  async created() {
-    try {
-      const userId = 1; // 根据实际情况获取用户 ID
-      const response = await userBalance(userId);
-      this.balance = response.data.balance; // 假设响应数据中包含余额信息
-    } catch (error) {
-      console.error('Error fetching user balance:', error);
-    }
+  created() {
+    this.fetchUserBalance();
+  },
+  methods: {
+    async fetchUserBalance() {
+      try {
+        const userId = localStorage.getItem('userId');
+        console.log(userId)// 假设你登录后把userId存到了localStorage
+        if (!userId) {
+          this.userBalanceData = {userBalance: '未登录'};
+          return;
+        }
+        const response = await userBalance(userId);
+        if (response.data) {
+          console.log(response.data)
+          this.userBalanceData.userBalance = response.data; // 假设response.data直接返回了余额信息
+        } else {
+          this.userBalanceData.userBalance = {userBalance: '获取失败'};
+        }
+      } catch (error) {
+        this.userBalanceData = {userBalance: '获取失败'};
+        console.error('Error fetching user balance:', error);
+      }
+    },
   },
 };
 </script>
-
-<style scoped>
-/* 添加样式 */
-</style>

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 6/7] =?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 7/7] =?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;