From 327a10138631d23197da0f191535dd7726873382 Mon Sep 17 00:00:00 2001 From: ISA Date: Tue, 25 Feb 2025 15:54:33 +0100 Subject: [PATCH] Optimierung nach Kai, Einheit entfernt in Chart und DIA0 bis DIA2 von Dropdown entfernt --- .../LoopMeasurementChart/LoopChartActionBar.tsx | 6 +++--- .../LoopMeasurementChart/LoopMeasurementChart.tsx | 13 +++++++------ config/webVersion.ts | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopChartActionBar.tsx b/components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopChartActionBar.tsx index 654b79f..de5f262 100644 --- a/components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopChartActionBar.tsx +++ b/components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopChartActionBar.tsx @@ -119,9 +119,9 @@ const LoopChartActionBar: React.FC = () => { } className="px-3 py-1 bg-white border rounded text-sm" > - - - + + + {/* Dropdown für Slot-Typ */} diff --git a/components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopMeasurementChart.tsx b/components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopMeasurementChart.tsx index 2ecbce0..58ef243 100644 --- a/components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopMeasurementChart.tsx +++ b/components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopMeasurementChart.tsx @@ -47,7 +47,7 @@ const LoopMeasurementChart = () => { // Basis-Datasets für alle Datenpunkte const datasets = [ { - label: "Messwert Minimum (kOhm)", + label: "Messwert Minimum ", data: loopMeasurementCurveChartData.map((entry) => ({ x: new Date(entry.t).getTime(), y: entry.i, @@ -57,7 +57,7 @@ const LoopMeasurementChart = () => { fill: false, }, { - label: "Messwert Maximum (kOhm)", + label: "Messwert Maximum ", data: loopMeasurementCurveChartData.map((entry) => ({ x: new Date(entry.t).getTime(), y: entry.a, @@ -74,7 +74,7 @@ const LoopMeasurementChart = () => { loopMeasurementCurveChartData.some((entry) => entry.m !== undefined) ) { datasets.push({ - label: "Messwert Aktuell (m)", + label: "Messwert", data: loopMeasurementCurveChartData.map((entry) => ({ x: new Date(entry.t).getTime(), y: entry.m ?? NaN, @@ -91,7 +91,7 @@ const LoopMeasurementChart = () => { loopMeasurementCurveChartData.some((entry) => entry.g !== undefined) ) { datasets.push({ - label: "Messwert Durchschnitt (g)", + label: "Messwert Durchschnitt", // g als Durchschnittswert verwenden data: loopMeasurementCurveChartData.map((entry) => ({ x: new Date(entry.t).getTime(), y: entry.g ?? NaN, @@ -110,6 +110,7 @@ const LoopMeasurementChart = () => { options: { responsive: true, maintainAspectRatio: false, + animation: false, elements: { line: { spanGaps: true }, }, @@ -121,7 +122,7 @@ const LoopMeasurementChart = () => { tooltipFormat: "dd.MM.yyyy HH:mm", displayFormats: { day: "dd.MM.yyyy" }, }, - title: { display: true, text: "Zeit (Datum)" }, + title: { display: true, text: "" }, // kann Zeit oder Datum eingefügt werden für X-Achse min: new Date(vonDatum).getTime(), max: new Date(bisDatum).getTime(), }, @@ -149,7 +150,7 @@ const LoopMeasurementChart = () => { zoom: { wheel: { enabled: true }, pinch: { enabled: true }, - mode: "x", + mode: "xy", onZoomComplete: (chart) => { const xScale = chart.chart.scales.x; const newVonDatum = new Date(xScale.min) diff --git a/config/webVersion.ts b/config/webVersion.ts index 0b1fea4..88fcf5e 100644 --- a/config/webVersion.ts +++ b/config/webVersion.ts @@ -6,5 +6,5 @@ 2: Patch oder Hotfix (Bugfixes oder kleine Änderungen). */ -const webVersion = "1.6.113"; +const webVersion = "1.6.114"; export default webVersion;