gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NEZ-1379 fix：时间范围选择器 end time 默认为 23:59:59

Browse Source
This commit is contained in:
zhangyu
2021-11-30 16:47:35 +08:00
parent 85a35de8d0
commit 02da69a79e
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nezha-fronted/src/components/charts/chartPreview.vue
View File

@@ -1783,6 +1783,7 @@ export default {
} }
}) })
this.setColor(legend.length) this.setColor(legend.length)
legend.forEach((t, i) => { t.color = this.bgColorList[i] })
this.initChart(this.chart, series, this.$refs.screenShowArea, legend) this.initChart(this.chart, series, this.$refs.screenShowArea, legend)
} }
}).catch(error => { }).catch(error => {

1
nezha-fronted/src/components/common/timePicker.vue
View File

@@ -91,6 +91,7 @@
<my-date-picker prefix-icon=" " class="panel-time-picker-hidden " size="mini" ref="calendar" <my-date-picker prefix-icon=" " class="panel-time-picker-hidden " size="mini" ref="calendar"
format="yyyy/MM/dd HH:mm:ss" @change="dateChange" v-model="searchTime" type="datetimerange" format="yyyy/MM/dd HH:mm:ss" @change="dateChange" v-model="searchTime" type="datetimerange"
popper-class="panel-time-picker-popper time-picker-popover__select-top" popper-class="panel-time-picker-popper time-picker-popover__select-top"
:default-time="['00:00:00', '23:59:59']"
:range-separator="$t('dashboard.panel.to')" :range-separator="$t('dashboard.panel.to')"
:start-placeholder="$t('dashboard.panel.startTime')" :start-placeholder="$t('dashboard.panel.startTime')"
:end-placeholder="$t('dashboard.panel.endTime')" align="right"> :end-placeholder="$t('dashboard.panel.endTime')" align="right">