From a6fb1cdb74ca11c9dba798e64bf3d61bbfbdf05b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 11 九月 2023 16:17:29 +0800
Subject: [PATCH] 修复Web页面播放国标录像无声音的问题

---
 web_src/src/components/UserManager.vue |   58 ++++++++++++++++++++++++++++++----------------------------
 1 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/web_src/src/components/UserManager.vue b/web_src/src/components/UserManager.vue
old mode 100644
new mode 100755
index 10faf6d..c0fa695
--- 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() {
@@ -102,8 +105,10 @@
           count: that.count
         }
       }).then(function (res) {
-        that.total = res.data.total;
-        that.userList = res.data.list;
+        if (res.data.code === 0) {
+          that.total = res.data.data.total;
+          that.userList = res.data.data.list;
+        }
         that.getUserListLoading = false;
       }).catch(function (error) {
         that.getUserListLoading = false;
@@ -118,7 +123,7 @@
           message: "瀵嗙爜淇敼鎴愬姛",
           type: "success",
         });
-        setTimeout(this.getDeviceList, 200)
+        setTimeout(this.getUserList, 200)
 
       })
     },
@@ -148,34 +153,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