komplette Zeile löschen. Die CPL kennt das // Zeichen nicht und würde trotzdem dei Werte berechnen und einsetzen.
This commit is contained in:
@@ -3,7 +3,7 @@
|
|||||||
import React, { useEffect, useState } from "react";
|
import React, { useEffect, useState } from "react";
|
||||||
import Image from "next/image";
|
import Image from "next/image";
|
||||||
import "bootstrap-icons/font/bootstrap-icons.css";
|
import "bootstrap-icons/font/bootstrap-icons.css";
|
||||||
import { loadWindowVariables } from "../utils/loadWindowVariables";
|
//import { loadWindowVariables } from "../utils/loadWindowVariables";
|
||||||
import SettingsModal from "./modales/SettingsModal";
|
import SettingsModal from "./modales/SettingsModal";
|
||||||
|
|
||||||
function Header() {
|
function Header() {
|
||||||
@@ -15,55 +15,12 @@ function Header() {
|
|||||||
let variablesLogged = false;
|
let variablesLogged = false;
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
loadWindowVariables()
|
if (!variablesLogged) {
|
||||||
.then(() => {
|
variablesLogged = true; // Setze das Flag, um das erneute Loggen zu verhindern
|
||||||
if (!variablesLogged) {
|
}
|
||||||
console.log("Geladene Systemvariablen:", {
|
|
||||||
deviceName: window.deviceName,
|
|
||||||
ip: window.ip,
|
|
||||||
mac1: window.mac1,
|
|
||||||
mac2: window.mac2,
|
|
||||||
subnet: window.subnet,
|
|
||||||
gateway: window.gateway,
|
|
||||||
datetime: window.datetime,
|
|
||||||
kueOnline: window.kueOnline,
|
|
||||||
kueIso: window.kueIso,
|
|
||||||
kueValid: window.kueValid,
|
|
||||||
kueAlarm1: window.kueAlarm1,
|
|
||||||
kueAlarm2: window.kueAlarm2,
|
|
||||||
kueRes: window.kueRes,
|
|
||||||
kueCableBreak: window.kueCableBreak,
|
|
||||||
kueGroundFault: window.kueGroundFault,
|
|
||||||
kueLimit1: window.kueLimit1,
|
|
||||||
kueLimit2Low: window.kueLimit2Low,
|
|
||||||
kueLimit2High: window.kueLimit2High,
|
|
||||||
kueDelay1: window.kueDelay1,
|
|
||||||
kueLoopInterval: window.kueLoopInterval,
|
|
||||||
kueID: window.kueID,
|
|
||||||
kueName: window.kueName,
|
|
||||||
kueVersion: window.kueVersion,
|
|
||||||
kueOverflow: window.kueOverflow,
|
|
||||||
kue100V: window.kue100V,
|
|
||||||
kueResidence: window.kueResidence,
|
|
||||||
kueBooting: window.kueBooting,
|
|
||||||
tdrAtten: window.tdrAtten,
|
|
||||||
tdrPulse: window.tdrPulse,
|
|
||||||
tdrSpeed: window.tdrSpeed,
|
|
||||||
tdrAmp: window.tdrAmp,
|
|
||||||
tdrTrigger: window.tdrTrigger,
|
|
||||||
tdrLocation: window.tdrLocation,
|
|
||||||
tdrActive: window.tdrActive,
|
|
||||||
tdrLast: window.tdrLast,
|
|
||||||
});
|
|
||||||
variablesLogged = true; // Setze das Flag, um das erneute Loggen zu verhindern
|
|
||||||
}
|
|
||||||
|
|
||||||
setStationsname(window.deviceName || "Unbekannt");
|
setStationsname(window.deviceName || "Unbekannt");
|
||||||
setCplStatus(window.hardware_version || "Unbekannt");
|
setCplStatus(window.hardware_version || "Unbekannt");
|
||||||
})
|
|
||||||
.catch((error) => {
|
|
||||||
console.error("Fehler beim Laden der Variablen:", error);
|
|
||||||
});
|
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const handleSettingsClick = () => setShowSettingsModal(true);
|
const handleSettingsClick = () => setShowSettingsModal(true);
|
||||||
|
|||||||
@@ -49,11 +49,11 @@ function KueModal({ showModal, onClose, slot, onModulNameChange }) {
|
|||||||
if (window.kueDelay1 && Array.isArray(window.kueDelay1)) {
|
if (window.kueDelay1 && Array.isArray(window.kueDelay1)) {
|
||||||
setVerzoegerung(window.kueDelay1);
|
setVerzoegerung(window.kueDelay1);
|
||||||
}
|
}
|
||||||
if (window.kueLowerLimit && Array.isArray(window.kueLowerLimit)) {
|
if (window.kueLimit2Low && Array.isArray(window.kueLimit2Low)) {
|
||||||
setUntereSchleifenGrenzwerte(window.kueLowerLimit);
|
setUntereSchleifenGrenzwerte(window.kueLimit2Low);
|
||||||
}
|
}
|
||||||
if (window.kueUpperLimit && Array.isArray(window.kueUpperLimit)) {
|
if (window.kueLimit2High && Array.isArray(window.kueLimit2High)) {
|
||||||
setObereSchleifenGrenzwerte(window.kueUpperLimit);
|
setObereSchleifenGrenzwerte(window.kueLimit2High);
|
||||||
}
|
}
|
||||||
if (window.kueLoopInterval && Array.isArray(window.kueLoopInterval)) {
|
if (window.kueLoopInterval && Array.isArray(window.kueLoopInterval)) {
|
||||||
setSchleifenintervall(window.kueLoopInterval);
|
setSchleifenintervall(window.kueLoopInterval);
|
||||||
|
|||||||
@@ -1,14 +1,58 @@
|
|||||||
|
// _app.js
|
||||||
import { useEffect } from "react";
|
import { useEffect } from "react";
|
||||||
|
import { loadWindowVariables } from "../utils/loadWindowVariables";
|
||||||
import Header from "../components/Header";
|
import Header from "../components/Header";
|
||||||
import Navigation from "../components/Navigation";
|
import Navigation from "../components/Navigation";
|
||||||
import Footer from "../components/Footer";
|
import Footer from "../components/Footer";
|
||||||
import "../styles/globals.css";
|
import "../styles/globals.css";
|
||||||
|
|
||||||
function MyApp({ Component, pageProps }) {
|
function MyApp({ Component, pageProps }) {
|
||||||
// Client-seitige Logik kann hier hinzugefügt werden
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (typeof window !== "undefined") {
|
if (typeof window !== "undefined") {
|
||||||
//console.log("Client-side logic can run here.");
|
loadWindowVariables()
|
||||||
|
.then(() => {
|
||||||
|
console.log("Window variables loaded successfully.");
|
||||||
|
console.log("Geladene Systemvariablen:", {
|
||||||
|
deviceName: window.deviceName,
|
||||||
|
ip: window.ip,
|
||||||
|
mac1: window.mac1,
|
||||||
|
mac2: window.mac2,
|
||||||
|
subnet: window.subnet,
|
||||||
|
gateway: window.gateway,
|
||||||
|
datetime: window.datetime,
|
||||||
|
kueOnline: window.kueOnline,
|
||||||
|
kueIso: window.kueIso,
|
||||||
|
kueValid: window.kueValid,
|
||||||
|
kueAlarm1: window.kueAlarm1,
|
||||||
|
kueAlarm2: window.kueAlarm2,
|
||||||
|
kueRes: window.kueRes,
|
||||||
|
kueCableBreak: window.kueCableBreak,
|
||||||
|
kueGroundFault: window.kueGroundFault,
|
||||||
|
kueLimit1: window.kueLimit1,
|
||||||
|
kueLimit2Low: window.kueLimit2Low,
|
||||||
|
kueLimit2High: window.kueLimit2High,
|
||||||
|
kueDelay1: window.kueDelay1,
|
||||||
|
kueLoopInterval: window.kueLoopInterval,
|
||||||
|
kueID: window.kueID,
|
||||||
|
kueName: window.kueName,
|
||||||
|
kueVersion: window.kueVersion,
|
||||||
|
kueOverflow: window.kueOverflow,
|
||||||
|
kue100V: window.kue100V,
|
||||||
|
kueResidence: window.kueResidence,
|
||||||
|
kueBooting: window.kueBooting,
|
||||||
|
tdrAtten: window.tdrAtten,
|
||||||
|
tdrPulse: window.tdrPulse,
|
||||||
|
tdrSpeed: window.tdrSpeed,
|
||||||
|
tdrAmp: window.tdrAmp,
|
||||||
|
tdrTrigger: window.tdrTrigger,
|
||||||
|
tdrLocation: window.tdrLocation,
|
||||||
|
tdrActive: window.tdrActive,
|
||||||
|
tdrLast: window.tdrLast,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
console.error("Error loading window variables:", error);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
@@ -16,13 +60,8 @@ function MyApp({ Component, pageProps }) {
|
|||||||
<div className="bg-gray-100 flex flex-col min-h-screen overflow-hidden">
|
<div className="bg-gray-100 flex flex-col min-h-screen overflow-hidden">
|
||||||
<Header />
|
<Header />
|
||||||
<div className="flex flex-grow w-full">
|
<div className="flex flex-grow w-full">
|
||||||
{" "}
|
<Navigation className="w-1/5" />
|
||||||
{/* Flexbox-Container für Navigation und Content */}
|
|
||||||
<Navigation className="w-1/5" />{" "}
|
|
||||||
{/* Navigation nimmt 20% der Breite ein */}
|
|
||||||
<main className="flex-1 p-4">
|
<main className="flex-1 p-4">
|
||||||
{" "}
|
|
||||||
{/* Der Content nimmt den restlichen Platz ein */}
|
|
||||||
<Component {...pageProps} />
|
<Component {...pageProps} />
|
||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,24 +1,30 @@
|
|||||||
|
|
||||||
var kueOnline=[<%=KSO80%>,<%=KSO81%>,<%=KSO82%>,<%=KSO83%>];
|
var kueOnline=[<%=KSO80%>,<%=KSO81%>,<%=KSO82%>,<%=KSO83%>];// Modul in Slot vorhanden 1 = vorhanden, 0 = nicht vorhanden
|
||||||
var kueIso=[<%=KIM80%>,<%=KIM81%>,<%=KIM82%>,<%=KIM83%>];
|
var kueVersion=[<%=KSV80%>,<%=KSV81%>,<%=KSV82%>,<%=KSV83%>]; //Version z.B. V4.19
|
||||||
var kueValid=[<%=KIV80%>,<%=KIV81%>,<%=KIV82%>,<%=KIV83%>];
|
var kueCableBreak=[<%=KSC80%>,<%=KSC81%>,<%=KSC82%>,<%=KSC83%>];//Aderbruch 1 = Fehler, 0 = kein Fehler
|
||||||
var kueAlarm1=[<%=KIA80%>,<%=KIA81%>,<%=KIA82%>,<%=KIA83%>];
|
var kueGroundFault=[<%=KSG80%>,<%=KSG81%>,<%=KSG82%>,<%=KSG83%>];//Erdschluss 1 = Fehler, 0 = kein Fehler
|
||||||
var kueAlarm2=[<%=KRA80%>,<%=KRA81%>,<%=KRA82%>,<%=KRA83%>];
|
var kueOverflow=[<%=KIW80%>,<%=KIW81%>,<%=KIW82%>,<%=KIW83%>]; //Überlauf 1 = Fehler, 0 = kein Fehler, wenn 1 soll ">200 MOhm" angezeigt werden in Display
|
||||||
var kueRes=[<%=KRM80%>,<%=KRM81%>,<%=KRM82%>,<%=KRM83%>];
|
//---------------------------------------------------
|
||||||
var kueCableBreak=[<%=KSC80%>,<%=KSC81%>,<%=KSC82%>,<%=KSC83%>];
|
var kueIso=[<%=KIM80%>,<%=KIM81%>,<%=KIM82%>,<%=KIM83%>];//Isolationswerte in Display (isoDisplay) Einheit: MOhm
|
||||||
var kueGroundFault=[<%=KSG80%>,<%=KSG81%>,<%=KSG82%>,<%=KSG83%>];
|
var kueAlarm1=[<%=KIA80%>,<%=KIA81%>,<%=KIA82%>,<%=KIA83%>];//Isolationsfehler 1 = Fehler, 0 = kein Fehler, Alarm kommt wenn kueIso < kueLimit1
|
||||||
var kueLimit1=[<%=KIG80%>,<%=KIG81%>,<%=KIG82%>,<%=KIG83%>];
|
var kueLimit1=[<%=KIG80%>,<%=KIG81%>,<%=KIG82%>,<%=KIG83%>];//Grenzwert (MOhm) für Isolationswiderstand
|
||||||
var kueLimit2Low=[<%=KRG80%>,<%=KRG81%>,<%=KRG82%>,<%=KRG83%>];
|
//---------------------------------------------------
|
||||||
var kueLimit2High=[<%=KRH80%>,<%=KRH81%>,<%=KRH82%>,<%=KRH83%>];
|
var kueRes=[<%=KRM80%>,<%=KRM81%>,<%=KRM82%>,<%=KRM83%>];//Schleifenwiderstand in Display (resDisplay) Einheit: KOhm
|
||||||
|
var kueResidence=[<%=KSN80%>,<%=KSN81%>,<%=KSN82%>,<%=KSN83%>];
|
||||||
|
var kueAlarm2=[<%=KRA80%>,<%=KRA81%>,<%=KRA82%>,<%=KRA83%>];//Schleifenfehler 1 = Fehler, 0 = kein Fehler, Alarm kommt wenn kueRes < kueLimit2Low
|
||||||
|
var kueLimit2Low=[<%=KRG80%>,<%=KRG81%>,<%=KRG82%>,<%=KRG83%>];//Schleifenmessung Unterer Grenzwert (KOhm)
|
||||||
|
|
||||||
var kueDelay1=[<%=KID80%>,<%=KID81%>,<%=KID82%>,<%=KID83%>];
|
var kueDelay1=[<%=KID80%>,<%=KID81%>,<%=KID82%>,<%=KID83%>];
|
||||||
var kueLoopInterval=[<%=KRI80%>,<%=KRI81%>,<%=KRI82%>,<%=KRI83%>];
|
var kueLoopInterval=[<%=KRI80%>,<%=KRI81%>,<%=KRI82%>,<%=KRI83%>];
|
||||||
var kueID=[<%=KSI80%>,<%=KSI81%>,<%=KSI82%>,<%=KSI83%>];
|
var kueID=[<%=KSI80%>,<%=KSI81%>,<%=KSI82%>,<%=KSI83%>];
|
||||||
var kueName=[<%=KSA80%>,<%=KSA81%>,<%=KSA82%>,<%=KSA83%>];
|
|
||||||
var kueVersion=[<%=KSV80%>,<%=KSV81%>,<%=KSV82%>,<%=KSV83%>];
|
|
||||||
var kueOverflow=[<%=KIW80%>,<%=KIW81%>,<%=KIW82%>,<%=KIW83%>];
|
|
||||||
var kue100V=[<%=KSS80%>,<%=KSS81%>,<%=KSS82%>,<%=KSS83%>];
|
//var kue100V=[<%=KSS80%>,<%=KSS81%>,<%=KSS82%>,<%=KSS83%>];
|
||||||
var kueResidence=[<%=KSN80%>,<%=KSN81%>,<%=KSN82%>,<%=KSN83%>];
|
//var kueBooting=[<%=KSB80%>,<%=KSB81%>,<%=KSB82%>,<%=KSB83%>];
|
||||||
var kueBooting=[<%=KSB80%>,<%=KSB81%>,<%=KSB82%>,<%=KSB83%>];
|
//var kueName=[<%=KSA80%>,<%=KSA81%>,<%=KSA82%>,<%=KSA83%>]; //Nicht relevant für Frontend, Frontend nutzt kueID
|
||||||
|
//var kueValid=[<%=KIV80%>,<%=KIV81%>,<%=KIV82%>,<%=KIV83%>];// bei Abgleich in CPL
|
||||||
|
//var kueLimit2High=[<%=KRH80%>,<%=KRH81%>,<%=KRH82%>,<%=KRH83%>]; //noch in der Entwicklung
|
||||||
//TDR----------------------------
|
//TDR----------------------------
|
||||||
var tdrAtten=[<%=KTD80%>,<%=KTD81%>,<%=KTD82%>,<%=KTD83%>];
|
var tdrAtten=[<%=KTD80%>,<%=KTD81%>,<%=KTD82%>,<%=KTD83%>];
|
||||||
var tdrPulse=[<%=KTP80%>,<%=KTP81%>,<%=KTP82%>,<%=KTP83%>];
|
var tdrPulse=[<%=KTP80%>,<%=KTP81%>,<%=KTP82%>,<%=KTP83%>];
|
||||||
|
|||||||
Reference in New Issue
Block a user