From aede998431e37c5f8929cd17165babc3a2d2da81 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 10 Nov 2020 17:40:22 +0100 Subject: [PATCH] Fix Loader image --- Thermo.Active.Config/Config/DataModel.xml | 7 + Thermo.Active.Config/Config/serverConfig.xml | 4 + .../Controllers/RedisController.cs | 2 +- .../Listeners/SignalR/SignalRListener.cs | 7 +- .../wwwroot/assets/styles/base/setup.less | 30 + Thermo.Active/wwwroot/assets/styles/style.css | 30 + .../components/gantt/gantt-component.vue | 5 +- .../SVG-Components/SVGcaricatore.ts | 31 +- .../SVG-Components/SVGcaricatore.vue | 572 ++---------------- .../components/base-components/caricatore.vue | 8 +- .../wwwroot/src/store/machineStatus.store.ts | 6 +- 11 files changed, 154 insertions(+), 548 deletions(-) diff --git a/Thermo.Active.Config/Config/DataModel.xml b/Thermo.Active.Config/Config/DataModel.xml index cb0abf08..a2cdf20f 100644 --- a/Thermo.Active.Config/Config/DataModel.xml +++ b/Thermo.Active.Config/Config/DataModel.xml @@ -108,5 +108,12 @@ + + + + + + + \ No newline at end of file diff --git a/Thermo.Active.Config/Config/serverConfig.xml b/Thermo.Active.Config/Config/serverConfig.xml index 0f8cfeb2..fac4f66d 100644 --- a/Thermo.Active.Config/Config/serverConfig.xml +++ b/Thermo.Active.Config/Config/serverConfig.xml @@ -85,6 +85,10 @@ LoaderXsize 1400 + + loaderSuckersNumber + 12 + ThermoCameraXpos 93 diff --git a/Thermo.Active.Database/Controllers/RedisController.cs b/Thermo.Active.Database/Controllers/RedisController.cs index 2eeed753..92c00809 100644 --- a/Thermo.Active.Database/Controllers/RedisController.cs +++ b/Thermo.Active.Database/Controllers/RedisController.cs @@ -33,7 +33,7 @@ namespace Thermo.Active.Database.Controllers private const string machineAxisSpeed = "Machine:Axes:%NN%:FeedRate"; private const string machineAxisLoad = "Machine:Axes:%NN%:Load"; private const string machineAxisName = "Machine:Axes:%NN%:Name"; - private const string machineEventKpis = "Machine:Events:Kpis"; + private const string machineEventKpis = "Events:Kpis"; public static void WriteProductionNotification(uint ProductionProcess, string Notification) { diff --git a/Thermo.Active/Listeners/SignalR/SignalRListener.cs b/Thermo.Active/Listeners/SignalR/SignalRListener.cs index 2e38bbb0..e0029ecb 100644 --- a/Thermo.Active/Listeners/SignalR/SignalRListener.cs +++ b/Thermo.Active/Listeners/SignalR/SignalRListener.cs @@ -452,6 +452,7 @@ namespace Thermo.Active.Listeners.SignalR if (!LastProdPanelData.Equals(currProdPanel)) { + bool newPiece = currProdPanel.NumDone != LastProdPanelData.NumDone; LastProdPanelData = currProdPanel; var context = GlobalHost.ConnectionManager.GetHubContext(); @@ -459,7 +460,7 @@ namespace Thermo.Active.Listeners.SignalR if (Config.ServerConfig.ServerStartupConfig.CmsConnectReady) { - if (currProdPanel.NumDone != LastProdPanelData.NumDone) + if (newPiece) RedisController.WriteProductionRepsDone(1, currProdPanel.NumDone.ToString()); if (currProdPanel.NumTarget != LastProdPanelData.NumTarget) @@ -468,10 +469,10 @@ namespace Thermo.Active.Listeners.SignalR //if (currProdPanel.LastTCiclo != LastProdPanelData.LastTCiclo) // RedisController.WriteProductionCycleTime(1, currProdPanel.LastTCiclo.ToString()); - if (currProdPanel.NumDone > 0 && currProdPanel.NumDone != LastProdPanelData.NumDone) + if (currProdPanel.NumDone > 0 && newPiece) { var ts = DateTime.UtcNow.ToString("o"); - var a = "{\"v\": { \"PART_COUNT\": 1}\"ts\": " + ts + "}"; + var a = "{\"v\": { \"PART_COUNT\": 1},\"ts\": \"" + ts + "\"}"; RedisController.WriteMachineEventKpis(a); } } diff --git a/Thermo.Active/wwwroot/assets/styles/base/setup.less b/Thermo.Active/wwwroot/assets/styles/base/setup.less index 56dcbb95..ff552c14 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/setup.less +++ b/Thermo.Active/wwwroot/assets/styles/base/setup.less @@ -211,6 +211,14 @@ flex: 1; flex-flow: column; align-items: center; + .ventosa{ + color: #FFFF; + display: flex; + justify-content: center; + align-items: center; + width: 100%; + height: 100%; + } .volantino{ height: 48px; width: 48px; @@ -218,11 +226,33 @@ bottom: 101px; left: 100px; } + .quota-volantino{ + height: 48px; + width: 169px; + position: absolute; + bottom: 101px; + left: 165px; + display: flex; + align-items: center; + font-size: 1.2em; + } + .quota-caricatore{ + height: 48px; + width: 169px; + position: absolute; + bottom: 137px; + right: 71px; + display: flex; + align-items: center; + justify-content: flex-end; + font-size: 1.2em; + } .load-label{ width: 100%; text-align: center; font-size: 2em; color: #4b4b4b; + padding-right: 45px; } .borded_label { diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index a58357ed..560d7990 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -189,6 +189,14 @@ flex-flow: column; align-items: center; } +.setup .modal section.body section article .svg-area .ventosa { + color: #FFFF; + display: flex; + justify-content: center; + align-items: center; + width: 100%; + height: 100%; +} .setup .modal section.body section article .svg-area .volantino { height: 48px; width: 48px; @@ -196,11 +204,33 @@ bottom: 101px; left: 100px; } +.setup .modal section.body section article .svg-area .quota-volantino { + height: 48px; + width: 169px; + position: absolute; + bottom: 101px; + left: 165px; + display: flex; + align-items: center; + font-size: 1.2em; +} +.setup .modal section.body section article .svg-area .quota-caricatore { + height: 48px; + width: 169px; + position: absolute; + bottom: 137px; + right: 71px; + display: flex; + align-items: center; + justify-content: flex-end; + font-size: 1.2em; +} .setup .modal section.body section article .svg-area .load-label { width: 100%; text-align: center; font-size: 2em; color: #4b4b4b; + padding-right: 45px; } .setup .modal section.body section article .svg-area .borded_label { cursor: pointer; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.vue index fa1ba0ab..6a72b025 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/gantt/gantt-component.vue @@ -53,13 +53,14 @@ >
{{value.estimatedDuration | round(1)}}s
- + />
- + @@ -14,565 +14,59 @@ y="58" /> - + + + + + + - + - - - - A1 - - - - - - - - A2 - - - - - - - - A3 - - - - - - - - A4 - - - - - - - - A5 - - - - - - - - A6 - - - - - - - - A7 - - - - - - - - A8 - - - - - - - - A9 - - - - - - - - A10 - - - - - - - - A11 - - - - - - - - A12 - - - - - - - - A13 - - - - - - - - A14 - - - - - - - - A15 - - - - - - - - A16 - - - - - - - - A17 - + +
{{index}}
+ - + - - - - B1 - - - - - - - - B2 - - - - - - - - B3 - - - - - - - - B4 - - - - - - - - B5 - - - - - - - - B6 - - - - - - - - B7 - - - - - - - - B8 - - - - - - - - B9 - - - - - - - - B10 - - - - - - - - B11 - - - - - - - - B12 - - - - - - - - B13 - - - - - - - - B14 - - - - - - - - B15 - - - - - - - - B16 - - - - - - - - B17 - + +
{{index}}
+ - + - - - - C1 - - - - - - - - C2 - - - - - - - - C3 - - - - - - - - C4 - - - - - - - - C5 - - - - - - - - C6 - - - - - - - - C7 - - - - - - - - C8 - - - - - - - - C9 - - - - - - - - C10 - - - - - - - - C11 - - - - - - - - C12 - - - - - - - - C13 - - - - - - - - C14 - - - - - - - - C15 - - - - - - - - C16 - - - - - - - - C17 - + +
{{index}}
+ + - + - - - - D1 - - - - - - - - D2 - - - - - - - - D3 - - - - - - - - D4 - - - - - - - - D5 - - - - - - - - D6 - - - - - - - - D7 - - - - - - - - D8 - - - - - - - - D9 - - - - - - - - D10 - - - - - - - - D11 - - - - - - - - D12 - - - - - - - - D13 - - - - - - - - D14 - - - - - - - - D15 - - - - - - - - D16 - - - - - - - - D17 - + +
{{index}}
+ @@ -582,6 +76,8 @@ +
{{quotaVolantino}} {{umeasVolantino}}
+
{{quotaVentose}} {{umeasVolantino}}
{{'lbl_loader_load_area'|localize('Area di Carico')}}
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue index a32c4771..f63ff242 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue @@ -107,7 +107,13 @@
- +