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

Merge pull request 'MTN6-130' (#78) from guga into main

Browse Source 
Reviewed-on: http://192.168.5.191:3000/LCI/MTN6/pulls/78
This commit is contained in:
GigiMamaladze 2025-05-05 12:54:34 +00:00
commit b163d5087a
16 changed files with 376 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,9 +8,9 @@
], ],
"attributes": { "attributes": {
"lastModification": { "lastModification": {
"actor": "ilia-gu-autstand", "actor": "admin",
"timestamp": "2025-04-18T12:56:12Z" "timestamp": "2025-05-05T11:33:17Z"
}, },
"lastModificationSignature": "1c4e28ae538739c912b6f4046df20cbd53ab81ffd41fc6976544a3570bf320cd" "lastModificationSignature": "69e0b4eb7437508dcdd5bad4cbba406ed92458f5a645da86b5bb9fd81788ec1b"
} }
} }

6
MTN6_SCADA/com.inductiveautomation.perspective/session-props/props.json
View File

@ -3,7 +3,9 @@
"alarm_filter": { "alarm_filter": {
"magnificaiton": "x2", "magnificaiton": "x2",
"orderby": false, "orderby": false,
"show_camera_jams": true,
"show_diagnostic": true, "show_diagnostic": true,
"show_fio": true,
"show_gateways": true, "show_gateways": true,
"show_low_alarm": true, "show_low_alarm": true,
"show_map": true, "show_map": true,
@ -213,13 +215,13 @@
} }
}, },
"props": { "props": {
"address": "127.0.0.1", "address": "192.168.5.149",
"appBar": { "appBar": {
"togglePosition": "hidden" "togglePosition": "hidden"
}, },
"device": {}, "device": {},
"geolocation": {}, "geolocation": {},
"locale": "en-US", "locale": "en-US",
"timeZoneId": "Asia/Tbilisi" "timeZoneId": "America/Los_Angeles"
} }
} }

6
MTN6_SCADA/com.inductiveautomation.perspective/session-props/resource.json
View File

@ -8,9 +8,9 @@
], ],
"attributes": { "attributes": {
"lastModification": { "lastModification": {
"actor": "ilia-gu-autstand", "actor": "admin",
"timestamp": "2025-04-18T12:57:02Z" "timestamp": "2025-05-05T11:33:50Z"
}, },
"lastModificationSignature": "05ab8f4189e958a2574a5dd382d68a0a48ef873c68962b8bf0cccbb604930795" "lastModificationSignature": "b0f6aa6ac39bc3338d5381747b44b588c0dc933b3f25fa822a373703bed27699"
} }
} }

172
MTN6_SCADA/com.inductiveautomation.perspective/views/Objects/PowerTable/FilterMenuItem/view.json Normal file
View File

@ -0,0 +1,172 @@
{
"custom": {},
"params": {
"active": false,
"color": "",
"id": "",
"text": "hello world"
},
"propConfig": {
"params.active": {
"paramDirection": "inout",
"persistent": true
},
"params.color": {
"paramDirection": "input",
"persistent": true
},
"params.id": {
"paramDirection": "input",
"persistent": true
},
"params.text": {
"paramDirection": "input",
"persistent": true
}
},
"props": {
"defaultSize": {
"height": 28,
"width": 183
}
},
"root": {
"children": [
{
"events": {
"dom": {
"onClick": {
"config": {
"script": "\tsystem.perspective.sendMessage(\u0027activate-filter\u0027, payload \u003d {\u0027id\u0027:self.view.params.id}, scope \u003d \u0027page\u0027)\n\tself.view.params.active \u003d True "
},
"scope": "G",
"type": "script"
}
}
},
"meta": {
"name": "AddButton"
},
"position": {
"basis": "30px"
},
"propConfig": {
"position.display": {
"binding": {
"config": {
"expression": "!{view.params.active}"
},
"type": "expr"
}
},
"props.color": {
"binding": {
"config": {
"path": "view.params.color"
},
"type": "property"
}
}
},
"props": {
"path": "material/add",
"style": {
"cursor": "pointer"
}
},
"type": "ia.display.icon"
},
{
"events": {
"dom": {
"onClick": {
"config": {
"script": "\tsystem.perspective.sendMessage(\u0027deactivate-filter\u0027, payload \u003d {\u0027id\u0027:self.view.params.id}, scope \u003d \u0027page\u0027)\n\tself.view.params.active \u003d False "
},
"scope": "G",
"type": "script"
}
}
},
"meta": {
"name": "RemoveButton"
},
"position": {
"basis": "30px"
},
"propConfig": {
"position.display": {
"binding": {
"config": {
"expression": "{view.params.active}"
},
"type": "expr"
}
},
"props.color": {
"binding": {
"config": {
"path": "view.params.color"
},
"type": "property"
}
}
},
"props": {
"path": "material/remove",
"style": {
"cursor": "pointer"
}
},
"type": "ia.display.icon"
},
{
"meta": {
"name": "FilterText"
},
"position": {
"basis": "153px"
},
"propConfig": {
"props.text": {
"binding": {
"config": {
"path": "view.params.text"
},
"type": "property"
}
}
},
"props": {
"style": {
"classes": "Page/Text",
"fontSize": 12
}
},
"type": "ia.display.label"
}
],
"meta": {
"name": "root"
},
"props": {
"style": {
"overflow": "hidden"
}
},
"scripts": {
"customMethods": [],
"extensionFunctions": null,
"messageHandlers": [
{
"messageType": "deactivate-filter",
"pageScope": true,
"script": "\t# implement your handler here\n\tif payload[\u0027id\u0027] \u003d\u003d self.view.params.id or payload[\u0027id\u0027] \u003d\u003d -1:\n\t\tself.view.params.active \u003d False",
"sessionScope": false,
"viewScope": false
}
]
},
"type": "ia.container.flex"
}
}

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

@ -8,9 +8,9 @@
], ],
"attributes": { "attributes": {
"lastModification": { "lastModification": {
"actor": "external", "actor": "admin",
"timestamp": "2025-04-08T09:28:16Z" "timestamp": "2025-05-05T11:34:22Z"
}, },
"lastModificationSignature": "d111ed4aae06b606bf8e60bb2cd41c71b6a09a05949e5f7635da94e2c4afb814" "lastModificationSignature": "5ce6b3b1e290b6fe23bc0f09b69dd5ffce89501248fc27d020feea242b3c8f00"
} }
} }

6
SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/session-props/props.json
View File

@ -3,7 +3,9 @@
"alarm_filter": { "alarm_filter": {
"magnificaiton": "x2", "magnificaiton": "x2",
"orderby": false, "orderby": false,
"show_camera_jams": true,
"show_diagnostic": true, "show_diagnostic": true,
"show_fio": true,
"show_gateways": true, "show_gateways": true,
"show_low_alarm": true, "show_low_alarm": true,
"show_map": true, "show_map": true,
@ -211,13 +213,13 @@
} }
}, },
"props": { "props": {
"address": "10.10.1.96", "address": "192.168.5.149",
"appBar": { "appBar": {
"togglePosition": "hidden" "togglePosition": "hidden"
}, },
"device": {}, "device": {},
"geolocation": {}, "geolocation": {},
"locale": "en-US", "locale": "en-US",
"timeZoneId": "UTC" "timeZoneId": "America/Los_Angeles"
} }
} }

6
SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/session-props/resource.json
View File

@ -8,9 +8,9 @@
], ],
"attributes": { "attributes": {
"lastModification": { "lastModification": {
"actor": "external", "actor": "admin",
"timestamp": "2025-04-08T09:28:16Z" "timestamp": "2025-05-05T11:34:37Z"
}, },
"lastModificationSignature": "10564629d4c4e4b19b7052e86e32227c3f52b9e3ceaf4c368387f024d3973232" "lastModificationSignature": "f1e43b35cecef48b11eb98d4df5d824e5cc70863454469e76e841a0644cdea6d"
} }
} }

4
SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Header/Header/resource.json
View File

@ -10,8 +10,8 @@
"attributes": { "attributes": {
"lastModification": { "lastModification": {
"actor": "external", "actor": "external",
"timestamp": "2025-04-08T09:28:16Z" "timestamp": "2025-05-05T11:32:51Z"
}, },
"lastModificationSignature": "06ddb0449b703928a3e4774c5b0a07898223175e43d6e75b65816e252328ef09" "lastModificationSignature": "c4a3f28f3d6918e73fbf5e8cf058655b9fedc96ebc01b55ef96e414aa737b4e0"
} }
} }

4
SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Navigation-Views/Docked-West/resource.json
View File

@ -10,8 +10,8 @@
"attributes": { "attributes": {
"lastModification": { "lastModification": {
"actor": "external", "actor": "external",
"timestamp": "2025-04-08T09:28:16Z" "timestamp": "2025-05-05T11:32:51Z"
}, },
"lastModificationSignature": "71dd458df15514c9f077cbc4ab84c1f584b60df90856cc4d46af22190483f0a9" "lastModificationSignature": "7e37f445b20ca02eb9e75cb3e8c521042113c4196f4aad6602f9f05e2a08a859"
} }
} }

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

@ -414,7 +414,7 @@
"custom.filters_active": { "custom.filters_active": {
"binding": { "binding": {
"config": { "config": {
"expression": "if(!{session.custom.alarm_filter.show_diagnostic} ||\r\n!{session.custom.alarm_filter.show_gateways} ||\r\n!{session.custom.alarm_filter.show_low_alarm} ||\r\n{session.custom.alarm_filter.orderby} ||\r\n!{session.custom.alarm_filter.show_running} ||\r\n!{session.custom.alarm_filter.show_safety}, \r\nTrue,\r\nFalse)\r\n" "expression": "if(!{session.custom.alarm_filter.show_diagnostic} ||\r\n!{session.custom.alarm_filter.show_gateways} ||\r\n!{session.custom.alarm_filter.show_low_alarm} ||\r\n{session.custom.alarm_filter.orderby} ||\r\n!{session.custom.alarm_filter.show_running} ||\r\n!{session.custom.alarm_filter.show_fio} ||\r\n!{session.custom.alarm_filter.show_camera_jams} ||\r\n!{session.custom.alarm_filter.show_safety}, \r\nTrue,\r\nFalse)\r\n"
}, },
"type": "expr" "type": "expr"
} }

4
SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/resource.json
View File

@ -10,8 +10,8 @@
"attributes": { "attributes": {
"lastModification": { "lastModification": {
"actor": "external", "actor": "external",
"timestamp": "2025-04-08T09:28:16Z" "timestamp": "2025-05-05T11:32:51Z"
}, },
"lastModificationSignature": "afdbc6c55f3c1b63596518adb828168116854c5e2058dd2726594ba76c7575d7" "lastModificationSignature": "f9a13e113bf9ddb1434c44c39c1cb8ff9abb3289e4f79be67dcaaa20d8ef76c1"
} }
} }

158
SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Detail-View-Filter/view.json
View File

@ -114,7 +114,7 @@
"props.selected": { "props.selected": {
"binding": { "binding": {
"config": { "config": {
"expression": "if({session.custom.alarm_filter.show_diagnostic} \u0026\u0026 \r\n{session.custom.alarm_filter.show_gateways} \u0026\u0026\r\n{session.custom.alarm_filter.show_low_alarm} \u0026\u0026\r\n{session.custom.alarm_filter.show_running} \u0026\u0026 \r\n{session.custom.alarm_filter.show_safety}, True, False)" "expression": "if({session.custom.alarm_filter.show_diagnostic} \u0026\u0026 \r\n{session.custom.alarm_filter.show_gateways} \u0026\u0026\r\n{session.custom.alarm_filter.show_low_alarm} \u0026\u0026\r\n{session.custom.alarm_filter.show_running} \u0026\u0026\r\n{session.custom.alarm_filter.show_camera_jams} \u0026\u0026\r\n{session.custom.alarm_filter.show_fio} \u0026\u0026\r\n{session.custom.alarm_filter.show_safety}, True, False)"
}, },
"type": "expr" "type": "expr"
} }
@ -459,7 +459,7 @@
} }
}, },
"meta": { "meta": {
"name": "Show-Gateways", "name": "Show-DPM-MCM",
"tooltip": { "tooltip": {
"delay": 250 "delay": 250
} }
@ -502,7 +502,159 @@
"marginLeft": 10, "marginLeft": 10,
"marginRight": 10 "marginRight": 10
}, },
"text": "Show Gateways" "text": "Show DPM \u0026 MCM"
},
"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"
},
{
"custom": {
"buttonid": "status_filters/camera_jams"
},
"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-Camera-Jams",
"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_camera_jams"
},
"type": "property"
}
}
},
"props": {
"checkedIcon": {
"color": {
"disabled": "#FFFFFF",
"enabled": "#FFFFFF"
}
},
"style": {
"color": "#FFFFFF",
"fontFamily": "Arial",
"fontSize": 12,
"fontWeight": "bold",
"marginLeft": 10,
"marginRight": 10
},
"text": "Show Camera Jams"
},
"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"
},
{
"custom": {
"buttonid": "status_filters/fio_sio"
},
"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-Fios",
"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_fio"
},
"type": "property"
}
}
},
"props": {
"checkedIcon": {
"color": {
"disabled": "#FFFFFF",
"enabled": "#FFFFFF"
}
},
"style": {
"color": "#FFFFFF",
"fontFamily": "Arial",
"fontSize": 12,
"fontWeight": "bold",
"marginLeft": 10,
"marginRight": 10
},
"text": "Show FIO \u0026 SIO"
}, },
"scripts": { "scripts": {
"customMethods": [], "customMethods": [],

4
SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/DeviceStatus/resource.json
View File

@ -10,8 +10,8 @@
"attributes": { "attributes": {
"lastModification": { "lastModification": {
"actor": "external", "actor": "external",
"timestamp": "2025-04-08T09:28:16Z" "timestamp": "2025-05-05T11:32:51Z"
}, },
"lastModificationSignature": "b970c7e443cf45a6e6471f2f60fb4981a3e56b53a433a445667724e9912c31ad" "lastModificationSignature": "43a80ff05948c024735279605a4549b0d0c03b5920a4bd87eeb2bd2af6da24de"
} }
} }

10
SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Device-Views/DeviceStatus/view.json
View File

@ -80,7 +80,7 @@
"meta.visible": { "meta.visible": {
"binding": { "binding": {
"config": { "config": {
"expression": "if({parent.custom.state}\u003d1||{parent.custom.covert_mode}||{parent.custom.isMatch}\u003e0,true,false)" "expression": "true"
}, },
"type": "expr" "type": "expr"
} }
@ -270,6 +270,14 @@
}, },
"type": "expr" "type": "expr"
} }
},
"meta.visible": {
"binding": {
"config": {
"path": "session.custom.alarm_filter.show_fio"
},
"type": "property"
}
} }
}, },
"props": { "props": {

4
SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/THEA/resource.json
View File

@ -10,8 +10,8 @@
"attributes": { "attributes": {
"lastModification": { "lastModification": {
"actor": "external", "actor": "external",
"timestamp": "2025-04-08T09:28:16Z" "timestamp": "2025-05-05T11:32:51Z"
}, },
"lastModificationSignature": "774aa512c5cb95950ea32184d9d85344f66319a3beb05ca4a3fec93b0f82004c" "lastModificationSignature": "bfc32d1b73d4c2b852bc0b4138d804e75fc123a2ade9d5316609d26e09f096dd"
} }
} }

10
SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/THEA/view.json
View File

@ -10,7 +10,7 @@
"priority": 0, "priority": 0,
"priority_string": "No active alarms", "priority_string": "No active alarms",
"running_status": 0, "running_status": 0,
"searchId": "value", "searchId": "PLC01",
"state": 5, "state": 5,
"state_string": "Unknown" "state_string": "Unknown"
}, },
@ -584,6 +584,14 @@
"type": "expr" "type": "expr"
} }
}, },
"meta.visible": {
"binding": {
"config": {
"path": "session.custom.alarm_filter.show_camera_jams"
},
"type": "property"
}
},
"props.style.classes": { "props.style.classes": {
"binding": { "binding": {
"config": { "config": {