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>
This commit is contained in:
GigiMamaladze 2025-04-18 16:25:28 +00:00
commit f685c7a8ab
7 changed files with 88 additions and 193 deletions

View File

@ -1,46 +0,0 @@
{
"custom": {},
"params": {},
"props": {
"defaultSize": {
"height": 1080,
"width": 1920
}
},
"root": {
"children": [
{
"meta": {
"name": "Image"
},
"position": {
"height": 1,
"width": 1
},
"propConfig": {
"props.source": {
"binding": {
"config": {
"expression": "\"http://127.0.0.1:5500/SAT9%20Overview.svg?var\" + toMillis(now(100))"
},
"type": "expr"
}
}
},
"props": {
"fit": {
"mode": "fill"
}
},
"type": "ia.display.image"
}
],
"meta": {
"name": "root"
},
"props": {
"mode": "percent"
},
"type": "ia.container.coord"
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

View File

@ -1,125 +0,0 @@
{
"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"
}
]
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

View File

@ -4334,6 +4334,54 @@
"path": "Symbol-Views/Equipment-Views/Estop"
},
"type": "ia.display.view"
},
{
"meta": {
"elementPrefix": "CON",
"forcedPrefix": "CON",
"groupSuffix": "u",
"id": "rect18",
"inheritedGroupPrefix": "CON",
"name": "ULC4-7CH",
"originalName": "ULC4-6"
},
"position": {
"height": 23,
"rotate": {
"angle": "270deg"
},
"width": 25,
"x": 790.86,
"y": 203.38
},
"props": {
"path": "Symbol-Views/Equipment-Views/StatusNonPowered"
},
"type": "ia.display.view"
},
{
"meta": {
"elementPrefix": "CON",
"forcedPrefix": "CON",
"groupSuffix": "u",
"id": "rect18",
"inheritedGroupPrefix": "CON",
"name": "ULC3-7CH",
"originalName": "ULC4-6"
},
"position": {
"height": 23,
"rotate": {
"angle": "270deg"
},
"width": 24,
"x": 642.37,
"y": 203.89
},
"props": {
"path": "Symbol-Views/Equipment-Views/StatusNonPowered"
},
"type": "ia.display.view"
}
],
"meta": {

View File

@ -9,7 +9,7 @@
id="svg1"
xml:space="preserve"
inkscape:version="1.4 (86a8ad7, 2024-10-11)"
sodipodi:docname="SAT9 MCM01.svg"
sodipodi:docname="MCM01 Bulk Inbound.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
@ -23,9 +23,9 @@
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="px"
inkscape:zoom="1.1"
inkscape:cx="609.54545"
inkscape:cy="582.72727"
inkscape:zoom="3.1112698"
inkscape:cx="727.67716"
inkscape:cy="330.41171"
inkscape:window-width="3840"
inkscape:window-height="2054"
inkscape:window-x="-11"
@ -286,10 +286,10 @@
inkscape:label="ULC4-5" /><rect
style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-dasharray:none"
id="rect18"
width="29.014893"
height="201.14192"
width="29.014954"
height="192.7852"
x="-817.35272"
y="221.17261"
y="229.52931"
transform="scale(-1,1)"
inkscape:label="ULC4-6" /><rect
style="fill:#ffffff;stroke:#000000;stroke-width:0.997909;stroke-dasharray:none"
@ -320,4 +320,22 @@
x="-474.53992"
y="-1617.1968"
transform="matrix(0,-1,-1,0,0,0)"
inkscape:label="ULC4-2" /></g></g></svg>
inkscape:label="ULC4-2" /><rect
style="fill:#ffffff;stroke:#000000;stroke-width:0.985382;stroke-dasharray:none"
id="rect3"
width="29.014618"
height="24.750513"
x="639.75757"
y="-227.14697"
transform="scale(1,-1)"
ry="0"
inkscape:label="ULC2-12" /><rect
style="fill:#ffffff;stroke:#000000;stroke-width:0.985382;stroke-dasharray:none"
id="rect4"
width="29.014618"
height="24.750513"
x="788.47192"
y="-227.14697"
transform="scale(1,-1)"
ry="0"
inkscape:label="ULC2-12" /></g></g></svg>

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -23,9 +23,9 @@
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="px"
inkscape:zoom="3.1999438"
inkscape:cx="486.57105"
inkscape:cy="484.07101"
inkscape:zoom="9.0508078"
inkscape:cx="1044.9896"
inkscape:cy="336.76552"
inkscape:window-width="3840"
inkscape:window-height="2054"
inkscape:window-x="-11"
@ -679,10 +679,10 @@
sodipodi:nodetypes="cczcczc" /><rect
style="fill:#ffffff;stroke:#000000;stroke-width:1.03591;stroke-dasharray:none"
id="rect1-6-2-0-0-4-8-1-2-8-3-1-5-1"
width="10.964087"
height="74.422653"
width="10.964111"
height="58.623005"
x="1713.765"
y="-659.79724"
y="-643.9975"
transform="scale(1,-1)" /><path
style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-dasharray:none;stroke-dashoffset:0"
d="m 1772.6367,544.66556 c 0,0 3.1357,0.53891 5.2201,2.16513 2.0844,1.62622 3.0442,3.53559 3.0442,3.53559 l 10.5011,-0.0201 c 0,0 -1.4771,-6.36326 -6.4911,-10.86012 -5.014,-4.49686 -12.4696,-5.32632 -12.4696,-5.32632 z"
@ -691,23 +691,23 @@
style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-dasharray:none"
id="rect1-6-2-0-0-4-8-1-2-8-3-1-5-1-6"
width="10.583984"
height="92.072266"
height="91.851288"
x="1781.059"
y="-643.8194"
y="-643.59845"
transform="scale(1,-1)" /><rect
style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-dasharray:none"
id="rect1-6-2-0-0-4-8-1-2-8-3-1-5-1-6-8"
width="10.583984"
height="12.072266"
height="19.364433"
x="1781.0588"
y="-657.90833"
y="-665.2005"
transform="scale(1,-1)" /><rect
style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-dasharray:none"
id="rect1-6-2-0-0-4-8-1-2-8-3-1-5-1-6-8-5"
width="11.083984"
height="10.572266"
height="19.963556"
x="1713.6628"
y="-664.07166"
y="-665.72882"
transform="scale(1,-1)" /><rect
style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-dasharray:none"
id="rect1-6-2-0-0-4-8-1-2-8-1-4"
@ -2477,9 +2477,9 @@
style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-dasharray:none"
id="rect1-6-2-0-0-4-8-1-2-8-3-1-5-1-6-8-5-1"
width="10.583984"
height="12.072266"
height="26.988001"
x="1088.0968"
y="-961.03888"
y="-975.95465"
transform="scale(1,-1)" /><rect
style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-dasharray:none"
id="rect1-6-2-0-0-4-8-1-2-8-3-1-5-1-6-8-5-1-7"

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 102 KiB