fix conflicts

This commit is contained in:
b.makharadze 2025-06-10 11:52:45 +04:00
parent c329e5a3b1
commit 94b46b151d

View File

@ -6,7 +6,9 @@
"priority": 0, "priority": 0,
"priority_string": "No active alarms", "priority_string": "No active alarms",
"searchId": "PLC01", "searchId": "PLC01",
"state": 0 "state": 5,
"status": 0,
"visible_status": false
}, },
"params": { "params": {
"forceFaultStatus": null, "forceFaultStatus": null,
@ -328,7 +330,7 @@
"dom": { "dom": {
"onClick": { "onClick": {
"config": { "config": {
"script": "\tsystem.perspective.openDock(\u0027Docked-East\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})" "script": "\tsystem.perspective.openDock(\u0027Docked-East-JR\u0027,params\u003d{\u0027tagProps\u0027:self.view.params.tagProps})"
}, },
"scope": "G", "scope": "G",
"type": "script" "type": "script"