diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue index 2caaeb6e0..00521b6c3 100644 --- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue +++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue @@ -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 } diff --git a/nezha-fronted/src/components/charts/chartDataFormat.js b/nezha-fronted/src/components/charts/chartDataFormat.js index 04fd7948f..eda266706 100644 --- a/nezha-fronted/src/components/charts/chartDataFormat.js +++ b/nezha-fronted/src/components/charts/chartDataFormat.js @@ -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转化配置信息 /*