From ea09bd51a51483c76278c57644f5a21b76e4cf40 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Tue, 5 Jul 2022 13:30:11 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1945=20fix=20:=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=20=E8=AF=A6=E7=BB=86?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E4=B8=8B=20=E5=A2=9E=E5=8A=A0=20=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=8F=90=E7=A4=BA=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detailView/list/userDetail/userDetail.vue | 48 ++++++++++++-------
 .../common/table/settings/userTable.vue       | 13 +----
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/nezha-fronted/src/components/common/detailView/list/userDetail/userDetail.vue b/nezha-fronted/src/components/common/detailView/list/userDetail/userDetail.vue
index 89ff33128..4ba4c1811 100644
--- a/nezha-fronted/src/components/common/detailView/list/userDetail/userDetail.vue
+++ b/nezha-fronted/src/components/common/detailView/list/userDetail/userDetail.vue
@@ -27,14 +27,18 @@
       >
         <div class="detail-row-info">
           <div class="asset-manageIp">
-            <span class="flex-align-center">
-              <span v-if="item.status" >
-                <span :class="{'active-icon green-bg':item.status == 1,'active-icon gray-bg':item.status == 0}"></span>
-              </span>
-              <span v-else style="display: inline-block;width: 13px"></span>
-              <span class="user-name-top">{{item.name}}</span>
-              <el-tag size="mini" v-if="mfaEnable == '1' || item.mfaLevel > 0" style="margin-left: 5px">2FA</el-tag>
-            </span>
+             <div class="user-name-td"
+             @mouseenter="labelHover(item, 'user', true, false, $event)"
+             @mouseleave="labelHover(item, 'user', false, false,)">
+               <span class="flex-align-center">
+                 <span v-if="item.status" >
+                   <span :class="{'active-icon green-bg':item.status == 1,'active-icon gray-bg':item.status == 0}"></span>
+                 </span>
+                 <span v-else style="display: inline-block;width: 13px"></span>
+                 <span class="user-name-top">{{item.name}}</span>
+                 <el-tag size="mini" v-if="mfaEnable == '1' || item.mfaLevel > 0" style="margin-left: 5px">2FA</el-tag>
+               </span>
+             </div>
           </div>
           <div class="asset-name">
             <span>@{{item.username}}</span>
@@ -42,6 +46,13 @@
         </div>
       </li>
     </ul>
+     <alertLabel
+      v-if="alertLabelShow"
+      :id="alertLabelId"
+      :that="alertLabelObj"
+      :type="alertLabelType"
+      :detailList = true
+    ></alertLabel>
   </div>
 </template>
 
@@ -50,9 +61,10 @@
 import detailViewLeftMixin from '@/components/common/mixin/detailViewLeftMixin'
 import alertLabel from '@/components/common/alert/alertLabel'
 import { terminalLog } from '@/components/common/js/constants'
+import alertLabelMixin from '@/components/common/mixin/alertLabelMixin'
 export default {
   name: 'userDetail',
-  mixins: [detailViewLeftMixin],
+  mixins: [detailViewLeftMixin, alertLabelMixin],
   components: {
     alertLabel
   },
@@ -120,15 +132,15 @@ export default {
   },
   methods: {
     // label 鼠标划入
-    labelHover (item, type, loading, e) {
-      if (e) {
-        const dom = e.currentTarget
-        const position = dom.getBoundingClientRect()
-        this.$set(item, 'position', position)
-      }
-      this.$set(item, 'loading', loading)
-      // this.$set(this.tableData,index,item);// 调用父组件
-    },
+    // labelHover (item, type, loading, e) {
+    //   if (e) {
+    //     const dom = e.currentTarget
+    //     const position = dom.getBoundingClientRect()
+    //     this.$set(item, 'position', position)
+    //   }
+    //   this.$set(item, 'loading', loading)
+    //   // this.$set(this.tableData,index,item);// 调用父组件
+    // },
     getStatusText () {
       return function (status) {
         return terminalLog.status[status]
diff --git a/nezha-fronted/src/components/common/table/settings/userTable.vue b/nezha-fronted/src/components/common/table/settings/userTable.vue
index b42b2042d..fd4613ddb 100644
--- a/nezha-fronted/src/components/common/table/settings/userTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/userTable.vue
@@ -39,9 +39,7 @@
       <template slot-scope="scope" :column="item">
         <template v-if="item.prop === 'name'">
           <div style="cursor:text" class="document-copy-block">
-            <div class="user-name-td document-copy-text" :class="{'margin-l-10': !scope.row.online}"
-             @mouseenter="labelHover(scope.row, 'user', true, false, $event)"
-             @mouseleave="labelHover(scope.row, 'user', false, false,)">
+            <div class="user-name-td document-copy-text" :class="{'margin-l-10': !scope.row.online}">
               <i class="nz-icon nz-icon-user1 user-online" v-if="scope.row.online" :title="$t('overall.online')"/>
               <div>
               <div class="flex-align-center">
@@ -120,21 +118,14 @@
       <div v-else>&nbsp;</div>
     </template>
   </el-table>
-  <alertLabel
-      v-if="alertLabelShow"
-      :id="alertLabelId"
-      :that="alertLabelObj"
-      :type="alertLabelType"
-    ></alertLabel>
   </div>
 </template>
 
 <script>
 import table from '@/components/common/mixin/table'
-import alertLabelMixin from '@/components/common/mixin/alertLabelMixin'
 export default {
   name: 'userTable',
-  mixins: [table, alertLabelMixin],
+  mixins: [table],
   props: {
     loading: Boolean
   },