Einheit in Analoge Eingänge

This commit is contained in:
ISA
2025-05-02 12:07:28 +02:00
parent 1dfa7590dc
commit 0aee569ea0
4 changed files with 62 additions and 23 deletions

View File

@@ -7,23 +7,37 @@ interface Props {
onClose: () => void;
}
export default function AnalogInputsSettingsModal({
export default function AnalogInputSettingsModal({
selectedInput,
isOpen,
onClose,
}: Props) {
const [name, setName] = useState("");
const [offset, setOffset] = useState(0);
const [factor, setFactor] = useState(1);
const [loggerInterval, setLoggerInterval] = useState(10);
const [offset, setOffset] = useState("0.000000");
const [factor, setFactor] = useState("1.000000");
const [loggerInterval, setLoggerInterval] = useState("10");
const [unit, setUnit] = useState("V");
const [isSaving, setIsSaving] = useState(false);
useEffect(() => {
if (selectedInput && isOpen) {
setName(selectedInput.name || "");
setOffset(selectedInput.offset || 0);
setFactor(selectedInput.factor || 1);
setLoggerInterval(selectedInput.loggerInterval || 10);
setOffset(
typeof selectedInput.offset === "number"
? selectedInput.offset.toFixed(6)
: selectedInput.offset || "0.000000"
);
setFactor(
typeof selectedInput.factor === "number"
? selectedInput.factor.toFixed(6)
: selectedInput.factor || "1.000000"
);
setLoggerInterval(
selectedInput.loggerInterval !== undefined
? selectedInput.loggerInterval.toString()
: "10"
);
setUnit(selectedInput.unit || "V");
}
}, [selectedInput, isOpen]);
@@ -31,39 +45,46 @@ export default function AnalogInputsSettingsModal({
const handleSave = async () => {
setIsSaving(true);
const slot = selectedInput.id;
const isDev = window.location.hostname === "localhost";
const offsetParam = offset.replace(",", ".");
const factorParam = factor.replace(",", ".");
const loggerParam = loggerInterval;
const acn = encodeURIComponent(name);
const offsetParam = offset.toString().replace(",", ".");
const factorParam = factor.toString().replace(",", ".");
const loggerParam = loggerInterval.toString();
const acu = encodeURIComponent(unit);
const url = `/CPL?/Service/ae.ACP&ACN${slot}=${acn}&ACO${slot}=${offsetParam}&ACF${slot}=${factorParam}&ACL${slot}=${loggerParam}`;
const url = `/CPL?/Service/ae.ACP&ACN${slot}=${acn}&ACO${slot}=${offsetParam}&ACF${slot}=${factorParam}&ACL${slot}=${loggerParam}&ACU${slot}=${acu}`;
try {
if (isDev) {
// Entwicklung: lokale Mock-API
await fetch("/api/cpl/updateAnalogInputsSettingsAPIHandler", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({
updates: [
{ key: "win_analogInputsNames", index: slot - 1, value: name },
{ key: "win_analogInputsOffset", index: slot - 1, value: offset },
{ key: "win_analogInputsFactor", index: slot - 1, value: factor },
{
key: "win_analogInputsOffset",
index: slot - 1,
value: parseFloat(offsetParam),
},
{
key: "win_analogInputsFactor",
index: slot - 1,
value: parseFloat(factorParam),
},
{ key: "win_analogInputsUnits", index: slot - 1, value: unit },
{
key: "win_analogInputsloggerIntervall",
index: slot - 1,
value: loggerInterval,
value: parseInt(loggerParam),
},
],
}),
});
alert("Mockdaten gespeichert.");
} else {
// Produktion: direkter CGI-Befehl
const result = await fetch(url);
if (!result.ok) throw new Error("Fehler bei CGI-Aufruf");
alert("Einstellungen gespeichert (Produktion).");
@@ -97,19 +118,34 @@ export default function AnalogInputsSettingsModal({
<label className="block mb-2 text-sm font-medium">Offset</label>
<input
type="number"
step="0.000001"
className="w-full border rounded px-3 py-1 mb-4"
value={offset}
onChange={(e) => setOffset(parseFloat(e.target.value))}
onChange={(e) => setOffset(e.target.value)}
/>
<label className="block mb-2 text-sm font-medium">Faktor</label>
<input
type="number"
step="0.000001"
className="w-full border rounded px-3 py-1 mb-4"
value={factor}
onChange={(e) => setFactor(parseFloat(e.target.value))}
onChange={(e) => setFactor(e.target.value)}
/>
<label className="block mb-2 text-sm font-medium">Einheit</label>
<select
className="w-full border rounded px-3 py-1 mb-4"
value={unit}
onChange={(e) => setUnit(e.target.value)}
>
<option value="V">V</option>
<option value="mA">mA</option>
<option value="°C">°C</option>
<option value="bar">bar</option>
<option value="%">%</option>
</select>
<label className="block mb-2 text-sm font-medium">
Loggerintervall (s)
</label>
@@ -117,12 +153,13 @@ export default function AnalogInputsSettingsModal({
type="number"
className="w-full border rounded px-3 py-1 mb-4"
value={loggerInterval}
onChange={(e) => setLoggerInterval(parseInt(e.target.value))}
onChange={(e) => setLoggerInterval(e.target.value)}
/>
<div className="flex justify-end gap-2">
<button
onClick={onClose}
disabled={isSaving}
className="px-4 py-2 bg-gray-300 rounded hover:bg-gray-400"
>
Abbrechen

View File

@@ -35,6 +35,7 @@ export default function AnalogeEingaengeTable({
<th className="border p-1 text-left">Eingang</th>
<th className="border p-3 text-left">Messwert</th>
<th className="border p-3 text-left">Bezeichnung</th>
<th className="border p-3 text-left">Einheit</th>
<th className="border p-3 text-left">Aktion</th>
</tr>
</thead>
@@ -61,6 +62,7 @@ export default function AnalogeEingaengeTable({
>
{e.name || "----"}
</td>
<td className="border p-3">{e.unit || "-"}</td>
<td className="border p-3 text-center">
<button
onClick={() => {