From 28e9e55c0e883f128ad1f2eadfcc867ed2be0966 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Mon, 29 Nov 2021 16:46:53 +0800
Subject: [PATCH] =?UTF-8?q?merge:=20=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/popBox/selectPanel.scss |  6 ++
 .../common/rightBox/alertRuleBox.scss         |  4 +
 .../page/dashboard/overview/overview2.vue     | 86 -------------------
 3 files changed, 10 insertions(+), 86 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/popBox/selectPanel.scss b/nezha-fronted/src/assets/css/components/common/popBox/selectPanel.scss
index 254cf774d..a62303378 100644
--- a/nezha-fronted/src/assets/css/components/common/popBox/selectPanel.scss
+++ b/nezha-fronted/src/assets/css/components/common/popBox/selectPanel.scss
@@ -14,6 +14,12 @@
       cursor: pointer;
     }
   }
+  .el-dropdown-menu__item {
+    padding: 0;
+    div {
+      padding: 0 20px;
+    }
+  }
 }
 .tree--node > span:last-of-type > span > i {
   font-weight: normal !important;
diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss
index d45f7b479..d5c627077 100644
--- a/nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss
+++ b/nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss
@@ -62,6 +62,10 @@
   .query-row .metric-selector-input-box {
     width: calc(100% - 120px);
   }
+
+  .el-input-number--small {
+    width: 100%;
+  }
 }
 .severity-item{
   color: $--color-text-secondary;
diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
index 3d2f4622d..4e1c06f9f 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
@@ -1566,89 +1566,3 @@ export default {
   }
 }
 </script>
-
-<style lang="scss">
-  @import "./overview2.scss";
-
-  .leaflet-control-zoom{
-    border: 1px solid #E7EAED !important;
-    box-shadow: -1px 1px 9px -1px rgba(205,205,205,0.77) !important;
-    .leaflet-control-zoom-out,.leaflet-control-zoom-in{
-      opacity: .7;
-      background: #FFF;
-    }
-  }
-  .leaflet-control-attribution{
-    background-color: unset !important;
-    color: rgba(178, 178, 178, 0.77);
-  }
-  @keyframes error-animation{
-    0% {fill-opacity:.5}
-    50% {fill-opacity:0.75}
-    100% {fill-opacity:1}
-  }
-  .error-item{
-    color: #FADED7 ;
-    animation: error-animation 1s infinite ease-in-out;
-    animation-direction:normal;
-  }
-  .real-marker{
-    pointer-events: none;
-  }
-  .error-color{
-
-  }
-  .my-pane {
-    position: fixed;
-    width: 1px;
-    z-index: 99999;
-    height: 1px;
-    background-color: transparent;
-  }
-  .leaflet-bottom{
-    z-index: 409;
-  }
-  .el-carousel--horizontal{
-    height: 100%;
-  }
-  .el-carousel__container{
-    height: calc(100% - 36px);
-  }
-  .el-carousel__item .project-name {
-    font-size: 18px;
-    margin: 0;
-    position: absolute;
-    z-index: 1;
-  }
-
-  .el-carousel__item:nth-child(2n) {
-    /*background-color: #99a9bf;*/
-  }
-
-  .el-carousel__item:nth-child(2n+1) {
-    /*background-color: #d3dce6;*/
-  }
-</style>
-<style scoped>
-  .maskLayer{
-    width: 100%;
-    height: 100%;
-    opacity: 0;
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 10;
-    cursor: pointer;
-  }
-  /deep/ .el-carousel__indicator--horizontal .el-carousel__button{
-    background-color: #C0C4CC;
-    opacity: .24;
-    height: 10px;
-    width: 10px;
-    border-radius: 50%;
-  }
-  /deep/ .el-carousel__indicator--horizontal.is-active .el-carousel__button{
-    opacity: 1;
-  }
-
-</style>