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/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/layout.less b/Thermo.Active/wwwroot/assets/styles/base/layout.less index 61a41d28..41dc93ab 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/layout.less +++ b/Thermo.Active/wwwroot/assets/styles/base/layout.less @@ -8,6 +8,7 @@ @import "slider.less"; @import "tastierino.less"; @import "circlegantt.less"; +@import "paddle.less"; @import "arretramento-riscaldi.less"; @import "avvio-prod.less"; @import "ciclo.less"; 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/setup.less b/Thermo.Active/wwwroot/assets/styles/base/setup.less index 09ead65d..a9386061 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/setup.less +++ b/Thermo.Active/wwwroot/assets/styles/base/setup.less @@ -276,9 +276,13 @@ color: #90BF3D; } - &.fa-minus-circle{ - color: #7A7C74; + &.fa-check-circle.undone-step{ + color: #1791FF; } + + // &.fa-minus-circle{ + // color: #7A7C74; + // } } position: relative; diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index 68ddc941..5cd1214d 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -4502,6 +4502,132 @@ width: 20px; height: 20px; } +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; +} +.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(2, 1fr); + grid-template-rows: 1fr 1fr; + align-items: center; + justify-items: center; + padding: 5px; +} +.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; +} +.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; +} +.container #app .sidebar .sidebar-panel .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; +} +.container #app .sidebar .sidebar-panel .box-sidebar-panel { + display: grid; + grid-template-columns: repeat(2, 1fr); + align-items: center; + justify-items: center; +} +.container #app .sidebar .sidebar-panel .box-sidebar-panel .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; +} +.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; 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_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/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 88523abc..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 @@ -4,51 +4,51 @@ @@ -57,19 +57,44 @@
- + +
- + +
- + +
- + +
- + +
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 c3020ee0..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 @@ -4,71 +4,71 @@ @@ -77,34 +77,73 @@
- +
- + +
- + +
- + +
- + +
- + +
- + +
- + +
- + +
- + +
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/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.ts index 1fd94220..f0761419 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.ts @@ -6,20 +6,14 @@ import {Prop} from 'vue-property-decorator'; export default class SVGTermoregolazioneSuperiore extends Vue{ @Prop({default:0}) - max:number; + max:Recipe.IValue; @Prop({default:0}) - min:number; + min:Recipe.IValue; @Prop({default:0}) - inizio:number; + inizio:Recipe.IValue; @Prop({default:0}) - fine:number; + fine:Recipe.IValue; @Prop({default:0}) - perc_riposo:number; - - mock_max:number=this.max - mock_min:number=this.min - mock_inizio:number=this.inizio - mock_fine:number=this.fine - mock_perc_riposo:number=this.perc_riposo + perc_riposo:Recipe.IValue; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue index 4c0d97e5..f42fe4a7 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue @@ -3,25 +3,25 @@
- +
- +
- +
- +
- +
270 °C diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.ts index ab56fc4e..10703ace 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.ts @@ -3,18 +3,51 @@ import Component from 'vue-class-component'; import {Prop} from 'vue-property-decorator'; import Slider from "@/app_modules_thermo/components/slider.vue"; import ToggleButton from "@/components/toggleButton.vue"; +// import Recipe from "@/@types/recipe-current"; @Component({name:"pirometro", components: { slider:Slider, ToggleButton}}) export default class Pirometro extends Vue{ - - @Prop({default:100}) - temperatura:number; - @Prop({default:0}) - ritardo:number; - - mock_temperatura:number=this.temperatura; - mock_ritardo:number=this.ritardo; - - enabling:boolean=true; + + recipe:Recipe.IRecipe={ + pyrometer_pyrometer_enabled:{ + range:{ + min:3, + max:103 + }, + status:{ + enabled:true, + visible:true, + hasError:false + }, + unitMeasure:"", + valueAct:79 + }, + pyrometer_pyrometer_delay:{ + range:{ + min:7, + max:152 + }, + status:{ + enabled:true, + visible:true, + hasError:false + }, + unitMeasure:"", + valueAct:86 + }, + pyrometer_pyrometer_setpoint:{ + range:{ + min:2, + max:159 + }, + status:{ + enabled:true, + visible:true, + hasError:false + }, + unitMeasure:"", + valueAct:3 + } + }; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.vue index e1119bba..6c6db4d9 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/pirometro.vue @@ -3,20 +3,30 @@
- +
- +
- + +
- +
- + +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.ts index baa4f431..1e900d3b 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.ts @@ -8,23 +8,111 @@ import SVGTermoregolazioneSuperiore from './SVG_Components/SVG-termo-superiore.v @Component({name:'termosuperiore', components: { slider:Slider, ToggleButton, svgtermosuperiore:SVGTermoregolazioneSuperiore}}) export default class TermoregolazioneSuperiore extends Vue{ - @Prop({default:0}) - inizioreg:number; - @Prop({default:0}) - finereg:number; - @Prop({default:0}) - max:number; - @Prop({default:0}) - min:number; - @Prop({default:0}) - riposo:number; - - mock_inizioreg:number=this.inizioreg - mock_finereg:number=this.finereg - mock_max:number=this.max - mock_min:number=this.min - mock_riposo:number=this.riposo - - enabling:boolean=true; + recipe:Recipe.IRecipe={ + pyrometer_upperthermoregulator_start_adjustment:{ + range:{ + min:7, + max:189 + }, + status:{ + enabled:true, + visible:true, + hasError:false + }, + unitMeasure:"", + valueAct:33 + }, + pyrometer_upperthermoregulator_end_adjustment:{ + range:{ + min:0, + max:109 + }, + status:{ + enabled:true, + visible:true, + hasError:false + }, + unitMeasure:"", + valueAct:59 + }, + pyrometer_upperthermoregulator_max_percentage:{ + range:{ + min:7, + max:181 + }, + status:{ + enabled:true, + visible:true, + hasError:false + }, + unitMeasure:"", + valueAct:39 + }, + pyrometer_upperthermoregulator_min_percentage:{ + range:{ + min:1, + max:155 + }, + status:{ + enabled:true, + visible:true, + hasError:false + }, + unitMeasure:"", + valueAct:17 + }, + pyrometer_upperthermoregulator_sleep_enabled:{ + range:{ + min:3, + max:179 + }, + status:{ + enabled:true, + visible:true, + hasError:false + }, + unitMeasure:"", + valueAct:90 + }, + pyrometer_upperthermoregulator_sleep_percentage:{ + range:{ + min:5, + max:174 + }, + status:{ + enabled:true, + visible:true, + hasError:false + }, + unitMeasure:"", + valueAct:169 + }, + pyrometer_upperthermoregulator_sleep_temperature:{ + range:{ + min:6, + max:125 + }, + status:{ + enabled:true, + visible:true, + hasError:false + }, + unitMeasure:"", + valueAct:45 + }, + pyrometer_upperthermoregulator_working_temperature:{ + range:{ + min:5, + max:135 + }, + status:{ + enabled:true, + visible:true, + hasError:false + }, + unitMeasure:"", + valueAct:15 + } + }; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.vue index 7c6cc736..f4e2db74 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.vue @@ -3,43 +3,74 @@
- + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts index 63ed59e0..dc192d97 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts @@ -12,12 +12,12 @@ export default class ShowPirometroInfo extends Vue { show:string='termo-superiore'; - 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/pirometro/components/show-pirometro-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue index ae0e48aa..e9b2e21f 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue @@ -14,10 +14,10 @@
- -
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.ts index a46ade44..24d26bc8 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.ts @@ -4,11 +4,13 @@ import {Prop} from 'vue-property-decorator'; @Component({}) export default class QuoteVelocita extends Vue{ + + @Prop({default:0}) - corsa:number; + corsa:Recipe.IValue; @Prop({default:0}) - vel_salita:number; + vel_salita:Recipe.IValue; @Prop({default:0}) vel_salita_lenta:number; @Prop({default:0}) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue index 0bc1cbe2..d2c129bf 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue @@ -17,12 +17,12 @@
- +
- +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.ts index a46ade44..b4032b3b 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.ts @@ -6,12 +6,12 @@ import {Prop} from 'vue-property-decorator'; export default class QuoteVelocita extends Vue{ @Prop({default:0}) - corsa:number; + corsa:Recipe.IValue; @Prop({default:0}) - vel_salita:number; + vel_salita:Recipe.IValue; @Prop({default:0}) - vel_salita_lenta:number; + vel_salita_lenta:Recipe.IValue; @Prop({default:0}) - rall_salita:number; + rall_salita:Recipe.IValue; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue index ec7de234..d94d789c 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue @@ -5,24 +5,24 @@
- +
- +
- +
- +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.ts index 13cdd1e2..d242ac54 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.ts @@ -5,9 +5,9 @@ import {Prop} from 'vue-property-decorator'; @Component({}) export default class Controstamposvg extends Vue{ @Prop({default:0}) - corsa:number; + corsa:Recipe.IValue; @Prop({default:0}) - vel_discesa:number; + vel_discesa:Recipe.IValue; @Prop({default:0}) vel_discesa_lenta:number; @Prop({default:0}) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.vue index f1cc3430..8b63ee48 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.vue @@ -41,12 +41,12 @@ e diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts index 9d3608cc..f6c3c7a8 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts @@ -18,11 +18,13 @@ export default class Raffreddamento extends Vue{ show: string = "ventilatori"; annulla(){ - ModalHelper.HideModal(); + ModalHelper.HideModal(); + messageService.publishToChannel('show-controstampo-info'); }; conferma(){ ModalHelper.HideModal(); + messageService.publishToChannel('show-vuoto-info'); }; async beforeMount() { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.ts index ca8f6fe5..8769df89 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.ts @@ -11,12 +11,68 @@ import toggleButton from "@/components/toggleButton.vue"; }) export default class RiscaldiSuperiori extends Vue { - @Prop({ default: 0 }) - ritardo: number; - @Prop({ default: 0 }) - durata: number; + @Prop({default:0}) + setpoint:number; + mock_setpoint:number=this.setpoint; + + recipe:Recipe.IRecipe={ + heats_upperheaters_max_time:{ + range:{ + min:4, + max:165 + }, + status:{ + enabled:true, + visible:true, + hasError:false + }, + unitMeasure:"", + valueAct:159 + }, + + heats_upperheaters_movement_enabled:{ + range:{ + min:5, + max:157 + }, + status:{ + enabled:true, + visible:true, + hasError:false + }, + unitMeasure:"", + valueAct:71 + }, + + heats_upperheaters_enabled:{ + range:{ + min:8, + max:192 + }, + status:{ + enabled:true, + visible:true, + hasError:false + }, + unitMeasure:"", + valueAct:171 + }, + + heats_upperheaters_oscillation:{ + range:{ + min:4, + max:150 + }, + status:{ + enabled:true, + visible:true, + hasError:false + }, + unitMeasure:"", + valueAct:138 + }, + +} - 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/riscaldi/components/base-components/riscaldi-superiori.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.vue index 30263782..6a2a51c8 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.vue @@ -3,20 +3,25 @@ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/sostentamento-decompressione.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/sostentamento-decompressione.ts index bc44c56c..174bd92a 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/sostentamento-decompressione.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/sostentamento-decompressione.ts @@ -7,11 +7,105 @@ import toggleButton from "@/components/toggleButton.vue"; @Component({ name: "sostdecomp", components: { slider: Slider, toggleButton } }) export default class SostDecomp extends Vue { - @Prop({ default: 0 }) - portata: number; - @Prop({ default: 0 }) - duratamin: number; + recipe:Recipe.IRecipe={ + heats_decomsustain_type:{ + range:{ + min:4, + max:111 + }, + status:{ + enabled:true, + visible:true, + hasError:false + }, + unitMeasure:"", + valueAct:86 + }, + + heats_decomsustain_decompression_flow:{ + range:{ + min:9, + max:105 + }, + status:{ + enabled:true, + visible:true, + hasError:false + }, + unitMeasure:"", + valueAct:35 + }, + + heats_decomsustain_min_blowing_time:{ + range:{ + min:0, + max:127 + }, + status:{ + enabled:true, + visible:true, + hasError:false + }, + unitMeasure:"", + valueAct:63 + }, + + heats_decomsustain_sustain_delay:{ + range:{ + min:6, + max:198 + }, + status:{ + enabled:true, + visible:true, + hasError:false + }, + unitMeasure:"", + valueAct:159 + }, + + heats_decomsustain_decompression_delay:{ + range:{ + min:1, + max:163 + }, + status:{ + enabled:true, + visible:true, + hasError:false + }, + unitMeasure:"", + valueAct:26 + }, + + heats_decomsustain_decompression_duration:{ + range:{ + min:6, + max:108 + }, + status:{ + enabled:true, + visible:true, + hasError:false + }, + unitMeasure:"", + valueAct:72 + }, + + heats_decomsustain_smoke_function_enabled:{ + range:{ + min:5, + max:132 + }, + status:{ + enabled:true, + visible:true, + hasError:false + }, + unitMeasure:"", + valueAct:89 + }, + +} - mockP: number = this.portata; - mockDM: number = this.duratamin; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/sostentamento-decompressione.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/sostentamento-decompressione.vue index ca9fe711..7bb35b6f 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/sostentamento-decompressione.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/sostentamento-decompressione.vue @@ -9,17 +9,27 @@
- +
- + +
- +
- + +
- +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.ts index 8e8a632d..d8fd6550 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.ts @@ -12,12 +12,12 @@ export default class ShowRiscaldamentoSuperioreInfo extends Vue { show: string = "activeRS" - 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/riscaldi/components/show-riscaldi-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.vue index 53132099..459fb441 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.vue @@ -21,8 +21,8 @@ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.ts index d5fe1d36..02e1df0c 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.ts @@ -7,15 +7,126 @@ import Scheda from "@/app_modules_thermo/components/scheda.vue" @Component({name:'vuotoprincipale', components: { slider:Slider, scheda:Scheda}}) export default class VuotoPrincipale extends Vue{ - @Prop({default:0}) - ritardo:number; - @Prop({default:0}) - percentuale:number; - @Prop({default:0}) - durata:number; + 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 + }, + vacuum_main_1_chart_setpointx:{ + range:{ + min:0, + max:145 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:82 + }, + vacuum_main_1_chart_setpointy:{ + range:{ + min:8, + max:164 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:83 + }, + vacuum_main_2_chart_setpointx:{ + range:{ + min:3, + max:183 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:40 + }, + vacuum_main_2_chart_setpointy:{ + range:{ + min:9, + max:184 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:57 + }, + vacuum_main_3_chart_setpointx:{ + range:{ + min:1, + max:160 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:27 + }, + vacuum_main_3_chart_setpointy:{ + range:{ + min:6, + max:114 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:35 + } + }; + - mock_ritardo:number=this.ritardo; - mock_percentuale:number=this.percentuale; - mock_durata:number=this.durata; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue index 5e4c20cd..71563151 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue @@ -13,30 +13,49 @@
- +
- + +
- +
- + +
- - - + + +
- +
- +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts index 2c8b84e1..d3f396c2 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts @@ -13,10 +13,12 @@ export default class ShowVuotoInfo extends Vue { annulla(){ ModalHelper.HideModal(); + messageService.publishToChannel('show-raffreddamento-info'); }; conferma(){ ModalHelper.HideModal(); + messageService.publishToChannel('show-estrazione-info'); }; async beforeMount() { diff --git a/Thermo.Active/wwwroot/src/store/app.store.ts b/Thermo.Active/wwwroot/src/store/app.store.ts index a8fe29a1..1c3f4dd0 100644 --- a/Thermo.Active/wwwroot/src/store/app.store.ts +++ b/Thermo.Active/wwwroot/src/store/app.store.ts @@ -4,6 +4,7 @@ import Vuex, { Store } from 'vuex' import { machineInfoStore, MachineInfoModel } from "./machineInfo.store"; import { machineStatusStore, MachineStatusModel } from "./machineStatus.store"; import { alarmsStore, AlarmsModel } from "./alarms.store"; +import { paddleStore, PaddleModel } from "./paddle.store"; import { processStore, RunningProcessModel } from "./runningProcess.store"; import { localizationStore, LocalizationModel, localizationModelActions } from "./localization.store"; import { toolingStore, ToolingStoreModel } from "./tooling.store"; @@ -25,6 +26,7 @@ export interface AppModel { isMainViewLiftedUp: boolean; isFavSoftkeySelection: boolean; + paddle: PaddleModel; machineInfo: MachineInfoModel; machineStatus: MachineStatusModel; @@ -68,6 +70,7 @@ const _store = { modules: { // Sottomoduli dello store + paddle: paddleStore, machineInfo: machineInfoStore, machineStatus: machineStatusStore, process: processStore, diff --git a/Thermo.Active/wwwroot/src/store/index.ts b/Thermo.Active/wwwroot/src/store/index.ts index f7e6e9a6..6860fe59 100644 --- a/Thermo.Active/wwwroot/src/store/index.ts +++ b/Thermo.Active/wwwroot/src/store/index.ts @@ -1,5 +1,6 @@ import { store, AppModel, appModelActions } from "./app.store"; import { machineInfoActions, MachineInfoModel } from "./machineInfo.store"; +import { paddleActions, PaddleModel } from "./paddle.store" import { machineStatusActions, MachineStatusModel, buttonStatus } from "./machineStatus.store"; import { AlarmsModel, alarmsModelActions, alarmsStore, AlarmModel } from "./alarms.store"; import { processModelActions, processStore, RunningProcessModel } from "./runningProcess.store"; @@ -14,6 +15,8 @@ export { machineInfoActions, MachineInfoModel, machineStatusActions, + paddleActions, + PaddleModel, MachineStatusModel, AlarmsModel, alarmsModelActions, diff --git a/Thermo.Active/wwwroot/src/store/paddle.store.ts b/Thermo.Active/wwwroot/src/store/paddle.store.ts new file mode 100644 index 00000000..f74b748e --- /dev/null +++ b/Thermo.Active/wwwroot/src/store/paddle.store.ts @@ -0,0 +1,26 @@ + +export interface PaddleModel { + isNavOpen: boolean + } + +export const paddleStore={ + state:{ + isNavOpen:false + } as PaddleModel, + mutations: { + toggleNav(state){ + state.isNavOpen=!state.isNavOpen + } + }, + actions:{ + Toggle(context){ + context.commit("toggleNav"); + } + } +} + +export const paddleActions = paddleStore.actions; + + + +