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"
>
- Absolute time range
+ {{$t('timepicker.timerange')}}
- From
+ {{$t('dashboard.panel.chartForm.valMapping.from')}}
-
+
- To
+ {{$t('dashboard.panel.chartForm.valMapping.to')}}
-
+
@@ -65,11 +65,11 @@
type="primary"
size="mini"
class="time-range-button el-button--primary"
- >Apply time range{{$t('timepicker.applytimerange')}}
- Recently used absolute ranges
+ {{$t('timepicker.recentlyUsed')}}
{{ timeFormate(item.start) }}
- —
+ {{ $t("dashboard.panel.to") }}
{{ timeFormate(item.end) }}
@@ -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)"
>
- Relatime time ranges
+ {{$t('timepicker.relatime')}}
- 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) {