From b778723a8cab2535efb5b54793f1e73c6c5b8d20 Mon Sep 17 00:00:00 2001
From: wanglihui <1769794040@qq.com>
Date: Sun, 29 Dec 2024 19:37:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E-=E7=94=A8=E6=88=B7-?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                         |  2 +-
 src/pages/message/recordpersonal.vue | 12 ------------
 src/pages/user/userlist.vue          | 16 ++++++++++++++++
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index e108efa..91c9a79 100755
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tsdd-control",
   "private": true,
-  "version": "1.0.0",
+  "version": "1.2.0",
   "scripts": {
     "dev": "cross-env APP_ENV=dev vite",
     "build": "cross-env APP_ENV=prod vite build",
diff --git a/src/pages/message/recordpersonal.vue b/src/pages/message/recordpersonal.vue
index 7ab1155..f5fab45 100644
--- a/src/pages/message/recordpersonal.vue
+++ b/src/pages/message/recordpersonal.vue
@@ -62,8 +62,6 @@
         />
       </div>
     </div>
-    <!-- 查看设备 -->
-    <Devices v-model:value="devicesValue" :uid="devicesUid" />
   </bd-page>
 </template>
 
@@ -77,7 +75,6 @@ meta:
 import { useRoute } from 'vue-router';
 import { ElButton, ElSpace, ElAvatar, ElMessage, ElMessageBox } from 'element-plus';
 import BdMsg from '@/components/BdMsg/index.vue';
-import Devices from './components/Devices.vue';
 
 import { BU_DOU_CONFIG } from '@/config';
 // API 接口
@@ -272,15 +269,6 @@ const onDel = (item: any) => {
     });
 };
 
-// 查看设备
-const devicesValue = ref(false);
-const devicesUid = ref('');
-
-const onDevices = () => {
-  devicesUid.value = route.query.touid as string;
-  devicesValue.value = true;
-};
-
 // 初始化
 onMounted(() => {
   getUserList();
diff --git a/src/pages/user/userlist.vue b/src/pages/user/userlist.vue
index 41e27bf..8a6a046 100644
--- a/src/pages/user/userlist.vue
+++ b/src/pages/user/userlist.vue
@@ -56,6 +56,8 @@
     </div>
     <!-- 发消息 -->
     <bd-send-msg v-model:value="sendValue" v-bind="sendInfo" />
+    <!-- 查看设备 -->
+    <Devices v-model:value="devicesValue" :uid="devicesUid" />
   </bd-page>
 </template>
 
@@ -68,6 +70,7 @@ meta:
 <script lang="tsx" setup>
 import { useRouter } from 'vue-router';
 import { ElButton, ElSpace, ElAvatar, ElDropdown, ElDropdownMenu, ElDropdownItem, ElMessage, ElMessageBox } from 'element-plus';
+import Devices from '@/pages/message/components/Devices.vue';
 import { useUserStore } from '@/stores/modules/user';
 import { BU_DOU_CONFIG } from '@/config';
 // API 接口
@@ -197,6 +200,10 @@ const column = reactive<Column.ColumnOptions[]>([
                       <i-bd-info class={'mr-4px'} />
                       {scope.row.status === 1 ? '封禁' : '解禁'}
                     </ElDropdownItem>
+                    <ElDropdownItem onClick={() => onDevices(scope.row)}>
+                      <i-bd-devices class={'mr-4px'} />
+                      查看设备
+                    </ElDropdownItem>
                   </ElDropdownMenu>
                 );
               }
@@ -318,6 +325,15 @@ const onUseLiftban = (item: any) => {
     });
 };
 
+// 查看设备
+const devicesValue = ref(false);
+const devicesUid = ref('');
+
+const onDevices = (item: any) => {
+  devicesUid.value = item.uid;
+  devicesValue.value = true;
+};
+
 // 初始化
 onMounted(() => {
   getUserList();