From e71339f21c1175a039e0dd5d4214b996a32cbc69 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 16 Dec 2020 11:27:29 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9overview=E9=A1=B6?=
 =?UTF-8?q?=E9=83=A8tool=E5=8C=BA=E5=9F=9F=E7=9A=84=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/dashboard/overview/overview2.scss         | 14 +++++++++-----
 .../page/dashboard/overview/overview2.vue          |  4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview2.scss b/nezha-fronted/src/components/page/dashboard/overview/overview2.scss
index ef0e0a70b..dc4685d5c 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/overview2.scss
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview2.scss
@@ -4,9 +4,9 @@
 .overview-content-header{
   display: flex;
   padding: 8px 0 2px 0;
+  justify-content: space-between;
 }
 .overview-content-header .header-title{
-  flex:12;
   height: 35px;
   line-height: 35px;
   font-size: 1.5rem !important;
@@ -14,15 +14,21 @@
   margin-left: 15px;
 }
 .overview-content-header .header-tool{
-  flex: 2;
   height: 35px;
+  min-width: 340px;
+  display: flex;
+  padding: 5px;
 }
 .header-tool .tool-container{
   display: flex;
   text-align: center;
+  justify-content: space-between;
+  min-width: 310px;
+}
+.tool-container .pickTime{
+  margin-right: -20px;
 }
 .tool-container .time{
-  flex: 4;
   font-size: 1rem !important;
   display: inline-block;
   height: 35px;
@@ -31,7 +37,6 @@
   vertical-align: middle;
 }
 .tool-container .date{
-  flex: 4;
   height: 35px;
 }
 .date .week{
@@ -44,7 +49,6 @@
   line-height: 0.75rem;
 }
 .tool-container .operation{
-  flex: 2;
   display: inline-block;
   line-height: 35px;
 }
diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
index ec6c942bf..2b8644313 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
@@ -5,15 +5,15 @@
     <!--标题-->
     <div class="overview-content-header">
       <div class="header-title" :class="{'hide-div':!isFullScreen}">{{systemName&&systemName != 'undefined'&&systemName != null?systemName: $t('dashboard.overview.contentTitle')}}</div>
-      <div class="overview-loading"><loading ref="overviewLoading" ></loading></div>
       <div class="header-tool">
+        <div class="overview-loading"><loading ref="overviewLoading" ></loading></div>
         <div class="tool-container">
           <div class="time">{{sysTime}}</div>
           <div class="date">
             <div class="week">{{sysWeek}}</div>
             <div class="sys-date">{{sysDate}}</div>
           </div>
-          <pick-time  :showTimePicker="false" class="float-right pickTime margin-l-20" :refresh-data-func="setFreshDataTimer" v-model="searchTime" :use-chart-unit="false" ref="pickTime"></pick-time>
+          <pick-time  :showTimePicker="false" class="float-right pickTime" :refresh-data-func="setFreshDataTimer" v-model="searchTime" :use-chart-unit="false" ref="pickTime"></pick-time>
           <div class="operation" @click="switchFullScreen" ><span ><i class="nz-icon screen-icon" :class="{'nz-icon-maxview':!isFullScreen,'nz-icon-exit-full-screen':isFullScreen}"></i></span></div>
         </div>
       </div>