Compare commits

...

17 Commits

Author SHA1 Message Date
0f573839a0 Merge pull request 'SAT9-16' (#8) from nk-branch into main
Reviewed-on: http://192.168.5.191:3000/LCI/SAT9/pulls/8
Reviewed-by: GigiMamaladze <gigi.mamaladze@autStand.com>
2025-04-21 07:48:38 +00:00
6bc5ce9f56 Returned expresion 2025-04-21 11:47:23 +04:00
Gigi Mamaladze
2991f19ba0 deleted duplicated SCADA folder 2025-04-21 11:10:00 +04:00
5b3baad990 SAT9-16 2025-04-21 11:08:35 +04:00
c4642a9506 Merge pull request 'Updated chutes to NonPowered' (#7) from beka-branch into main
Reviewed-on: http://192.168.5.191:3000/LCI/SAT9/pulls/7
Reviewed-by: GigiMamaladze <gigi.mamaladze@autStand.com>
2025-04-21 06:57:35 +00:00
dbaeb09144 Updated chutes to NonPowered 2025-04-21 10:54:29 +04:00
e7c7b4f55f Merge pull request 'SAT9-14' (#6) from beka-branch into main
Reviewed-on: http://192.168.5.191:3000/LCI/SAT9/pulls/6
Reviewed-by: GigiMamaladze <gigi.mamaladze@autStand.com>
2025-04-21 06:51:09 +00:00
a8b4b0c51c SAT9-14 2025-04-21 10:47:50 +04:00
7c21700891 Merge pull request 'Added missing chevrons and updated svg' (#5) from GM-branch into main
Reviewed-on: http://192.168.5.191:3000/LCI/SAT9/pulls/5
2025-04-18 19:55:50 +00:00
Gigi Mamaladze
683cb1fafe Added missing chevrons and updated svg 2025-04-18 23:55:04 +04:00
74504ac934 Merge pull request 'Renamed SAT9' (#4) from GM-branch into main
Reviewed-on: http://192.168.5.191:3000/LCI/SAT9/pulls/4
2025-04-18 19:23:26 +00:00
Gigi Mamaladze
134b4129c3 Renamed SAT9 2025-04-18 23:21:57 +04:00
f78fe4bead Merge pull request 'SAT9-13' (#3) from GM-branch into main
Reviewed-on: http://192.168.5.191:3000/LCI/SAT9/pulls/3
2025-04-18 18:45:03 +00:00
Gigi Mamaladze
d171466f45 SAT9-13 2025-04-18 22:43:54 +04:00
5611c9dd0a Merge pull request 'SAT9-12' (#2) from GK-branch into main
Reviewed-on: http://192.168.5.191:3000/LCI/SAT9/pulls/2
2025-04-18 16:52:18 +00:00
Gigi Mamaladze
2fb4c78bc1 Changed dataprovider 2025-04-18 20:30:57 +04:00
f685c7a8ab Merge pull request 'SAT9-11' (#1) from GK-branch into main
Reviewed-on: http://192.168.5.191:3000/LCI/SAT9/pulls/1
Reviewed-by: GigiMamaladze <gigi.mamaladze@autStand.com>
2025-04-18 16:25:28 +00:00
332 changed files with 19694 additions and 1738 deletions

View File

@ -32,7 +32,7 @@
"fit": {
"mode": "fill"
},
"source": "http://127.0.0.1:5500/MCM02-MCM03%20Fluid%20Inbound.svg",
"source": "http://127.0.0.1:5500/MCM02-MCM03%20Fluid%20Inbound.svg?var1744995181039",
"style": {
"backgroundColor": "#EEEEEE"
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

View File

@ -1,17 +0,0 @@
{
"scope": "G",
"version": 1,
"restricted": false,
"overridable": true,
"files": [
"view.json",
"thumbnail.png"
],
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-04-18T15:37:20Z"
},
"lastModificationSignature": "6a2291bcc4437d0e7ba40c20e1c8faa7ba271819aa1b4619543710118119a57f"
}
}

Binary file not shown.

View File

@ -1,16 +0,0 @@
{
"scope": "A",
"version": 1,
"restricted": false,
"overridable": true,
"files": [
"data.bin"
],
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-02-27T10:24:21Z"
},
"lastModificationSignature": "6e175753bc8bc77b624e21e389814c862acdb50c7241d932b12fd9a3b08bdb2e"
}
}

View File

@ -0,0 +1,125 @@
{
"pages": {
"/": {
"title": "",
"viewPath": "Main-Views/Home"
},
"/Command": {
"title": "",
"viewPath": "Main-Views/CommandControl"
},
"/CustomView/:customView": {
"title": "",
"viewPath": "Custom-Views/Detail"
},
"/DetailedView/:detailedView/:plcTagPath": {
"title": "DetailedView",
"viewPath": "Detailed-Views/Detail"
},
"/DetailedView/MCM01 Bulk Inbound": {
"title": "",
"viewPath": "Detailed-Views/MCM01 Bulk Inbound"
},
"/DetailedView/MCM02 \u0026 MCM03 Fluid Inbound": {
"title": "",
"viewPath": "Detailed-Views/MCM02-MCM03 Fluid Inbound"
},
"/DetailedView/MCM04 \u0026 MCM05 Sorter Destination,chutes and bypass": {
"title": "",
"viewPath": "Detailed-Views/MCM04-MCM05 Sorter Destination, chutes and Bypass"
},
"/Device-manager": {
"viewPath": "Main-Views/Device-Manager/DeviceManager"
},
"/Help": {
"title": "Help",
"viewPath": "Main-Views/Help"
},
"/MAP-Home": {
"title": "",
"viewPath": "Additional-Home-View/SAT9"
},
"/Monitron": {
"title": "",
"viewPath": "Main-Views/Monitron"
},
"/Oil": {
"viewPath": "Main-Views/OilMonitoring"
},
"/Temperature": {
"title": "",
"viewPath": "Main-Views/TempMonitoring"
},
"/Tools": {
"title": "Tools",
"viewPath": "Main-Views/ToolBox"
}
},
"sharedDocks": {
"bottom": [
{
"anchor": "fixed",
"autoBreakpoint": 480,
"content": "cover",
"handle": "show",
"iconUrl": "material/notifications_active",
"id": "Docked-South",
"modal": false,
"resizable": false,
"show": "onDemand",
"size": 165,
"viewParams": {},
"viewPath": "Navigation-Views/Docked-South"
}
],
"cornerPriority": "top-bottom",
"left": [
{
"anchor": "fixed",
"autoBreakpoint": 805,
"content": "auto",
"handle": "autoHide",
"iconUrl": "",
"id": "Docked-West",
"modal": false,
"resizable": false,
"show": "auto",
"size": 70,
"viewParams": {},
"viewPath": "Navigation-Views/Docked-West"
}
],
"right": [
{
"anchor": "fixed",
"autoBreakpoint": 480,
"content": "cover",
"handle": "hide",
"iconUrl": "",
"id": "Docked-East",
"modal": false,
"resizable": false,
"show": "onDemand",
"size": 400,
"viewParams": {},
"viewPath": "PopUp-Views/Controller-Equipment/Information-Docked-East"
}
],
"top": [
{
"anchor": "fixed",
"autoBreakpoint": 480,
"content": "auto",
"handle": "hide",
"iconUrl": "",
"id": "",
"modal": false,
"resizable": false,
"show": "visible",
"size": 50,
"viewParams": {},
"viewPath": "Framework/Breakpoint"
}
]
}
}

View File

@ -9,8 +9,8 @@
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-04-18T14:39:35Z"
"timestamp": "2025-04-18T16:47:46Z"
},
"lastModificationSignature": "09a0763055426d34259de69a781861b842df0d38ceeb841fdee28766a7363315"
"lastModificationSignature": "67e2e9024099675ecb63c7ec73f0b5ae1ba1c1c894241610a80266978c53e7b0"
}
}

File diff suppressed because one or more lines are too long

View File

@ -8,9 +8,9 @@
],
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-04-18T11:28:57Z"
"actor": "external",
"timestamp": "2025-04-18T18:42:34Z"
},
"lastModificationSignature": "541352301bc33febe5b9d0d3df5651423b99f75e9e7d26bad2df163d02a87692"
"lastModificationSignature": "6b256c5095aaffbca4fbbf7a230d147d552c0099d07eb3b723f9e78ab349f6ad"
}
}

Some files were not shown because too many files have changed in this diff Show More