Compare commits

...

8 Commits

5 changed files with 207 additions and 35 deletions

View File

@ -81,6 +81,14 @@
"/Tools": { "/Tools": {
"title": "Tools", "title": "Tools",
"viewPath": "Main-Views/ToolBox" "viewPath": "Main-Views/ToolBox"
},
"/Windows/Statistics": {
"title": "Statistics",
"viewPath": "Windows/Statistics"
},
"/Windows/Status": {
"title": "Status",
"viewPath": "Windows/Status"
} }
}, },
"sharedDocks": { "sharedDocks": {

View File

@ -39,7 +39,7 @@
}, },
{ {
"meta": { "meta": {
"name": "PS1_1_EP1" "name": "PS1_1_EPC1"
}, },
"position": { "position": {
"height": 31.97, "height": 31.97,
@ -246,7 +246,7 @@
}, },
{ {
"meta": { "meta": {
"name": "UL1_1_S2" "name": "PS1_1_S2"
}, },
"position": { "position": {
"height": 13, "height": 13,
@ -949,7 +949,7 @@
}, },
{ {
"meta": { "meta": {
"name": "UL8_3_EPC2_Line_1" "name": "UL9_4_EPC2_Line_1"
}, },
"position": { "position": {
"height": 6, "height": 6,
@ -1494,7 +1494,7 @@
}, },
{ {
"meta": { "meta": {
"name": "UL8_3_EPC2" "name": "UL9_4_EPC2"
}, },
"position": { "position": {
"height": 31.97, "height": 31.97,
@ -1901,7 +1901,7 @@
}, },
{ {
"meta": { "meta": {
"name": "UL12_1_EPC1_Line" "name": "UL12_3_EPC1_Line"
}, },
"position": { "position": {
"height": 6, "height": 6,
@ -2657,7 +2657,7 @@
}, },
{ {
"meta": { "meta": {
"name": "PS3_12_EPC_Line_2" "name": "PS3_12_EPC1_Line_2"
}, },
"position": { "position": {
"height": 6, "height": 6,
@ -3448,7 +3448,7 @@
}, },
{ {
"meta": { "meta": {
"name": "UL12_1_EPC2" "name": "UL12_3_EPC2"
}, },
"position": { "position": {
"height": 31.97, "height": 31.97,
@ -4396,7 +4396,7 @@
}, },
{ {
"meta": { "meta": {
"name": "PS3_12_EPC_Line_1" "name": "PS3_12_EPC1_Line_1"
}, },
"position": { "position": {
"height": 6, "height": 6,
@ -5531,7 +5531,7 @@
}, },
{ {
"meta": { "meta": {
"name": "PS7_9_JR1" "name": "UL7_9_JR1"
}, },
"position": { "position": {
"height": 13, "height": 13,
@ -5563,7 +5563,7 @@
}, },
{ {
"meta": { "meta": {
"name": "UL1_1_S1" "name": "PS1_1_S1"
}, },
"position": { "position": {
"height": 13, "height": 13,
@ -5768,7 +5768,7 @@
}, },
{ {
"meta": { "meta": {
"name": "UL12_1_EPC2_Line" "name": "UL12_3_EPC2_Line"
}, },
"position": { "position": {
"height": 6, "height": 6,
@ -6990,7 +6990,7 @@
}, },
{ {
"meta": { "meta": {
"name": "PS1_1_EP2" "name": "PS1_1_EPC2"
}, },
"position": { "position": {
"height": 31.97, "height": 31.97,
@ -7093,7 +7093,7 @@
}, },
{ {
"meta": { "meta": {
"name": "PS3_12_EPC" "name": "PS3_12_EPC1"
}, },
"position": { "position": {
"height": 31.97, "height": 31.97,
@ -8218,7 +8218,7 @@
}, },
{ {
"meta": { "meta": {
"name": "UL8_3_EPC1" "name": "UL9_4_EPC1"
}, },
"position": { "position": {
"height": 31.97, "height": 31.97,
@ -8285,7 +8285,7 @@
}, },
{ {
"meta": { "meta": {
"name": "PS7_9_S1" "name": "UL7_9_S1"
}, },
"position": { "position": {
"height": 13, "height": 13,
@ -8993,7 +8993,7 @@
}, },
{ {
"meta": { "meta": {
"name": "PS1_1_EP1_Line" "name": "PS1_1_EPC1_Line"
}, },
"position": { "position": {
"height": 6, "height": 6,
@ -10012,7 +10012,7 @@
}, },
{ {
"meta": { "meta": {
"name": "UL8_3_EPC1_Line_1" "name": "UL9_4_EPC1_Line_1"
}, },
"position": { "position": {
"height": 6, "height": 6,
@ -10840,7 +10840,7 @@
}, },
{ {
"meta": { "meta": {
"name": "PS7_9_S2" "name": "UL7_9_S2"
}, },
"position": { "position": {
"height": 13, "height": 13,
@ -13061,7 +13061,7 @@
}, },
{ {
"meta": { "meta": {
"name": "UL12_1_EPC1" "name": "UL12_3_EPC1"
}, },
"position": { "position": {
"height": 31.97, "height": 31.97,
@ -13096,7 +13096,7 @@
}, },
{ {
"meta": { "meta": {
"name": "UL8_3_EPC1_Line_2" "name": "UL9_4_EPC1_Line_2"
}, },
"position": { "position": {
"height": 6, "height": 6,
@ -13298,7 +13298,7 @@
}, },
{ {
"meta": { "meta": {
"name": "UL8_3_EPC2_Line_2" "name": "UL9_4_EPC2_Line_2"
}, },
"position": { "position": {
"height": 6, "height": 6,
@ -14023,7 +14023,7 @@
}, },
{ {
"meta": { "meta": {
"name": "PS7_9_JR2" "name": "UL7_9_JR2"
}, },
"position": { "position": {
"height": 13, "height": 13,
@ -14838,7 +14838,7 @@
}, },
{ {
"meta": { "meta": {
"name": "PS1_1_EP2_Line" "name": "PS1_1_EPC2_Line"
}, },
"position": { "position": {
"height": 6, "height": 6,
@ -14909,7 +14909,7 @@
}, },
{ {
"meta": { "meta": {
"name": "PS1_1_EP1_END" "name": "PS1_1_EPC1_END"
}, },
"position": { "position": {
"height": 30, "height": 30,
@ -15609,7 +15609,7 @@
}, },
{ {
"meta": { "meta": {
"name": "UL8_3_EPC1_END" "name": "UL9_4_EPC1_END"
}, },
"position": { "position": {
"height": 30, "height": 30,
@ -16064,7 +16064,7 @@
}, },
{ {
"meta": { "meta": {
"name": "PS1_1_EP2_END" "name": "PS1_1_EPC2_END"
}, },
"position": { "position": {
"height": 30, "height": 30,
@ -16379,7 +16379,7 @@
}, },
{ {
"meta": { "meta": {
"name": "UL12_1_EPC1_END" "name": "UL12_3_EPC1_END"
}, },
"position": { "position": {
"height": 30, "height": 30,
@ -16589,7 +16589,7 @@
}, },
{ {
"meta": { "meta": {
"name": "UL8_3_EPC2_END" "name": "UL9_4_EPC2_END"
}, },
"position": { "position": {
"height": 30, "height": 30,
@ -16974,7 +16974,7 @@
}, },
{ {
"meta": { "meta": {
"name": "UL12_1_EPC2_END" "name": "UL12_3_EPC2_END"
}, },
"position": { "position": {
"height": 30, "height": 30,
@ -17394,7 +17394,7 @@
}, },
{ {
"meta": { "meta": {
"name": "PS3_12_EPC_END" "name": "PS3_12_EPC1_END"
}, },
"position": { "position": {
"height": 30, "height": 30,
@ -17894,6 +17894,38 @@
"path": "Custom-Views/Area_Nav_Button" "path": "Custom-Views/Area_Nav_Button"
}, },
"type": "ia.display.view" "type": "ia.display.view"
},
{
"meta": {
"name": "PS3_1_S1"
},
"position": {
"height": 13,
"width": 13,
"x": 953.35,
"y": 379.54
},
"props": {
"params": {
"forceFaultStatus": null,
"forceRunningStatus": null,
"has_state": false,
"tagProps": [
"System/MCM01/Estop/PS7_9_S2",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value",
"value"
]
},
"path": "Symbol-Views/Equipment-Views/Estop"
},
"type": "ia.display.view"
} }
], ],
"meta": { "meta": {

View File

@ -44,6 +44,14 @@
"title": "Tools", "title": "Tools",
"viewPath": "Main-Views/ToolBox" "viewPath": "Main-Views/ToolBox"
}, },
"/Windows/Statistics": {
"title": "",
"viewPath": ""
},
"/Windows/Status": {
"title": "",
"viewPath": ""
},
"/config": { "/config": {
"title": "", "title": "",
"viewPath": "CommissioningTool/PageConfig" "viewPath": "CommissioningTool/PageConfig"

View File

@ -6,9 +6,9 @@
"$": [ "$": [
"ts", "ts",
192, 192,
1715164723047 1745914528657
], ],
"$ts": 1715164723045 "$ts": 1745914528656
} }
} }
}, },
@ -235,6 +235,7 @@
"config": { "config": {
"path": "this.custom.s3URI" "path": "this.custom.s3URI"
}, },
"enabled": false,
"transforms": [ "transforms": [
{ {
"code": "\treturn AWS.s3.getPresignedURL(self, value)", "code": "\treturn AWS.s3.getPresignedURL(self, value)",
@ -247,9 +248,10 @@
}, },
"props": { "props": {
"fit": { "fit": {
"height": 40, "height": 30,
"mode": "fill" "mode": "fill"
} },
"source": "/system/images/Builtin/amazon_rme_logo.png"
}, },
"type": "ia.display.image" "type": "ia.display.image"
}, },

View File

@ -195,6 +195,9 @@
"type": "ia.container.flex" "type": "ia.container.flex"
}, },
{ {
"custom": {
"show": false
},
"events": { "events": {
"component": { "component": {
"onActionPerformed": { "onActionPerformed": {
@ -631,6 +634,125 @@
"type": "ia.input.button" "type": "ia.input.button"
}, },
{ {
"custom": {
"show": false
},
"events": {
"component": {
"onActionPerformed": {
"config": {
"script": "\tsystem.perspective.navigate(\"/Windows/Statistics\")"
},
"scope": "G",
"type": "script"
}
}
},
"meta": {
"name": "Statistic",
"tooltip": {
"enabled": true,
"text": "Notifications"
}
},
"position": {
"basis": "70px"
},
"propConfig": {
"position.display": {
"binding": {
"config": {
"expression": "if(isNull({session.custom.download_url}), False, True)"
},
"enabled": false,
"type": "expr"
}
}
},
"props": {
"image": {
"height": 32,
"icon": {
"color": "#FCFFFC",
"path": "material/leaderboard"
},
"position": "top",
"width": 32
},
"style": {
"classes": "Buttons/Button-Menu",
"color": "#FFFFFF",
"margin": 1
},
"text": "Statistic",
"textStyle": {
"classes": "Text-Styles/Docked-Buttons"
}
},
"type": "ia.input.button"
},
{
"custom": {
"show": false
},
"events": {
"component": {
"onActionPerformed": {
"config": {
"script": "\tsystem.perspective.navigate(\"/Windows/Status\")"
},
"scope": "G",
"type": "script"
}
}
},
"meta": {
"name": "Status",
"tooltip": {
"enabled": true,
"text": "Notifications"
}
},
"position": {
"basis": "70px"
},
"propConfig": {
"position.display": {
"binding": {
"config": {
"expression": ""
},
"enabled": false,
"type": "expr"
}
}
},
"props": {
"image": {
"height": 32,
"icon": {
"color": "#FFFFFD",
"path": "material/done"
},
"position": "top",
"width": 32
},
"style": {
"classes": "Buttons/Button-Menu",
"color": "#FFFFFF",
"margin": 1
},
"text": "Status",
"textStyle": {
"classes": "Text-Styles/Docked-Buttons"
}
},
"type": "ia.input.button"
},
{
"custom": {
"show": false
},
"events": { "events": {
"component": { "component": {
"onActionPerformed": { "onActionPerformed": {
@ -782,7 +904,7 @@
"image": { "image": {
"height": 32, "height": 32,
"icon": { "icon": {
"color": "#FF8C00", "color": "#FFFAF1",
"path": "material/cloud_download" "path": "material/cloud_download"
}, },
"position": "top", "position": "top",