From 9258a0d7fdbad688dcafcb516b6c6343d6c86899 Mon Sep 17 00:00:00 2001
From: zhangxiaolong <zhangxiaolong@geedgenetworks.com>
Date: Wed, 13 Apr 2022 19:06:47 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1787=20fix=20:=20=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E7=BB=84=E4=BB=B6=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20=E5=9B=BD=E9=99=85=E5=8C=96=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/panelTabNew.scss         | 15 ++++++--
 .../css/components/common/timePicker.scss     |  8 ++--
 .../src/components/common/timePicker.vue      | 37 +++++--------------
 3 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/panelTabNew.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/panelTabNew.scss
index b13a423ec..6931f0ade 100644
--- a/nezha-fronted/src/assets/css/components/common/bottomBox/panelTabNew.scss
+++ b/nezha-fronted/src/assets/css/components/common/bottomBox/panelTabNew.scss
@@ -151,10 +151,17 @@
       background: $--background-color-empty;
     }
   }
-  &.el-button--mini{
-    color: $--color-text-label;
-    background-color: $--color-primary;
-    border-color: $--color-primary;
+  .date-range-panel{
+    .el-button--primary{
+      color: $--color-text-label;
+      background-color: $--color-primary;
+      border-color: $--color-primary;
+    }
+    .el-button--primary:hover{
+      color: $--color-text-label;
+      background-color: $--color-primary;
+      border-color: $--color-primary;
+    }
   }
 
   .nz-dashboard-dropdown {
diff --git a/nezha-fronted/src/assets/css/components/common/timePicker.scss b/nezha-fronted/src/assets/css/components/common/timePicker.scss
index 4462ebe91..f48ba5ff5 100644
--- a/nezha-fronted/src/assets/css/components/common/timePicker.scss
+++ b/nezha-fronted/src/assets/css/components/common/timePicker.scss
@@ -108,7 +108,7 @@
   visibility: hidden !important;
   position: absolute;
   top: 0;
-  left: 0;
+  left: -20px;
 }
 
 .date-range-text {
@@ -183,7 +183,9 @@
     }
 
     .content-input {
+      width: 230px;
       .el-input{
+        width: auto;
         .el-input__inner{
           border: 1px solid #E7EAED;
           border-radius: 2px;
@@ -198,10 +200,6 @@
       }
     }
 
-    .content-input:focus {
-      border: 1px solid #169AFF;
-    }
-
     .date-range-history {
       flex: 1;
       overflow-y: auto;
diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue
index b43d5a7c5..625ae3599 100644
--- a/nezha-fronted/src/components/common/timePicker.vue
+++ b/nezha-fronted/src/components/common/timePicker.vue
@@ -34,7 +34,7 @@
             class="date-range-panel-content date-range-panel-content-left"
           >
             <div class="date-range-title" style="padding-left: 0">
-              Absolute time range
+              {{$t('timepicker.timerange')}}
             </div>
             <my-date-picker
               prefix-icon=" "
@@ -50,13 +50,13 @@
             >
             </my-date-picker>
 
-            <div class="content-title">From</div>
+            <div class="content-title">{{$t('dashboard.panel.chartForm.valMapping.from')}}</div>
             <div @click="myDatePickerShow('start')" tabindex="1" class="content-input">
-              <el-input v-model="searchTime[0]" @change="dateChange('start',searchTime[0])"> </el-input>
+              <el-input  v-model="searchTime[0]" @change="dateChange('start',searchTime[0])"> </el-input>
             </div>
-            <div class="content-title">To</div>
+            <div class="content-title">{{$t('dashboard.panel.chartForm.valMapping.to')}}</div>
             <div @click="myDatePickerShow('end')" tabindex="2" class="content-input">
-              <el-input v-model="searchTime[1]" @change="dateChange('end',searchTime[1])"> </el-input>
+              <el-input  v-model="searchTime[1]" @change="dateChange('end',searchTime[1])"> </el-input>
 
             </div>
             <div>
@@ -65,11 +65,11 @@
                 type="primary"
                 size="mini"
                 class="time-range-button el-button--primary"
-                >Apply time range</el-button
+                >{{$t('timepicker.applytimerange')}}</el-button
               >
             </div>
             <div class="date-range-title" style="padding-left: 0">
-              Recently used absolute ranges
+              {{$t('timepicker.recentlyUsed')}}
             </div>
             <div class="date-range-history">
               <div
@@ -79,7 +79,7 @@
                 @click="historyChange(item)"
               >
                 {{ timeFormate(item.start) }}
-                —
+                {{ $t("dashboard.panel.to") }}
                 {{ timeFormate(item.end) }}
               </div>
             </div>
@@ -89,7 +89,7 @@
             class="date-range-panel-content date-range-panel-content-right"
             style="border-left: 1px solid rgba(0, 0, 0, 0.09)"
           >
-            <div class="date-range-title">Relatime time ranges</div>
+            <div class="date-range-title">{{$t('timepicker.relatime')}}</div>
             <ul class="date-range-item">
               <li
                 v-for="(item, key) in timeData"
@@ -247,7 +247,6 @@ export default {
     this.getItem()
     this.getUtcStr()
     this.getRangeHistoryArr()
-    console.log(this.sign)
   },
   methods: {
     changeDropdownFlag(){
@@ -300,10 +299,8 @@ export default {
       this.$set(this.searchTime, 2, '')
       this.showDropdown()
       this.getRangeHistoryArr()
-      console.log('timerange里searchTime', this.searchTime)
       this.setSearchTime('', '', this.searchTime)
       this.$emit('change', this.searchTime)
-      console.log(this.searchTime)
     },
     showDropdown () {
       this.dropdownFlag = !this.dropdownFlag
@@ -314,9 +311,7 @@ export default {
           const startTime = bus.timeFormate(this.searchTimeValue).trim().split(' ')[0] + ' '
           this.$set(this.searchTime, 0, startTime)
         } else {
-          console.log(v)
           const str = v.trim().split(' ')[1]
-          console.log(str)
           const reg = /^([01]\d|2[0-3]):[0-5]\d:[0-5]\d$/
           if (reg.test(str)) {
             const startTime = bus.timeFormate(v)
@@ -331,7 +326,6 @@ export default {
           this.$set(this.searchTime, 1, endTime)
         } else {
           const str = v.trim().split(' ')[1]
-          console.log(str)
           const reg = /^([01]\d|2[0-3]):[0-5]\d:[0-5]\d$/
           if (reg.test(str)) {
             const endTime = bus.timeFormate(v)
@@ -342,7 +336,6 @@ export default {
         }
       }
       this.searchTime[2] = ''
-      console.log('searchTime', this.searchTime)
       this.$set(this.showTime, 'id', 0)
       this.$set(
         this.showTime,
@@ -353,15 +346,12 @@ export default {
           ' ' +
           this.searchTime[1]
       )
-      console.log('showTime', this.showTime)
     },
     setCustomTime (timeGroup, timeRange) {
       if (timeGroup) {
-        console.log('timeGroup', timeGroup)
         this.showTime = this.nowTimeType = this.timeData.find(
           (item) => item.id == timeGroup.id
         )
-        console.log(this.showTime)
         if (this.showTime) {
           this.showTime = Object.assign({}, this.showTime)
           this.$set(this.searchTime, 0, timeGroup.start_time)
@@ -371,7 +361,6 @@ export default {
           this.showTime = this.nowTimeType = {
             text: time[0] + ' ' + this.$t('dashboard.panel.to') + ' ' + time[1]
           }
-          console.log(this.showTime)
           this.$set(this.searchTime, 0, bus.timeFormate(time[0]))
           this.$set(this.searchTime, 1, bus.timeFormate(time[1]))
           // this.$set(this.searchTime, 0, bus.timeFormate(timeGroup.start_time));
@@ -397,7 +386,6 @@ export default {
           // this.$set(this.searchTime, 0, bus.timeFormate(time[0]));
         }
       } else {
-        console.log('no timegroup')
         this.showTime = this.nowTimeType = {
           id: 4,
           text: this.$t('dashboard.panel.lastOneHour'),
@@ -410,7 +398,6 @@ export default {
       }
     },
     timeChange (val, from) {
-      console.log(val, from)
       this.nowTimeType = val
       this.$set(this.showTime, 'id', val.id)
       this.$set(this.showTime, 'text', val.text)
@@ -450,7 +437,6 @@ export default {
             }
           }
         } else {
-          console.log('else', this.searchTime)
           // this.isCustom = false;
           this.showDropdown()
           if (this.showEmpty && id === 12) {
@@ -534,11 +520,6 @@ export default {
     }
   },
   watch: {
-    searchTime: {
-      handler (n, o) {
-        console.log(n)
-      }
-    },
     defaultPick: {
       immediate: true,
       handler (n, o) {