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

NEZ-1688 fix：选择图表显示单位时，选择时间单位显示格式出错

Browse Source
This commit is contained in:
zhangyu
2022-03-23 10:07:06 +08:00
parent 712369ef2e
commit 6a89b446bd
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
View File

@@ -82,7 +82,7 @@ export default {
chartOption.yAxis.axisLabel.formatter = this.yAxisLabelFormatter(minValue, maxValue, copies, unit, dot)
chartOption.yAxis.minInterval = chartDataFormat.Interval(maxValue, copies, unit.type, 'min')
chartOption.yAxis.maxInterval = chartDataFormat.Interval(maxValue, copies, unit.type, 'max') * Math.ceil(chartOption.series.length / 5)
if (unit.type = 'Time') {
if (unit.type === 'Time') {
delete chartOption.yAxis.minInterval
delete chartOption.yAxis.maxInterval
}

2
nezha-fronted/src/components/charts/chartDataFormat.js
View File

@@ -421,7 +421,7 @@ function timeFormat34 (value) {
return bus.timeFormate(parseInt(value), 'YYYY-MM-DD HH:mm:ss')
}
function timeFormat35 (value) {
return bus.timeFormate(parseInt(value), 'MM/dd/yyyy h:mm:ss a')
return bus.timeFormate(parseInt(value), 'MM/DD/yyyy h:mm:ss A')
}
// unit转化配置信息
/*