Merge remote-tracking branch 'origin/master'

src/api/engine/engine.js

@@ -39,5 +39,19 @@ export  function del(id){
 }
 
 
+export  function selectLevel(){
+  return request({
+    url: "/engine/level/selectLevelList",
+    method: "post"
+  })
+}
+
+// 查询规则引擎版本列表
+export function getRuleEngineInfo(id) {
+  return request({
+    url: '/engine/engine/getRuleEngineInfo/' + id,
+    method: 'put'
+  })
+}
 
 

src/api/system/user.js

@@ -89,6 +89,15 @@ export function changeUserStatus(userId, status) {
   })
 }
 
+//对用户余额进行添加
+export function addUserMoney(data) {
+  return request({
+    url: '/system/user/addUserMoney',
+    method: 'post',
+    data:data
+  })
+}
+
 // 查询用户个人信息
 export function getUserProfile() {
   return request({

src/views/engine/engine/index.vue

@@ -38,12 +38,6 @@
     >新增
     </el-button>
 
-
-
-
-
-
-
     <!-- 添加或修改规则引擎对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -130,10 +124,6 @@
       </div>
     </el-dialog>
 
-
-
-
-
     <el-table :data="arr" style="width: 100%">
       <el-table-column label="编号" prop="id"></el-table-column>
       <el-table-column label="名称" prop="name"></el-table-column>
@@ -183,7 +173,14 @@
             type="text"
             @click="handleUpdate(scope.row)">修改规则配置</el-button>
 
-          <router-link to="list">规则维护</router-link>
+          <el-button
+            icon="el-icon-service"
+            size="mini"
+            type="text"
+            @click="engineRuleMaintenance(scope.row.id)">修改规则配置</el-button>
+
+
+
         </template>
       </el-table-column>
     </el-table>
@@ -241,9 +238,6 @@ export default {
         engineCode: [
           {required: true, message: "规则编码不能为空", trigger: "blur"}
         ],
-        // scope: [
-        //   {required: true, message: "规则级别不能为空", trigger: "change"}
-        // ],
         isActivate: [
           {required: true, message: "是否激活不能为空", trigger: "change"}
         ],
@@ -282,23 +276,22 @@ export default {
       })
     },
     handleDelete(id){
+      if (confirm("是否删除这条数据？")){
       del(id).then(res =>{
-        //判断删除是否成功
-        if (confirm("是否删除这条数据？")){
-          this.$message.success(res.msg || "删除成功")
-        }
+          //判断删除是否成功
+            this.$message.success(res.msg || "删除成功")
       })
+      }
     },
     findSelectSourceExport(){
       this.download('engine/engine/export', {
         ...this.engineReq
-      }, `source_${new Date().getTime()}.xlsx`)
+      },
+        `source_${new Date().getTime()}.xlsx`)
     },
     select(){
       this.findSelectSourceList();
     },
-
-
     /** 新增按钮操作 */
     handleAdd() {
       // this.reset();
@@ -332,11 +325,12 @@ export default {
         }
       });
     },
-
-
-
-
-
+    engineRuleMaintenance(row){
+      this.$router.push({
+        path:'list',
+        query:{id:row.id}
+      })
+    }
   },
   //生命周期 - 创建完成（可以访问当前this实例）",
   created() {

src/views/engine/engine/list.vue

@@ -0,0 +1,34 @@
+<template>
+  <div>
+    {{scopeList}}
+  </div>
+</template>
+<script>
+import {getRuleEngineInfo} from "@/api/engine/engine";
+
+export default {
+  //import引入的组件需要注入到对象中才能使用"
+  components: {},
+  props: {},
+  data() {
+    //这里存放数据"
+    return {
+      scopeList:[]
+    };
+  },
+  methods: {
+      List(){
+        getRuleEngineInfo().then(res =>{
+          this.scopeList = res.data;
+        })
+      }
+  },
+  //生命周期 - 创建完成（可以访问当前this实例）",
+  created() {
+    this.List();
+    this.scopeList.id = this.$router.query.id
+  }
+}
+</script>
+<style scoped>
+</style>

src/views/etl/switch/index.vue

@@ -77,27 +77,8 @@
           <el-input v-model="sourceAddReq.connectionParams"></el-input>
         </el-form-item>
 
-<!--        <el-form-item label="初始化连接数量">-->
-<!--          <el-input v-model="sourceAddReq.initLinkNum"></el-input>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="最大连接数量">-->
-<!--          <el-input v-model="sourceAddReq.maxLinkNum"></el-input>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="最大等待时间">-->
-<!--          <el-input v-model="sourceAddReq.maxWaitTime"></el-input>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="最大等待次数">-->
-<!--          <el-input v-model="sourceAddReq.maxWaitTimes"></el-input>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="备注">-->
-<!--          <el-input v-model="sourceAddReq.remark"></el-input>-->
-<!--        </el-form-item>-->
-
-
-
       </el-form>
 
-
       <el-card class="box-card">
         <div slot="header" class="clearfix">
           <span>连接池配置</span>

src/views/money/pay/index.vue

@@ -2,8 +2,10 @@
   <el-card class="box-card">
     <ul class="msg-box">
       <li>
-        <h4 style="margin-bottom: 15px;">充值说明</h4>
+        <h1 style="margin-bottom: 15px;">充值说明</h1>
         <h4>你敢充钱,我就敢让你没钱</h4>
+        <h4>子龙说你得有个小目标</h4>
+        <h4>什么小目标,得一个亿</h4>
       </li>
       <li>
         <h4 style="margin-bottom: 15px;">支付金额</h4>
@@ -35,11 +37,13 @@
 </template>
 
 <script>
-import { userRecharge } from "@/api/system/user";
+import {addUserMoney, userRecharge} from "@/api/system/user";
+
 export default {
   data() {
     return {
       amountVal: '',
+      addSysUser: {},
       disabled: false,
       // 同步跳转页面地址
       returnUrl: 'http://172.13.1.1/money/money',
@@ -82,14 +86,14 @@ export default {
           // 传递同步跳转地址
           returnUrl: this.returnUrl,
           // 商品名称
-          subject: '支付金额',
+          subject: '充值金额',
           // 支付类型
           productCode: 'FAST_INSTANT_TRADE_PAY'
         }
         userRecharge(praem).then(code => {
           if (code.code === 200) {
             // 支付方式跳转
-            this.$message.success('支付宝支付')
+            this.$message.success('支付宝支付跳转')
             const payDiv = document.getElementById('payDiv');
             if (payDiv) {
               document.body.removeChild(payDiv);
@@ -101,6 +105,13 @@ export default {
             document.getElementById('payDiv').getElementsByTagName('form')[0].submit();
           }
         })
+        this.addSysUser.userBalance = this.rechargeParams.totalAmt;
+        let userId = localStorage.getItem('userId');
+        this.addSysUser.userId = userId;
+        addUserMoney(this.addSysUser).then(res => {
+        }).catch(error => {
+          console.error('Error updating user balance:', error);
+        });
       }
     },
     // 获取当前日期的方法

src/views/money/user/index.vue

@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import { userBalance } from "@/api/system/user"; // 假设你的userBalance函数在@/api/money目录下
+import { userBalance } from "@/api/system/user"; //
 
 export default {
   data() {