diff --git a/.history/Thermo.Active/wwwroot/src/@types/recipe-current.d_20200503231334.ts b/.history/Thermo.Active/wwwroot/src/@types/recipe-current.d_20200503231334.ts new file mode 100644 index 00000000..e68a2194 --- /dev/null +++ b/.history/Thermo.Active/wwwroot/src/@types/recipe-current.d_20200503231334.ts @@ -0,0 +1,57 @@ +declare module Recipe{ + + interface IRange{ + min: number; + max: number; + } + + interface IStatus{ + visible: boolean; + enabled: boolean; + hasError: boolean; + } + + interface IValue{ + range:IRange, + status:IStatus, + unitMeasure:string, + valueAct: number + } + + interface IRecipe{ + vacuum_main_start?:IValue, + vacuum_main_delay?:IValue, + vacuum_main_max_time?:IValue, + vacuum_main_1_chart_setpointx?:IValue, + vacuum_main_1_chart_setpointy?:IValue, + vacuum_main_2_chart_setpointx?:IValue, + vacuum_main_2_chart_setpointy?:IValue, + vacuum_main_3_chart_setpointx?:IValue, + vacuum_main_3_chart_setpointy?:IValue, + vacuum_main_manual?:IValue, + vacuum_direct_enabled?:IValue, + vacuum_direct_delay?:IValue, + vacuum_direct_time?:IValue, + vacuum_aux_enabled?:IValue, + vacuum_aux_delay?:IValue, + vacuum_aux_max_time?:IValue, + vacuum_aux_1_chart_setpointx?:IValue, + vacuum_aux_1_chart_setpointy?:IValue, + vacuum_aux_2_chart_setpointx?:IValue, + vacuum_aux_2_chart_setpointy?:IValue, + vacuum_aux_3_chart_setpointx?:IValue, + vacuum_aux_3_chart_setpointy?:IValue, + vacuum_aux_manual?:IValue, + vacuum_pre_enabled?:IValue, + vacuum_pre_delay?:IValue, + vacuum_pre_max_time?:IValue, + vacuum_pre_1_chart_setpointx?:IValue, + vacuum_pre_1_chart_setpointy?:IValue, + vacuum_pre_2_chart_setpointx?:IValue, + vacuum_pre_2_chart_setpointy?:IValue, + vacuum_pre_3_chart_setpointx?:IValue, + vacuum_pre_3_chart_setpointy?:IValue + } + + +} \ No newline at end of file diff --git a/.history/Thermo.Active/wwwroot/src/@types/recipe-current.d_20200504112349.ts b/.history/Thermo.Active/wwwroot/src/@types/recipe-current.d_20200504112349.ts new file mode 100644 index 00000000..ac8d196d --- /dev/null +++ b/.history/Thermo.Active/wwwroot/src/@types/recipe-current.d_20200504112349.ts @@ -0,0 +1,57 @@ +declare module Recipe{ + + interface IRange{ + min: number; + max: number; + } + + interface IStatus{ + visible: boolean; + enabled: boolean; + hasError: boolean; + } + + interface IValue{ + range:IRange, + status:IStatus, + unitMeasure:string, + valueAct: number + } + + interface IRecipe{ + vacuum_main_start?:IValue, + vacuum_main_delay?:IValue, + vacuum_main_max_time?:IValue, + vacuum_main_1_chart_setpointx?:IValue, + vacuum_main_1_chart_setpointy?:IValue, + vacuum_main_2_chart_setpointx?:IValue, + vacuum_main_2_chart_setpointy?:IValue, + vacuum_main_3_chart_setpointx?:IValue, + vacuum_main_3_chart_setpointy?:IValue, + vacuum_main_manual?:IValue, + vacuum_direct_enabled?:IValue, + vacuum_direct_delay?:IValue, + vacuum_direct_time?:IValue, + vacuum_aux_enabled?:IValue, + vacuum_aux_delay?:IValue, + vacuum_aux_max_time?:IValue, + vacuum_aux_1_chart_setpointx?:IValue, + vacuum_aux_1_chart_setpointy?:IValue, + vacuum_aux_2_chart_setpointx?:IValue, + vacuum_aux_2_chart_setpointy?:IValue, + vacuum_aux_3_chart_setpointx?:IValue, + vacuum_aux_3_chart_setpointy?:IValue, + vacuum_aux_manual?:IValue, + vacuum_pre_enabled?:IValue, + vacuum_pre_delay?:IValue, + vacuum_pre_max_time?:IValue, + vacuum_pre_1_chart_setpointx?:IValue, + vacuum_pre_1_chart_setpointy?:IValue, + vacuum_pre_2_chart_setpointx?:IValue, + vacuum_pre_2_chart_setpointy?:IValue, + vacuum_pre_3_chart_setpointx?:IValue, + vacuum_pre_3_chart_setpointy?:IValue + } + + +} \ No newline at end of file diff --git a/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504095105.ts b/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504095105.ts new file mode 100644 index 00000000..afc3e070 --- /dev/null +++ b/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504095105.ts @@ -0,0 +1,48 @@ +import Vue from 'vue'; +import Component from 'vue-class-component'; +import {Prop} from 'vue-property-decorator'; +import Slider from "@/app_modules_thermo/components/slider.vue" +import Scheda from "@/app_modules_thermo/components/scheda.vue" + +@Component({name:'vuotoprincipale', components: { slider:Slider, scheda:Scheda}}) +export default class VuotoPrincipale extends Vue{ + + Recipe:Recipe.IRecipe={ + vacuum_main_delay:{ + range:{ + min:8, + max:105 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:57 + }, + vacuum_main_max_time:{ + range:{ + min:9, + max:127 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:30 + }, + }; + + @Prop({default:0}) + ritardo:number; + + @Prop({default:0}) + percentuale:number; + + @Prop({default:0}) + durata:number; + +} \ No newline at end of file diff --git a/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504101519.vue b/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504101519.vue new file mode 100644 index 00000000..6a4dfe88 --- /dev/null +++ b/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504101519.vue @@ -0,0 +1,50 @@ + + + \ No newline at end of file diff --git a/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112349.ts b/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112349.ts new file mode 100644 index 00000000..d1958f93 --- /dev/null +++ b/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112349.ts @@ -0,0 +1,50 @@ +import Vue from 'vue'; +import Component from 'vue-class-component'; +import {Prop} from 'vue-property-decorator'; +import Slider from "@/app_modules_thermo/components/slider.vue" +import Scheda from "@/app_modules_thermo/components/scheda.vue" + +@Component({name:'vuotoprincipale', components: { slider:Slider, scheda:Scheda}}) +export default class VuotoPrincipale extends Vue{ + + Recipe:Recipe.IRecipe={ + vacuum_main_delay:{ + range:{ + min:8, + max:105 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:57 + }, + vacuum_main_max_time:{ + range:{ + min:9, + max:127 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:30 + }, + }; + + @Prop({default:0}) + ritardo:number; + @Prop({default:0}) + percentuale:number; + @Prop({default:0}) + durata:number; + + mock_ritardo:number=this.ritardo; + mock_percentuale:number=this.percentuale; + mock_durata:number=this.durata; + +} \ No newline at end of file diff --git a/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112349.vue b/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112349.vue new file mode 100644 index 00000000..ea97211b --- /dev/null +++ b/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112349.vue @@ -0,0 +1,44 @@ + + + \ No newline at end of file diff --git a/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112646.ts b/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112646.ts new file mode 100644 index 00000000..688bc25b --- /dev/null +++ b/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112646.ts @@ -0,0 +1,63 @@ +import Vue from 'vue'; +import Component from 'vue-class-component'; +import {Prop} from 'vue-property-decorator'; +import Slider from "@/app_modules_thermo/components/slider.vue" +import Scheda from "@/app_modules_thermo/components/scheda.vue" + +@Component({name:'vuotoprincipale', components: { slider:Slider, scheda:Scheda}}) +export default class VuotoPrincipale extends Vue{ + + Recipe:Recipe.IRecipe={ + vacuum_main_delay:{ + range:{ + min:8, + max:105 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:57 + }, + vacuum_main_max_time:{ + range:{ + min:9, + max:127 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:30 + }, + vacuum_main_manual:{ + range:{ + min:4, + max:115 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:8 + }, + }; + + @Prop({default:0}) + ritardo:number; + @Prop({default:0}) + percentuale:number; + @Prop({default:0}) + durata:number; + + mock_ritardo:number=this.ritardo; + mock_percentuale:number=this.percentuale; + mock_durata:number=this.durata; + +} \ No newline at end of file diff --git a/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112646.vue b/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112646.vue new file mode 100644 index 00000000..d8394fb2 --- /dev/null +++ b/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112646.vue @@ -0,0 +1,44 @@ + + + \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/icons/png/star.png b/Thermo.Active/wwwroot/assets/icons/png/star.png new file mode 100644 index 00000000..51d56b48 Binary files /dev/null and b/Thermo.Active/wwwroot/assets/icons/png/star.png differ diff --git a/Thermo.Active/wwwroot/assets/icons/png/star@2x.png b/Thermo.Active/wwwroot/assets/icons/png/star@2x.png new file mode 100644 index 00000000..4ac4b609 Binary files /dev/null and b/Thermo.Active/wwwroot/assets/icons/png/star@2x.png differ diff --git a/Thermo.Active/wwwroot/assets/icons/png/star@3x.png b/Thermo.Active/wwwroot/assets/icons/png/star@3x.png new file mode 100644 index 00000000..20455aa9 Binary files /dev/null and b/Thermo.Active/wwwroot/assets/icons/png/star@3x.png differ diff --git a/Thermo.Active/wwwroot/assets/icons/png/tast-disable.png b/Thermo.Active/wwwroot/assets/icons/png/tast-disable.png new file mode 100644 index 00000000..95c33ed2 Binary files /dev/null and b/Thermo.Active/wwwroot/assets/icons/png/tast-disable.png differ diff --git a/Thermo.Active/wwwroot/assets/icons/svg/disegno-controstampo-quote-velocita.svg b/Thermo.Active/wwwroot/assets/icons/svg/disegno-controstampo-quote-velocita.svg new file mode 100644 index 00000000..064b33cb --- /dev/null +++ b/Thermo.Active/wwwroot/assets/icons/svg/disegno-controstampo-quote-velocita.svg @@ -0,0 +1,240 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Thermo.Active/wwwroot/assets/icons/svg/paddle-altra-funzione.svg b/Thermo.Active/wwwroot/assets/icons/svg/paddle-altra-funzione.svg new file mode 100644 index 00000000..c7bc0709 --- /dev/null +++ b/Thermo.Active/wwwroot/assets/icons/svg/paddle-altra-funzione.svg @@ -0,0 +1,30 @@ + + + + 5A09BD7B-590B-4C1C-80C4-3EBCC52E6F59 + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/icons/svg/paddle-riscaldo.svg b/Thermo.Active/wwwroot/assets/icons/svg/paddle-riscaldo.svg new file mode 100644 index 00000000..6b9a810a --- /dev/null +++ b/Thermo.Active/wwwroot/assets/icons/svg/paddle-riscaldo.svg @@ -0,0 +1,29 @@ + + + + 0D940249-E1C4-43F6-A37B-FBC98CD8A1F7 + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/base/avvio-prod.less b/Thermo.Active/wwwroot/assets/styles/base/avvio-prod.less new file mode 100644 index 00000000..da482df2 --- /dev/null +++ b/Thermo.Active/wwwroot/assets/styles/base/avvio-prod.less @@ -0,0 +1,34 @@ +// out: false, sourceMap: false, main: ../style.less +@import "grid-system.less"; +@import "colors.less"; +@import "fonts.less"; +@modal: modal; + +.@{modal}.avvio-produzione-info { + margin-top: 100px; + width: 653px; + height: 616px; + + section.body{ + + section{ + justify-content: center; + + .specific{ + + .disabled{ + width: 420px; + height: 330px; + } + + .tast{ + margin-left: 25%; + } + + } + + } + + } + +} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/base/ciclo.less b/Thermo.Active/wwwroot/assets/styles/base/ciclo.less index c0863f3a..3c7a79af 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/ciclo.less +++ b/Thermo.Active/wwwroot/assets/styles/base/ciclo.less @@ -50,26 +50,27 @@ .circle1{ position: relative; - top: 130px; + top: 200px; right: 25px; } .circle2{ position: relative; - top: 180px; + top: 400px; right: 25px; } .circle3{ + width: 135px; position: relative; - top: 175px; + top: 545px; right: 410px; } .circle4{ position: relative; - top: 60px; - right: 180px; + top: 585px; + right: 200px; } } diff --git a/Thermo.Active/wwwroot/assets/styles/base/circlegantt.less b/Thermo.Active/wwwroot/assets/styles/base/circlegantt.less new file mode 100644 index 00000000..83f1a351 --- /dev/null +++ b/Thermo.Active/wwwroot/assets/styles/base/circlegantt.less @@ -0,0 +1,92 @@ +// out: false, sourceMap: false, main: ../style.less +@import "grid-system.less"; +@import "colors.less"; +@import "fonts.less"; + +.circle-gantt{ + height: 70px; + + .specific{ + + div{ + + &:first-of-type{ + display: flex; + flex-direction: column; + justify-content: flex-end; + height: 70px; + object-fit: contain; + border-radius: 2px; + background-color: #57636b; + + label{ + margin-left: 37%; + } + + } + + &:last-of-type{ + display: flex; + flex-direction: column; + justify-content: center; + margin-top: -66px; + height: 40px; + object-fit: contain; + border-radius: 2px; + background-color: #c0c7cc; + + label{ + margin-left: 25%; + } + + } + + } + + &:first-of-type{ + + div{ + + &:first-of-type{ + display: flex; + flex-direction: column; + justify-content: flex-end; + width: 34px; + height: 70px; + object-fit: contain; + border-radius: 2px; + background-color: #57636b; + + label{ + margin-left: 25%; + } + + } + + &:last-of-type{ + display: flex; + flex-direction: column; + justify-content: flex-end; + margin-top: -66px; + width: 34px; + height: 40px; + object-fit: contain; + border-radius: 2px; + background-color: #c0c7cc; + + img{ + margin-left: 25%; + flex-shrink: 0; + width: 20px; + height: 20px; + } + + } + + } + + } + + } + +} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/base/estrazione.less b/Thermo.Active/wwwroot/assets/styles/base/estrazione.less index b869d1b1..d32bebe1 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/estrazione.less +++ b/Thermo.Active/wwwroot/assets/styles/base/estrazione.less @@ -7,16 +7,24 @@ .@{modal}.estrazione-info { width: 1820px; height: 785px; - .specific { - justify-content: flex-end; -.box{ - background-color: #e5f3ff; -} -} + section.body{ + section{ + .specific { + justify-content: flex-end; + padding-left: 10px; + + .box{ + margin:0; + background-color: #e5f3ff; + } + } + } + + } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/base/layout.less b/Thermo.Active/wwwroot/assets/styles/base/layout.less index f04c8c32..41dc93ab 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/layout.less +++ b/Thermo.Active/wwwroot/assets/styles/base/layout.less @@ -1,4 +1,5 @@ // out: false, sourceMap: false, main: ../style.less +@import "setup.less"; @import "colors.less"; @import "modals.less"; @import "pirometro.less"; @@ -6,8 +7,10 @@ @import "formato.less"; @import "slider.less"; @import "tastierino.less"; +@import "circlegantt.less"; +@import "paddle.less"; @import "arretramento-riscaldi.less"; -@import "setup.less"; +@import "avvio-prod.less"; @import "ciclo.less"; @import "raffreddamento.less"; @import "processo.less"; diff --git a/Thermo.Active/wwwroot/assets/styles/base/opzioni.less b/Thermo.Active/wwwroot/assets/styles/base/opzioni.less index 8259cb30..7eed4148 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/opzioni.less +++ b/Thermo.Active/wwwroot/assets/styles/base/opzioni.less @@ -15,8 +15,10 @@ margin: 0; } - .section{ - display: flex; + section.body{ + + section{ + padding: 0px; .specific{ @@ -60,31 +62,33 @@ } - } - - aside{ + aside{ - button{ - display: block; - background-color: #bbbcbc; - color: #002680; - padding: 22px 16px; - margin: 2px 0; - width: 547px; - height: 70px; - border: none; - text-align: left; - cursor: pointer; - font-size: 17px; - } + button{ + display: block; + background-color: #bbbcbc; + color: #002680; + padding: 22px 16px; + margin: 2px 0; + width: 547px; + height: 70px; + border: none; + text-align: left; + cursor: pointer; + font-size: 17px; + } + + .active{ + background-color: #fff; + font-weight: bold; + border-top: 2px solid #002680; + } - .active{ - background-color: #fff; - font-weight: bold; - border-top: 2px solid #002680; } } -} + } + + } diff --git a/Thermo.Active/wwwroot/assets/styles/base/paddle.less b/Thermo.Active/wwwroot/assets/styles/base/paddle.less new file mode 100644 index 00000000..e8c1944e --- /dev/null +++ b/Thermo.Active/wwwroot/assets/styles/base/paddle.less @@ -0,0 +1,188 @@ +// out: false, sourceMap: false, main: ../style.less +@import "grid-system.less"; +@import "colors.less"; +@import "fonts.less"; + +html { + height: 100%; + overflow:hidden; +} + + body { + border: 0; margin: 0; padding: 0; + height: 100%; + } + + .hidden { + visibility: hidden; + } + +.container{ + + #app{ + + nav { + position: absolute; + top: 50%; + right: 0; + + .active button{ + transform: translate(-761px, 0px); + } + + div{ + + button { + position: relative; + height: 30px; + width: 32px; + display: block; + z-index: 9999; + border: 0; + border-radius: 0; + pointer-events: all; + background: #dddddd; + border-bottom-left-radius: 90px; + border-top-left-radius: 90px; + height: 90px; + width: 45px; + + div{ + display: grid; + grid-template-columns: repeat(2, 1fr); + grid-template-rows: 1fr 1fr; + align-items: center; + justify-items: center; + padding: 5px; + + + div { + width: 2px; + height: 2px; + border-radius: 10px; + margin: 2px; + background: #002680; + + } + + } + + } + + } + } + + + // .slide-enter-active, + // .slide-leave-active + // { + // transition: left,right 0s ease-in-out; + // } + + // .slide-enter, + // .slide-leave-to { + // transition: right,left 0s ease-in-out + // } + + .sidebar{ + + .sidebar-backdrop{ + width: 100vw; + height: 100vh; + position: fixed; + top: 0; + left: 0; + cursor: pointer; + } + + .sidebar-panel{ + + overflow-y: auto; + background-color: #130f40; + position: fixed; + right: 0; + top: 141px; + height: 100vh; + z-index: 900; + padding: 3rem 20px 2rem 20px; + width: 721px; + height: 920px; + border-radius: 4px; + box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5); + background-color: #dddddd; + + .text-head-sidebar{ + margin: 10px auto; + font-size: 24px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + text-align: center; + color: #002680; + } + + .box-sidebar-panel{ + display: grid; + grid-template-columns: repeat(2, 1fr); + align-items: center; + justify-items: center; + + .sidebar-panel-nav{ + width: 286px; + height: 100px; + border-radius: 2px; + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.5); + background-color: #808e96; + margin: 10px 30px; + + .text-box-paddle{ + display: flex; + width: 268px; + height: 78px; + font-family: WorkSans; + font-size: 18px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #ffffff; + margin: 10px; + + i{ + text-align: end; + width: 50px; + color: #bbbcbc; + } + + label{ + width: 117px; + margin: 10px; + } + + } + + .text-box-paddle.text-soft{ + label{ + width: 100%; + align-self: center; + } + } + + } + + } + + + } + + + + } + + } + +} + \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/base/pirometro.less b/Thermo.Active/wwwroot/assets/styles/base/pirometro.less index ddd84787..acaa83b1 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/pirometro.less +++ b/Thermo.Active/wwwroot/assets/styles/base/pirometro.less @@ -10,83 +10,84 @@ width: 1820px; height: 980px; - section{ - - .specific{ - width: 470px; - @{pirometro-margin}:37%; - } - - .termospecific{ - @{pirometro-margin}:0%; - - .svg-area{ - padding-left: 90px; - width: 1270px; - height: 800px; - - .disegnoTermoSuperiore{ - flex-shrink: 0; - width: 1100px; - height: 750px; - } - - .border-termo-superiore{ - - .circle1{ - position: relative; - top: 135px; - right: 1150px; - } - - .circle2{ - position: relative; - top: 355px; - right: 1150px; - } - - .circle3{ - position: relative; - top: 425px; - right: 1150px; - } - - .circle4{ - position: relative; - top: 470px; - right: 635px; - } - - .circle5{ - position: relative; - top: 400px; - right: 255px; - } - - .circle6{ - width: 64px; - height: 20px; - color:white; - object-fit: contain; - background-color: #c03d58; - position: relative; - top: 95px; - right: 125px; - } - - } + section.body{ + + section{ + .specific{ + width: 470px; + @{pirometro-margin}:37%; } - button{ - margin-left: 5px; - width: 48px; - height: 48px; - object-fit: contain; - border-radius: 2px; - box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5); - border: solid 1px #001e48; - background-image: linear-gradient(to bottom, #1756ad, #002680); + .termospecific{ + @{pirometro-margin}:0%; + + .svg-area{ + padding-left: 90px; + width: 1270px; + height: 800px; + + .disegnoTermoSuperiore{ + flex-shrink: 0; + width: 1100px; + height: 750px; + } + + .border-termo-superiore{ + + .circle1{ + position: relative; + top: 135px; + right: 1150px; + } + + .circle2{ + position: relative; + top: 355px; + right: 1150px; + } + + .circle3{ + position: relative; + top: 425px; + right: 1150px; + } + + .circle4{ + position: relative; + top: 470px; + right: 635px; + } + + .circle5{ + position: relative; + top: 400px; + right: 255px; + } + + .circle6{ + width: 100px; + background-color: #c03d58; + position: relative; + top: 87px; + right: 150px; + } + + } + + } + + button{ + margin-left: 5px; + width: 48px; + height: 48px; + object-fit: contain; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5); + border: solid 1px #001e48; + background-image: linear-gradient(to bottom, #1756ad, #002680); + } + } } diff --git a/Thermo.Active/wwwroot/assets/styles/base/processo.less b/Thermo.Active/wwwroot/assets/styles/base/processo.less index 83652a1c..fac2e2a5 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/processo.less +++ b/Thermo.Active/wwwroot/assets/styles/base/processo.less @@ -7,5 +7,54 @@ .@{modal}.processo-info { width: 1820px; height: 980px; - margin: 150px 193px; + margin-top: 50px; + + header{ + font-size: 22px; + color: #4b4b4b; + + .tab-header{ + padding: 10px 0px; + + button{ + padding: 0; + display: flex; + justify-content: flex-start; + margin-right: 10px; + width: 149px; + height: 48px; + border-radius: 2px; + box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.5); + background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%); + font-size: 14px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: 1.15; + letter-spacing: normal; + color: #4b4b4b; + + img{ + margin-right: 20px; + } + + } + + label{ + width: 106px; + height: 32px; + font-size: 32px; + font-weight: 600; + font-stretch: normal; + font-style: normal; + line-height: 1; + letter-spacing: normal; + text-align: right; + color: #545454; + } + + } + + } + } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less index ac2d1a58..7dc7a3b9 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less +++ b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less @@ -48,22 +48,15 @@ height: 795px; } + .disegnoControstampoQuoteVelocita{ + flex-shrink: 0; + margin-left: 600px; + width: 1156px; + height: 800px; + } + .input-circles{ - - span{ - object-fit: contain; - font-size: 22px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: white; - background-color: #979797; - } - .circle{ width: 147px; height: 60px; @@ -181,16 +174,57 @@ .circle-stampo-10{ position: relative; - bottom: 557px; + bottom: 560px; right: 769px; } .circle-stampo-11{ position: relative; - top: 38px; + top: 35px; right: 781px; } + .circle-controstampo-1{ + position: relative; + top: 300px; + right: 1090px; + } + + .circle-controstampo-2{ + position: relative; + top: 570px; + right: 990px; + } + + .circle-controstampo-3{ + position: relative; + top: 475px; + right: 770px; + } + + .circle-controstampo-4{ + position: relative; + right: 650px; + } + + .circle-controstampo-5{ + position: relative; + top: 45px; + right: 480px; + } + + .circle-controstampo-6{ + position: relative; + top: -335px; + right: 650px; + } + + .circle-controstampo-7{ + position: relative; + top: 400px; + right: 650px; + } + } } diff --git a/Thermo.Active/wwwroot/assets/styles/base/scheda.less b/Thermo.Active/wwwroot/assets/styles/base/scheda.less index 3b079e64..01ff405c 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/scheda.less +++ b/Thermo.Active/wwwroot/assets/styles/base/scheda.less @@ -10,7 +10,7 @@ .input-area{ width: 480px; - margin: 3px; + margin: 4px; margin-bottom: 0px; } diff --git a/Thermo.Active/wwwroot/assets/styles/base/setup.less b/Thermo.Active/wwwroot/assets/styles/base/setup.less index 5ee37eb3..a9386061 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/setup.less +++ b/Thermo.Active/wwwroot/assets/styles/base/setup.less @@ -41,6 +41,7 @@ .auto{ overflow-y: auto; + overflow-x: hidden; } aside { @@ -75,6 +76,19 @@ display: flex; flex-direction: column; + span{ + object-fit: contain; + font-size: 22px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + text-align: center; + color: white; + background-color: #979797; + } + .circle { width: 141px; height: 60px; @@ -87,6 +101,21 @@ border: solid 4px #9b9b9b; } + input{ + width: 40px; + height: 21px; + margin: auto; + object-fit: contain; + font-size: 20px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #6d6d6d; + border: none; + } + label { margin: auto; object-fit: contain; @@ -125,12 +154,10 @@ header { background-color: @color-white; color: @color-darkish-blue; - font-weight: 600; font-size: 24px; text-align: left; padding: 0px 23px; - display: flex; flex-flow: row nowrap; justify-content: space-between; @@ -249,9 +276,13 @@ color: #90BF3D; } - &.fa-minus-circle{ - color: #7A7C74; + &.fa-check-circle.undone-step{ + color: #1791FF; } + + // &.fa-minus-circle{ + // color: #7A7C74; + // } } position: relative; @@ -390,10 +421,19 @@ } .rect { - display: flex; - align-items: center; - justify-content: flex-end; - padding-inline-end: 20px; + // display: flex; + // align-items: center; + // justify-content: flex-end; + // padding-inline-end: 20px; + object-fit: contain; + font-size: 20px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #6d6d6d; + text-align: center; width: 98px; height: 48px; border-radius: 2px; diff --git a/Thermo.Active/wwwroot/assets/styles/base/tastierino.less b/Thermo.Active/wwwroot/assets/styles/base/tastierino.less index 276dddb9..1709ee9f 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/tastierino.less +++ b/Thermo.Active/wwwroot/assets/styles/base/tastierino.less @@ -4,86 +4,103 @@ @import "fonts.less"; .tast{ - margin-top: 30px; - margin-left: -350px; height: 261px; width: 293px; background-color:@color-silver; + + .mask{ + display: grid; + grid-template-columns: repeat(4, 52px); + grid-template-rows: repeat(4, 52px); + grid-gap: 5px 8px; + margin-top: 7%; + margin-left: 10%; + + button{ + border:none; + background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%); + box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5); + color:@color-darkish-blue; + font-size:20px; + } + .zero{ + grid-column: 1/span 2; + grid-row: 4/5; + border:none; + background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%); + box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5); + } + .submit{ + grid-column-start: 4; + grid-column-end: 5; + grid-row-start: 3; + grid-row-end: 5; + border:none; + background-image: linear-gradient(to bottom, #000080 0%, #191970 98%); + box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5); + + img{ + width: 30px; + height: 30px; + } + + } + .bCanc{ + grid-column: 4/5; + grid-row: 2/3; + + img{ + width: 30px; + height: 25px; + } + + } + .b1{ + grid-column: 1/2; + grid-row: 3/4; + } + .b2{ + grid-column: 2/3; + grid-row: 3/4; + } + .b3{ + grid-column: 3/4; + grid-row: 3/4; + } + .b4{ + grid-column: 1/2; + grid-row: 2/3; + } + .b5{ + grid-column: 2/3; + grid-row: 2/3; + } + .b6{ + grid-column: 3/4; + grid-row: 2/3; + } + .b7{ + grid-column: 1/2; + grid-row: 1/2; + } + .b8{ + grid-column: 2/3; + grid-row: 1/2; + } + .b9{ + grid-column: 3/4; + grid-row: 1/2; + } + + .bPunto{ + grid-column: 3/4; + grid-row: 4/5; + } + .bDel{ + grid-column: 4/5; + grid-row: 1/2; + } + + } + } -.mask{ - display: grid; - grid-template-columns: repeat(4, 52px); - grid-template-rows: repeat(4, 52px); - grid-gap: 5px 8px; - margin-top: 7%; - margin-left: 10%; -} -.tasto{ - border:none; - background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%); - box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5); -} -.zero{ - grid-column: 1/span 2; - grid-row: 4/5; - border:none; - background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%); - box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5); -} -.submit{ - grid-column-start: 4; - grid-column-end: 5; - grid-row-start: 3; - grid-row-end: 5; - border:none; - background-image: linear-gradient(to bottom, #000080 0%, #191970 98%); - box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5); -} -.b1{ - grid-column: 1/2; - grid-row: 3/4; -} -.b2{ - grid-column: 2/3; - grid-row: 3/4; -} -.b3{ - grid-column: 3/4; - grid-row: 3/4; -} -.b4{ - grid-column: 1/2; - grid-row: 2/3; -} -.b5{ - grid-column: 2/3; - grid-row: 2/3; -} -.b6{ - grid-column: 3/4; - grid-row: 2/3; -} -.b7{ - grid-column: 1/2; - grid-row: 1/2; -} -.b8{ - grid-column: 2/3; - grid-row: 1/2; -} -.b9{ - grid-column: 3/4; - grid-row: 1/2; -} -.bCanc{ - grid-column: 4/5; - grid-row: 2/3; -} -.bPunto{ - grid-column: 3/4; - grid-row: 4/5; -} -.bDel{ - grid-column: 4/5; - grid-row: 1/2; -} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index 9802d2cd..5cd1214d 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -1,6 +1,373 @@ @import url(../../libs/font-awesome/css/font-awesome.css); @import url(../../libs/glyphicons/styles/glyphicons.css); @import "iziToast.min.css"; +.setup { + padding-top: 50px; + display: flex; + justify-content: flex-start; + align-items: center; + flex-flow: column nowrap; + width: 100vw; + height: 100vh; +} +.setup hr { + flex-shrink: 0; + background-color: #979797; + width: 2px; + height: 100%; + margin: 0; + margin-left: 5px; +} +.setup .modal { + width: 1820px; + height: 980px; +} +.setup .modal section.body { + height: calc(100% - 66px); +} +.setup .modal section.body section { + height: 100%; + flex-flow: row nowrap; + padding: 14px; + display: flex; + justify-content: flex-start; + width: calc(100% - 28px); + height: calc(100% - 28px - 82px); +} +.setup .modal section.body section .auto { + overflow-y: auto; + overflow-x: hidden; +} +.setup .modal section.body section aside { + display: flex; + justify-content: start; + flex-direction: column; + height: 100%; + width: 520px; + flex: 0 0 520px; + overflow-y: scroll; + padding-right: 10px; +} +.setup .modal section.body section aside hr { + flex-shrink: 0; + background-color: #979797; + width: 100%; + height: 2px; + margin-left: 0px; +} +.setup .modal section.body section .specific { + display: flex; + flex-direction: column; +} +.setup .modal section.body section .specific .svg-area { + display: flex; + justify-content: center; +} +.setup .modal section.body section .specific .svg-area .input-circles { + display: flex; + flex-direction: column; +} +.setup .modal section.body section .specific .svg-area .input-circles span { + object-fit: contain; + font-size: 22px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + text-align: center; + color: white; + background-color: #979797; +} +.setup .modal section.body section .specific .svg-area .input-circles .circle { + width: 141px; + height: 60px; + box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.5); + background-color: rgba(255, 255, 255, 0.8); + display: flex; + justify-content: flex-start; + object-fit: contain; + border-radius: 40.5px; + border: solid 4px #9b9b9b; +} +.setup .modal section.body section .specific .svg-area .input-circles input { + width: 40px; + height: 21px; + margin: auto; + object-fit: contain; + font-size: 20px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #6d6d6d; + border: none; +} +.setup .modal section.body section .specific .svg-area .input-circles label { + margin: auto; + object-fit: contain; + font-size: 20px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #6d6d6d; +} +.setup .modal section.body section .specific .svg-area .input-circles img { + margin: auto; + width: 20px; + height: 20px; + object-fit: contain; +} +.setup .modal section.body footer { + height: 82px; + display: flex; + justify-content: flex-end; + align-items: center; +} +.setup .modal header { + background-color: #fff; + color: #002680; + font-weight: 600; + font-size: 24px; + text-align: left; + padding: 0px 23px; + display: flex; + flex-flow: row nowrap; + justify-content: space-between; + align-items: stretch; +} +.modal.setup-info header { + padding-left: 31px; + display: flex; + align-items: center; + font-size: 20px; + font-weight: bold; + color: darkblue; +} +.tab-header { + display: flex; + flex-flow: row; + align-items: stretch; + justify-content: flex-start; +} +.tab-header button { + background: none; + border: 1px solid #bbbcbc; + padding: 0 38px; + border-bottom: none; + font-size: 20px; + background-color: #bbbcbc; + color: #002680; +} +.tab-header button.active { + background-color: #fff; + font-weight: bold; + border-top: 2px solid #002680; +} +.modal.setup-info { + width: 1639px; + height: 695px; + background-color: #fff; + margin: 150px 193px; + box-shadow: none; +} +.modal.setup-info section { + height: 100%; +} +.modal.setup-info section .Rectangle { + width: calc(100% - 200px); + height: calc(100% - 200px); + background-color: #BBBCBC; + display: grid; + grid-template-columns: repeat(6, 1fr); + grid-template-rows: 1fr 1fr; + align-items: center; + justify-items: center; + padding: 100px; +} +.setup-button { + cursor: pointer; + display: grid; + width: 200px; + height: 128px; + grid-template-columns: 50px 1fr; + grid-template-rows: 1fr 50px; + position: relative; +} +.setup-button span, +.setup-button label { + grid-column: 1; + display: flex; + align-items: flex-end; + color: #fff; + z-index: 2; + justify-content: center; + font-weight: 500; + font-size: 18px; + padding-left: 10px; +} +.setup-button label { + grid-column: 2; + color: #002680; + justify-content: flex-start; +} +.setup-button img { + grid-column: 2; + grid-row: 2; + z-index: 2; + margin: auto; +} +.setup-button i { + grid-column: 2; + grid-row: 2; + z-index: 2; + margin: auto; + transform: scale(1.5); +} +.setup-button i.fa-check-circle { + color: #90BF3D; +} +.setup-button i.fa-minus-circle { + color: #7A7C74; +} +.setup-button .background-top, +.setup-button .background-bottom { + position: absolute; + left: 0; + width: 100%; + height: 50%; + transform: skewX(12px); +} +.setup-button .background-top:after, +.setup-button .background-bottom:after { + content: ""; + display: block; + position: absolute; + left: 0; + top: 0; + height: 100%; + width: 35px; + background-color: #002680; +} +.setup-button .background-top { + background-image: linear-gradient(to bottom, #fff, #e6e6e6); + top: 0; + transform: skewX(20deg); +} +.setup-button .background-bottom { + background-image: linear-gradient(to bottom, #e6e6e6, #e2e2e2); + bottom: 0; + transform: skewX(-20deg); +} +.box { + margin-bottom: 30px; + box-sizing: border-box; + clear: both; +} +.box .header { + display: flex; + align-items: center; + justify-content: center; + height: 44px; + width: 100%; + font-size: 24px; + font-weight: bold; + color: #fff; + background-color: #979797; +} +.box .body { + padding: 20px; + display: flex; + flex-flow: column; + justify-items: center; + padding-bottom: 10px; + border: 2px solid #979797; +} +.box .submit { + margin: auto; + width: 90px; + height: 48px; + object-fit: contain; + border-radius: 8px; + border: none; + box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.5); + background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%); +} +.box .submit label { + object-fit: contain; + font-size: 18px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + text-align: center; + color: #002680; +} +.input-area { + margin: 10px auto; + display: flex; + flex-flow: row; + align-items: center; + justify-content: space-between; + width: 100%; + height: 48px; +} +.input-area.col { + flex-flow: column; + align-items: flex-start; + height: auto; +} +.input-area h3 { + font-weight: normal; + color: #002680; + margin: 18px 0; +} +.input-area .buttons { + width: 100%; + display: flex; + flex-flow: row; + margin-bottom: 18px; +} +.input-area .buttons:last-child { + margin-bottom: 0; +} +.input-area label { + color: #002680; + font-size: 24px; + font-weight: 500; + flex: 1; +} +.input-area .rect { + object-fit: contain; + font-size: 20px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #6d6d6d; + text-align: center; + width: 98px; + height: 48px; + border-radius: 2px; + box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5); +} +.input-area select { + min-width: 150px; + height: 48px; + background-color: #fff; + padding: 0 20px; + font-size: 1rem; +} +.setup-play { + cursor: pointer; + margin: auto; + display: flex; +} .text-success { color: #002680; } @@ -3674,59 +4041,56 @@ width: 1820px; height: 980px; } -.modal.pirometro-info section .specific { +.modal.pirometro-info section.body section .specific { width: 470px; margin-left: 37%; } -.modal.pirometro-info section .termospecific { +.modal.pirometro-info section.body section .termospecific { margin-left: 0%; } -.modal.pirometro-info section .termospecific .svg-area { +.modal.pirometro-info section.body section .termospecific .svg-area { padding-left: 90px; width: 1270px; height: 800px; } -.modal.pirometro-info section .termospecific .svg-area .disegnoTermoSuperiore { +.modal.pirometro-info section.body section .termospecific .svg-area .disegnoTermoSuperiore { flex-shrink: 0; width: 1100px; height: 750px; } -.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle1 { +.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle1 { position: relative; top: 135px; right: 1150px; } -.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle2 { +.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle2 { position: relative; top: 355px; right: 1150px; } -.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle3 { +.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle3 { position: relative; top: 425px; right: 1150px; } -.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle4 { +.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle4 { position: relative; top: 470px; right: 635px; } -.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle5 { +.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle5 { position: relative; top: 400px; right: 255px; } -.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle6 { - width: 64px; - height: 20px; - color: white; - object-fit: contain; +.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle6 { + width: 100px; background-color: #c03d58; position: relative; - top: 95px; - right: 125px; + top: 87px; + right: 150px; } -.modal.pirometro-info section .termospecific button { +.modal.pirometro-info section.body section .termospecific button { margin-left: 5px; width: 48px; height: 48px; @@ -3989,13 +4353,11 @@ margin: 16px; } .tast { - margin-top: 30px; - margin-left: -350px; height: 261px; width: 293px; background-color: #bbbcbc; } -.mask { +.tast .mask { display: grid; grid-template-columns: repeat(4, 52px); grid-template-rows: repeat(4, 52px); @@ -4003,19 +4365,21 @@ margin-top: 7%; margin-left: 10%; } -.tasto { +.tast .mask button { border: none; background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%); box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5); + color: #002680; + font-size: 20px; } -.zero { +.tast .mask .zero { grid-column: 1 / span 2; grid-row: 0.8; border: none; background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%); box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5); } -.submit { +.tast .mask .submit { grid-column-start: 4; grid-column-end: 5; grid-row-start: 3; @@ -4024,329 +4388,197 @@ background-image: linear-gradient(to bottom, #000080 0%, #191970 98%); box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5); } -.b1 { - grid-column: 0.5; - grid-row: 0.75; +.tast .mask .submit img { + width: 30px; + height: 30px; } -.b2 { - grid-column: 0.66666667; - grid-row: 0.75; -} -.b3 { - grid-column: 0.75; - grid-row: 0.75; -} -.b4 { - grid-column: 0.5; - grid-row: 0.66666667; -} -.b5 { - grid-column: 0.66666667; - grid-row: 0.66666667; -} -.b6 { - grid-column: 0.75; - grid-row: 0.66666667; -} -.b7 { - grid-column: 0.5; - grid-row: 0.5; -} -.b8 { - grid-column: 0.66666667; - grid-row: 0.5; -} -.b9 { - grid-column: 0.75; - grid-row: 0.5; -} -.bCanc { +.tast .mask .bCanc { grid-column: 0.8; grid-row: 0.66666667; } -.bPunto { +.tast .mask .bCanc img { + width: 30px; + height: 25px; +} +.tast .mask .b1 { + grid-column: 0.5; + grid-row: 0.75; +} +.tast .mask .b2 { + grid-column: 0.66666667; + grid-row: 0.75; +} +.tast .mask .b3 { + grid-column: 0.75; + grid-row: 0.75; +} +.tast .mask .b4 { + grid-column: 0.5; + grid-row: 0.66666667; +} +.tast .mask .b5 { + grid-column: 0.66666667; + grid-row: 0.66666667; +} +.tast .mask .b6 { + grid-column: 0.75; + grid-row: 0.66666667; +} +.tast .mask .b7 { + grid-column: 0.5; + grid-row: 0.5; +} +.tast .mask .b8 { + grid-column: 0.66666667; + grid-row: 0.5; +} +.tast .mask .b9 { + grid-column: 0.75; + grid-row: 0.5; +} +.tast .mask .bPunto { grid-column: 0.75; grid-row: 0.8; } -.bDel { +.tast .mask .bDel { grid-column: 0.8; grid-row: 0.5; } -.modal.estrazione-info { - width: 560px; - height: 411px; +.circle-gantt { + height: 70px; } -.setup { - padding-top: 50px; - display: flex; - justify-content: flex-start; - align-items: center; - flex-flow: column nowrap; - width: 100vw; - height: 100vh; -} -.setup hr { - flex-shrink: 0; - background-color: #979797; - width: 2px; - height: 100%; - margin: 0; - margin-left: 5px; -} -.setup .modal { - width: 1820px; - height: 980px; -} -.setup .modal section.body { - height: calc(100% - 66px); -} -.setup .modal section.body section { - height: 100%; - flex-flow: row nowrap; - padding: 14px; - display: flex; - justify-content: flex-start; - width: calc(100% - 28px); - height: calc(100% - 28px - 82px); -} -.setup .modal section.body section .auto { - overflow-y: auto; -} -.setup .modal section.body section aside { - display: flex; - justify-content: start; - flex-direction: column; - height: 100%; - width: 520px; - flex: 0 0 520px; - overflow-y: scroll; - padding-right: 10px; -} -.setup .modal section.body section aside hr { - flex-shrink: 0; - background-color: #979797; - width: 100%; - height: 2px; - margin-left: 0px; -} -.setup .modal section.body section .specific { +.circle-gantt .specific div:first-of-type { display: flex; flex-direction: column; + justify-content: flex-end; + height: 70px; + object-fit: contain; + border-radius: 2px; + background-color: #57636b; } -.setup .modal section.body section .specific .svg-area { +.circle-gantt .specific div:first-of-type label { + margin-left: 37%; +} +.circle-gantt .specific div:last-of-type { display: flex; + flex-direction: column; justify-content: center; + margin-top: -66px; + height: 40px; + object-fit: contain; + border-radius: 2px; + background-color: #c0c7cc; } -.setup .modal section.body section .specific .svg-area .input-circles { +.circle-gantt .specific div:last-of-type label { + margin-left: 25%; +} +.circle-gantt .specific:first-of-type div:first-of-type { display: flex; flex-direction: column; + justify-content: flex-end; + width: 34px; + height: 70px; + object-fit: contain; + border-radius: 2px; + background-color: #57636b; } -.setup .modal section.body section .specific .svg-area .input-circles .circle { - width: 141px; - height: 60px; - box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.5); - background-color: rgba(255, 255, 255, 0.8); +.circle-gantt .specific:first-of-type div:first-of-type label { + margin-left: 25%; +} +.circle-gantt .specific:first-of-type div:last-of-type { display: flex; - justify-content: flex-start; + flex-direction: column; + justify-content: flex-end; + margin-top: -66px; + width: 34px; + height: 40px; object-fit: contain; - border-radius: 40.5px; - border: solid 4px #9b9b9b; + border-radius: 2px; + background-color: #c0c7cc; } -.setup .modal section.body section .specific .svg-area .input-circles label { - margin: auto; - object-fit: contain; - font-size: 20px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: #6d6d6d; -} -.setup .modal section.body section .specific .svg-area .input-circles img { - margin: auto; +.circle-gantt .specific:first-of-type div:last-of-type img { + margin-left: 25%; + flex-shrink: 0; width: 20px; height: 20px; - object-fit: contain; } -.setup .modal section.body footer { - height: 82px; - display: flex; - justify-content: flex-end; - align-items: center; +html { + height: 100%; + overflow: hidden; } -.setup .modal header { - background-color: #fff; - color: #002680; - font-weight: 600; - font-size: 24px; - text-align: left; - padding: 0px 23px; - display: flex; - flex-flow: row nowrap; - justify-content: space-between; - align-items: stretch; -} -.modal.setup-info header { - padding-left: 31px; - display: flex; - align-items: center; - font-size: 20px; - font-weight: bold; - color: darkblue; -} -.tab-header { - display: flex; - flex-flow: row; - align-items: stretch; - justify-content: flex-start; -} -.tab-header button { - background: none; - border: 1px solid #bbbcbc; - padding: 0 38px; - border-bottom: none; - font-size: 20px; - background-color: #bbbcbc; - color: #002680; -} -.tab-header button.active { - background-color: #fff; - font-weight: bold; - border-top: 2px solid #002680; -} -.modal.setup-info { - width: 1639px; - height: 695px; - background-color: #fff; - margin: 150px 193px; - box-shadow: none; -} -.modal.setup-info section { +body { + border: 0; + margin: 0; + padding: 0; height: 100%; } -.modal.setup-info section .Rectangle { - width: calc(100% - 200px); - height: calc(100% - 200px); - background-color: #BBBCBC; +.hidden { + visibility: hidden; +} +.container #app nav { + position: absolute; + top: 50%; + right: 0; +} +.container #app nav .active button { + transform: translate(-761px, 0px); +} +.container #app nav div button { + position: relative; + height: 30px; + width: 32px; + display: block; + z-index: 9999; + border: 0; + border-radius: 0; + pointer-events: all; + background: #dddddd; + border-bottom-left-radius: 90px; + border-top-left-radius: 90px; + height: 90px; + width: 45px; +} +.container #app nav div button div { display: grid; - grid-template-columns: repeat(6, 1fr); + grid-template-columns: repeat(2, 1fr); grid-template-rows: 1fr 1fr; align-items: center; justify-items: center; - padding: 100px; + padding: 5px; } -.setup-button { +.container #app nav div button div div { + width: 2px; + height: 2px; + border-radius: 10px; + margin: 2px; + background: #002680; +} +.container #app .sidebar .sidebar-backdrop { + width: 100vw; + height: 100vh; + position: fixed; + top: 0; + left: 0; cursor: pointer; - display: grid; - width: 200px; - height: 128px; - grid-template-columns: 50px 1fr; - grid-template-rows: 1fr 50px; - position: relative; } -.setup-button span, -.setup-button label { - grid-column: 1; - display: flex; - align-items: flex-end; - color: #fff; - z-index: 2; - justify-content: center; - font-weight: 500; - font-size: 18px; - padding-left: 10px; +.container #app .sidebar .sidebar-panel { + overflow-y: auto; + background-color: #130f40; + position: fixed; + right: 0; + top: 141px; + height: 100vh; + z-index: 900; + padding: 3rem 20px 2rem 20px; + width: 721px; + height: 920px; + border-radius: 4px; + box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5); + background-color: #dddddd; } -.setup-button label { - grid-column: 2; - color: #002680; - justify-content: flex-start; -} -.setup-button img { - grid-column: 2; - grid-row: 2; - z-index: 2; - margin: auto; -} -.setup-button i { - grid-column: 2; - grid-row: 2; - z-index: 2; - margin: auto; - transform: scale(1.5); -} -.setup-button i.fa-check-circle { - color: #90BF3D; -} -.setup-button i.fa-minus-circle { - color: #7A7C74; -} -.setup-button .background-top, -.setup-button .background-bottom { - position: absolute; - left: 0; - width: 100%; - height: 50%; - transform: skewX(12px); -} -.setup-button .background-top:after, -.setup-button .background-bottom:after { - content: ""; - display: block; - position: absolute; - left: 0; - top: 0; - height: 100%; - width: 35px; - background-color: #002680; -} -.setup-button .background-top { - background-image: linear-gradient(to bottom, #fff, #e6e6e6); - top: 0; - transform: skewX(20deg); -} -.setup-button .background-bottom { - background-image: linear-gradient(to bottom, #e6e6e6, #e2e2e2); - bottom: 0; - transform: skewX(-20deg); -} -.box { - margin-bottom: 30px; - box-sizing: border-box; - clear: both; -} -.box .header { - display: flex; - align-items: center; - justify-content: center; - height: 44px; - width: 100%; +.container #app .sidebar .sidebar-panel .text-head-sidebar { + margin: 10px auto; font-size: 24px; - font-weight: bold; - color: #fff; - background-color: #979797; -} -.box .body { - padding: 20px; - display: flex; - flex-flow: column; - justify-items: center; - padding-bottom: 10px; - border: 2px solid #979797; -} -.box .submit { - margin: auto; - width: 90px; - height: 48px; - object-fit: contain; - border-radius: 8px; - border: none; - box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.5); - background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%); -} -.box .submit label { - object-fit: contain; - font-size: 18px; font-weight: 500; font-stretch: normal; font-style: normal; @@ -4355,61 +4587,65 @@ text-align: center; color: #002680; } -.input-area { - margin: 10px auto; - display: flex; - flex-flow: row; +.container #app .sidebar .sidebar-panel .box-sidebar-panel { + display: grid; + grid-template-columns: repeat(2, 1fr); align-items: center; - justify-content: space-between; - width: 100%; - height: 48px; + justify-items: center; } -.input-area.col { - flex-flow: column; - align-items: flex-start; - height: auto; -} -.input-area h3 { - font-weight: normal; - color: #002680; - margin: 18px 0; -} -.input-area .buttons { - width: 100%; - display: flex; - flex-flow: row; - margin-bottom: 18px; -} -.input-area .buttons:last-child { - margin-bottom: 0; -} -.input-area label { - color: #002680; - font-size: 24px; - font-weight: 500; - flex: 1; -} -.input-area .rect { - display: flex; - align-items: center; - justify-content: flex-end; - padding-inline-end: 20px; - width: 98px; - height: 48px; +.container #app .sidebar .sidebar-panel .box-sidebar-panel .sidebar-panel-nav { + width: 286px; + height: 100px; border-radius: 2px; - box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5); + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.5); + background-color: #808e96; + margin: 10px 30px; } -.input-area select { - min-width: 150px; - height: 48px; - background-color: #fff; - padding: 0 20px; - font-size: 1rem; -} -.setup-play { - cursor: pointer; - margin: auto; +.container #app .sidebar .sidebar-panel .box-sidebar-panel .sidebar-panel-nav .text-box-paddle { display: flex; + width: 268px; + height: 78px; + font-family: WorkSans; + font-size: 18px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #ffffff; + margin: 10px; +} +.container #app .sidebar .sidebar-panel .box-sidebar-panel .sidebar-panel-nav .text-box-paddle i { + text-align: end; + width: 50px; + color: #bbbcbc; +} +.container #app .sidebar .sidebar-panel .box-sidebar-panel .sidebar-panel-nav .text-box-paddle label { + width: 117px; + margin: 10px; +} +.container #app .sidebar .sidebar-panel .box-sidebar-panel .sidebar-panel-nav .text-box-paddle.text-soft label { + width: 100%; + align-self: center; +} +.modal.estrazione-info { + width: 560px; + height: 411px; +} +.modal.avvio-produzione-info { + margin-top: 100px; + width: 653px; + height: 616px; +} +.modal.avvio-produzione-info section.body section { + justify-content: center; +} +.modal.avvio-produzione-info section.body section .specific .disabled { + width: 420px; + height: 330px; +} +.modal.avvio-produzione-info section.body section .specific .tast { + margin-left: 25%; } .modal.ciclo-info section .specific { padding: 0 10px; @@ -4440,23 +4676,24 @@ } .modal.ciclo-info section .specific .svg-area .input-circles .circle1 { position: relative; - top: 130px; + top: 200px; right: 25px; } .modal.ciclo-info section .specific .svg-area .input-circles .circle2 { position: relative; - top: 180px; + top: 400px; right: 25px; } .modal.ciclo-info section .specific .svg-area .input-circles .circle3 { + width: 135px; position: relative; - top: 175px; + top: 545px; right: 410px; } .modal.ciclo-info section .specific .svg-area .input-circles .circle4 { position: relative; - top: 60px; - right: 180px; + top: 585px; + right: 200px; } .modal.ciclo-info section .specific .box { margin-bottom: 10px; @@ -4477,7 +4714,47 @@ .modal.processo-info { width: 1820px; height: 980px; - margin: 150px 193px; + margin-top: 50px; +} +.modal.processo-info header { + font-size: 22px; + color: #4b4b4b; +} +.modal.processo-info header .tab-header { + padding: 10px 0px; +} +.modal.processo-info header .tab-header button { + padding: 0; + display: flex; + justify-content: flex-start; + margin-right: 10px; + width: 149px; + height: 48px; + border-radius: 2px; + box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.5); + background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%); + font-size: 14px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: 1.15; + letter-spacing: normal; + color: #4b4b4b; +} +.modal.processo-info header .tab-header button img { + margin-right: 20px; +} +.modal.processo-info header .tab-header label { + width: 106px; + height: 32px; + font-size: 32px; + font-weight: 600; + font-stretch: normal; + font-style: normal; + line-height: 1; + letter-spacing: normal; + text-align: right; + color: #545454; } .modal.progr-preriscaldo-info { width: 1639px; @@ -4739,17 +5016,11 @@ width: 1200px; height: 795px; } -.modal.quote-velocita-info section .specific .svg-area .input-circles span { - object-fit: contain; - font-size: 22px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: white; - background-color: #979797; +.modal.quote-velocita-info section .specific .svg-area .disegnoControstampoQuoteVelocita { + flex-shrink: 0; + margin-left: 600px; + width: 1156px; + height: 800px; } .modal.quote-velocita-info section .specific .svg-area .input-circles .circle { width: 147px; @@ -4848,14 +5119,48 @@ } .modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-10 { position: relative; - bottom: 557px; + bottom: 560px; right: 769px; } .modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-11 { position: relative; - top: 38px; + top: 35px; right: 781px; } +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-controstampo-1 { + position: relative; + top: 300px; + right: 1090px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-controstampo-2 { + position: relative; + top: 570px; + right: 990px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-controstampo-3 { + position: relative; + top: 475px; + right: 770px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-controstampo-4 { + position: relative; + right: 650px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-controstampo-5 { + position: relative; + top: 45px; + right: 480px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-controstampo-6 { + position: relative; + top: -335px; + right: 650px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-controstampo-7 { + position: relative; + top: 400px; + right: 650px; +} .modal.quote-velocita-info section .specific button { margin-left: 10px; width: 48px; @@ -4876,17 +5181,17 @@ background-color: #979797; margin: 0; } -.modal.opzioni-info .section { - display: flex; +.modal.opzioni-info section.body section { + padding: 0px; } -.modal.opzioni-info .section .specific:last-of-type { +.modal.opzioni-info section.body section .specific:last-of-type { margin-left: 100px; width: 471px; } -.modal.opzioni-info .section .specific:first-of-type .box-color { +.modal.opzioni-info section.body section .specific:first-of-type .box-color { background-color: #ffffff; } -.modal.opzioni-info .section .specific:first-of-type button { +.modal.opzioni-info section.body section .specific:first-of-type button { background-color: #dddddd; display: block; color: #000000; @@ -4898,17 +5203,17 @@ cursor: pointer; font-size: 17px; } -.modal.opzioni-info .section .specific:first-of-type .active { +.modal.opzioni-info section.body section .specific:first-of-type .active { background-color: rgba(23, 145, 255, 0.75); color: #ffffff; } -.modal.opzioni-info .section .specific:first-of-type label { +.modal.opzioni-info section.body section .specific:first-of-type label { font-size: 14px; width: 60px; margin-left: 5px; margin-right: 30px; } -.modal.opzioni-info aside button { +.modal.opzioni-info section.body section aside button { display: block; background-color: #bbbcbc; color: #002680; @@ -4921,7 +5226,7 @@ cursor: pointer; font-size: 17px; } -.modal.opzioni-info aside .active { +.modal.opzioni-info section.body section aside .active { background-color: #fff; font-weight: bold; border-top: 2px solid #002680; @@ -4942,10 +5247,12 @@ width: 1820px; height: 785px; } -.modal.estrazione-info .specific { +.modal.estrazione-info section.body section .specific { justify-content: flex-end; + padding-left: 10px; } -.modal.estrazione-info .specific .box { +.modal.estrazione-info section.body section .specific .box { + margin: 0; background-color: #e5f3ff; } .scheda .body { @@ -4953,7 +5260,7 @@ } .scheda .body .input-area { width: 480px; - margin: 3px; + margin: 4px; margin-bottom: 0px; } .modal.vuoto-info { diff --git a/Thermo.Active/wwwroot/config.development.json b/Thermo.Active/wwwroot/config.development.json index d47c9870..3f9529d8 100644 --- a/Thermo.Active/wwwroot/config.development.json +++ b/Thermo.Active/wwwroot/config.development.json @@ -2,6 +2,6 @@ "env": "development", "api": { "enabled": true, - "apiServerUrl": "http://localhost:9000" + "apiServerUrl": "http://seriate.steamware.net:9000/" } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/config.production.json b/Thermo.Active/wwwroot/config.production.json index 42e97807..52d7f647 100644 --- a/Thermo.Active/wwwroot/config.production.json +++ b/Thermo.Active/wwwroot/config.production.json @@ -2,6 +2,6 @@ "env": "development", "api": { "enabled": false, - "apiServerUrl": "https://localhost:9000" + "apiServerUrl": "http://seriate.steamware.net:9000/" } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/index.html b/Thermo.Active/wwwroot/index.html index 226df41d..f1b8ee9e 100644 --- a/Thermo.Active/wwwroot/index.html +++ b/Thermo.Active/wwwroot/index.html @@ -2,31 +2,30 @@ - - - - - - CMS Active + + + + + + CMS Active - - - - - + + + + + - + - -
- - - + +
+ + + - - + \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/@types/recipe-current.d.ts b/Thermo.Active/wwwroot/src/@types/recipe-current.d.ts new file mode 100644 index 00000000..8f1ab5ec --- /dev/null +++ b/Thermo.Active/wwwroot/src/@types/recipe-current.d.ts @@ -0,0 +1,339 @@ +declare module Recipe { + + interface IRange{ + min:number, + max:number + } + + interface IStatus{ + visible:boolean, + enabled:boolean, + hasError:boolean + } + + interface IValue{ + range:IRange, + status:IStatus, + unitMeasure:string, + valueAct:number + } + + interface IRecipe{ + general_sizes_mould_dim_x?:IValue, + general_sizes_mould_dim_y?:IValue, + general_sizes_mould_max_height?:IValue, + general_sizes_mould_min_height?:IValue, + general_sizes_mould_base_height?:IValue, + general_sizes_sheet_material?:IValue, + general_sizes_sheet_dim_x?:IValue, + general_sizes_sheet_dim_y?:IValue, + general_sizes_sheet_thickness?:IValue, + general_sizes_plate_type?:IValue, + general_sizes_plate_dim_x?:IValue, + general_sizes_plate_dim_y?:IValue, + general_sizes_frame_traverses?:IValue, + general_sizes_frame_dim_x?:IValue, + general_sizes_frame_dim_y?:IValue, + general_sizes_upperplate_max_height?:IValue, + general_area_working_dxsx?:IValue, + positions_mould_lower_position?:IValue, + positions_mould_lower_speed?:IValue, + positions_mould_intermediate_position?:IValue, + positions_mould_upper_position?:IValue, + positions_mould_upper_speed?:IValue, + positions_mould_upperdeceleration_position?:IValue, + positions_mould_upperdeceleration_speed?:IValue, + positions_mould_lowerdeceleration_speed?:IValue, + positions_mould_lowerdeceleration_position?:IValue, + positions_frame_lower_position?:IValue, + positions_frame_lower_speed?:IValue, + positions_frame_upper_speed?:IValue, + positions_frame_upper_position?:IValue, + positions_frame_intermediate_position?:IValue, + positions_frame_intermediate_speed?:IValue, + positions_frame_unload_position?:IValue, + positions_upperplate_lower_position?:IValue, + positions_upperplate_lower_speed?:IValue, + positions_upperplate_upper_position?:IValue, + positions_upperplate_upper_speed?:IValue, + positions_upperplate_upperdeceleration_position?:IValue, + positions_upperplate_upperdeceleration_speed?:IValue, + positions_upperplate_lowerdeceleration_position?:IValue, + positions_upperplate_lowerdeceleration_speed?:IValue, + cycle_forming_type?:IValue, + cycle_forming_pause_cycle?:IValue, + cycle_forming_cooling_enabled?:IValue, + cycle_forming_blowingbox_enabled?:IValue, + cycle_acrylicframe_enabled?:IValue, + cycle_acrylicframe_time?:IValue, + cycle_upperoverheating_enabled?:IValue, + cycle_upperoverheating_time?:IValue, + cycle_crystallisation_type?:IValue, + cycle_crystallisation_enabled?:IValue, + cycle_crystallisation_time?:IValue, + cycle_loader_enable?:IValue, + cycle_loader_lifter_lowerposition_delay?:IValue, + cycle_loader_lifter_upperposition_delay?:IValue, + cycle_loader_split_sheet_time?:IValue, + cycle_loader_ejector_position?:IValue, + cycle_loader_pallet_height?:IValue + cycle_loader_center_x?:IValue, + cycle_loader_center_y?:IValue, + cycle_loader_checktichness_enabled?:IValue, + cycle_loader_suckers_vacuum?:IValue, + cycle_loader_ionizer_enabled?:IValue, + cycle_loader_manualunloading_enabled?:IValue, + heats_lowerheaters_max_time?:IValue, + heats_lowerheaters_movement_enabled?:IValue, + heats_lowerheaters_enabled?:IValue, + heats_lowerheaters_oscillation?:IValue, + heats_upperheaters_max_time?:IValue, + heats_upperheaters_movement_enabled?:IValue, + heats_upperheaters_enabled?:IValue, + heats_upperheaters_oscillation?:IValue, + heats_decomsustain_type?:IValue, + heats_decomsustain_decompression_flow?:IValue, + heats_decomsustain_min_blowing_time?:IValue, + heats_decomsustain_sustain_delay?:IValue, + heats_decomsustain_decompression_delay?:IValue, + heats_decomsustain_decompression_duration?:IValue, + heats_decomsustain_smoke_function_enabled?:IValue, + pyrometer_pyrometer_enabled?:IValue, + pyrometer_pyrometer_setpoint?:IValue, + pyrometer_pyrometer_delay?:IValue, + pyrometer_upperthermoregulator_start_adjustment?:IValue, + pyrometer_upperthermoregulator_end_adjustment?:IValue, + pyrometer_upperthermoregulator_min_percentage?:IValue, + pyrometer_upperthermoregulator_max_percentage?:IValue, + pyrometer_upperthermoregulator_sleep_enabled?:IValue, + pyrometer_upperthermoregulator_sleep_percentage?:IValue, + pyrometer_lowerthermoregulator_start_adjustment?:IValue, + pyrometer_lowerthermoregulator_end_adjustment?:IValue, + pyrometer_lowerthermoregulator_min_percentage?:IValue, + pyrometer_lowerthermoregulator_max_percentage?:IValue, + pyrometer_lowerthermoregulator_sleep_enabled?:IValue, + pyrometer_lowerthermoregulator_sleep_percentage?:IValue, + pyrometer_upperthermoregulator_sleep_temperature?:IValue, + pyrometer_upperthermoregulator_working_temperature?:IValue, + pyrometer_lowerthermoregulator_sleep_temperature?:IValue, + pyrometer_lowerthermoregulator_working_temperature?:IValue, + drawing_type?:IValue, + drawing_height?:IValue, + drawing_delay?:IValue, + drawing_1_chart_setpointx?:IValue, + drawing_1_chart_setpointy?:IValue, + drawing_photocell?:IValue, + drawing_mantaining_flow?:IValue, + drawing_manual?:IValue, + drawing_mould_up_delay?:IValue, + upperplate_cycle_type?:IValue, + upperplate_cycle_delay?:IValue, + upperplate_cycle_time?:IValue, + upperplate_air_enable?:IValue, + upperplate_air_delay?:IValue, + upperplate_air_max_time?:IValue, + upperplate_air_1_chart_setpointx?:IValue, + upperplate_air_1_chart_setpointy?:IValue, + upperplate_air_2_chart_setpointx?:IValue, + upperplate_air_2_chart_setpointy?:IValue, + upperplate_air_3_chart_setpointx?:IValue, + upperplate_air_3_chart_setpointy?:IValue, + upperplate_air_manual?:IValue, + upperplate_vacuum_enable?:IValue, + upperplate_vacuum_delay?:IValue, + upperplate_vacuum_max_time?:IValue, + upperplate_vacuum_1_chart_setpointx?:IValue, + upperplate_vacuum_1_chart_setpointy?:IValue, + upperplate_vacuum_2_chart_setpointx?:IValue, + upperplate_vacuum_2_chart_setpointy?:IValue, + upperplate_vacuum_3_chart_setpointx?:IValue, + upperplate_vacuum_3_chart_setpointy?:IValue, + upperplate_vacuum_manual?:IValue, + upperplate_extraction_enable?:IValue, + upperplate_extraction_delay?:IValue, + upperplate_extraction_1_chart_setpointx?:IValue, + upperplate_extraction_1_chart_setpointy?:IValue, + upperplate_extraction_manual?:IValue, + cooling_blowing_type?:IValue, + cooling_blowing_delay?:IValue, + cooling_blowing_time?:IValue, + cooling_pyrometer_enabled?:IValue, + cooling_pyrometer_setpoint?:IValue, + cooling_pyrometer_delay?:IValue, + cooling_nebulizer_type?:IValue, + cooling_nebulizer_delay?:IValue, + cooling_nebulizer_time?:IValue, + cooling_telescopic_enable?:IValue, + cooling_telescopic_position?:IValue, + cooling_telescopic_swing_enable?:IValue, + cooling_telescopic_swing_stroke?:IValue, + cooling_shutter_1_opening_perc?:IValue, + cooling_shutter_2_opening_perc?:IValue, + cooling_shutter_3_opening_perc?:IValue, + cooling_shutter_4_opening_perc?:IValue, + cooling_shutter_5_opening_perc?:IValue, + cooling_shutter_6_opening_perc?:IValue, + cooling_shutter_7_opening_perc?:IValue, + cooling_shutter_8_opening_perc?:IValue, + cooling_shutter_9_opening_perc?:IValue, + cooling_shutter_10_opening_perc?:IValue, + cooling_shutter_11_opening_perc?:IValue, + cooling_shutter_12_opening_perc?:IValue, + cooling_shutter_13_opening_perc?:IValue, + cooling_shutter_14_opening_perc?:IValue, + cooling_shutter_15_opening_perc?:IValue, + cooling_shutter_16_opening_perc?:IValue, + + + vacuum_main_start?:IValue, + vacuum_main_delay?:IValue, + vacuum_main_max_time?:IValue, + vacuum_main_1_chart_setpointx?:IValue, + vacuum_main_1_chart_setpointy?:IValue, + vacuum_main_2_chart_setpointx?:IValue, + vacuum_main_2_chart_setpointy?:IValue, + vacuum_main_3_chart_setpointx?:IValue, + vacuum_main_3_chart_setpointy?:IValue, + vacuum_main_manual?:IValue, + vacuum_direct_enabled?:IValue, + vacuum_direct_delay?:IValue, + vacuum_direct_time?:IValue, + vacuum_aux_enabled?:IValue, + vacuum_aux_delay?:IValue, + vacuum_aux_max_time?:IValue, + vacuum_aux_1_chart_setpointx?:IValue, + vacuum_aux_1_chart_setpointy?:IValue, + vacuum_aux_2_chart_setpointx?:IValue, + vacuum_aux_2_chart_setpointy?:IValue, + vacuum_aux_3_chart_setpointx?:IValue, + vacuum_aux_3_chart_setpointy?:IValue, + vacuum_aux_manual?:IValue, + vacuum_pre_enabled?:IValue, + vacuum_pre_delay?:IValue, + vacuum_pre_max_time?:IValue, + vacuum_pre_1_chart_setpointx?:IValue, + vacuum_pre_1_chart_setpointy?:IValue, + vacuum_pre_2_chart_setpointx?:IValue, + vacuum_pre_2_chart_setpointy?:IValue, + vacuum_pre_3_chart_setpointx?:IValue, + vacuum_pre_3_chart_setpointy?:IValue, + + + extraction_main_type?:IValue, + extraction_main_mould_dw_delay?:IValue, + extraction_main_delay?:IValue, + extraction_main_1_chart_setpointx?:IValue, + extraction_main_1_chart_setpointy?:IValue, + extraction_main_manual?:IValue, + extraction_aux_enabled?:IValue, + extraction_aux_delay?:IValue, + extraction_aux_1_chart_setpointx?:IValue, + extraction_aux_1_chart_setpointy?:IValue, + extraction_aux_manual?:IValue, + + options_undercutmould_1_mode?:IValue, + options_undercutmould_1_position?:IValue, + options_undercutmould_1_delay_acti?:IValue, + options_undercutmould_1_delay_dis?:IValue, + options_undercutmould_2_mode?:IValue, + options_undercutmould_2_position?:IValue, + options_undercutmould_2_delay_acti?:IValue, + options_undercutmould_2_delay_dis?:IValue, + options_undercutmould_3_mode?:IValue, + options_undercutmould_3_position?:IValue, + options_undercutmould_3_delay_acti?:IValue, + options_undercutmould_3_delay_dis?:IValue, + options_undercutmould_4_mode?:IValue, + options_undercutmould_4_position?:IValue, + options_undercutmould_4_delay_acti?:IValue, + options_undercutmould_4_delay_dis?:IValue, + options_undercutmould_5_mode?:IValue, + options_undercutmould_5_position?:IValue, + options_undercutmould_5_delay_acti?:IValue, + options_undercutmould_5_delay_dis?:IValue, + options_undercutmould_6_mode?:IValue, + options_undercutmould_6_position?:IValue, + options_undercutmould_6_delay_acti?:IValue, + options_undercutmould_6_delay_dis?:IValue, + options_undercutmould_7_mode?:IValue, + options_undercutmould_7_position?:IValue, + options_undercutmould_7_delay_acti?:IValue, + options_undercutmould_7_delay_dis?:IValue, + options_undercutmould_8_mode?:IValue, + options_undercutmould_8_position?:IValue, + options_undercutmould_8_delay_acti?:IValue, + options_undercutmould_8_delay_dis?:IValue, + options_undercutmould_9_mode?:IValue, + options_undercutmould_9_position?:IValue, + options_undercutmould_9_delay_acti?:IValue, + options_undercutmould_9_delay_dis?:IValue, + options_undercutmould_10_mode?:IValue, + options_undercutmould_10_position?:IValue, + options_undercutmould_10_delay_acti?:IValue, + options_undercutmould_10_delay_dis?:IValue, + + options_undercutupperplate_1_mode?:IValue, + options_undercutupperplate_1_position?:IValue, + options_undercutupperplate_1_delay_acti?:IValue, + options_undercutupperplate_1_delay_dis?:IValue, + options_undercutupperplate_2_mode?:IValue, + options_undercutupperplate_2_position?:IValue, + options_undercutupperplate_2_delay_acti?:IValue, + options_undercutupperplate_2_delay_dis?:IValue, + options_undercutupperplate_3_mode?:IValue, + options_undercutupperplate_3_position?:IValue, + options_undercutupperplate_3_delay_acti?:IValue, + options_undercutupperplate_3_delay_dis?:IValue, + options_undercutupperplate_4_mode?:IValue, + options_undercutupperplate_4_position?:IValue, + options_undercutupperplate_4_delay_acti?:IValue, + options_undercutupperplate_4_delay_dis?:IValue, + options_undercutupperplate_5_mode?:IValue, + options_undercutupperplate_5_position?:IValue, + options_undercutupperplate_5_delay_acti?:IValue, + options_undercutupperplate_5_delay_dis?:IValue, + options_undercutupperplate_6_mode?:IValue, + options_undercutupperplate_6_position?:IValue, + options_undercutupperplate_6_delay_acti?:IValue, + options_undercutupperplate_6_delay_dis?:IValue, + options_undercutupperplate_7_mode?:IValue, + options_undercutupperplate_7_position?:IValue, + options_undercutupperplate_7_delay_acti?:IValue, + options_undercutupperplate_7_delay_dis?:IValue, + options_undercutupperplate_8_mode?:IValue, + options_undercutupperplate_8_position?:IValue, + options_undercutupperplate_8_delay_acti?:IValue, + options_undercutupperplate_8_delay_dis?:IValue, + options_undercutupperplate_9_mode?:IValue, + options_undercutupperplate_9_position?:IValue, + options_undercutupperplate_9_delay_acti?:IValue, + options_undercutupperplate_9_delay_dis?:IValue, + options_undercutupperplate_10_mode?:IValue, + options_undercutupperplate_10_position?:IValue, + options_undercutupperplate_10_delay_acti?:IValue, + options_undercutupperplate_10_delay_dis?:IValue, + + options_thermoregulator_1_enabled?:IValue, + options_thermoregulator_1_setpoint?:IValue, + options_thermoregulator_2_enabled?:IValue, + options_thermoregulator_2_setpoint?:IValue, + options_thermoregulator_3_enabled?:IValue, + options_thermoregulator_3_setpoint?:IValue, + options_thermoregulator_4_enabled?:IValue, + options_thermoregulator_4_setpoint?:IValue, + options_thermoregulator_5_enabled?:IValue, + options_thermoregulator_5_setpoint?:IValue, + options_thermoregulator_6_enabled?:IValue, + options_thermoregulator_6_setpoint?:IValue, + options_thermoregulator_7_enabled?:IValue, + options_thermoregulator_7_setpoint?:IValue, + options_thermoregulator_8_enabled?:IValue, + options_thermoregulator_8_setpoint?:IValue, + options_thermoregulator_9_enabled?:IValue, + options_thermoregulator_9_setpoint?:IValue, + options_thermoregulator_10_enabled?:IValue, + options_thermoregulator_10_setpoint?:IValue, + } + +} + diff --git a/Thermo.Active/wwwroot/src/@types/recipe-overview.d.ts b/Thermo.Active/wwwroot/src/@types/recipe-overview.d.ts new file mode 100644 index 00000000..0b6f1b94 --- /dev/null +++ b/Thermo.Active/wwwroot/src/@types/recipe-overview.d.ts @@ -0,0 +1,16 @@ +declare module Overview { + interface IOverview{ + + general:string, + positions:string, + cycle: string, + heats: string, + pyrometer: string, + drawing: string, + upperPlate: string, + cooling: string, + vacuum: string, + extraction: string, + options: string + } +} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/App.ts b/Thermo.Active/wwwroot/src/App.ts index a07e2fcd..9c201c17 100644 --- a/Thermo.Active/wwwroot/src/App.ts +++ b/Thermo.Active/wwwroot/src/App.ts @@ -10,6 +10,9 @@ import { ModalContainer, ModalNcContainer } from "./modules/base-components"; import { ModalHelper } from "@/components/modals" import { store, appModelActions, machineStatusActions } from "@/store"; import { underTheHood } from "@/app_modules/under-the-hood"; +import SwitchButton from "@/app_modules_thermo/components/paddle/switch-button.vue"; +import Sidebar from "@/app_modules_thermo/components/paddle/sidebar.vue"; +import ToggleButton from "@/components/toggleButton.vue"; import * as iziToast from "izitoast"; @@ -30,6 +33,8 @@ declare var cmsClient; appFooter: Footer, modalContainer: ModalContainer, modalNcContainer: ModalNcContainer, + switchButton: SwitchButton, + sidebar: Sidebar, alarmList, underTheHood, } @@ -39,6 +44,7 @@ export default class app extends Vue { $route: any; $router:any; + state = this.$store.state; applyBlur = false; showHeaderOnBlur = false; diff --git a/Thermo.Active/wwwroot/src/App.vue b/Thermo.Active/wwwroot/src/App.vue index c8bf1de2..4a36198b 100644 --- a/Thermo.Active/wwwroot/src/App.vue +++ b/Thermo.Active/wwwroot/src/App.vue @@ -7,7 +7,6 @@
-
@@ -18,6 +17,13 @@
+ + + + + diff --git a/Thermo.Active/wwwroot/src/app.business-logic.ts b/Thermo.Active/wwwroot/src/app.business-logic.ts index 0ea51ce9..99391de1 100644 --- a/Thermo.Active/wwwroot/src/app.business-logic.ts +++ b/Thermo.Active/wwwroot/src/app.business-logic.ts @@ -16,6 +16,7 @@ import ShowEstrazioneInfo from "@/app_modules_thermo/setup/estrazione/components import ShowVuotoInfo from "@/app_modules_thermo/setup/vuoto/show-vuoto-info.vue"; import ShowImbutituraInfo from "@/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue"; import ShowOpzioniInfo from "@/app_modules_thermo/setup/opzioni/show-opzioni-info.vue"; +import AvvioProduzione from "@/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.vue"; import ShowArretramentoRiscaldiInfo from "@/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.vue"; // import { DataService } from "./services/dataService"; // import { ToolingService } from "./services/toolingService"; @@ -51,6 +52,7 @@ let HMIScreenshotInterval; let HMIprodTimeout; let RerenderInterval; +messageService.subscribeToChannel("show-avvio-produzione-info", () => { ModalHelper.ShowModal(AvvioProduzione); }); messageService.subscribeToChannel("show-arretramento-riscaldi-info", () => { ModalHelper.ShowModal(ShowArretramentoRiscaldiInfo); }); messageService.subscribeToChannel("show-opzioni-info", () => { ModalHelper.ShowModal(ShowOpzioniInfo); }); messageService.subscribeToChannel("show-vuoto-info", () => { ModalHelper.ShowModal(ShowVuotoInfo); }); diff --git a/Thermo.Active/wwwroot/src/app_modules/alarms/components/alarms-list.ts b/Thermo.Active/wwwroot/src/app_modules/alarms/components/alarms-list.ts index b7c65ea8..9498dd8f 100644 --- a/Thermo.Active/wwwroot/src/app_modules/alarms/components/alarms-list.ts +++ b/Thermo.Active/wwwroot/src/app_modules/alarms/components/alarms-list.ts @@ -133,7 +133,7 @@ export default class alarmsList extends Vue { public get opened(): boolean { return this.$store.state.alarms.opened; - } + } public get serviceOpened(): boolean { return this.$store.state.alarms.serviceOpened; diff --git a/Thermo.Active/wwwroot/src/app_modules/machine/components/login.ts b/Thermo.Active/wwwroot/src/app_modules/machine/components/login.ts index 355b8f57..f20ac9a6 100644 --- a/Thermo.Active/wwwroot/src/app_modules/machine/components/login.ts +++ b/Thermo.Active/wwwroot/src/app_modules/machine/components/login.ts @@ -14,7 +14,7 @@ export default class Login extends Vue { $router: any; public user: server.loginViewModel = { password: null, username: null }; - public hasError: boolean = false; + public hasError: boolean = false; public logginIn: boolean = false; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/sidebar.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/sidebar.ts new file mode 100644 index 00000000..6c776934 --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/sidebar.ts @@ -0,0 +1,19 @@ +import Vue from "vue"; +import Component from "vue-class-component"; +import {paddleActions} from '@/store/paddle.store'; +import ToggleButton from "@/components/toggleButton.vue"; + +@Component({name: 'sidebar',components: { toggleButton:ToggleButton } }) +export default class Sidebar extends Vue{ + + azione1:boolean=false; + azione2:boolean=false; + + isPanelOpen(){ + return this.$store.state.paddle.isNavOpen; + } + + closeSidebarPanel() { + paddleActions.Toggle(this.$store); + } +} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/sidebar.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/sidebar.vue new file mode 100644 index 00000000..5a6fa93f --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/sidebar.vue @@ -0,0 +1,80 @@ + + \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts index 7ffb8c95..383243d1 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts @@ -3,13 +3,21 @@ import Component from 'vue-class-component'; import {Prop} from 'vue-property-decorator'; import { messageService } from "@/_base/messageService"; import { Modal, ModalHelper } from "@/components/modals"; +import CircleGantt from "../circles-gantt/circle-gantt.vue" @Component({ components: { - modal: Modal + modal: Modal, + circlegantt: CircleGantt } }) export default class Processo extends Vue{ + + @Prop({default:25}) + actual:number; + @Prop({default:145}) + tot:number; + public sendMessage(name: string) { messageService.publishToChannel(name); } diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue index d50267ba..b65e5537 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue @@ -1,7 +1,16 @@ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.ts new file mode 100644 index 00000000..2f8e5d7b --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.ts @@ -0,0 +1,48 @@ +import Vue from "vue"; +import { Modal, ModalHelper } from "@/components/modals"; +import { Factory, messageService, awaiter } from "@/_base"; +import Component from "vue-class-component"; +import { Prop } from 'vue-property-decorator'; +import ToggleButton from "@/components/toggleButton.vue"; +import Tastierino from "@/app_modules_thermo/setup/formato/components/tastierino.vue" + +@Component({ + components: { + modal: Modal, + ToggleButton, + tastierino:Tastierino + } +}) +export default class AvvioProduzione extends Vue { + + enabling:boolean=true; + @Prop({default:0}) + pieces:number; + + mock_pieces:number=this.pieces; + + annulla(){ + ModalHelper.HideModal(); + }; + + conferma(){ + ModalHelper.HideModal(); + }; + + async beforeMount() { + // this.contactInfo = await awaiter(new machineService().getContactConfiguration()); + messageService.subscribeToChannel("esc_pressed", args => { + this.close(); + }); + } + + beforeDestroy() { + messageService.deleteChannel("esc_pressed"); + } + + close() { + messageService.deleteChannel("esc_pressed"); + ModalHelper.HideModal(); + } + +} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.vue new file mode 100644 index 00000000..289dbb0c --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.vue @@ -0,0 +1,31 @@ + + + \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.ts index 52cac898..7d90dad4 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.ts @@ -6,11 +6,11 @@ import {Prop} from 'vue-property-decorator'; export default class SVGCaricatore extends Vue{ @Prop({default:1600}) dxalto:number; - @Prop({default:0}) + @Prop({default:610}) dxbasso:number; - @Prop({default:0}) + @Prop({default:1030}) basso:number; - @Prop({default:0}) + @Prop({default:1360}) volante:number; minoreuguale:string="<="; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue index 6d2957e1..746e216d 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue @@ -2,10 +2,10 @@
- - - - + {{dxalto}} mm + {{dxbasso}} mm + {{minoreuguale}} {{basso}} mm + {{volante}} mm
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.ts index 1ad97752..62b56c2a 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.ts @@ -7,29 +7,165 @@ import ToggleButton from "@/components/toggleButton.vue"; @Component({ components: { ToggleButton, slider: Slider, svgcaricatore: SVGCaricatore, } }) export default class Caricatore extends Vue { - - @Prop({ default: 0 }) - ritardodiscesa: number; - @Prop({ default: 0 }) - ritardosalita: number = 0; - @Prop({ default: 0 }) - durata: number = 0; - @Prop({ default: 0 }) - ritardoespulsore: number = 0; - @Prop({ default: 0 }) - altezza: number = 0; - - ritdsol = this.ritardodiscesa - ritssol = this.ritardosalita - dursep = this.durata - ritesp = this.ritardoespulsore - altbanc = this.altezza - - abi: string = "ON"; - - retAbi() { - if (this.abi == "OFF") this.abi = "ON" - else this.abi = "OFF"; - }; +recipe:Recipe.IRecipe={ + cycle_loader_enable: { + range: { + min: 6, + max: 127 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 48 + }, + cycle_loader_lifter_lowerposition_delay: { + range: { + min: 5, + max: 133 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 38 + }, + cycle_loader_lifter_upperposition_delay: { + range: { + min: 6, + max: 172 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 16 + }, + cycle_loader_split_sheet_time: { + range: { + min: 1, + max: 111 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 50 + }, + cycle_loader_ejector_position: { + range: { + min: 3, + max: 199 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 47 + }, + cycle_loader_pallet_height: { + range: { + min: 1, + max: 149 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 116 + }, + cycle_loader_center_x: { + range: { + min: 6, + max: 167 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 142 + }, + cycle_loader_center_y: { + range: { + min: 7, + max: 109 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 58 + }, + cycle_loader_checktichness_enabled: { + range: { + min: 1, + max: 197 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 113 + }, + cycle_loader_suckers_vacuum: { + range: { + min: 9, + max: 105 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 20 + }, + cycle_loader_ionizer_enabled: { + range: { + min: 3, + max: 152 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 70 + }, + cycle_loader_manualunloading_enabled: { + range: { + min: 2, + max: 126 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 96 + } + +} + } \ No newline at end of file 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 0e692bcb..0121e02f 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 @@ -3,34 +3,59 @@
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.ts index 93ebc5b5..5798c287 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.ts @@ -14,10 +14,60 @@ import ToggleButton from "@/components/toggleButton.vue"; } }) export default class CicloFormatura extends Vue { +recipe:Recipe.IRecipe={ + cycle_forming_type: { + range: { + min: 7, + max: 179 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 160 + }, + cycle_forming_pause_cycle:{ + range: { + min: 1, + max: 127 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 9 + }, + cycle_forming_cooling_enabled: { + range: { + min: 3, + max: 132 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 36 + }, + cycle_forming_blowingbox_enabled: { + range: { + min: 0, + max: 130 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 89 + }, - pausa: boolean = false; - raffr: boolean = false; - vent: boolean = false; - +} } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.vue index 11aaf3fc..f1b1eb7c 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.vue @@ -9,15 +9,15 @@
- +
- +
- +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.ts index 2803f7f8..0c823c2f 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.ts @@ -6,13 +6,35 @@ import ToggleButton from "@/components/toggleButton.vue"; @Component({ components: { slider: Slider, ToggleButton } }) export default class MascheraAcrilico extends Vue { +recipe:Recipe.IRecipe={ + cycle_acrylicframe_time: { + range: { + min: 6, + max: 190 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 23 + }, + cycle_acrylicframe_enabled: { + range: { + min: 9, + max: 133 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 113 + } - enabling:boolean=true; - - @Prop({ default: 0 }) - durata: number; - - +} } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.vue index 7069bc69..0c86910f 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-acrilico.vue @@ -6,13 +6,17 @@
- +
-
{{durata}} s
+
- + +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.ts index 0c655d35..72b7fd7c 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.ts @@ -6,13 +6,48 @@ import ToggleButton from "@/components/toggleButton.vue"; @Component({ components: { slider: Slider, ToggleButton } }) export default class MascheraCristallizzazione extends Vue { +recipe:Recipe.IRecipe={ - enabling:boolean=true; - - @Prop({ default: 0 }) - durata: number; - - +cycle_crystallisation_type: { + range: { + min: 1, + max: 100 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 94 +}, +cycle_crystallisation_enabled: { + range: { + min: 1, + max: 100 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 94 +}, +cycle_crystallisation_time: { + range: { + min: 0, + max: 198 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 121 +}, +} } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.vue index 16b28612..39b43b0c 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-cristallizzazione.vue @@ -6,13 +6,17 @@
- +
-
{{durata}} s
+
- + +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-riscaldo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-riscaldo.ts index 307f4a78..f0fa17a9 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-riscaldo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-riscaldo.ts @@ -5,13 +5,34 @@ import Slider from "@/app_modules_thermo/components/slider.vue"; @Component({ components: { slider: Slider } }) export default class MascheraRiscaldo extends Vue { - - - - @Prop({ default: 0 }) - durata: number; - - - +recipe:Recipe.IRecipe={ + + cycle_upperoverheating_enabled:{ + range: { + min: 1, + max: 173 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 160 + }, + cycle_upperoverheating_time: { + range: { + min: 2, + max: 164 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 151 + } +} } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-riscaldo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-riscaldo.vue index 5225eda2..95dc6f60 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-riscaldo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/formatura-riscaldo.vue @@ -6,9 +6,13 @@
-
{{durata}} s
+
- + +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.ts index 5db91d45..4794e634 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.ts @@ -1,24 +1,23 @@ import Vue from 'vue'; import Component from 'vue-class-component'; import { Prop } from 'vue-property-decorator'; -import Slider from "@/app_modules_thermo/components/slider.vue"; import StepFooter from "@/app_modules_thermo/setup/components/step-footer.vue"; import { Modal, ModalHelper } from "@/components/modals"; import { Factory, messageService, awaiter } from "@/_base"; import CicloFormatura from "./base-components/ciclo-formatura.vue"; import Caricatore from "./base-components/caricatore.vue"; -@Component({ components: { modal: Modal, slider: Slider, stepfooter: StepFooter, caricatore: Caricatore, cicloformatura: CicloFormatura } }) +@Component({ components: { modal: Modal, stepfooter: StepFooter, caricatore: Caricatore, cicloformatura: CicloFormatura } }) export default class ShowCicloInfo extends Vue { - + show: string = "caricatore"; - annulla() { - ModalHelper.HideModal(); + annulla(name:string) { + messageService.publishToChannel(name); }; - conferma() { - ModalHelper.HideModal(); + conferma(name:string) { + messageService.publishToChannel(name); }; async beforeMount() { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.vue index 40976662..ffa3cf84 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.vue @@ -13,8 +13,8 @@ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue index 2ddfaebe..c97d74cd 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue @@ -20,67 +20,67 @@ @click="sendMessage('show-ciclo-info')" :phase="3" title="Ciclo" - statusImage="fa fa-minus-circle" + statusImage="fa fa-check-circle undone-step" >
- +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.ts index 659a67eb..45d47b8d 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.ts @@ -7,14 +7,137 @@ import Scheda from "@/app_modules_thermo/components/scheda.vue"; @Component({name:"ariacontrostampo", components: { scheda:Scheda,slider:Slider}}) export default class AriaControstampo extends Vue { - @Prop({default:0}) - ritardo:number; - - mockR:number=this.ritardo; - - @Prop({default:0}) - durata:number; - - mockD:number=this.durata; + recipe:Recipe.IRecipe={ + upperplate_air_enable: { + range: { + min: 8, + max: 181 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 72 + }, + upperplate_air_delay: { + range: { + min: 7, + max: 152 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 70 + }, + upperplate_air_max_time: { + range: { + min: 9, + max: 192 + }, + status: { + visible: true, + enabled: true, + hasError: true + }, + unitMeasure: "", + valueAct: 195 + }, + upperplate_air_1_chart_setpointx: { + range: { + min: 0, + max: 141 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 108 + }, + upperplate_air_1_chart_setpointy: { + range: { + min: 4, + max: 127 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 104 + }, + upperplate_air_2_chart_setpointx: { + range: { + min: 2, + max: 167 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 86 + }, + upperplate_air_2_chart_setpointy: { + range: { + min: 9, + max: 109 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 22 + }, + upperplate_air_3_chart_setpointx: { + range: { + min: 8, + max: 165 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 87 + }, + upperplate_air_3_chart_setpointy: { + range: { + min: 3, + max: 190 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 60 + }, + upperplate_air_manual: { + range: { + min: 3, + max: 191 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 28 + }, + } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue index 058ae816..2c99e15c 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue @@ -4,22 +4,41 @@
-
{{mockR}}s
+
- + +
- - - + + +
-
{{mockD}}s
+
- + +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.ts index e8074db2..7a7c483e 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.ts @@ -13,14 +13,49 @@ import ToggleButton from "@/components/toggleButton.vue"; }) export default class CicloControstampo extends Vue { - @Prop({default:0}) - durata:number; - @Prop({default:0}) - ritardo:number; + recipe:Recipe.IRecipe={ + upperplate_cycle_type: { + range: { + min: 6, + max: 114 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 29 + }, + upperplate_cycle_delay: { + range: { + min: 9, + max: 129 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 11 + }, + upperplate_cycle_time: { + range: { + min: 5, + max: 157 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 107 + }, + + } abilit:boolean=false; - mockD:number=this.durata; - mockR:number=this.ritardo; - } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.vue index addae4db..7a604484 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.vue @@ -12,20 +12,26 @@
- - -
- {{mockR}}s -
+ + +
- + +
- -
- {{mockD}}s -
+ +
- + + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.ts index 4b464204..5595c328 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.ts @@ -12,12 +12,12 @@ export default class ShowControstampoInfo extends Vue { show: string = "CC"; - annulla(){ - ModalHelper.HideModal(); + annulla(name:string){ + messageService.publishToChannel(name); }; - conferma(){ - ModalHelper.HideModal(); + conferma(name:string){ + messageService.publishToChannel(name); }; async beforeMount() { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.vue index 7ddfcc3c..2a6c1287 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.vue @@ -15,8 +15,8 @@ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts index 4e649ba6..7a3f942e 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts @@ -11,9 +11,48 @@ slider:Slider}}) export default class EstrazionePrincipale extends Vue{ - @Prop({default:0}) - ritardo:number; + recipe:Recipe.IRecipe={ + extraction_main_delay:{ + range:{ + min:5, + max:155 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:15 + }, + extraction_main_1_chart_setpointx:{ + range:{ + min:0, + max:154 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:128 + }, + extraction_main_1_chart_setpointy:{ + range:{ + min:6, + max:106 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:49 + } + }; + - mockR:number=this.ritardo; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue index 02fc3944..8735e2ed 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue @@ -1,15 +1,17 @@ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.ts index 59a89181..35719c0e 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.ts @@ -18,10 +18,12 @@ export default class ShowEstrazioneInfo extends Vue{ annulla(){ ModalHelper.HideModal(); + messageService.publishToChannel('show-vuoto-info'); }; conferma(){ ModalHelper.HideModal(); + messageService.publishToChannel('show-opzioni-info'); }; async beforeMount() { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.ts index 58c8e9db..003251b8 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.ts @@ -5,5 +5,5 @@ import {Prop} from 'vue-property-decorator'; @Component({}) export default class ControstampoSVG extends Vue{ @Prop({default:0}) - alt:number; + alt:Recipe.IValue; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.vue index ec644a6b..9669b336 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.vue @@ -4,7 +4,8 @@
- + +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.ts index 3f81b4cb..39ac82f1 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.ts @@ -5,7 +5,7 @@ import {Prop} from 'vue-property-decorator'; @Component({}) export default class CorniceSVG extends Vue{ @Prop({default:0}) - x:number; + x:Recipe.IValue; @Prop({default:0}) - y:number; + y:Recipe.IValue; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.vue index 3e454a73..04780e93 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.vue @@ -4,11 +4,13 @@
- + +
- + +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.ts index 144a358f..3a219b9f 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.ts @@ -5,10 +5,10 @@ import {Prop} from 'vue-property-decorator'; @Component({}) export default class LastraSVG extends Vue{ @Prop({default:0}) - x:number; + x:Recipe.IValue; @Prop({default:0}) - y:number; + y:Recipe.IValue; @Prop({default:0}) - spes:number; + spes:Recipe.IValue; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.vue index 70eebd4f..3c20f93a 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.vue @@ -4,15 +4,18 @@
- + +
- + +
- + +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.ts index 495ee632..a34fdfb0 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.ts @@ -5,7 +5,7 @@ import {Prop} from 'vue-property-decorator'; @Component({}) export default class PiastraSVG extends Vue{ @Prop({default:0}) - x:number; + x:Recipe.IValue; @Prop({default:0}) - y:number; + y:Recipe.IValue; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.vue index eb4967a8..c5fb5f57 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.vue @@ -4,11 +4,13 @@
- + +
- + +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.ts index e1bf0024..b8d77cc4 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.ts @@ -5,13 +5,13 @@ import {Prop} from 'vue-property-decorator'; @Component({}) export default class StampoSVG extends Vue{ @Prop({default:0}) - x:number; + x:Recipe.IValue; @Prop({default:0}) - y:number; + y:Recipe.IValue; @Prop({default:0}) alt:number; @Prop({default:0}) - altB:number; + altB:Recipe.IValue; @Prop({default:0}) stampoNeg:number; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.vue index bd9fc4d3..68449f61 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.vue @@ -4,23 +4,28 @@
- + +
- + +
- + +
- + +
- + +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/controstampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/controstampo.ts index ae866602..590b276d 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/controstampo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/controstampo.ts @@ -7,6 +7,7 @@ import Slider from "@/app_modules_thermo/components/slider.vue" export default class Controstampo extends Vue { @Prop({default:0}) - alt:number; + alt:Recipe.IValue; + } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/controstampo.vue index b6ff3a63..05aa9d1d 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/controstampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/controstampo.vue @@ -6,9 +6,13 @@
-
{{alt}}mm
+
- +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/cornice.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/cornice.ts index 5ae1b3e6..391ef2be 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/cornice.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/cornice.ts @@ -7,10 +7,13 @@ import Slider from "@/app_modules_thermo/components/slider.vue" export default class Cornice extends Vue { @Prop({default:0}) - x:number; + x:Recipe.IValue; @Prop({default:0}) - y:number; + y:Recipe.IValue; @Prop({default:false}) notsel:boolean; + + + } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/cornice.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/cornice.vue index 08c7633b..964d486c 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/cornice.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/cornice.vue @@ -13,15 +13,23 @@
-
{{x}}mm
+
- +
-
{{y}}mm
+
- + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/lastra.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/lastra.ts index f3cebf9a..6aba8a42 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/lastra.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/lastra.ts @@ -7,10 +7,13 @@ import Slider from "@/app_modules_thermo/components/slider.vue" export default class Lastra extends Vue { @Prop({default:0}) - x:number; + x:Recipe.IValue; @Prop({default:0}) - y:number; + y:Recipe.IValue; @Prop({default:0}) - spes:number; + spes:Recipe.IValue; + + + } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/lastra.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/lastra.vue index 77b41853..c31af2f7 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/lastra.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/lastra.vue @@ -13,19 +13,31 @@
-
{{x}} mm
+
- +
-
{{y}} mm
+
- +
-
{{spes}} mm
+
- + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/piastra_riduzione.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/piastra_riduzione.ts index 28564ae5..685e15a7 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/piastra_riduzione.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/piastra_riduzione.ts @@ -7,10 +7,12 @@ import Slider from "@/app_modules_thermo/components/slider.vue" export default class Piastra extends Vue { @Prop({default:0}) - x:number; + x:Recipe.IValue; @Prop({default:0}) - y:number; + y:Recipe.IValue; @Prop({default:true}) notsel:boolean; + + } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/piastra_riduzione.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/piastra_riduzione.vue index 63b997d4..d84be405 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/piastra_riduzione.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/piastra_riduzione.vue @@ -13,15 +13,23 @@
-
{{x}}mm
+
- +
-
{{y}}mm
+
- + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts index b54f030f..8a116c45 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts @@ -35,32 +35,243 @@ import StepFooter from "@/app_modules_thermo/setup/components/step-footer.vue" }) export default class ShowFormatoInfo extends Vue { + recipe:Recipe.IRecipe={ + general_area_working_dxsx: { + range: { + min: 8, + max: 197 + }, + status: { + visible: true, + enabled: true, + hasError: true + }, + unitMeasure: "", + valueAct: 199 + }, + general_sizes_mould_dim_x: { + range: { + min: 3, + max: 106 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 41 + }, + general_sizes_mould_dim_y: { + range: { + min: 1, + max: 174 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 40 + }, + general_sizes_mould_max_height: { + range: { + min: 2, + max: 116 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 37 + }, + general_sizes_mould_base_height: { + range: { + min: 1, + max: 178 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 63 + }, + general_sizes_plate_type: { + range: { + min: 0, + max: 140 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 39 + }, + general_sizes_plate_dim_x: { + range: { + min: 6, + max: 154 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 78 + }, + general_sizes_plate_dim_y: { + range: { + min: 6, + max: 142 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 81 + }, + general_sizes_sheet_material: { + range: { + min: 3, + max: 144 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 86 + }, + general_sizes_sheet_dim_x: { + range: { + min: 1, + max: 168 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 90 + }, + general_sizes_sheet_dim_y: { + range: { + min: 2, + max: 158 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 26 + }, + general_sizes_sheet_thickness: { + range: { + min: 9, + max: 109 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 45 + }, + general_sizes_frame_traverses: { + range: { + min: 3, + max: 116 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 72 + }, + general_sizes_frame_dim_x: { + range: { + min: 0, + max: 129 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 7 + }, + general_sizes_frame_dim_y: { + range: { + min: 4, + max: 125 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 107 + }, + + positions_mould_lower_speed: { + range: { + min: 5, + max: 140 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 28 + }, + general_sizes_upperplate_max_height: { + range: { + min: 2, + max: 149 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 106 + } + } show:string="placeholder"; - StX:number=100; - StY:number=10; - StAlt:number=70; - StAltB:number=600; - StStampoNeg:number=300; - - LaX:number=1; - LaY:number=1; - LaSpes:number=1; - - PiX:number=1; - PiY:number=1; - - CoX:number=1; - CoY:number=1; - - CsAlt:number=1; + @Prop({default:0}) + stamponeg:number; + @Prop({default:0}) + altezza:number; annulla(){ ModalHelper.HideModal(); }; - conferma(){ - ModalHelper.HideModal(); + conferma(name:string) { + messageService.publishToChannel(name); }; async beforeMount() { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.vue index d9a81c8c..9a8fe8f5 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.vue @@ -8,11 +8,30 @@
- +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.ts index f8db5e74..df07e7af 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.ts @@ -7,14 +7,15 @@ import Slider from "@/app_modules_thermo/components/slider.vue"; export default class inputSottosquadra extends Vue{ - @Prop({default:0}) - quota:number; - @Prop({default:0}) - ritardoAtt:number; - @Prop({default:0}) - ritardoDisatt:number; + @Prop() + quota:Recipe.IValue; + @Prop() + ritardoAtt:Recipe.IValue; + @Prop() + ritardoDisatt:Recipe.IValue; - mockQuota:number=this.quota; - mockRitAtt:number=this.ritardoAtt; - mockRitDis:number=this.ritardoDisatt; + @Prop({default:""}) + unitMeasure:string; + + } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.vue index bbff5097..f8038f4c 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.vue @@ -9,25 +9,34 @@
-
- {{mockQuota}} mm -
+
- + +
-
- {{mockRitAtt}} s -
+
- + +
-
- {{mockRitDis}} s -
+
- + + \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.ts index 8b63ec8f..aff147ed 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.ts @@ -5,12 +5,12 @@ import { Prop } from "vue-property-decorator"; @Component({}) export default class setupTermo extends Vue { - @Prop() + @Prop({default:""}) numTermo: string; @Prop() - status: string; + status: Recipe.IValue; @Prop() - setpoint: number; + setpoint: Recipe.IValue; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.vue index 84d5281a..e826a19c 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/setupTermo.vue @@ -1,8 +1,8 @@ \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.ts index 01a4aa4b..97c1ec9a 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.ts @@ -10,5 +10,212 @@ import SetupSottosquadra from "./base-components/setupSottosquadra.vue"; inputSottosquadra: InputSottosquadra }}) export default class SottosqaudraStampo extends Vue{ + + recipe:Recipe.IRecipe={ + + options_undercutupperplate_1_position:{ + range:{ + min:0, + max:194 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:81 + }, + options_undercutupperplate_1_delay_acti:{ + range:{ + min:5, + max:173 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:61 + }, + options_undercutupperplate_1_delay_dis:{ + range:{ + min:0, + max:172 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:156 + }, + + options_undercutupperplate_2_position:{ + range:{ + min:7, + max:189 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:122 + }, + options_undercutupperplate_2_delay_acti:{ + range:{ + min:6, + max:125 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:87 + }, + options_undercutupperplate_2_delay_dis:{ + range:{ + min:3, + max:169 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:119 + }, + + options_undercutupperplate_3_position:{ + range:{ + min:6, + max:133 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:12 + }, + options_undercutupperplate_3_delay_acti:{ + range:{ + min:9, + max:125 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:28 + }, + options_undercutupperplate_3_delay_dis:{ + range:{ + min:2, + max:106 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:98 + }, + + options_undercutupperplate_4_position:{ + range:{ + min:3, + max:177 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:11 + }, + options_undercutupperplate_4_delay_acti:{ + range:{ + min:9, + max:147 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:103 + }, + options_undercutupperplate_4_delay_dis:{ + range:{ + min:5, + max:141 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:93 + }, + + options_undercutupperplate_5_position:{ + range:{ + min:4, + max:134 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:28 + }, + options_undercutupperplate_5_delay_acti:{ + range:{ + min:8, + max:114 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:53 + }, + options_undercutupperplate_5_delay_dis:{ + range:{ + min:1, + max:120 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:12 + }, + + + +}; + showSottosquadra: string = "sottosquadra-1"; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue index ba56e914..231ba3e8 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue @@ -1,54 +1,54 @@ \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.ts index bf7421ac..34d31368 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.ts @@ -11,5 +11,282 @@ import InputTermo from "./base-components/inputTermo.vue"; } }) export default class Termoragolatori extends Vue { + + recipe:Recipe.IRecipe={ + + options_thermoregulator_1_enabled:{ + range:{ + min:5, + max:171 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:132 + }, + options_thermoregulator_1_setpoint:{ + range:{ + min:2, + max:130 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:7 + }, + + options_thermoregulator_2_enabled:{ + range:{ + min:8, + max:107 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:53 + }, + options_thermoregulator_2_setpoint:{ + range:{ + min:6, + max:192 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:153 + }, + + options_thermoregulator_3_enabled:{ + range:{ + min:7, + max:112 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:30 + }, + options_thermoregulator_3_setpoint:{ + range:{ + min:9, + max:184 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:116 + }, + + options_thermoregulator_4_enabled:{ + range:{ + min:1, + max:166 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:148 + }, + options_thermoregulator_4_setpoint:{ + range:{ + min:8, + max:125 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:28 + }, + + options_thermoregulator_5_enabled:{ + range:{ + min:3, + max:134 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:42 + }, + options_thermoregulator_5_setpoint:{ + range:{ + min:9, + max:146 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:119 + }, + + options_thermoregulator_6_enabled:{ + range:{ + min:0, + max:178 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:130 + }, + options_thermoregulator_6_setpoint:{ + range:{ + min:6, + max:165 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:17 + }, + + options_thermoregulator_7_enabled:{ + range:{ + min:3, + max:163 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:120 + }, + options_thermoregulator_7_setpoint:{ + range:{ + min:7, + max:136 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:12 + }, + + options_thermoregulator_8_enabled:{ + range:{ + min:9, + max:158 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:101 + }, + options_thermoregulator_8_setpoint:{ + range:{ + min:9, + max:132 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:43 + }, + + options_thermoregulator_9_enabled:{ + range:{ + min:6, + max:112 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:43 + }, + options_thermoregulator_9_setpoint:{ + range:{ + min:5, + max:191 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:144 + }, + + options_thermoregulator_10_enabled:{ + range:{ + min:7, + max:147 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:8 + }, + options_thermoregulator_10_setpoint:{ + range:{ + min:2, + max:101 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:4 + } + + + }; + + showTermo: string = "termo-1"; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue index 2c68e051..21a0691a 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue @@ -1,74 +1,74 @@ \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts index af68e837..6e4bff73 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts @@ -14,12 +14,13 @@ import Termoregolatori from "./components/termoregolatori.vue"; stepfooter: StepFooter } }) -export default class ShowQuoteVelocitaInfo extends Vue { +export default class ShowOpzioniInfo extends Vue { showOpzioni: string = "TR"; annulla() { ModalHelper.HideModal(); + messageService.publishToChannel('show-estrazione-info'); }; conferma() { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.vue index b37545b9..9ab47572 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.vue @@ -6,8 +6,8 @@ -
-
+