From 336ad36049b42bdd3a884246dacaa86bad1d3181 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Thu, 16 Jun 2022 16:51:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=9E=E4=BD=93=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=EF=BC=8C=E5=A4=B4=E9=83=A8=E5=B1=95=E7=A4=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=92=8C=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/components/components/table/common.scss       | 3 ---
 .../css/components/views/entityExplorer/entity-filter.scss   | 1 -
 src/views/entityExplorer/EntityTop.vue                       | 5 ++---
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/assets/css/components/components/table/common.scss b/src/assets/css/components/components/table/common.scss
index e0cc9b1f..770f3bae 100644
--- a/src/assets/css/components/components/table/common.scss
+++ b/src/assets/css/components/components/table/common.scss
@@ -1,6 +1,3 @@
-.pop-title{
-  margin-top: 7px;
-}
 .pop-custom {
   padding: 0 12px 12px 12px;
   border: 1px solid #EBEEF5;
diff --git a/src/assets/css/components/views/entityExplorer/entity-filter.scss b/src/assets/css/components/views/entityExplorer/entity-filter.scss
index bff1ae68..74c7e7d4 100644
--- a/src/assets/css/components/views/entityExplorer/entity-filter.scss
+++ b/src/assets/css/components/views/entityExplorer/entity-filter.scss
@@ -83,7 +83,6 @@
       .chart__loading {
         height: calc(100% - 65px);
       }
-      margin-top: 12px;
       .top-table-percent{
         display:grid;
         grid-template-columns: 50% auto;
diff --git a/src/views/entityExplorer/EntityTop.vue b/src/views/entityExplorer/EntityTop.vue
index 48e71d9a..8e680758 100644
--- a/src/views/entityExplorer/EntityTop.vue
+++ b/src/views/entityExplorer/EntityTop.vue
@@ -3,14 +3,13 @@
     <div class="pop-title">
       <div>
         <i :class="itemData.icon"></i>
-        <span>{{itemData.label}}</span>
+        <span>{{itemData.value}}{{$t('overall.operator')}} {{itemData.label}}</span>
       </div>
     </div>
 <!--    <button @click="esc" class="el-dialog__headerbtn" type="button"><i class="el-dialog__close el-icon el-icon-close"></i></button>-->
     <div class="filter-top-box">
       <div class="filter-top-body">
         <loading :loading="loading"></loading>
-        <div class="filter-top-type">{{itemData.value}}{{$t('overall.operator')}}{{itemData.label}}</div>
         <el-table
             :data="popoverData"
             :header-cell-style="tableHeaderCellStyle"
@@ -83,7 +82,7 @@ export default {
     },
     tableHeaderCellStyle ({ row, column, rowIndex, columnIndex }) {
       if (rowIndex === 0) {
-        return 'padding-bottom:5px;padding-top:14px;'
+        return 'padding-bottom:5px;padding-top:7px;'
       }
     },
     tableHeaderRowStyle ({ row, rowIndex }) {