From e1ed66c47b1e24ad8f9fc64d44d629a642d1a738 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 15 Jun 2022 13:48:56 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1931=20fix=EF=BC=9A=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=20=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=20=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/table/settings/userTable.scss      |  9 +++++++++
 .../common/table/settings/userTable.vue       | 19 +++++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/table/settings/userTable.scss b/nezha-fronted/src/assets/css/components/common/table/settings/userTable.scss
index 4c7d0656a..256fb8b1e 100644
--- a/nezha-fronted/src/assets/css/components/common/table/settings/userTable.scss
+++ b/nezha-fronted/src/assets/css/components/common/table/settings/userTable.scss
@@ -22,4 +22,13 @@
     font-size: 14px;
     line-height: 14px;
   }
+  .user-name-td{
+    display: flex;
+    align-items: center;
+    .user-online{
+      margin-right: 5px;
+      margin-left: -10px;
+      color: #38cc20;
+    }
+  }
 }
diff --git a/nezha-fronted/src/components/common/table/settings/userTable.vue b/nezha-fronted/src/components/common/table/settings/userTable.vue
index 59abdb306..e727c1f1a 100644
--- a/nezha-fronted/src/components/common/table/settings/userTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/userTable.vue
@@ -32,18 +32,21 @@
       :width="`${item.width}`"
     >
       <template slot="header">
-        <span class="data-column__span">{{item.label}}</span>
+        <span class="data-column__span" :class="{'margin-l-10': item.prop === 'name'}">{{item.label}}</span>
         <div class="col-resize-area"></div>
       </template>
       <template slot-scope="scope" :column="item">
         <template v-if="item.prop === 'name'">
-          <div>
-            <div class="flex-align-center">
-              <span class="user-name-top">{{scope.row[item.prop]}}</span>
-              <el-tag size="mini" v-if="mfaEnable == '1' || scope.row.mfaLevel > 0" style="margin-left: 5px">2FA</el-tag>
-            </div>
-            <div class="user-name-bottom">
-              @{{scope.row.username}}
+          <div class="user-name-td" :class="{'margin-l-10': !scope.row.online}">
+            <i class="nz-icon nz-icon-user1 user-online" v-if="scope.row.online"/>
+            <div>
+              <div class="flex-align-center">
+                <span class="user-name-top">{{scope.row[item.prop]}}</span>
+                <el-tag size="mini" v-if="mfaEnable == '1' || scope.row.mfaLevel > 0" style="margin-left: 5px">2FA</el-tag>
+              </div>
+              <div class="user-name-bottom">
+                @{{scope.row.username}}
+              </div>
             </div>
           </div>
         </template>