Merge pull request 'MTN6-18 and fix some names' (#158) from beka-4 into main
Reviewed-on: #158
This commit is contained in:
commit
f659e55241
@ -4260,7 +4260,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"meta": {
|
"meta": {
|
||||||
"name": "UL7_4)DPM1"
|
"name": "UL7_4_DPM1"
|
||||||
},
|
},
|
||||||
"position": {
|
"position": {
|
||||||
"height": 0.0146,
|
"height": 0.0146,
|
||||||
@ -5904,7 +5904,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"meta": {
|
"meta": {
|
||||||
"name": "UL4_4)DPM1"
|
"name": "UL4_4_DPM1"
|
||||||
},
|
},
|
||||||
"position": {
|
"position": {
|
||||||
"height": 0.0146,
|
"height": 0.0146,
|
||||||
@ -6688,7 +6688,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"meta": {
|
"meta": {
|
||||||
"name": "PS1_DPM1"
|
"name": "PS1_4_DPM1"
|
||||||
},
|
},
|
||||||
"position": {
|
"position": {
|
||||||
"height": 0.0146,
|
"height": 0.0146,
|
||||||
|
|||||||
@ -3235,7 +3235,7 @@
|
|||||||
"meta": {
|
"meta": {
|
||||||
"elementPrefix": null,
|
"elementPrefix": null,
|
||||||
"id": "path14",
|
"id": "path14",
|
||||||
"name": "UL5_12_FIO1",
|
"name": "PS5_12_FIO1",
|
||||||
"originalName": "UL21-3"
|
"originalName": "UL21-3"
|
||||||
},
|
},
|
||||||
"position": {
|
"position": {
|
||||||
|
|||||||
@ -10393,7 +10393,7 @@
|
|||||||
"forcedPrefix": "CON",
|
"forcedPrefix": "CON",
|
||||||
"id": "rect1-6-0-9-7",
|
"id": "rect1-6-0-9-7",
|
||||||
"inheritedGroupPrefix": "CON",
|
"inheritedGroupPrefix": "CON",
|
||||||
"name": "PS8_9_FIO2",
|
"name": "PDP14_FIO1",
|
||||||
"originalName": "PS11-2"
|
"originalName": "PS11-2"
|
||||||
},
|
},
|
||||||
"position": {
|
"position": {
|
||||||
@ -10433,7 +10433,7 @@
|
|||||||
"forcedPrefix": "CON",
|
"forcedPrefix": "CON",
|
||||||
"id": "rect1-6-0-9-7",
|
"id": "rect1-6-0-9-7",
|
||||||
"inheritedGroupPrefix": "CON",
|
"inheritedGroupPrefix": "CON",
|
||||||
"name": "PDP14_FIOH1",
|
"name": "PDP11_FIO1",
|
||||||
"originalName": "PS11-2"
|
"originalName": "PS11-2"
|
||||||
},
|
},
|
||||||
"position": {
|
"position": {
|
||||||
@ -10442,8 +10442,8 @@
|
|||||||
"angle": 0
|
"angle": 0
|
||||||
},
|
},
|
||||||
"width": 0.0108,
|
"width": 0.0108,
|
||||||
"x": 0.7453,
|
"x": 0.1464,
|
||||||
"y": 0.5517
|
"y": 0.3688
|
||||||
},
|
},
|
||||||
"props": {
|
"props": {
|
||||||
"params": {
|
"params": {
|
||||||
|
|||||||
@ -1,18 +1,19 @@
|
|||||||
{
|
{
|
||||||
"custom": {
|
"custom": {
|
||||||
"alarm_message": null,
|
"alarm_message": null,
|
||||||
"disconnected": true,
|
"disconnected": false,
|
||||||
"plc": "value",
|
"plc": "System",
|
||||||
"priority": 0,
|
"priority": 0,
|
||||||
"priority_string": "Unknown",
|
"priority_string": "Unknown",
|
||||||
"searchId": "PLC01",
|
"searchId": "value",
|
||||||
"state": 0,
|
"state": 0,
|
||||||
"state_string": "Normal"
|
"state_string": "Normal"
|
||||||
},
|
},
|
||||||
"params": {
|
"params": {
|
||||||
|
"color": 1,
|
||||||
"forceFaultStatus": null,
|
"forceFaultStatus": null,
|
||||||
"tagProps": [
|
"tagProps": [
|
||||||
"value",
|
"System/MCM01/StationR/UL1_3_JR_PB1",
|
||||||
"value",
|
"value",
|
||||||
"value",
|
"value",
|
||||||
"value",
|
"value",
|
||||||
@ -135,6 +136,10 @@
|
|||||||
},
|
},
|
||||||
"persistent": true
|
"persistent": true
|
||||||
},
|
},
|
||||||
|
"params.color": {
|
||||||
|
"paramDirection": "input",
|
||||||
|
"persistent": true
|
||||||
|
},
|
||||||
"params.forceFaultStatus": {
|
"params.forceFaultStatus": {
|
||||||
"paramDirection": "input",
|
"paramDirection": "input",
|
||||||
"persistent": true
|
"persistent": true
|
||||||
@ -172,7 +177,7 @@
|
|||||||
"props.elements[1].fill.paint": {
|
"props.elements[1].fill.paint": {
|
||||||
"binding": {
|
"binding": {
|
||||||
"config": {
|
"config": {
|
||||||
"expression": "if(\r\n {view.custom.disconnected},\r\n \u0027#D5D5D5\u0027,\r\n if(\r\n {view.custom.state} \u003d 1,\r\n \u0027#00D900\u0027,\r\n \u0027#D5D5D5\u0027\r\n )\r\n)\r\n"
|
"expression": "if(\r\n {view.custom.disconnected} \u0026\u0026 {view.params.color} \u003d 1,\r\n \"#D5D5D5\",\r\n if(\r\n {view.custom.disconnected} \u0026\u0026 {view.params.color} \u003d 2,\r\n \"#00D900\",\r\n if(\r\n {view.params.color} \u003d 1,\r\n if(\r\n {view.custom.state} \u003d 1,\r\n \"#FF0000\",\r\n \"#D5D5D5\"\r\n ),\r\n if(\r\n {view.params.color} \u003d 2,\r\n if(\r\n {view.custom.state} \u003d 1,\r\n \"#FF0000\",\r\n \"#00D900\"\r\n ),\r\n \"#D5D5D5\"\r\n )\r\n )\r\n )\r\n)\r\n"
|
||||||
},
|
},
|
||||||
"type": "expr"
|
"type": "expr"
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user