fixed conflicts

This commit is contained in:
gugak 2025-04-14 05:28:49 -07:00
commit 88922039c5
2 changed files with 105 additions and 183 deletions

View File

@ -213,7 +213,7 @@
},
{
"meta": {
"name": "UL4-10_B"
"name": "UL4-10B"
},
"position": {
"height": 20,
@ -1461,7 +1461,7 @@
},
{
"meta": {
"name": "UL7-10_B"
"name": "UL7-10B"
},
"position": {
"height": 20,
@ -3139,7 +3139,7 @@
},
{
"meta": {
"name": "UL1-20"
"name": "UL4-13"
},
"position": {
"height": 20.05,
@ -4331,7 +4331,7 @@
},
{
"meta": {
"name": "UL7-10_A"
"name": "UL7-10A"
},
"position": {
"height": 20.05,
@ -9602,7 +9602,7 @@
},
{
"meta": {
"name": "UL1-10_B"
"name": "UL1-10B"
},
"position": {
"height": 20,
@ -9943,7 +9943,7 @@
},
{
"meta": {
"name": "UL11-11_B"
"name": "UL11-11B"
},
"position": {
"height": 20,
@ -11505,7 +11505,7 @@
},
{
"meta": {
"name": "UL11-11_A"
"name": "UL11-11A"
},
"position": {
"height": 20.05,
@ -12658,7 +12658,7 @@
},
{
"meta": {
"name": "UL1-10_A"
"name": "UL1-10A"
},
"position": {
"height": 20.05,
@ -13164,7 +13164,7 @@
},
{
"meta": {
"name": "UL4-10_A"
"name": "UL4-10A"
},
"position": {
"height": 20.05,
@ -17462,7 +17462,7 @@
},
{
"meta": {
"name": "UL12-3-Camera"
"name": "Camera_1"
},
"position": {
"height": 20,
@ -17494,7 +17494,7 @@
},
{
"meta": {
"name": "UL12-7-Camera"
"name": "Camera_19"
},
"position": {
"height": 20,
@ -17526,7 +17526,7 @@
},
{
"meta": {
"name": "PS3-3-Camera"
"name": "Camera_30"
},
"position": {
"height": 20,
@ -17558,7 +17558,7 @@
},
{
"meta": {
"name": "PS3-6-Camera"
"name": "Camera_25"
},
"position": {
"height": 20,
@ -17590,7 +17590,7 @@
},
{
"meta": {
"name": "PS3-7-Camera"
"name": "Camera_26"
},
"position": {
"height": 20,
@ -17622,7 +17622,7 @@
},
{
"meta": {
"name": "PS4-12-Camera"
"name": "Camera_29"
},
"position": {
"height": 20,
@ -17654,7 +17654,7 @@
},
{
"meta": {
"name": "UL1-20-Camera"
"name": "Camera_23"
},
"position": {
"height": 20,
@ -17686,7 +17686,7 @@
},
{
"meta": {
"name": "UL3-6-Camera"
"name": "Camera_24"
},
"position": {
"height": 20,
@ -17718,7 +17718,7 @@
},
{
"meta": {
"name": "UL1-3-Camera"
"name": "Camera_3"
},
"position": {
"height": 20,
@ -17749,94 +17749,36 @@
"type": "ia.display.view"
},
{
"events": {
"dom": {
"onClick": {
"config": {
"params": {},
"view": "Detailed-Views/MCM07 Bypass"
},
"scope": "C",
"type": "nav"
}
}
},
"meta": {
"name": "Nav_Button"
"name": "Camera_2"
},
"position": {
"height": 42.87,
"width": 43.29,
"x": 1068.21,
"y": 930.75
"height": 20,
"width": 20,
"x": 83,
"y": 945
},
"props": {
"params": {
"direction": {
"downward": false,
"left": true,
"right": false,
"upward": false
},
"pageid": "DetailedView/MTN6"
"directionLeft": false,
"forceFaultStatus": null,
"forceRunningStatus": null,
"tagProps": [
"System/MCM02/THEA/THEA_2",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value"
]
},
"path": "Custom-Views/Nav_Button"
"path": "Symbol-Views/Equipment-Views/THEA"
},
"type": "ia.display.view"
},
{
"events": {
"dom": {
"onClick": {
"config": {
"params": {},
"view": "Detailed-Views/MCM02 Fluid Inbound Merges 5-7"
},
"scope": "C",
"type": "nav"
}
}
},
"meta": {
"name": "Nav_Button_0"
},
"position": {
"height": 42.87,
"rotate": {
"angle": "180deg"
},
"width": 43.29,
"x": 1163.21,
"y": 930.75
},
"props": {
"params": {
"direction": {
"downward": false,
"left": true,
"right": false,
"upward": false
},
"pageid": "DetailedView/MTN6"
},
"path": "Custom-Views/Nav_Button"
},
"type": "ia.display.view"
},
{
"meta": {
"name": "Label"
},
"position": {
"height": 32,
"width": 50,
"x": 1019.33,
"y": 8
},
"props": {
"text": "MCM01"
},
"type": "ia.display.label"
}
],
"meta": {

View File

@ -47,7 +47,7 @@
"position": {
"height": 20.05,
"width": 19.98,
"x": 1250.97,
"x": 1270.97,
"y": 629.02
},
"props": {
@ -864,7 +864,7 @@
"position": {
"height": 20.05,
"width": 19.98,
"x": 1228.95,
"x": 1263.95,
"y": 772.22
},
"props": {
@ -1807,7 +1807,7 @@
},
{
"meta": {
"name": "UL21-17-Camera"
"name": "Camera_35"
},
"position": {
"height": 20,
@ -2020,7 +2020,7 @@
},
{
"meta": {
"name": "UL21-11-Camera"
"name": "Camera_13"
},
"position": {
"height": 20,
@ -3411,7 +3411,7 @@
"position": {
"height": 20.05,
"width": 19.98,
"x": 1310.91,
"x": 1328.91,
"y": 629.02
},
"props": {
@ -3446,8 +3446,8 @@
"position": {
"height": 20.05,
"width": 19.98,
"x": 1206.38,
"y": 772.22
"x": 1232.38,
"y": 771.22
},
"props": {
"params": {
@ -3721,7 +3721,7 @@
},
{
"meta": {
"name": "UL21-1-Camera"
"name": "Camera"
},
"position": {
"height": 20,
@ -4258,7 +4258,7 @@
},
{
"meta": {
"name": "UL19-6-Camera"
"name": "Camera_18"
},
"position": {
"height": 20,
@ -4336,7 +4336,7 @@
"position": {
"height": 20.05,
"width": 19.98,
"x": 1261.14,
"x": 1301.14,
"y": 772.12
},
"props": {
@ -4398,7 +4398,7 @@
},
{
"meta": {
"name": "UL15-4-Camera"
"name": "Camera_1"
},
"position": {
"height": 20,
@ -5431,7 +5431,7 @@
},
{
"meta": {
"name": "UL15-6-Camera"
"name": "Camera_19"
},
"position": {
"height": 20,
@ -6041,7 +6041,7 @@
},
{
"meta": {
"name": "UL20-3-Camera"
"name": "Camera_0"
},
"position": {
"height": 20,
@ -8004,7 +8004,7 @@
"position": {
"height": 20.05,
"width": 19.98,
"x": 1208.97,
"x": 1224.97,
"y": 629.02
},
"props": {
@ -8573,7 +8573,7 @@
"position": {
"height": 20.05,
"width": 19.98,
"x": 1177.89,
"x": 1179.89,
"y": 772.32
},
"props": {
@ -9308,94 +9308,74 @@
"type": "ia.display.view"
},
{
"events": {
"dom": {
"onClick": {
"config": {
"params": {},
"view": "Detailed-Views/MCM02 Fluid Inbound Upper"
},
"scope": "C",
"type": "nav"
}
}
},
"meta": {
"name": "Nav_Button_0"
"elementPrefix": null,
"id": "path54",
"name": "UL13-9B",
"originalName": "UL13-9A"
},
"position": {
"height": 42.87,
"rotate": {
"angle": "180deg"
},
"width": 43.29,
"x": 1163.21,
"y": 930.75
"height": 20,
"width": 20,
"x": 1203,
"y": 772
},
"props": {
"params": {
"direction": {
"downward": false,
"left": true,
"right": false,
"upward": false
},
"pageid": "DetailedView/MTN6"
"directionLeft": false,
"forceFaultStatus": null,
"forceRunningStatus": null,
"tagProps": [
"System/MCM02/Status/UL13-9A",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value"
]
},
"path": "Custom-Views/Nav_Button"
},
"type": "ia.display.view"
},
{
"events": {
"dom": {
"onClick": {
"config": {
"params": {},
"view": "Detailed-Views/MCM01 Fluid Inbound Merges 1-4"
},
"scope": "C",
"type": "nav"
}
}
},
"meta": {
"name": "Nav_Button"
},
"position": {
"height": 42.87,
"width": 43.29,
"x": 1068.21,
"y": 930.75
},
"props": {
"params": {
"direction": {
"downward": false,
"left": true,
"right": false,
"upward": false
},
"pageid": "DetailedView/MTN6"
},
"path": "Custom-Views/Nav_Button"
"path": "Symbol-Views/Equipment-Views/Status"
},
"type": "ia.display.view"
},
{
"meta": {
"name": "Label"
"elementPrefix": null,
"id": "path38",
"name": "UL18-13B",
"originalName": "UL18-13A"
},
"position": {
"height": 32,
"width": 50,
"x": 1019.33,
"y": 8
"height": 20,
"width": 20,
"x": 1195,
"y": 628
},
"props": {
"text": "MCM02"
"params": {
"directionLeft": false,
"forceFaultStatus": null,
"forceRunningStatus": null,
"tagProps": [
"System/MCM02/Status/UL18-13A",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value"
]
},
"path": "Symbol-Views/Equipment-Views/Status"
},
"type": "ia.display.label"
"type": "ia.display.view"
}
],
"meta": {