Merge remote-tracking branch 'origin/master'

src/api/engine/engine.js

@@ -4,7 +4,7 @@ import request from '@/utils/request'
 export function selectEngineList(data){
   return request({
     url: "/engine/engine/getMaintenanceList",
-    method: "Get",
+    method: "post",
     data:data
   })
 }

src/api/system/user.js

@@ -10,6 +10,24 @@ export function listUser(query) {
   })
 }
 
+
+// 用户余额
+export function userRecharge(data) {
+  return request({
+    url: '/user/alipay/recharge',
+    method: 'post',
+    params: data
+  })
+}
+
+// 查询用户余额
+export function userBalance(userId) {
+  return request({
+    url: '/user/balance/' + userId,
+    method: 'get',
+  })
+}
+
 // 查询用户详细
 export function getUser(userId) {
   return request({

src/views/engine/engine/index.vue

@@ -151,6 +151,47 @@
     </el-table>
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!--    分页-->
+
+
+
+
+
+
+
+    <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="engineReq.pageNum"
+      :page-sizes="[1, 2, 3, 4, 5]"
+      :page-size="engineReq.pageSize"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="total">
+    </el-pagination>
+
+
+
+
+
+
+
+
+
+
+
   </div>
 </template>
 
@@ -168,13 +209,15 @@ export default {
 
     return {
       engineReq:{
-
+       pageNum:1,
+        pageSize:5
       },
       engine:{
 
       },
       arr:[],
-      dialogFormVisible:false
+      dialogFormVisible:false,
+      total:0
     };
   },
   //计算属性 类似于data概念",
@@ -183,6 +226,16 @@ export default {
   watch: {},
   //方法集合",
   methods: {
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.engineReq.pageSize = val;
+      this.findSelectSourceList();
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.engineReq.pageNum = val;
+      this.findSelectSourceList();
+    },
     insert(){
       this.dialogFormVisible = true
       insert(this.engine).then(res =>{
@@ -191,8 +244,9 @@ export default {
       this.engine = {}
     },
     findSelectSourceList(){
-      selectEngineList().then(res=>{
-          this.arr=res.data;
+      selectEngineList(this.engineReq).then(res=>{
+          this.arr=res.data.list;
+          this.total=res.data.total;
       })
     },
     handleDelete(id){

src/views/money/user/index.vue

@@ -0,0 +1,50 @@
+<template>
+  <div>
+    <el-table
+      :data="listDate"
+      style="width: 100%">
+      <el-table-column
+        label="用户余额"
+        width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ scope.row.paymentAmount }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { userBalance } from "@/api/system/user"; // 引入 API 方法
+import { getToken } from "@/utils/auth"; // 引入获取 Token 的方法
+
+export default {
+  data() {
+    return {
+      listDate: [],
+      userId: null
+    };
+  },
+  created() {
+    this.userId = getToken(); // 从 Token 中获取用户 ID
+    if (this.userId) {
+      this.fetchUserBalance(this.userId); // 获取用户余额
+    }
+  },
+  methods: {
+    async fetchUserBalance(userId) {
+      try {
+        const response = await userBalance(userId);
+        this.listDate = [{ paymentAmount: response.data.userBalance }];
+      } catch (error) {
+        console.error('Error fetching user balance:', error);
+      }
+    },
+
+  }
+};
+</script>
+
+<style scoped>
+/* 添加样式 */
+</style>

src/views/task/task/index.vue

@@ -158,17 +158,16 @@
         </el-form-item>
 
 
+        <el-form-item label="优先级选择">
+          <el-select v-model="taskReq.weigh" placeholder="请选择等级">
+            <el-option label="请选择" value=""></el-option>
+            <el-option label="紧急" value="1"></el-option>
+            <el-option label="低" value="2"></el-option>
+            <el-option label="中" value="3"></el-option>
+            <el-option label="高" value="4"></el-option>
+          </el-select>
+        </el-form-item>
 
-        <el-table-column
-          label="任务权重级别"
-          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>
-          </template>
-        </el-table-column>
       </el-form>
 
 
@@ -201,17 +200,14 @@
         <el-form-item label="表别名">
           <el-input v-model="taskInputReq.tableAsName"></el-input>
         </el-form-item>
+      </el-form>
+
       <div slot="footer" class="dialog-footer">
         <el-button @click="taskInputAdd = false">取 消</el-button>
         <el-button type="primary" @click="addTaskInput()">下一步</el-button>
       </div>
-      </el-form>
 
 
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">取 消</el-button>
-        <el-button type="primary" @click="addTask()">确 定</el-button>
-      </div>
     </el-dialog>
 
 <!--    字段选择列表-->
@@ -341,7 +337,7 @@ export default {
   //方法集合",
   methods: {
     executeTask(){
-
+      this.taskInputAdd = true;
     },
 
     addTaskInput(){

vue.config.js

@@ -38,6 +38,7 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         target: `http://172.13.1.1/prod-api`,
+        // target: `http://127.0.0.1/8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''