Merge remote-tracking branch 'origin/codeCheck' into codeCheck

# Conflicts:
#	nezha-fronted/src/components/page/dashboard/overview/overview2.vue

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{
@@ -45,7 +50,6 @@
   width: 88px;
 }
 .tool-container .operation{
-  flex: 2;
   display: inline-block;
   line-height: 35px;
 }

nezha-fronted/src/components/page/dashboard/overview/overview2.vue

@@ -5,8 +5,8 @@
     <!--标题-->
     <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">