From 6b54d60ae0c8b14e94652485bfb975ce49b70d0b Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 17 May 2024 11:34:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppSeatManagementXbot/components/GroupList.vue    |  1 +
 .../xbot/AppSeatManagementXbot/components/List.vue    | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/xbot/AppSeatManagementXbot/components/GroupList.vue b/packages/xbot/AppSeatManagementXbot/components/GroupList.vue
index 4177301d..aeefbdda 100644
--- a/packages/xbot/AppSeatManagementXbot/components/GroupList.vue
+++ b/packages/xbot/AppSeatManagementXbot/components/GroupList.vue
@@ -107,6 +107,7 @@ export default {
         { prop: "status", label: '群状态', align: 'center', dict: 'xbotGroupStatus'},
         { prop: "managerTpUserName", label: '关联人员', align: 'center'},
         { prop: "managerTpUserDeptName", label: '主部门', align: 'center'},
+        { prop: "areaName", label: '所属地区', align: 'center'},
         { slot: "option"},
         // { prop: "status", label: '状态'},
       ]
diff --git a/packages/xbot/AppSeatManagementXbot/components/List.vue b/packages/xbot/AppSeatManagementXbot/components/List.vue
index e0a8a0e1..dba1baac 100644
--- a/packages/xbot/AppSeatManagementXbot/components/List.vue
+++ b/packages/xbot/AppSeatManagementXbot/components/List.vue
@@ -29,11 +29,16 @@
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="total" :current.sync="search.current" :size.sync="search.size"
                   @getList="getTableData()" :col-configs="colConfigs">
-          <el-table-column slot="avatar" label="头像 "  align="left" width="150">
+          <el-table-column slot="avatar" label="头像 "  align="left" width="100">
             <template slot-scope="{ row }">
               <img :src="row.avatar ? row.avatar : 'https://cdn.cunwuyun.cn/dvcp/group-img.png'" alt="" class="group-avatar">
             </template>
           </el-table-column>
+          <el-table-column slot="loginUserName" label="姓名"  align="left" width="180" show-overflow-tooltip>
+            <template slot-scope="{ row }">
+              <p>{{row.loginUserName}}   ({{row.loginUserId}})</p>
+            </template>
+          </el-table-column>
           <el-table-column slot="groupCount" label="监控群聊"  align="center">
             <template slot-scope="{ row }">
               <div @click="showDialog(row)" style="cursor: pointer;color:#26f">{{row.monitorGroupCount}}</div>
@@ -137,8 +142,8 @@ export default {
         { prop: "type", label: '类型', dict: 'xbotType', width: 150},
         { slot: "avatar"},
         { prop: "xbotName", label: '机位'},
-        { slot: "loginUserId", label: '用户id'},
-        { prop: "loginUserName", label: '姓名', align: "left"},
+        // { slot: "loginUserId", label: '用户id'},
+        { slot: "loginUserName"},
         { prop: "phone", label: '手机号'},
         // { prop: "girdNames", label: '管辖区域'},
         { slot: "groupCount", label: '监控群聊'},