Ismail/CPLv4.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimierung nach Kai, Einheit entfernt in Chart und DIA0 bis DIA2 von Dropdown entfernt

Browse Source
This commit is contained in:
ISA
2025-02-25 15:54:33 +01:00
parent 9bbf5cd570
commit 327a101386
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopChartActionBar.tsx
View File

@@ -119,9 +119,9 @@ const LoopChartActionBar: React.FC = () => {
} }
className="px-3 py-1 bg-white border rounded text-sm" className="px-3 py-1 bg-white border rounded text-sm"
> >
<option value="DIA0">Alle Messwerte (DIA0)</option> <option value="DIA0">Alle Messwerte</option>
<option value="DIA1">Stündliche Werte (DIA1)</option> <option value="DIA1">Stündliche Werte</option>
<option value="DIA2">Tägliche Werte (DIA2)</option> <option value="DIA2">Tägliche Werte</option>
</select> </select>
{/* Dropdown für Slot-Typ */} {/* Dropdown für Slot-Typ */}

13
components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopMeasurementChart.tsx
View File

@@ -47,7 +47,7 @@ const LoopMeasurementChart = () => {
// Basis-Datasets für alle Datenpunkte // Basis-Datasets für alle Datenpunkte
const datasets = [ const datasets = [
{ {
label: "Messwert Minimum (kOhm)", label: "Messwert Minimum ",
data: loopMeasurementCurveChartData.map((entry) => ({ data: loopMeasurementCurveChartData.map((entry) => ({
x: new Date(entry.t).getTime(), x: new Date(entry.t).getTime(),
y: entry.i, y: entry.i,
@@ -57,7 +57,7 @@ const LoopMeasurementChart = () => {
fill: false, fill: false,
}, },
{ {
label: "Messwert Maximum (kOhm)", label: "Messwert Maximum ",
data: loopMeasurementCurveChartData.map((entry) => ({ data: loopMeasurementCurveChartData.map((entry) => ({
x: new Date(entry.t).getTime(), x: new Date(entry.t).getTime(),
y: entry.a, y: entry.a,
@@ -74,7 +74,7 @@ const LoopMeasurementChart = () => {
loopMeasurementCurveChartData.some((entry) => entry.m !== undefined) loopMeasurementCurveChartData.some((entry) => entry.m !== undefined)
) { ) {
datasets.push({ datasets.push({
label: "Messwert Aktuell (m)", label: "Messwert",
data: loopMeasurementCurveChartData.map((entry) => ({ data: loopMeasurementCurveChartData.map((entry) => ({
x: new Date(entry.t).getTime(), x: new Date(entry.t).getTime(),
y: entry.m ?? NaN, y: entry.m ?? NaN,
@@ -91,7 +91,7 @@ const LoopMeasurementChart = () => {
loopMeasurementCurveChartData.some((entry) => entry.g !== undefined) loopMeasurementCurveChartData.some((entry) => entry.g !== undefined)
) { ) {
datasets.push({ datasets.push({
label: "Messwert Durchschnitt (g)", label: "Messwert Durchschnitt", // g als Durchschnittswert verwenden
data: loopMeasurementCurveChartData.map((entry) => ({ data: loopMeasurementCurveChartData.map((entry) => ({
x: new Date(entry.t).getTime(), x: new Date(entry.t).getTime(),
y: entry.g ?? NaN, y: entry.g ?? NaN,
@@ -110,6 +110,7 @@ const LoopMeasurementChart = () => {
options: { options: {
responsive: true, responsive: true,
maintainAspectRatio: false, maintainAspectRatio: false,
animation: false,
elements: { elements: {
line: { spanGaps: true }, line: { spanGaps: true },
}, },
@@ -121,7 +122,7 @@ const LoopMeasurementChart = () => {
tooltipFormat: "dd.MM.yyyy HH:mm", tooltipFormat: "dd.MM.yyyy HH:mm",
displayFormats: { day: "dd.MM.yyyy" }, 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(), min: new Date(vonDatum).getTime(),
max: new Date(bisDatum).getTime(), max: new Date(bisDatum).getTime(),
}, },
@@ -149,7 +150,7 @@ const LoopMeasurementChart = () => {
zoom: { zoom: {
wheel: { enabled: true }, wheel: { enabled: true },
pinch: { enabled: true }, pinch: { enabled: true },
mode: "x", mode: "xy",
onZoomComplete: (chart) => { onZoomComplete: (chart) => {
const xScale = chart.chart.scales.x; const xScale = chart.chart.scales.x;
const newVonDatum = new Date(xScale.min) const newVonDatum = new Date(xScale.min)

2
config/webVersion.ts
View File

@@ -6,5 +6,5 @@
2: Patch oder Hotfix (Bugfixes oder kleine Änderungen). 2: Patch oder Hotfix (Bugfixes oder kleine Änderungen).
*/ */
const webVersion = "1.6.113"; const webVersion = "1.6.114";
export default webVersion; export default webVersion;