From 7bb8903a3c0a9ba1ce18c183442c747e4437134e Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Wed, 11 Oct 2023 17:24:02 +0200 Subject: [PATCH] aggiunto nuovo set grafico di machine block --- MP-TAB-SERV/Components/MachineBlock.razor | 47 ++++++++++++++++++- MP-TAB-SERV/Components/MachineBlock.razor.css | 14 ++++-- .../Components/MachineBlock.razor.less | 17 +++++-- .../Components/MachineBlock.razor.min.css | 2 +- MP-TAB-SERV/MP-TAB-SERV.csproj | 2 +- MP-TAB-SERV/Pages/StatusMap.razor | 2 +- MP-TAB-SERV/Resources/ChangeLog.html | 2 +- MP-TAB-SERV/Resources/VersNum.txt | 2 +- MP-TAB-SERV/Resources/manifest.xml | 2 +- 9 files changed, 75 insertions(+), 15 deletions(-) diff --git a/MP-TAB-SERV/Components/MachineBlock.razor b/MP-TAB-SERV/Components/MachineBlock.razor index 3e87e819..16ccf129 100644 --- a/MP-TAB-SERV/Components/MachineBlock.razor +++ b/MP-TAB-SERV/Components/MachineBlock.razor @@ -31,7 +31,7 @@ else { @if (FullMode) { -
+ @*
@RecMSE.CodMacchina
@@ -103,6 +103,51 @@ else
+
*@ +
+ @RecMSE.CodMacchina +
+
+
+
+ @RecMSE.Nome +
+
+
+
+
+
+
+ @RecMSE.DescrizioneStato:   @(formatDurata(RecMSE.Durata)) +
+
+
+
+ Confermati +
+
+ @($"{RecMSE.PezziConf:N0}") +
+
+
+
+ Prodotti +
+
+ @($"{RecMSE.PezziProd:N0}") +
+
+
+
+ Ordinati +
+
+ @($"{RecMSE.NumPezzi:N0}") +
+
+
+
+
} else diff --git a/MP-TAB-SERV/Components/MachineBlock.razor.css b/MP-TAB-SERV/Components/MachineBlock.razor.css index c6e037aa..02926c4c 100644 --- a/MP-TAB-SERV/Components/MachineBlock.razor.css +++ b/MP-TAB-SERV/Components/MachineBlock.razor.css @@ -25,7 +25,7 @@ bottom: auto; color: #FFFFFF; background: #2200DE; - background: rgba(33, 0, 200, 0.7); + background: rgba(33, 36, 39, 0.7); -webkit-border-top-right-radius: inherit; border-top-right-radius: inherit; -webkit-border-top-left-radius: inherit; @@ -39,20 +39,24 @@ .sVe { text-align: left; background: #009036; - background: rgba(0, 255, 80, 0.6); + background: #198754; + /*background: rgba(0,255,80,.6);*/ /*padding: 0px 4px 0px 4px;*/ - color: Yellow; + /*color: Yellow;*/ + color: #fff; } .sGi { text-align: left; background: #ffec00; background: rgba(255, 220, 0, 0.6); + color: #fff; /*padding: 0px 4px 0px 4px;*/ } .sRo { text-align: left; background-color: #e2001a; background: rgba(240, 0, 10, 0.6); + color: #fff; /*padding: 0px 4px 0px 4px;*/ } .sBl { @@ -60,12 +64,14 @@ background: #3690FF; background: rgba(0, 80, 255, 0.6); /*padding: 0px 4px 0px 4px;*/ - color: Yellow; + /*color: Yellow;*/ + color: #fff; } .sGr { text-align: left; background-color: #bcbcbc; background: rgba(180, 180, 180, 0.6); + color: #fff; /*padding: 0px 4px 0px 4px;*/ } /*end semafori */ \ No newline at end of file diff --git a/MP-TAB-SERV/Components/MachineBlock.razor.less b/MP-TAB-SERV/Components/MachineBlock.razor.less index 439b5756..e3497e78 100644 --- a/MP-TAB-SERV/Components/MachineBlock.razor.less +++ b/MP-TAB-SERV/Components/MachineBlock.razor.less @@ -27,7 +27,7 @@ bottom: auto; color: #FFFFFF; background: #2200DE; - background: rgba(33,0,200,.7); + background: rgba(33,36,39,.7); -webkit-border-top-right-radius: inherit; border-top-right-radius: inherit; -webkit-border-top-left-radius: inherit; @@ -42,15 +42,18 @@ .sVe { text-align: left; background: #009036; - background: rgba(0,255,80,.6); + background: #198754; + /*background: rgba(0,255,80,.6);*/ /*padding: 0px 4px 0px 4px;*/ - color: Yellow; + /*color: Yellow;*/ + color: #fff; } .sGi { text-align: left; background: #ffec00; background: rgba(255,220,0,.6); + color: #fff; /*padding: 0px 4px 0px 4px;*/ } @@ -58,6 +61,7 @@ text-align: left; background-color: #e2001a; background: rgba(240,0,10,.6); + color: #fff; /*padding: 0px 4px 0px 4px;*/ } @@ -66,13 +70,18 @@ background: #3690FF; background: rgba(0,80,255,.6); /*padding: 0px 4px 0px 4px;*/ - color: Yellow; + /*color: Yellow;*/ + color: #fff; } .sGr { text-align: left; background-color: #bcbcbc; background: rgba(180,180,180,.6); + color: #fff; /*padding: 0px 4px 0px 4px;*/ } /*end semafori */ + + + diff --git a/MP-TAB-SERV/Components/MachineBlock.razor.min.css b/MP-TAB-SERV/Components/MachineBlock.razor.min.css index 82b3cba0..78a5665d 100644 --- a/MP-TAB-SERV/Components/MachineBlock.razor.min.css +++ b/MP-TAB-SERV/Components/MachineBlock.razor.min.css @@ -1 +1 @@ -.mapBlock{font-family:'Open Sans Condensed',sans-serif;color:#fff;background-image:linear-gradient(#111,#000);min-width:8em;}.labelTopDx{padding:.1em .4em;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#fff;background:#2200de;background:rgba(33,0,200,.7);-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;}.sVe{text-align:left;background:#009036;background:rgba(0,255,80,.6);color:#ff0;}.sGi{text-align:left;background:#ffec00;background:rgba(255,220,0,.6);}.sRo{text-align:left;background-color:#e2001a;background:rgba(240,0,10,.6);}.sBl{text-align:left;background:#3690ff;background:rgba(0,80,255,.6);color:#ff0;}.sGr{text-align:left;background-color:#bcbcbc;background:rgba(180,180,180,.6);} \ No newline at end of file +.mapBlock{font-family:'Open Sans Condensed',sans-serif;color:#fff;background-image:linear-gradient(#111,#000);min-width:8em;}.labelTopDx{padding:.1em .4em;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#fff;background:#2200de;background:rgba(33,36,39,.7);-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;}.sVe{text-align:left;background:#009036;background:#198754;color:#fff;}.sGi{text-align:left;background:#ffec00;background:rgba(255,220,0,.6);color:#fff;}.sRo{text-align:left;background-color:#e2001a;background:rgba(240,0,10,.6);color:#fff;}.sBl{text-align:left;background:#3690ff;background:rgba(0,80,255,.6);color:#fff;}.sGr{text-align:left;background-color:#bcbcbc;background:rgba(180,180,180,.6);color:#fff;} \ No newline at end of file diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index fecadb13..2a4259a3 100644 --- a/MP-TAB-SERV/MP-TAB-SERV.csproj +++ b/MP-TAB-SERV/MP-TAB-SERV.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2310.1116 + 6.16.2310.1117 enable MP_TAB_SERV diff --git a/MP-TAB-SERV/Pages/StatusMap.razor b/MP-TAB-SERV/Pages/StatusMap.razor index cd5bea4b..359a023f 100644 --- a/MP-TAB-SERV/Pages/StatusMap.razor +++ b/MP-TAB-SERV/Pages/StatusMap.razor @@ -17,7 +17,7 @@ { @foreach (var item in ListMSE) { -
+
} diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index 37e378e4..07c6555f 100644 --- a/MP-TAB-SERV/Resources/ChangeLog.html +++ b/MP-TAB-SERV/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2310.1116

+

Versione: 6.16.2310.1117


Note di rilascio: