adjustments in overview. removed back button from the header and moved the back to the main scope logic to the BACK button in the Docked-West view

This commit is contained in:
Salijoghli 2025-08-19 12:38:50 +04:00
parent fb49648106
commit 143db2ae6d
23 changed files with 103 additions and 60 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

View File

@ -13,7 +13,8 @@
"show_fio_safety": true, "show_fio_safety": true,
"show_map": true, "show_map": true,
"show_photoeyes": true, "show_photoeyes": true,
"show_px": true "show_px": true,
"show_solenoids": true
}, },
"areaHover": [], "areaHover": [],
"currentGraphic": "Windows/Graphics/Overview", "currentGraphic": "Windows/Graphics/Overview",

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 994 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

View File

@ -620,7 +620,7 @@
"enabled": true, "enabled": true,
"rate": "3" "rate": "3"
}, },
"queryPath": "GetActiveAlarmsByLocationAndPriority", "queryPath": "Alarms-autStand/GetActiveAlarmsByLocationAndPriority",
"returnFormat": "json" "returnFormat": "json"
}, },
"transforms": [ "transforms": [

View File

@ -2,8 +2,8 @@
"custom": { "custom": {
"plc": "", "plc": "",
"searchId": "value", "searchId": "value",
"state": 1, "state": 0,
"string": "Actuated" "string": "Inactive"
}, },
"params": { "params": {
"tagProps": [ "tagProps": [
@ -188,7 +188,7 @@
"meta.visible": { "meta.visible": {
"binding": { "binding": {
"config": { "config": {
"path": "session.custom.alarm_filter.show_beacons" "path": "session.custom.alarm_filter.show_solenoids"
}, },
"type": "property" "type": "property"
} }

View File

@ -85,7 +85,7 @@
"props.selected": { "props.selected": {
"binding": { "binding": {
"config": { "config": {
"expression": "if({session.custom.alarm_filter.show_dpm_mcm} \u0026\u0026 \r\n{session.custom.alarm_filter.show_beacons} \u0026\u0026\r\n{session.custom.alarm_filter.show_VFD} \u0026\u0026\r\n{session.custom.alarm_filter.show_buttons} \u0026\u0026\r\n{session.custom.alarm_filter.show_photoeyes} \u0026\u0026\r\n{session.custom.alarm_filter.show_encoders} \u0026\u0026\r\n{session.custom.alarm_filter.show_epc} \u0026\u0026\r\n{session.custom.alarm_filter.show_px} \u0026\u0026\r\n{session.custom.alarm_filter.show_camera_jams} \u0026\u0026\r\n{session.custom.alarm_filter.show_fio_safety}, True, False)" "expression": "if({session.custom.alarm_filter.show_dpm_mcm} \u0026\u0026 \r\n{session.custom.alarm_filter.show_beacons} \u0026\u0026\r\n{session.custom.alarm_filter.show_VFD} \u0026\u0026\r\n{session.custom.alarm_filter.show_buttons} \u0026\u0026\r\n{session.custom.alarm_filter.show_photoeyes} \u0026\u0026\r\n{session.custom.alarm_filter.show_encoders} \u0026\u0026\r\n{session.custom.alarm_filter.show_epc} \u0026\u0026\r\n{session.custom.alarm_filter.show_px} \u0026\u0026\r\n{session.custom.alarm_filter.show_camera_jams} \u0026\u0026\r\n{session.custom.alarm_filter.show_solenoids} \u0026\u0026\r\n{session.custom.alarm_filter.show_fio_safety}, True, False)"
}, },
"type": "expr" "type": "expr"
} }
@ -869,6 +869,82 @@
] ]
}, },
"type": "ia.input.checkbox" "type": "ia.input.checkbox"
},
{
"custom": {
"buttonid": "status_filters/running_status"
},
"events": {
"component": {
"onActionPerformed": {
"config": {
"script": "\tif not self.props.selected:\n\t\tbuttonid \u003d self.custom.buttonid\n\t\tactivityLog.logger.callLogger(self.view, \u0027click\u0027, buttonid)\n\t\tactivityLog.productMetrics.callLogger(self.view, \u0027click\u0027, buttonid)"
},
"scope": "G",
"type": "script"
}
}
},
"meta": {
"name": "Show-Sols",
"tooltip": {
"delay": 250
}
},
"position": {
"basis": "36px"
},
"propConfig": {
"props.enabled": {
"binding": {
"config": {
"expression": "if ({session.custom.alarm_filter.show_map}\u003dTrue \u0026\u0026 {session.custom.view_in_focus}\u003d\u0027/MAP-Home\u0027, True, False)"
},
"enabled": false,
"type": "expr"
}
},
"props.selected": {
"binding": {
"config": {
"bidirectional": true,
"path": "session.custom.alarm_filter.show_solenoids"
},
"type": "property"
}
}
},
"props": {
"checkedIcon": {
"color": {
"disabled": "#FFFFFF",
"enabled": "#FFFFFF"
}
},
"style": {
"color": "#FFFFFF",
"fontFamily": "Arial",
"fontSize": 12,
"fontWeight": "bold",
"marginLeft": 10,
"marginRight": 10
},
"text": "Show Solenoids"
},
"scripts": {
"customMethods": [],
"extensionFunctions": null,
"messageHandlers": [
{
"messageType": "select-all-filters",
"pageScope": false,
"script": "\tdata \u003d payload[\"data\"]\n\tself.props.selected \u003d data",
"sessionScope": false,
"viewScope": true
}
]
},
"type": "ia.input.checkbox"
} }
], ],
"meta": { "meta": {

View File

@ -9,8 +9,8 @@
"attributes": { "attributes": {
"lastModification": { "lastModification": {
"actor": "admin", "actor": "admin",
"timestamp": "2025-08-18T17:06:14Z" "timestamp": "2025-08-19T08:33:19Z"
}, },
"lastModificationSignature": "e233175b59a33bd771a4aa14f8361dc017245fb277350dfec8fe8b28dccbf4d5" "lastModificationSignature": "cd77e0634eff9d154a6da87d3dbe394d0505c72d038e08114b5bae607d11e284"
} }
} }

View File

@ -9,9 +9,9 @@
], ],
"attributes": { "attributes": {
"lastModification": { "lastModification": {
"actor": "admin", "actor": "external",
"timestamp": "2025-08-18T17:06:35Z" "timestamp": "2025-08-18T17:10:43Z"
}, },
"lastModificationSignature": "f7ce6455e576f34a531726016f349810dc2ef53652ec32614f8452f8840bb016" "lastModificationSignature": "ff4dc5a6ba7255f698a00573d69c699b8b43309b76df1f44b0730680f23f3c1e"
} }
} }

View File

@ -10,8 +10,8 @@
"attributes": { "attributes": {
"lastModification": { "lastModification": {
"actor": "admin", "actor": "admin",
"timestamp": "2025-08-18T17:06:35Z" "timestamp": "2025-08-19T08:34:34Z"
}, },
"lastModificationSignature": "ab4eee9ffbf14a771f611261d4e2b383847e0d0ef4246d845453bca8f3937979" "lastModificationSignature": "61948bcab0aecbfcfbb060262dd66913e0ddae5cc98d42f23d226982194c7286"
} }
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 71 KiB

View File

@ -9,9 +9,9 @@
], ],
"attributes": { "attributes": {
"lastModification": { "lastModification": {
"actor": "external", "actor": "admin",
"timestamp": "2025-08-18T16:55:42Z" "timestamp": "2025-08-19T08:36:40Z"
}, },
"lastModificationSignature": "b494201c09ed9c7d5b2d46ceb2cc845f37b6a4b1749e3ebca06c8368e77a81a2" "lastModificationSignature": "33e6935db616a5830005ef8b0e01e416aeaed54b4f0ddc71deb0f451ce59fe55"
} }
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

@ -719,10 +719,10 @@
"component": { "component": {
"onActionPerformed": { "onActionPerformed": {
"config": { "config": {
"script": "\tsystem.perspective.navigateBack()" "page": "/"
}, },
"scope": "G", "scope": "C",
"type": "script" "type": "nav"
} }
} }
}, },
@ -730,7 +730,7 @@
"name": "Back", "name": "Back",
"tooltip": { "tooltip": {
"enabled": true, "enabled": true,
"text": "Back" "text": "Back to DEX"
} }
}, },
"position": { "position": {

View File

@ -10,8 +10,8 @@
"attributes": { "attributes": {
"lastModification": { "lastModification": {
"actor": "admin", "actor": "admin",
"timestamp": "2025-08-18T17:10:18Z" "timestamp": "2025-08-19T08:36:48Z"
}, },
"lastModificationSignature": "ca8be9c37bbcbadf5ed96232cff9fa89d84bd494ccdc12cb2ac039dcfb4e21e3" "lastModificationSignature": "66e5b378124ac8f89350bb3e7f20e5350deba2f86531b26524693a89a4fd9dfe"
} }
} }

View File

@ -251,40 +251,6 @@
}, },
"type": "ia.display.icon" "type": "ia.display.icon"
}, },
{
"events": {
"dom": {
"onClick": {
"config": {
"page": "/"
},
"scope": "C",
"type": "nav"
}
}
},
"meta": {
"name": "Back",
"tooltip": {
"enabled": true,
"text": "Go back to DEX"
}
},
"position": {
"basis": "24px",
"shrink": 0
},
"props": {
"color": "#FFFFFF",
"path": "material/arrow_back",
"style": {
"classes": "Header/Icon",
"cursor": "pointer",
"marginRight": "10px"
}
},
"type": "ia.display.icon"
},
{ {
"children": [ "children": [
{ {

View File

@ -10,8 +10,8 @@
"attributes": { "attributes": {
"lastModification": { "lastModification": {
"actor": "admin", "actor": "admin",
"timestamp": "2025-08-18T17:01:01Z" "timestamp": "2025-08-19T08:34:40Z"
}, },
"lastModificationSignature": "c96954f271301fbe6967d01705c0eb2e394c1b3bd378dcf2031c9ecfbc3d1b87" "lastModificationSignature": "a1382ca3a17352b6faf6ba1fba9188090bd7729856296047472239fff3495f3b"
} }
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 26 KiB

View File

@ -167,8 +167,8 @@
"position": { "position": {
"height": 0.037, "height": 0.037,
"width": 0.0208, "width": 0.0208,
"x": 0.9703, "x": 0.9755,
"y": 0.5778 "y": 0.5406
}, },
"props": { "props": {
"path": "autStand/Equipment/Camera", "path": "autStand/Equipment/Camera",