Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0dev-2.0

# Conflicts:
#	nezha-fronted/src/components/common/project/topologyL5.vue

2 files changed, 13 insertions, 4 deletions

diff --git a/nezha-fronted/src/components/common/project/topology.scss b/nezha-fronted/src/components/common/project/topology.scss
index c8660b557..40cb598ef 100644
--- a/nezha-fronted/src/components/common/project/topology.scss
+++ b/nezha-fronted/src/components/common/project/topology.scss
@@ -545,11 +545,20 @@
 .selpop {
   cursor: pointer;
 }
-.topo-noData /deep/ .icon{
-  width: 5rem;
-  height: 5rem;
+.topo-noData{
   position: absolute;
   top: 50%;
   left: 50%;
   transform: translate(-50%,-50%);
+  .content{
+    text-align: center;
+    font-size: 16px;
+    color: #333333;
+    font-weight: 400;
+  }
+}
+.topo-noData /deep/ .icon{
+  width: 5rem;
+  height: 5rem;
+
 }
diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue
index 2c6385757..43553fcf0 100644
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/nezha-fronted/src/components/common/project/topologyL5.vue
@@ -232,7 +232,7 @@
               <svg class="icon" aria-hidden="true">
                 <use xlink:href="#nz-icon-no-data-project"></use>
               </svg>
-              <div class="icon" style="font-size: 16px;color: #333333;font-weight: 400;top: 57%;left: 51%">No data</div>
+              <div class="content">No data</div>
             </div>
           </div>
           <!--endpoint-->