From fc0ad32f815535a5a4aee55f92eaac92cbd4d97b Mon Sep 17 00:00:00 2001
From: jiang <893224616@qq.com>
Date: 星期二, 19 七月 2022 18:13:19 +0800
Subject: [PATCH] 1.修复新增用户没有pushkey的问题 2.将重置pushkey改为修改pushkey
---
web_src/src/components/UserManager.vue | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/web_src/src/components/UserManager.vue b/web_src/src/components/UserManager.vue
index 10faf6d..1048f53 100644
--- a/web_src/src/components/UserManager.vue
+++ b/web_src/src/components/UserManager.vue
@@ -21,7 +21,7 @@
<template slot-scope="scope">
<el-button size="medium" icon="el-icon-edit" type="text" @click="edit(scope.row)">淇敼瀵嗙爜</el-button>
<el-divider direction="vertical"></el-divider>
- <el-button size="medium" icon="el-icon-refresh" type="text" @click="resetPushKey(scope.row)">閲嶇疆pushkey</el-button>
+ <el-button size="medium" icon="el-icon-edit" type="text" @click="changePushKey(scope.row)">淇敼pushkey</el-button>
<el-divider direction="vertical"></el-divider>
<el-button size="medium" icon="el-icon-delete" type="text" @click="deleteUser(scope.row)"
style="color: #f56c6c">鍒犻櫎
@@ -30,6 +30,7 @@
</el-table-column>
</el-table>
<changePasswordForAdmin ref="changePasswordForAdmin"></changePasswordForAdmin>
+ <changePushKey ref="changePushKey"></changePushKey>
<addUser ref="addUser"></addUser>
<el-pagination
style="float: right"
@@ -47,6 +48,7 @@
<script>
import uiHeader from '../layout/UiHeader.vue'
import changePasswordForAdmin from './dialog/changePasswordForAdmin.vue'
+import changePushKey from './dialog/changePushKey.vue'
import addUser from '../components/dialog/addUser.vue'
export default {
@@ -54,6 +56,7 @@
components: {
uiHeader,
changePasswordForAdmin,
+ changePushKey,
addUser
},
data() {
@@ -118,7 +121,7 @@
message: "瀵嗙爜淇敼鎴愬姛",
type: "success",
});
- setTimeout(this.getDeviceList, 200)
+ setTimeout(this.getUserList, 200)
})
},
@@ -148,34 +151,31 @@
},
- resetPushKey: function (row) {
- let msg = "纭畾閲嶇疆pushkey锛�"
- if (row.online !== 0) {
- msg = "<strong>纭畾閲嶇疆pushkey锛�</strong>"
- }
- this.$confirm(msg, '鎻愮ず', {
- dangerouslyUseHTMLString: true,
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- center: true,
- type: 'warning'
- }).then(() => {
- this.$axios({
- method: 'get',
- url: `/api/user/resetPushKey?id=${row.id}`
- }).then((res) => {
- this.getUserList();
- }).catch((error) => {
- console.error(error);
+
+ changePushKey: function (row) {
+ this.$refs.changePushKey.openDialog(row, () => {
+ this.$refs.changePushKey.close();
+ this.$message({
+ showClose: true,
+ message: "pushKey淇敼鎴愬姛",
+ type: "success",
});
- }).catch(() => {
+ setTimeout(this.getUserList, 200)
- });
-
-
+ })
},
addUser: function () {
- this.$refs.addUser.openDialog()
+ // this.$refs.addUser.openDialog()
+ this.$refs.addUser.openDialog( () => {
+ this.$refs.addUser.close();
+ this.$message({
+ showClose: true,
+ message: "鐢ㄦ埛娣诲姞鎴愬姛",
+ type: "success",
+ });
+ setTimeout(this.getUserList, 200)
+
+ })
}
}
}
--
Gitblit v1.8.0