Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.steamware.net/steamware/mapo-core into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2023-11-06 19:10:27 +01:00
parent bf8e4fe389 ff6b9e0fd3
commit 705eeb56df
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/Components/MachineBlock.razor
+23 -6
View File
@@ -56,9 +56,12 @@ else
</div>
<div class="col-8" style="line-height: 1.6rem;">
<div class="d-flex justify-content-around">
<div class="text-center text-success ">
<div class="text-center text-success d-flex justify-content-between">
<div>
<i class="fa-regular fa-circle-check"></i>&nbsp; @($" {RecMSE.PezziConf:N0}")
<i class="fa-regular fa-circle-check"></i>&nbsp; @($" {RecMSE.PezziConf:N0}") &nbsp;
</div>
<div class="text-danger">
+ &nbsp; @($" {0:N0}")
</div>
</div>
<div class="text-center text-warning ">
@@ -104,9 +107,16 @@ else
<EgwCoreLib.Razor.CircleGaugeMulti Titolo="@($"{currMaxVal}")" Testo="#pz prod" maxVal="@currMaxVal" ListInner="@innerCircleVals" ListOuter="@outerCircleVals" ShowCircleBtn="true"></EgwCoreLib.Razor.CircleGaugeMulti>
</div>
<div style="font-size: 1rem" class="me-3 col-6">
<div class="text-center text-success d-flex justify-content-between">
<div class="text-center text-success d-flex justify-content-between pe-2">
<div class="col-4"><i class="fa-regular fa-circle-check"></i></div>
<div class="col-8">@($"{RecMSE.PezziConf:N0}")</div>
<div class="col-8 d-flex justify-content-between">
<div>
@($"{RecMSE.PezziConf:N0}")
</div>
<div class="text-danger">
+ &nbsp; @($" {0:N0}")
</div>
</div>
</div>
<div class="text-center text-warning d-flex justify-content-between">
<div class="col-4"><i class="fa-solid fa-layer-group"></i></div>
@@ -138,10 +148,17 @@ else
@RecMSE.Nome
</h4>
</div>
<div style="font-size: 1rem" class="me-3 col-6">
<div style="font-size: 1rem" class="me-3">
<div class="text-end text-success d-flex justify-content-between">
<div class="col-4"><i class="fa-regular fa-circle-check"></i></div>
<div class="col-8">@($"{RecMSE.PezziConf:N0}")</div>
<div class="col-8 d-flex justify-content-between">
<div>
@($"{RecMSE.PezziConf:N0}")
</div>
<div class="text-danger">
+ &nbsp; @($" {0:N0}")
</div>
</div>
</div>
<div class="text-end text-warning d-flex justify-content-between">
<div class="col-4"><i class="fa-solid fa-layer-group"></i></div>
MP-TAB-SERV/Pages/StatusMap.razor
+4 -4
View File
@@ -6,13 +6,13 @@
<div class="row">
@if (ListMSE == null || ListMSE.Count == 0 || isCalcSize)
{
@for (int i = 0; i < 10; i++)
@*@for (int i = 0; i < 10; i++)
{
<div class="col-6 col-sm-6 col-md-4 col-lg-3 col-xl-2 mb-2 px-1 bloccoMacc">
@*<MachineBlock></MachineBlock>*@
<EgwCoreLib.Razor.LoadingData></EgwCoreLib.Razor.LoadingData>
@*<MachineBlock></MachineBlock>
</div>
}
}*@
<EgwCoreLib.Razor.LoadingData></EgwCoreLib.Razor.LoadingData>
}
else
{