diff --git a/src/api/engine/engine.js b/src/api/engine/engine.js
index 689fb64..63cc44a 100644
--- a/src/api/engine/engine.js
+++ b/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
})
}
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 89d3972..9776c1b 100644
--- a/src/api/system/user.js
+++ b/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({
diff --git a/src/assets/images/login-background.jpg b/src/assets/images/login-background.jpg
new file mode 100644
index 0000000..8a89eb8
Binary files /dev/null and b/src/assets/images/login-background.jpg differ
diff --git a/src/views/engine/engine/index.vue b/src/views/engine/engine/index.vue
index 9d89bc0..0215e8f 100644
--- a/src/views/engine/engine/index.vue
+++ b/src/views/engine/engine/index.vue
@@ -151,6 +151,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -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){
diff --git a/src/views/money/user/index.vue b/src/views/money/user/index.vue
new file mode 100644
index 0000000..ddf25c8
--- /dev/null
+++ b/src/views/money/user/index.vue
@@ -0,0 +1,50 @@
+
+
+
+
+
+ {{ scope.row.paymentAmount }}
+
+
+
+
+
+
+
+
+
diff --git a/src/views/task/task/index.vue b/src/views/task/task/index.vue
index b677763..22f6b11 100644
--- a/src/views/task/task/index.vue
+++ b/src/views/task/task/index.vue
@@ -158,17 +158,16 @@
+
+
+
+
+
+
+
+
+
-
-
- 紧急
- 底
- 中
- 高
-
-
@@ -201,17 +200,14 @@
-
-
+
+
@@ -341,7 +337,7 @@ export default {
//方法集合",
methods: {
executeTask(){
-
+ this.taskInputAdd = true;
},
addTaskInput(){
diff --git a/vue.config.js b/vue.config.js
index 5fa6595..d93d965 100644
--- a/vue.config.js
+++ b/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]: ''