Fix conflicts

This commit is contained in:
gugak 2025-04-14 03:30:54 -07:00
commit e1b276394a
2 changed files with 7051 additions and 8720 deletions

View File

@ -17460,6 +17460,294 @@
},
"type": "ia.display.view"
},
{
"meta": {
"name": "UL12-3-Camera"
},
"position": {
"height": 20,
"width": 20,
"x": 368.0416679382324,
"y": 58.03125
},
"props": {
"params": {
"directionLeft": false,
"forceFaultStatus": null,
"forceRunningStatus": null,
"tagProps": [
"System/MCM02/THEA/THEA_2",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value"
]
},
"path": "Symbol-Views/Equipment-Views/THEA"
},
"type": "ia.display.view"
},
{
"meta": {
"name": "UL12-7-Camera"
},
"position": {
"height": 20,
"width": 20,
"x": 724,
"y": 117
},
"props": {
"params": {
"directionLeft": false,
"forceFaultStatus": null,
"forceRunningStatus": null,
"tagProps": [
"System/MCM02/THEA/THEA_2",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value"
]
},
"path": "Symbol-Views/Equipment-Views/THEA"
},
"type": "ia.display.view"
},
{
"meta": {
"name": "PS3-3-Camera"
},
"position": {
"height": 20,
"width": 20,
"x": 984,
"y": 336
},
"props": {
"params": {
"directionLeft": false,
"forceFaultStatus": null,
"forceRunningStatus": null,
"tagProps": [
"System/MCM02/THEA/THEA_2",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value"
]
},
"path": "Symbol-Views/Equipment-Views/THEA"
},
"type": "ia.display.view"
},
{
"meta": {
"name": "PS3-6-Camera"
},
"position": {
"height": 20,
"width": 20,
"x": 1245,
"y": 364
},
"props": {
"params": {
"directionLeft": false,
"forceFaultStatus": null,
"forceRunningStatus": null,
"tagProps": [
"System/MCM02/THEA/THEA_2",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value"
]
},
"path": "Symbol-Views/Equipment-Views/THEA"
},
"type": "ia.display.view"
},
{
"meta": {
"name": "PS3-7-Camera"
},
"position": {
"height": 20,
"width": 20,
"x": 1519,
"y": 369
},
"props": {
"params": {
"directionLeft": false,
"forceFaultStatus": null,
"forceRunningStatus": null,
"tagProps": [
"System/MCM02/THEA/THEA_2",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value"
]
},
"path": "Symbol-Views/Equipment-Views/THEA"
},
"type": "ia.display.view"
},
{
"meta": {
"name": "PS4-12-Camera"
},
"position": {
"height": 20,
"width": 20,
"x": 1794,
"y": 533.8958740234375
},
"props": {
"params": {
"directionLeft": false,
"forceFaultStatus": null,
"forceRunningStatus": null,
"tagProps": [
"System/MCM02/THEA/THEA_2",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value"
]
},
"path": "Symbol-Views/Equipment-Views/THEA"
},
"type": "ia.display.view"
},
{
"meta": {
"name": "UL1-20-Camera"
},
"position": {
"height": 20,
"width": 20,
"x": 1030,
"y": 559
},
"props": {
"params": {
"directionLeft": false,
"forceFaultStatus": null,
"forceRunningStatus": null,
"tagProps": [
"System/MCM02/THEA/THEA_2",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value"
]
},
"path": "Symbol-Views/Equipment-Views/THEA"
},
"type": "ia.display.view"
},
{
"meta": {
"name": "UL3-6-Camera"
},
"position": {
"height": 20,
"width": 20,
"x": 848,
"y": 750
},
"props": {
"params": {
"directionLeft": false,
"forceFaultStatus": null,
"forceRunningStatus": null,
"tagProps": [
"System/MCM02/THEA/THEA_2",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value"
]
},
"path": "Symbol-Views/Equipment-Views/THEA"
},
"type": "ia.display.view"
},
{
"meta": {
"name": "UL1-3-Camera"
},
"position": {
"height": 20,
"width": 20,
"x": 391,
"y": 837
},
"props": {
"params": {
"directionLeft": false,
"forceFaultStatus": null,
"forceRunningStatus": null,
"tagProps": [
"System/MCM02/THEA/THEA_2",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value"
]
},
"path": "Symbol-Views/Equipment-Views/THEA"
},
"type": "ia.display.view"
},
{
"events": {
"dom": {