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

Merge pull request 'MCM05: MTN6-40, MTN6-76, MTN6-69' (#10) from nika-branch-2 into main

Browse Source 
Reviewed-on: http://192.168.5.191:3000/LCI/MTN6/pulls/10
Reviewed-by: ilia-gurielidze-autstand <ilia.gurielidze@autStand.com>
This commit is contained in:
ilia-gurielidze-autstand 2025-04-09 13:51:09 +00:00
commit 9303ee6574
3 changed files with 1506 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1370
MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 North Bulk Inbound, Fluid Outbound and Problem Solve/view.json
View File

File diff suppressed because it is too large Load Diff

5
conversion-report.txt
View File

@ -1,4 +1,9 @@
Starting conversion: 20250408:12.12.42
Conversion finished. Elapsed time: 15 ms
<<<<<<< Updated upstream
Starting conversion: 20250409:10.08.29
Conversion finished. Elapsed time: 10 ms
=======
Starting conversion: 20250409:11.19.29
Conversion finished. Elapsed time: 12 ms
>>>>>>> Stashed changes

255
image_server/MCM05_Bulk_Inbound_Problem_Solve_+_Fluid_Inbound.svg
View File

@ -23,9 +23,9 @@
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="px"
inkscape:zoom="45.254832"
inkscape:cx="1652.1772"
inkscape:cy="845.54507"
inkscape:zoom="3.9999998"
inkscape:cx="583.75003"
inkscape:cy="299.50001"
inkscape:window-width="3840"
inkscape:window-height="2054"
inkscape:window-x="-11"
@ -37,7 +37,7 @@
orientation="0,-1"
id="guide14"
inkscape:locked="false" /><sodipodi:guide
position="729.89561,540.76489"
position="742.00003,774.99999"
orientation="1,0"
id="guide17"
inkscape:locked="false" /><sodipodi:guide
@ -94,6 +94,12 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"><path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:4, 1;stroke-dashoffset:0;stroke-opacity:1"
d="m 1084.7655,647.02283 -0.1767,78.1353"
id="path1"
inkscape:connector-type="polyline"
inkscape:connector-curvature="0"
transform="rotate(-90,708.27767,522.50545)" /><path
style="fill:#ffffff;stroke:#000000"
d="M 1491.875,370.125 1452.5,354.375 V 337.25 l 39.1875,-7.3125 z"
id="path105"
@ -142,51 +148,6 @@
d="m 1372.9018,604.35111 -16.5,-0.19327 -4.3713,-39.9415 25.7855,-0.0455 z"
id="path24"
sodipodi:nodetypes="ccccc" /><g
id="g63"
inkscape:label="CON_u"
transform="translate(-57,-7)"><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.913405;stroke-dasharray:none;stroke-opacity:1"
id="rect13"
width="176.83661"
height="19.086609"
x="782.62726"
y="719.96149"
ry="0"
transform="rotate(-90,711.77767,526.00545)"
inkscape:label="PS9-2" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.913405;stroke-dasharray:none;stroke-opacity:1"
id="rect14"
width="202.13139"
height="19.086609"
x="961.37726"
y="719.96149"
ry="0"
transform="rotate(-90,711.77767,526.00545)" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.913405;stroke-dasharray:none;stroke-opacity:1"
id="rect15"
width="50.399048"
height="19.086609"
x="1165.4325"
y="719.87793"
ry="0"
transform="rotate(-90,711.77767,526.00545)" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.913405;stroke-dasharray:none;stroke-opacity:1"
id="rect24"
width="470.38446"
height="19.08667"
x="602.25287"
y="1046.3779"
ry="0"
transform="rotate(-90,711.77767,526.00545)"
inkscape:label="PRS1-3" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.95694;stroke-dasharray:none;stroke-opacity:1"
id="rect1"
width="256.52863"
height="19.043091"
x="791.08856"
y="1365.0146"
transform="rotate(-90,711.77767,526.00545)"
inkscape:label="PS8-11" /></g><g
id="g67"
inkscape:label="CON_l"
transform="rotate(-90,738.27767,492.50545)"><rect
@ -512,34 +473,92 @@
inkscape:label="PS8-1" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.997791;stroke-dasharray:none;stroke-opacity:1"
id="rect21"
width="19.002209"
height="401.65796"
width="19.002197"
height="299.80484"
x="1074.6221"
y="347.78979"
inkscape:label="PRS2-1" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.997791;stroke-dasharray:none;stroke-opacity:1"
id="rect21-8"
width="19.002197"
height="61.156219"
x="1075.0271"
y="725.8761"
inkscape:label="PRS2-1" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.997808;stroke-dasharray:none;stroke-opacity:1"
id="rect2"
width="19.002192"
height="162.53796"
width="19.002197"
height="121.87932"
x="1074.5886"
y="857.58301"
y="898.24164"
ry="0"
inkscape:label="PRS1-4" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.997816;stroke-dasharray:none;stroke-opacity:1"
id="rect104"
width="19.002184"
height="74.662949"
x="1074.5886"
y="750.70801"
x="1074.9421"
y="789.59888"
ry="0"
inkscape:label="PRS1-6" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.997838;stroke-dasharray:none;stroke-opacity:1"
id="rect105"
width="19.002163"
height="28.91293"
x="1073.5886"
y="826.95801"
ry="0" /></g><path
x="1075.0028"
y="866.90955"
ry="0" /></g><rect
style="fill:#090909;stroke:#000000;stroke-width:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:0"
id="rect5"
width="412.53436"
height="141.53435"
x="304.48282"
y="199.48285" /><g
id="g63"
inkscape:label="CON_u"
transform="translate(-57,-7)"><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.913405;stroke-dasharray:none;stroke-opacity:1"
id="rect13"
width="176.83661"
height="19.086609"
x="782.62726"
y="719.96149"
ry="0"
transform="rotate(-90,711.77767,526.00545)"
inkscape:label="PS9-2" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.913405;stroke-dasharray:none;stroke-opacity:1"
id="rect14"
width="202.13139"
height="19.086609"
x="961.37726"
y="719.96149"
ry="0"
transform="rotate(-90,711.77767,526.00545)" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.913405;stroke-dasharray:none;stroke-opacity:1"
id="rect15"
width="50.399048"
height="19.086609"
x="1165.4325"
y="719.87793"
ry="0"
transform="rotate(-90,711.77767,526.00545)" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.913405;stroke-dasharray:none;stroke-opacity:1"
id="rect24"
width="470.38446"
height="19.08667"
x="602.25287"
y="1046.3779"
ry="0"
transform="rotate(-90,711.77767,526.00545)"
inkscape:label="PRS1-3" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.95694;stroke-dasharray:none;stroke-opacity:1"
id="rect1"
width="256.52863"
height="19.043091"
x="791.08856"
y="1365.0146"
transform="rotate(-90,711.77767,526.00545)"
inkscape:label="PS8-11" /></g><path
style="fill:#ffffff;stroke:#000000"
d="m 1016.8735,604.35111 -16.5,-0.19327 -4.37128,-39.9415 25.78548,-0.0455 z"
id="path5"
@ -583,4 +602,120 @@
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-dasharray:none"
d="m 1648.3979,931.14889 2.1397,-3.45409 -0.01,-26.25532 5.4425,-0.0112 0.1883,-51.97982 18.99,0.0361 -0.054,51.86916 4.5488,-0.0174 0.2286,26.43019 2.582,2.96201 -0.1271,9.63767 -33.9418,-0.0868 c -0.034,-0.24101 0.01,-9.13014 0.01,-9.13014 z"
id="path12"
sodipodi:nodetypes="cccccccccccccc" /></g></svg>
sodipodi:nodetypes="cccccccccccccc" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"
id="rect1-55"
width="19.734003"
height="19.734001"
x="354.51962"
y="257.05585"
inkscape:label="PRS1-7-ERSC14" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"
id="rect1-8"
width="19.734001"
height="19.734003"
x="376.95844"
y="257.13348"
inkscape:label="PRS1-7-ERSC13" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"
id="rect1-8-5"
width="19.734001"
height="19.734003"
x="399.22821"
y="257.24588"
inkscape:label="PRS1-7-ERSC12" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"
id="rect1-8-5-1"
width="19.734003"
height="19.734001"
x="421.5593"
y="257.46716"
inkscape:label="PRS1-7-ERSC11" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"
id="rect1-8-5-1-7"
width="19.734003"
height="19.734001"
x="444.19058"
y="257.68835"
inkscape:label="PRS1-7-ERSC10" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"
id="rect1-8-5-1-7-2"
width="19.734003"
height="19.734001"
x="467.16742"
y="257.80423"
inkscape:label="PRS1-7-ERSC9" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"
id="rect1-8-5-1-7-2-1"
width="19.734003"
height="19.734001"
x="489.85913"
y="257.8121"
inkscape:label="PRS1-7-ERSC8" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"
id="rect1-8-5-1-7-2-1-7"
width="19.734003"
height="19.734001"
x="512.72687"
y="257.79416"
inkscape:label="PRS1-7-ERSC7" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"
id="rect1-8-5-1-7-2-1-9"
width="19.734003"
height="19.734001"
x="535.32123"
y="257.86646"
inkscape:label="PRS1-7-ERSC6" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"
id="rect1-8-5-1-7-2-1-5"
width="19.734003"
height="19.734001"
x="557.85193"
y="257.91449"
inkscape:label="PRS1-7-ERSC5" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"
id="rect1-8-5-1-7-2-1-2"
width="19.734003"
height="19.734001"
x="579.96948"
y="257.97885"
inkscape:label="PRS1-7-ERSC4" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"
id="rect1-8-5-1-7-2-1-1"
width="19.734003"
height="19.734001"
x="602.66431"
y="257.99097"
inkscape:label="PRS1-7-ERSC3" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"
id="rect1-8-5-1-7-2-1-74"
width="19.734003"
height="19.734001"
x="625.47974"
y="258.14771"
inkscape:label="PRS1-7-ERSC2" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"
id="rect1-8-5-1-7-2-1-93"
width="19.734003"
height="19.734001"
x="647.99878"
y="258.16354"
inkscape:label="PRS1-7-ERSC1" /><path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 717.87503,199.50001 76.5,-24.125"
id="path13"
inkscape:connector-type="polyline"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /><path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 788.25003,190.00001 6.125,-14.875"
id="path14"
inkscape:connector-type="polyline"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /><path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 779.12503,170.00001 15.625,5.125"
id="path17"
inkscape:connector-type="polyline"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /></g></svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 31 KiB