From 63eb01d64170d861b03009f75be29ef28618f873 Mon Sep 17 00:00:00 2001
From: wx <645899409@qq.com>
Date: Wed, 27 Dec 2023 17:55:35 +0800
Subject: [PATCH] =?UTF-8?q?update=201.=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=B2=A1=E6=9C=89=E5=B7=A5=E5=8F=B7=202.?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../secondMap/components/userInfoModal/userInfoModal.vue  | 5 +++--
 .../secondMap/components/watchListDialog.vue              | 8 +++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/userInfoModal.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/userInfoModal.vue
index e90cc6f..f92c035 100644
--- a/src/components/secondaryScreen/secondMap/components/userInfoModal/userInfoModal.vue
+++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/userInfoModal.vue
@@ -3,7 +3,8 @@
         <template #container>
             <div class="user-info-modal" style="display: flex">
                 <div style="width: 23%; padding: 0 20px 20px" class="fff">
-                    <div style="margin-bottom: 10px; font-weight: bold"> 用户名称：{{ infoData?.username }}</div>
+                    <div style="margin-bottom: 10px; font-weight: bold"> 员工姓名：{{ infoData?.username }}</div>
+                    <div style="margin-bottom: 10px; font-weight: bold"> 员工工号：{{ infoData?.workNo }} </div>
                     <div style="margin-bottom: 10px; font-weight: bold"> 工具编码：{{ infoData?.watchNo }}</div>
                     <div style="margin-bottom: 10px; font-weight: bold"> 单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位：{{ infoData?.unit }} </div>
                     <div style="margin-bottom: 10px; font-weight: bold">
@@ -116,4 +117,4 @@
     .tabs-d {
         padding: 20px;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/secondaryScreen/secondMap/components/watchListDialog.vue b/src/components/secondaryScreen/secondMap/components/watchListDialog.vue
index cfe39f0..7fe1de7 100644
--- a/src/components/secondaryScreen/secondMap/components/watchListDialog.vue
+++ b/src/components/secondaryScreen/secondMap/components/watchListDialog.vue
@@ -5,6 +5,7 @@
                 <div class="dialog-con">
                     <a-table
                         class="ant-table-striped"
+                        :class="[dataSource.length === 0 ? 'no-bottom' : '']"
                         :dataSource="dataSource"
                         :columns="columns"
                         :scroll="{ y: '56vh' }"
@@ -73,6 +74,7 @@
         const { code, result } = await getUserListByDeptId({ orgId: id, pageSize: pageSize.value, pageNo: current.value });
         if (code == 200) {
             dataSource.value = result?.records;
+            total.value = result?.total;
         }
     }
 
@@ -199,4 +201,8 @@
     :deep(.ant-table-pagination-right) {
         margin-right: 10px !important;
     }
-</style>
\ No newline at end of file
+
+    :deep(.no-bottom .ant-table-cell) {
+        border-bottom: none !important;
+    }
+</style>