Drei Linien werden angezeigt
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
"use client";
|
"use client"; // components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopMeasurementChart.tsx
|
||||||
import React, { useEffect, useRef, useState } from "react";
|
import React, { useEffect, useRef, useState } from "react";
|
||||||
import { useSelector, useDispatch } from "react-redux";
|
import { useSelector, useDispatch } from "react-redux";
|
||||||
import { RootState } from "../../../../../../redux/store";
|
import { RootState } from "../../../../../../redux/store";
|
||||||
@@ -23,6 +23,16 @@ const LoopMeasurementChart = () => {
|
|||||||
|
|
||||||
const chartRef = useRef<HTMLCanvasElement>(null);
|
const chartRef = useRef<HTMLCanvasElement>(null);
|
||||||
const chartInstance = useRef<Chart | null>(null);
|
const chartInstance = useRef<Chart | null>(null);
|
||||||
|
const [zoomPlugin, setZoomPlugin] = useState<any>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (typeof window !== "undefined") {
|
||||||
|
import("chartjs-plugin-zoom").then((mod) => {
|
||||||
|
setZoomPlugin(mod.default);
|
||||||
|
Chart.register(mod.default);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (chartRef.current) {
|
if (chartRef.current) {
|
||||||
@@ -34,7 +44,7 @@ const LoopMeasurementChart = () => {
|
|||||||
console.log("Von Datum:", vonDatum, "Bis Datum:", bisDatum);
|
console.log("Von Datum:", vonDatum, "Bis Datum:", bisDatum);
|
||||||
console.log("Selected Mode:", selectedMode);
|
console.log("Selected Mode:", selectedMode);
|
||||||
|
|
||||||
// Basis-Datasets für alle drei Linien
|
// Basis-Datasets für alle Datenpunkte
|
||||||
const datasets = [
|
const datasets = [
|
||||||
{
|
{
|
||||||
label: "Messwert Minimum (kOhm)",
|
label: "Messwert Minimum (kOhm)",
|
||||||
@@ -56,17 +66,41 @@ const LoopMeasurementChart = () => {
|
|||||||
backgroundColor: "rgba(192, 75, 75, 0.2)",
|
backgroundColor: "rgba(192, 75, 75, 0.2)",
|
||||||
fill: false,
|
fill: false,
|
||||||
},
|
},
|
||||||
{
|
];
|
||||||
label: "Messwert Aktuell (m) - Orange",
|
|
||||||
|
// Falls DIA0: `m` als aktueller Messwert verwenden
|
||||||
|
if (
|
||||||
|
selectedMode === "DIA0" &&
|
||||||
|
loopMeasurementCurveChartData.some((entry) => entry.m !== undefined)
|
||||||
|
) {
|
||||||
|
datasets.push({
|
||||||
|
label: "Messwert Aktuell (m)",
|
||||||
data: loopMeasurementCurveChartData.map((entry) => ({
|
data: loopMeasurementCurveChartData.map((entry) => ({
|
||||||
x: new Date(entry.t).getTime(),
|
x: new Date(entry.t).getTime(),
|
||||||
y: entry.m ?? NaN, // Falls `m` fehlt, bleibt die Stelle leer
|
y: entry.m ?? NaN,
|
||||||
})),
|
})),
|
||||||
borderColor: "rgba(255, 165, 0, 1)", // Orange
|
borderColor: "rgba(255, 165, 0, 1)", // Orange
|
||||||
backgroundColor: "rgba(255, 165, 0, 0.2)",
|
backgroundColor: "rgba(255, 165, 0, 0.2)",
|
||||||
fill: false,
|
fill: false,
|
||||||
},
|
});
|
||||||
];
|
}
|
||||||
|
|
||||||
|
// Falls DIA1 oder DIA2: `g` als Durchschnittswert verwenden
|
||||||
|
if (
|
||||||
|
(selectedMode === "DIA1" || selectedMode === "DIA2") &&
|
||||||
|
loopMeasurementCurveChartData.some((entry) => entry.g !== undefined)
|
||||||
|
) {
|
||||||
|
datasets.push({
|
||||||
|
label: "Messwert Durchschnitt (g)",
|
||||||
|
data: loopMeasurementCurveChartData.map((entry) => ({
|
||||||
|
x: new Date(entry.t).getTime(),
|
||||||
|
y: entry.g ?? NaN,
|
||||||
|
})),
|
||||||
|
borderColor: "rgba(75, 75, 192, 1)", // Blau
|
||||||
|
backgroundColor: "rgba(75, 75, 192, 0.2)",
|
||||||
|
fill: false,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
const ctx = chartRef.current.getContext("2d");
|
const ctx = chartRef.current.getContext("2d");
|
||||||
if (ctx) {
|
if (ctx) {
|
||||||
@@ -92,7 +126,11 @@ const LoopMeasurementChart = () => {
|
|||||||
max: new Date(bisDatum).getTime(),
|
max: new Date(bisDatum).getTime(),
|
||||||
},
|
},
|
||||||
y: {
|
y: {
|
||||||
title: { display: true, text: "Messwert (kOhm)" },
|
ticks: {
|
||||||
|
callback: (value) =>
|
||||||
|
(typeof value === "number" ? value.toFixed(2) : value) +
|
||||||
|
" kOhm",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
plugins: {
|
plugins: {
|
||||||
@@ -107,35 +145,22 @@ const LoopMeasurementChart = () => {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
zoom: {
|
zoom: {
|
||||||
pan: {
|
pan: { enabled: true, mode: "x" },
|
||||||
enabled: true,
|
|
||||||
mode: "xy",
|
|
||||||
},
|
|
||||||
zoom: {
|
zoom: {
|
||||||
wheel: { enabled: true },
|
wheel: { enabled: true },
|
||||||
pinch: { enabled: true },
|
pinch: { enabled: true },
|
||||||
mode: "xy",
|
mode: "x",
|
||||||
onZoom: ({ chart }) => {
|
onZoomComplete: (chart) => {
|
||||||
const xScale = chart.scales.x;
|
const xScale = chart.chart.scales.x;
|
||||||
if (xScale.min && xScale.max) {
|
const newVonDatum = new Date(xScale.min)
|
||||||
const newVonDatum = new Date(xScale.min)
|
.toISOString()
|
||||||
.toISOString()
|
.split("T")[0];
|
||||||
.split("T")[0];
|
const newBisDatum = new Date(xScale.max)
|
||||||
const newBisDatum = new Date(xScale.max)
|
.toISOString()
|
||||||
.toISOString()
|
.split("T")[0];
|
||||||
.split("T")[0];
|
|
||||||
|
|
||||||
if (newVonDatum !== vonDatum)
|
dispatch(setVonDatum(newVonDatum));
|
||||||
dispatch(setVonDatum(newVonDatum));
|
dispatch(setBisDatum(newBisDatum));
|
||||||
if (newBisDatum !== bisDatum)
|
|
||||||
dispatch(setBisDatum(newBisDatum));
|
|
||||||
|
|
||||||
console.log(
|
|
||||||
"🔄 Redux Update nach Zoom:",
|
|
||||||
newVonDatum,
|
|
||||||
newBisDatum
|
|
||||||
);
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -6,5 +6,5 @@
|
|||||||
2: Patch oder Hotfix (Bugfixes oder kleine Änderungen).
|
2: Patch oder Hotfix (Bugfixes oder kleine Änderungen).
|
||||||
|
|
||||||
*/
|
*/
|
||||||
const webVersion = "1.6.111";
|
const webVersion = "1.6.112";
|
||||||
export default webVersion;
|
export default webVersion;
|
||||||
|
|||||||
Reference in New Issue
Block a user