From fcb24c6040a6f6ee6e086349ac0643c77530b8a3 Mon Sep 17 00:00:00 2001 From: beka makharadze Date: Wed, 16 Jul 2025 12:47:45 +0400 Subject: [PATCH] MTN6-56 --- .../views/Simulations/Station_EPC/view.json | 14 +++++++------- .../Information-Docked-East-Button/view.json | 15 +++++++++++---- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Station_EPC/view.json b/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Station_EPC/view.json index 93857a0..57e30a8 100644 --- a/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Station_EPC/view.json +++ b/MTN6_Simulation/com.inductiveautomation.perspective/views/Simulations/Station_EPC/view.json @@ -42,7 +42,7 @@ "params": { "forceFaultStatus": null, "tagProps": [ - "/System/Station/EPC/UL1_3_EPC1", + "System/MCM01/Station/EPC/UL1_3_EPC1", "value", "value", "value", @@ -75,7 +75,7 @@ "params": { "forceFaultStatus": null, "tagProps": [ - "/System/Station/EPC/UL1_3_EPC2", + "System/MCM01/Station/EPC/UL1_3_EPC2", "value", "value", "value", @@ -108,7 +108,7 @@ "params": { "forceFaultStatus": null, "tagProps": [ - "/System/Station/EPC/UL1_3_EPC2", + "System/MCM01/Station/EPC/UL1_3_EPC2", "value", "value", "value", @@ -141,7 +141,7 @@ "params": { "forceFaultStatus": null, "tagProps": [ - "/System/Station/EPC/UL1_3_EPC1", + "System/MCM01/Station/EPC/UL1_3_EPC1", "value", "value", "value", @@ -174,7 +174,7 @@ "params": { "forceFaultStatus": null, "tagProps": [ - "/System/Station/EPC/UL1_3_EPC1", + "System/MCM01/Station/EPC/UL1_3_EPC1", "value", "value", "value", @@ -207,7 +207,7 @@ "params": { "forceFaultStatus": null, "tagProps": [ - "/System/Station/EPC/UL1_3_EPC2", + "System/MCM01/Station/EPC/UL1_3_EPC2", "value", "value", "value", @@ -239,7 +239,7 @@ "forceFaultStatus": null, "forceRunningStatus": null, "tagProps": [ - "/System/Conveyor/UL1_3_VFD1", + "System/Conveyor/UL1_3_VFD1", "value", "value", "value", diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-Button/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-Button/view.json index 22dbd31..25f036c 100644 --- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-Button/view.json +++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-Button/view.json @@ -7,7 +7,7 @@ }, "params": { "tagProps": [ - "/System/Station/Buttons/UL1_3_JR_PB2", + "System/MCM01/Station/EPC/UL1_3_EPC1", "value", "value", "value", @@ -457,11 +457,11 @@ "0": "{view.params.tagProps[0]}", "fc": "{session.custom.fc}" }, - "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Alarm/PR_PB_Pressed" + "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/STATE" }, "transforms": [ { - "expression": "coalesce({value},{view.params.forceFaultStatus},\"UNKNOWN\")", + "expression": "if(\r\n indexOf({view.params.tagProps[0]}, \"EPC\") \u003e\u003d 0,\r\n coalesce(\r\n if({value} \u003d 0, 1, {value}),\r\n {view.params.forceFaultStatus},\r\n \"UNKNOWN\"\r\n ),\r\n coalesce({value}, {view.params.forceFaultStatus}, \"UNKNOWN\")\r\n)\r\n", "type": "expression" }, { @@ -475,6 +475,14 @@ { "input": 0, "output": "OFF" + }, + { + "input": 2, + "output": "ON" + }, + { + "input": 3, + "output": "ON" } ], "outputType": "scalar", @@ -569,7 +577,6 @@ "grow": 1 }, "props": { - "currentTabIndex": 1, "menuType": "modern", "tabSize": { "width": 1000