From 143d33e285c86c781de66c12ffbd5f625bebf712 Mon Sep 17 00:00:00 2001
From: CGD <3030332422@qq.com>
Date: Wed, 2 Apr 2025 08:05:03 +0800
Subject: [PATCH] =?UTF-8?q?=E2=80=9C=E5=88=86=E9=A1=B5=E6=9F=A5=E6=89=BE?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E2=80=9D=E6=9C=89=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E2=80=9C=E7=94=A8=E6=88=B7=E5=88=A0=E9=99=A4=E2=80=9D=E5=B7=B2?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/manager-web/src/apis/module/admin.js     | 35 ++++++--
 main/manager-web/src/views/UserManagement.vue | 82 +++++++++++--------
 2 files changed, 78 insertions(+), 39 deletions(-)

diff --git a/main/manager-web/src/apis/module/admin.js b/main/manager-web/src/apis/module/admin.js
index 977437ab..ecc413b0 100644
--- a/main/manager-web/src/apis/module/admin.js
+++ b/main/manager-web/src/apis/module/admin.js
@@ -4,20 +4,41 @@ import {getServiceUrl} from '../api'
 
 export default {
     // 用户列表
-    getUserList(callback) {
+    getUserList(params, callback) {
+      const queryParams = new URLSearchParams({
+        page: params.page,
+        limit: params.limit,
+        mobile: params.mobile
+      }).toString();
+
+      RequestService.sendRequest()
+        .url(`${getServiceUrl()}/api/v1/admin/users?${queryParams}`)
+                .method('GET')
+                .success((res) => {
+                    RequestService.clearRequestTime()
+                    callback(res)
+                })
+                .fail((err) => {
+                    console.error('请求失败:', err)
+                    RequestService.reAjaxFun(() => {
+                        this.getUserList(callback)
+                    })
+                }).send()
+        },
+    // 删除用户
+    deleteUser(id, callback) {
         RequestService.sendRequest()
-            .url(`${getServiceUrl()}/api/v1/admin/users`)
-            .method('GET')
+            .url(`${getServiceUrl()}/api/v1/admin/users/${id}`)
+            .method('DELETE')
             .success((res) => {
                 RequestService.clearRequestTime()
                 callback(res)
             })
             .fail((err) => {
-                console.error('请求失败:', err)
+                console.error('删除失败:', err)
                 RequestService.reAjaxFun(() => {
-                    this.getUserList(callback)
+                    this.deleteUser(id, callback)
                 })
-            })
-            .send()
+            }).send()
     }
 }
diff --git a/main/manager-web/src/views/UserManagement.vue b/main/manager-web/src/views/UserManagement.vue
index 53697b8e..4c3bc7b4 100644
--- a/main/manager-web/src/views/UserManagement.vue
+++ b/main/manager-web/src/views/UserManagement.vue
@@ -13,9 +13,9 @@
       <el-card class="user-card" shadow="never">
         <el-table :data="userList" class="transparent-table" :header-cell-class-name="headerCellClassName">
           <el-table-column label="选择" type="selection" align="center" width="120"></el-table-column>
-          <el-table-column label="用户Id" prop="user_id" align="center"></el-table-column>
+          <el-table-column label="用户Id" prop="userid" align="center"></el-table-column>
           <el-table-column label="手机号码" prop="mobile" align="center"></el-table-column>
-          <el-table-column label="设备数量" prop="device_count" align="center"></el-table-column>
+          <el-table-column label="设备数量" prop="deviceCount" align="center"></el-table-column>
           <el-table-column label="状态" prop="status" align="center"></el-table-column>
           <el-table-column label="操作" align="center">
             <template slot-scope="scope">
@@ -76,10 +76,9 @@ export default {
     return {
       searchPhone: '',
       userList: [],
-      originalUserList: [], // 原始数据
       currentPage: 1,
       pageSize: 5,
-      total: 20
+      total: 0
     };
   },
   created() {
@@ -87,7 +86,9 @@ export default {
   },
   computed: {
     pageCount() {
-      return Math.ceil(this.total / this.pageSize);
+      const count = Math.ceil(this.total / this.pageSize);
+      console.log('总页数计算:', this.total, '/', this.pageSize, '=', count);
+      return count;
     },
     visiblePages() {
       const pages = [];
@@ -108,34 +109,34 @@ export default {
   methods: {
     // 获取用户列表
     fetchUsers() {
-      adminApi.getUserList(({data}) => {
-        if (data.code === 0) {
-          const responseData = data.data[0] || data.data;
-          this.originalUserList = responseData.list.map(user => ({
-            ...user,
-            status: user.status === '1' ? '正常' : '禁用'
-          }));
-          this.userList = [...this.originalUserList];
-          this.total = responseData.totalCount || 0;
-        }
-      });
-    },
 
-    // 分页变化
-    handleCurrentChange(page) {
-      this.currentPage = page;
-      this.fetchUsers();
+      console.log('请求参数:', {
+      page: this.currentPage,
+      limit: this.pageSize,
+      mobile: this.searchPhone
+      });
+
+        adminApi.getUserList({
+            page: this.currentPage,
+            limit: this.pageSize,
+            mobile: this.searchPhone
+        }, ({ data }) => {
+          console.log('响应数据:', data);
+            if (data.code === 0) {
+                this.userList = data.data.list.map(user => ({
+                    ...user,
+                    status: user.status === '1' ? '正常' : '禁用'
+                }));
+                this.total = data.data.total;
+            }
+        });
     },
 
     // 搜索
     handleSearch() {
-      if (!this.searchPhone) {
-        this.userList = [...this.originalUserList];
-        return;
-      }
-      this.userList = this.originalUserList.filter(user =>
-        user.mobile.includes(this.searchPhone)
-      )},
+        this.currentPage = 1;
+        this.fetchUsers();
+    },
     batchDelete() {
       console.log('执行批量删除操作');
     },
@@ -154,7 +155,22 @@ export default {
       console.log('恢复用户：', row);
     },
     deleteUser(row) {
-      console.log('删除用户：', row);
+        this.$confirm('确定要删除该用户吗？', '警告', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        }).then(() => {
+            adminApi.deleteUser(row.userid, ({data}) => {
+              console.log("33333333")
+                if (data.code === 0) {
+                    this.$message.success('删除成功')
+                    // 删除后重新获取数据（或前端直接过滤）
+                    this.fetchUsers()
+                } else {
+                    this.$message.error(data.msg || '删除失败')
+                }
+            })
+        }).catch(() => {})
     },
     handleSizeChange(val) {
       this.pageSize = val;
@@ -173,18 +189,20 @@ export default {
     goPrev() {
       if (this.currentPage > 1) {
         this.currentPage--;
-        this.handleCurrentChange(this.currentPage);
+         this.fetchUsers();
       }
     },
     goNext() {
+      console.log("1111111111111")
       if (this.currentPage < this.pageCount) {
+        console.log("2222222222")
         this.currentPage++;
-        this.handleCurrentChange(this.currentPage);
+         this.fetchUsers();
       }
     },
     goToPage(page) {
       this.currentPage = page;
-      this.handleCurrentChange(page);
+      this.fetchUsers();
     },
   }
 };