From 8b4e3447d7101af4646e1f482577b39ae548c1eb Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 5 Mar 2021 14:27:11 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A0=E6=A1=86=E9=AB=98=E5=BA=A6=20=E4=BB=A5=E5=8F=8A=20?=
 =?UTF-8?q?=E9=99=84=E8=BF=91=E7=9B=B8=E5=85=B3=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/stylus/main.scss           | 12 ++++++------
 nezha-fronted/src/components/common/pickTime.vue    |  2 +-
 nezha-fronted/src/components/common/searchInput.vue | 10 +++++-----
 nezha-fronted/src/components/common/timePicker.vue  |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index 9aa11c421..c16bd0f22 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -217,7 +217,7 @@ li{
 }
 .nz-btn.nz-btn-size-normal:not(.nz-btn-size-alien) {
   font-size: 12px;
-  height: 24px;
+  height: 28px;
   padding: 0 8px;
 }
 .nz-btn.nz-btn-size-small {
@@ -672,7 +672,7 @@ li{
 .top-tool-right {
   display: flex;
   align-content: center;
-  height: 26px;
+  height: 30px;
   margin-right: 76px;
 }
 .top-tool-main-right {
@@ -719,7 +719,7 @@ li{
 /* begin--二级顶部工具栏*/
 .sub-top-tools {
   display: flex;
-  height: 30px;
+  height: 32px;
   align-items: center;
   justify-content: space-between;
   border-top: 1px solid #DCDFE6;
@@ -827,7 +827,7 @@ li{
 }
 .window-control-btn>i {
   color: #909399;
-  font-size: 17px;
+  font-size: 19px;
 }
 .window-control-btn>i:hover {
   color: $global-text-color-active;
@@ -1879,8 +1879,8 @@ revo-grid[theme=compact] revogr-viewport revogr-header .data-header-cell {
   background-color: $content-right-background-color;
 }
 .query-input-active .el-input__inner, .query-input-inactive .el-input__inner {
-  height: 25px;
-  line-height: 25px !important;
+  height: 30px;
+  line-height: 30px !important;
 }
 
 .el-textarea:not(.not-fixed-height) textarea {
diff --git a/nezha-fronted/src/components/common/pickTime.vue b/nezha-fronted/src/components/common/pickTime.vue
index 17172aa12..c3497b71c 100644
--- a/nezha-fronted/src/components/common/pickTime.vue
+++ b/nezha-fronted/src/components/common/pickTime.vue
@@ -2,7 +2,7 @@
   <div class="interval-refresh ">
     <time-picker v-if="showTimePicker" ref="timePicker" class="time-picker" @change="dateChange" :default-pick="defaultPick" :show-empty="showEmpty" v-model="this.searchTime"></time-picker>
     <chart-unit v-model="unit" v-if="useChartUnit"></chart-unit>
-      <div class="nz-btn-group nz-btn-group-size-normal nz-btn-group-light margin-r-20" v-show="useRefresh" style="height: 24px;line-height: 24px;vertical-align: middle;">
+      <div class="nz-btn-group nz-btn-group-size-normal nz-btn-group-light margin-r-20" v-show="useRefresh" style="vertical-align: middle;">
         <button style="border-right: 1px solid rgba(162,162,162,0.50);" type="button" class="nz-btn nz-btn-size-normal nz-btn-style-light" @click="refreshDataFunc" :id="id+'-refresh'">
           <i style="font-size: 14px" class="global-active-color nz-icon nz-icon-refresh"></i>&nbsp;
           <span class="nz-btn nz-btn-text" ><slot name="added-text"></slot></span>
diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue
index 8b9d1cd59..bc9b3faed 100644
--- a/nezha-fronted/src/components/common/searchInput.vue
+++ b/nezha-fronted/src/components/common/searchInput.vue
@@ -1337,10 +1337,10 @@
         min-width: 231px;
         background-color: $content-right-background-color;
         color: rgba(0,0,0,.55);
-        height: 24px;
-        line-height: 24px;
-        border-bottom-left-radius: 5px;
-        border-top-left-radius: 5px;
+        height: 28px;
+        line-height: 28px;
+        border-bottom-left-radius: 2px;
+        border-top-left-radius: 2px;
         display: flex;
         position: relative;
     }
@@ -1357,7 +1357,7 @@
         line-height: 16px;
         text-align: center;
         border-right: 1px solid #e5e5e5;
-        margin-top: 4px;
+        margin-top: 6px;
         position: relative;
     }
     .search-input-all .input-center-box{
diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue
index cbfc839dc..465961653 100644
--- a/nezha-fronted/src/components/common/timePicker.vue
+++ b/nezha-fronted/src/components/common/timePicker.vue
@@ -12,14 +12,14 @@
     color: #fff;
   }
   .calendar-dropdown-title {
-    line-height:24px;
+    line-height:28px;
     padding-left:5px;
     margin-left:0px;
     margin-top: 0px !important;
     text-align:left;
     border-radius:2px;
     min-width:80px;
-    height:24px;
+    height:28px;
     border:solid 1px  #d8dce1;
     white-space: nowrap;
     overflow: hidden;