mirror of
https://github.com/louislam/uptime-kuma.git
synced 2024-09-08 02:12:10 +00:00
Merge branch 'fix/chart-error'
This commit is contained in:
commit
39aa0a7f07
@ -24,7 +24,7 @@ import timezone from "dayjs/plugin/timezone";
|
|||||||
import utc from "dayjs/plugin/utc";
|
import utc from "dayjs/plugin/utc";
|
||||||
import { LineChart } from "vue-chart-3";
|
import { LineChart } from "vue-chart-3";
|
||||||
import { useToast } from "vue-toastification";
|
import { useToast } from "vue-toastification";
|
||||||
import { DOWN } from "../util.ts";
|
import { DOWN, log } from "../util.ts";
|
||||||
|
|
||||||
dayjs.extend(utc);
|
dayjs.extend(utc);
|
||||||
dayjs.extend(timezone);
|
dayjs.extend(timezone);
|
||||||
@ -217,7 +217,9 @@ export default {
|
|||||||
watch: {
|
watch: {
|
||||||
// Update chart data when the selected chart period changes
|
// Update chart data when the selected chart period changes
|
||||||
chartPeriodHrs: function (newPeriod) {
|
chartPeriodHrs: function (newPeriod) {
|
||||||
if (newPeriod === "0") {
|
|
||||||
|
// eslint-disable-next-line eqeqeq
|
||||||
|
if (newPeriod == "0") {
|
||||||
this.heartbeatList = null;
|
this.heartbeatList = null;
|
||||||
this.$root.storage().removeItem(`chart-period-${this.monitorId}`);
|
this.$root.storage().removeItem(`chart-period-${this.monitorId}`);
|
||||||
} else {
|
} else {
|
||||||
@ -240,7 +242,11 @@ export default {
|
|||||||
// And mirror latest change to this.heartbeatList
|
// And mirror latest change to this.heartbeatList
|
||||||
this.$watch(() => this.$root.heartbeatList[this.monitorId],
|
this.$watch(() => this.$root.heartbeatList[this.monitorId],
|
||||||
(heartbeatList) => {
|
(heartbeatList) => {
|
||||||
if (this.chartPeriodHrs !== "0") {
|
|
||||||
|
log.debug("ping_chart", `this.chartPeriodHrs type ${typeof this.chartPeriodHrs}, value: ${this.chartPeriodHrs}`);
|
||||||
|
|
||||||
|
// eslint-disable-next-line eqeqeq
|
||||||
|
if (this.chartPeriodHrs != "0") {
|
||||||
const newBeat = heartbeatList.at(-1);
|
const newBeat = heartbeatList.at(-1);
|
||||||
if (newBeat && dayjs.utc(newBeat.time) > dayjs.utc(this.heartbeatList.at(-1)?.time)) {
|
if (newBeat && dayjs.utc(newBeat.time) > dayjs.utc(this.heartbeatList.at(-1)?.time)) {
|
||||||
this.heartbeatList.push(heartbeatList.at(-1));
|
this.heartbeatList.push(heartbeatList.at(-1));
|
||||||
|
@ -102,7 +102,7 @@ class Logger {
|
|||||||
}
|
}
|
||||||
else if (level === "DEBUG") {
|
else if (level === "DEBUG") {
|
||||||
if (exports.isDev) {
|
if (exports.isDev) {
|
||||||
console.debug(formattedMessage);
|
console.log(formattedMessage);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -113,7 +113,7 @@ class Logger {
|
|||||||
console.error(formattedMessage);
|
console.error(formattedMessage);
|
||||||
} else if (level === "DEBUG") {
|
} else if (level === "DEBUG") {
|
||||||
if (isDev) {
|
if (isDev) {
|
||||||
console.debug(formattedMessage);
|
console.log(formattedMessage);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
console.log(formattedMessage);
|
console.log(formattedMessage);
|
||||||
|
Loading…
Reference in New Issue
Block a user