LCI/MTN6
10
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

base: LCI:6d72e34fdd2b4c9c4e42f6a329401f25d10b86c6
Branches Tags
LCI:main
LCI:beka
LCI:beka-4
LCI:beka-2
LCI:updated-tags
LCI:beka-1
LCI:guga
LCI:guga1
...
compare: LCI:fef1027a30b5986be990aa103a503188e8150540
Branches Tags
LCI:beka
LCI:beka-4
LCI:main
LCI:beka-2
LCI:updated-tags
LCI:beka-1
LCI:guga
LCI:guga1

8 Commits
6d72e34fdd ... fef1027a30

Author SHA1 Message Date
b.makharadze
fef1027a30 Added logo 2025-04-29 12:38:06 +04:00
GigiMamaladze
31152b7357 Merge pull request 'Add missed devices on MCM01' (#73) from GM-branch-13 into main 
Reviewed-on: http://192.168.5.191:3000/LCI/MTN6/pulls/73
 2025-04-28 15:30:19 +00:00
Gigi Mamaladze
d3096fe5f3 Add missed devices on MCM01 2025-04-28 19:29:19 +04:00
GigiMamaladze
2f2d9ab55f Merge pull request 'MTN6-126' (#72) from bk-branch into main 
Reviewed-on: http://192.168.5.191:3000/LCI/MTN6/pulls/72
Reviewed-by: GigiMamaladze <gigi.mamaladze@autStand.com>
 2025-04-28 14:09:42 +00:00
GigiMamaladze
225a34958a Merge pull request 'MTN6-124' (#71) from nk-branch-5 into main 
Reviewed-on: http://192.168.5.191:3000/LCI/MTN6/pulls/71
 2025-04-28 12:30:46 +00:00
nika
ed3b0d1812 update button order 2025-04-28 04:36:30 -07:00
nika
bd9ea993e4 Navigation to Statistics and status directly 2025-04-28 03:46:54 -07:00
nika
86010f651a MTN6-124 2025-04-28 00:00:14 -07:00
5 changed files with 207 additions and 35 deletions
Show Stats Expand all files Collapse all files

8
MTN6_SCADA/com.inductiveautomation.perspective/page-config/config.json
View File

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

92
MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Fluid Inbound Merges 1-4/view.json
View File

@ -39,7 +39,7 @@
},
{
"meta": {
"name": "PS1_1_EP1"
"name": "PS1_1_EPC1"
},
"position": {
"height": 31.97,
@ -246,7 +246,7 @@
},
{
"meta": {
"name": "UL1_1_S2"
"name": "PS1_1_S2"
},
"position": {
"height": 13,
@ -949,7 +949,7 @@
},
{
"meta": {
"name": "UL8_3_EPC2_Line_1"
"name": "UL9_4_EPC2_Line_1"
},
"position": {
"height": 6,
@ -1494,7 +1494,7 @@
},
{
"meta": {
"name": "UL8_3_EPC2"
"name": "UL9_4_EPC2"
},
"position": {
"height": 31.97,
@ -1901,7 +1901,7 @@
},
{
"meta": {
"name": "UL12_1_EPC1_Line"
"name": "UL12_3_EPC1_Line"
},
"position": {
"height": 6,
@ -2657,7 +2657,7 @@
},
{
"meta": {
"name": "PS3_12_EPC_Line_2"
"name": "PS3_12_EPC1_Line_2"
},
"position": {
"height": 6,
@ -3448,7 +3448,7 @@
},
{
"meta": {
"name": "UL12_1_EPC2"
"name": "UL12_3_EPC2"
},
"position": {
"height": 31.97,
@ -4396,7 +4396,7 @@
},
{
"meta": {
"name": "PS3_12_EPC_Line_1"
"name": "PS3_12_EPC1_Line_1"
},
"position": {
"height": 6,
@ -5531,7 +5531,7 @@
},
{
"meta": {
"name": "PS7_9_JR1"
"name": "UL7_9_JR1"
},
"position": {
"height": 13,
@ -5563,7 +5563,7 @@
},
{
"meta": {
"name": "UL1_1_S1"
"name": "PS1_1_S1"
},
"position": {
"height": 13,
@ -5768,7 +5768,7 @@
},
{
"meta": {
"name": "UL12_1_EPC2_Line"
"name": "UL12_3_EPC2_Line"
},
"position": {
"height": 6,
@ -6990,7 +6990,7 @@
},
{
"meta": {
"name": "PS1_1_EP2"
"name": "PS1_1_EPC2"
},
"position": {
"height": 31.97,
@ -7093,7 +7093,7 @@
},
{
"meta": {
"name": "PS3_12_EPC"
"name": "PS3_12_EPC1"
},
"position": {
"height": 31.97,
@ -8218,7 +8218,7 @@
},
{
"meta": {
"name": "UL8_3_EPC1"
"name": "UL9_4_EPC1"
},
"position": {
"height": 31.97,
@ -8285,7 +8285,7 @@
},
{
"meta": {
"name": "PS7_9_S1"
"name": "UL7_9_S1"
},
"position": {
"height": 13,
@ -8993,7 +8993,7 @@
},
{
"meta": {
"name": "PS1_1_EP1_Line"
"name": "PS1_1_EPC1_Line"
},
"position": {
"height": 6,
@ -10012,7 +10012,7 @@
},
{
"meta": {
"name": "UL8_3_EPC1_Line_1"
"name": "UL9_4_EPC1_Line_1"
},
"position": {
"height": 6,
@ -10840,7 +10840,7 @@
},
{
"meta": {
"name": "PS7_9_S2"
"name": "UL7_9_S2"
},
"position": {
"height": 13,
@ -13061,7 +13061,7 @@
},
{
"meta": {
"name": "UL12_1_EPC1"
"name": "UL12_3_EPC1"
},
"position": {
"height": 31.97,
@ -13096,7 +13096,7 @@
},
{
"meta": {
"name": "UL8_3_EPC1_Line_2"
"name": "UL9_4_EPC1_Line_2"
},
"position": {
"height": 6,
@ -13298,7 +13298,7 @@
},
{
"meta": {
"name": "UL8_3_EPC2_Line_2"
"name": "UL9_4_EPC2_Line_2"
},
"position": {
"height": 6,
@ -14023,7 +14023,7 @@
},
{
"meta": {
"name": "PS7_9_JR2"
"name": "UL7_9_JR2"
},
"position": {
"height": 13,
@ -14838,7 +14838,7 @@
},
{
"meta": {
"name": "PS1_1_EP2_Line"
"name": "PS1_1_EPC2_Line"
},
"position": {
"height": 6,
@ -14909,7 +14909,7 @@
},
{
"meta": {
"name": "PS1_1_EP1_END"
"name": "PS1_1_EPC1_END"
},
"position": {
"height": 30,
@ -15609,7 +15609,7 @@
},
{
"meta": {
"name": "UL8_3_EPC1_END"
"name": "UL9_4_EPC1_END"
},
"position": {
"height": 30,
@ -16064,7 +16064,7 @@
},
{
"meta": {
"name": "PS1_1_EP2_END"
"name": "PS1_1_EPC2_END"
},
"position": {
"height": 30,
@ -16379,7 +16379,7 @@
},
{
"meta": {
"name": "UL12_1_EPC1_END"
"name": "UL12_3_EPC1_END"
},
"position": {
"height": 30,
@ -16589,7 +16589,7 @@
},
{
"meta": {
"name": "UL8_3_EPC2_END"
"name": "UL9_4_EPC2_END"
},
"position": {
"height": 30,
@ -16974,7 +16974,7 @@
},
{
"meta": {
"name": "UL12_1_EPC2_END"
"name": "UL12_3_EPC2_END"
},
"position": {
"height": 30,
@ -17394,7 +17394,7 @@
},
{
"meta": {
"name": "PS3_12_EPC_END"
"name": "PS3_12_EPC1_END"
},
"position": {
"height": 30,
@ -17894,6 +17894,38 @@
"path": "Custom-Views/Area_Nav_Button"
},
"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": {

8
SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/page-config/config.json
View File

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

10
SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Header/Header/view.json
View File

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

124
SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-West/view.json
View File

@ -195,6 +195,9 @@
"type": "ia.container.flex"
},
{
"custom": {
"show": false
},
"events": {
"component": {
"onActionPerformed": {
@ -631,6 +634,125 @@
"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": {
"component": {
"onActionPerformed": {
@ -782,7 +904,7 @@
"image": {
"height": 32,
"icon": {
"color": "#FF8C00",
"color": "#FFFAF1",
"path": "material/cloud_download"
},
"position": "top",