From 2aab2cb5503605489b287e9b7fcdd39b256ac7c8 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 11 Oct 2021 16:12:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BC=98=E5=8C=96=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E4=B8=8E=E5=88=97=E8=A1=A8=E7=9A=84=E5=88=87=E6=8D=A2=E9=80=9F?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/mixin/detailViewMixin.js           |  1 +
 .../common/table/asset/assetTable.vue         | 41 +++++++++++++++++--
 .../src/components/page/asset/asset.vue       |  2 +-
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/common/mixin/detailViewMixin.js b/nezha-fronted/src/components/common/mixin/detailViewMixin.js
index b801a2bf9..a15f7caae 100644
--- a/nezha-fronted/src/components/common/mixin/detailViewMixin.js
+++ b/nezha-fronted/src/components/common/mixin/detailViewMixin.js
@@ -28,6 +28,7 @@ export default {
       }
       setTimeout(() => {
         this.detailViewLoading = false
+        this.$refs.clickSearch && this.$refs.clickSearch.needMore()
       }, 100)
     },
     searchDetail (params) {
diff --git a/nezha-fronted/src/components/common/table/asset/assetTable.vue b/nezha-fronted/src/components/common/table/asset/assetTable.vue
index ea377be1b..e16bae90b 100644
--- a/nezha-fronted/src/components/common/table/asset/assetTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue
@@ -52,11 +52,12 @@
           <span v-else >-</span>
         </template>
         <template v-else-if="item.prop === 'pingInfo'">
-          <el-popover :content="$t('asset.assetStatPre')+(scope.row.pingInfo.lastUpdate?utcTimeToTimezoneStr(scope.row.pingInfo.lastUpdate):$t('asset.assetStatDown'))" v-if="scope.row.pingInfo" placement="right" trigger="hover">
-            <div slot="reference">
-              <div :class="{'active-icon green-bg':scope.row.pingInfo.status == 1,'active-icon red-bg':scope.row.pingInfo.status == 0}"></div>{{scope.row.pingInfo.rtt?scope.row.pingInfo.rtt+'ms':''}}
+          <div class="ping-info">
+            <div :class="{'active-icon green-bg':scope.row.pingInfo.status == 1,'active-icon red-bg':scope.row.pingInfo.status == 0}" style="position: relative">
             </div>
-          </el-popover>
+            <div class="active-icon-content">{{$t('asset.assetStatPre')+(scope.row.pingInfo.lastUpdate?utcTimeToTimezoneStr(scope.row.pingInfo.lastUpdate):$t('asset.assetStatDown'))}}</div>
+            {{scope.row.pingInfo.rtt?scope.row.pingInfo.rtt+'ms':''}}
+          </div>
         </template>
         <template v-else-if="item.prop === 'model'">{{scope.row.model ? scope.row.model.name : '-'}}</template>
         <template v-else-if="item.prop === 'parent'">
@@ -336,3 +337,35 @@ export default {
   }
 }
 </script>
+<style scoped lang="scss">
+  /deep/ .el-table__row{
+    td{
+      position: relative;
+    }
+  }
+.active-icon-content {
+  display: none;
+  position: absolute;
+  background: #FFF;
+  min-width: 150px;
+  border: 1px solid #EBEEF5;
+  padding: 12px;
+  z-index: 2000;
+  color: #606266;
+  line-height: 1.4;
+  text-align: justify;
+  font-size: 14px;
+  box-shadow: 0 2px 12px 0 rgba(0,0,0,0.1);
+  left: 100%;
+  top: -60%;
+  width: auto;
+  white-space: nowrap;
+  transform: translateY(50%);
+}
+
+.ping-info:hover {
+  .active-icon-content{
+    display: block;
+  }
+}
+</style>
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 3bb9f051d..95cc9cdd2 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -51,7 +51,7 @@
         </top-tool-more-options>
       </template>
       <template v-slot:search >
-        <click-search ref="clickSearch" v-if="detailType === 'list'" :select-value.sync="selectValue" :title-search-list="titleSearchList" @reload="reloadTable"/>
+        <click-search ref="clickSearch" :select-value.sync="selectValue" :title-search-list="titleSearchList" @reload="reloadTable"/>
       </template>
       <template v-slot:default="slotProps">
         <asset-table