From c32f50070eee55ac560b8e148c58ca928d179ba9 Mon Sep 17 00:00:00 2001 From: "francesco.guerrieri" Date: Mon, 4 May 2020 11:35:13 +0200 Subject: [PATCH 1/5] Auto stash before merge of "newfeature/paddle" and "origin/develop" --- .../@types/recipe-current.d_20200503231334.ts | 57 +++++++++++++++++ .../@types/recipe-current.d_20200504112349.ts | 57 +++++++++++++++++ .../vuoto-principale_20200504095105.ts | 48 ++++++++++++++ .../vuoto-principale_20200504101519.vue | 50 +++++++++++++++ .../vuoto-principale_20200504112349.ts | 50 +++++++++++++++ .../vuoto-principale_20200504112349.vue | 44 +++++++++++++ .../vuoto-principale_20200504112646.ts | 63 +++++++++++++++++++ .../vuoto-principale_20200504112646.vue | 44 +++++++++++++ .../wwwroot/src/@types/recipe-current.d.ts | 57 +++++++++++++++++ .../vuoto/base-components/vuoto-principale.ts | 42 +++++++++++++ .../base-components/vuoto-principale.vue | 12 ++-- 11 files changed, 518 insertions(+), 6 deletions(-) create mode 100644 .history/Thermo.Active/wwwroot/src/@types/recipe-current.d_20200503231334.ts create mode 100644 .history/Thermo.Active/wwwroot/src/@types/recipe-current.d_20200504112349.ts create mode 100644 .history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504095105.ts create mode 100644 .history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504101519.vue create mode 100644 .history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112349.ts create mode 100644 .history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112349.vue create mode 100644 .history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112646.ts create mode 100644 .history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112646.vue create mode 100644 Thermo.Active/wwwroot/src/@types/recipe-current.d.ts 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/src/@types/recipe-current.d.ts b/Thermo.Active/wwwroot/src/@types/recipe-current.d.ts new file mode 100644 index 00000000..ac8d196d --- /dev/null +++ b/Thermo.Active/wwwroot/src/@types/recipe-current.d.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/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..688bc25b 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,6 +7,48 @@ 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}) 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..d8394fb2 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,17 +13,17 @@
- +
- +
- +
- +
@@ -34,9 +34,9 @@
- +
- +
From add63366a3dd4fc9b9ab2fb58eef246bd6b27eda Mon Sep 17 00:00:00 2001 From: "francesco.guerrieri" Date: Tue, 5 May 2020 15:15:13 +0200 Subject: [PATCH 2/5] recipe cooling, vacuum, extraction, options --- .../wwwroot/src/@types/recipe-current.d.ts | 149 ++++++++++++- .../app_modules_thermo/components/scheda.ts | 10 + .../app_modules_thermo/components/scheda.vue | 4 +- .../base-components/estrazione-principale.ts | 42 ++++ .../base-components/estrazione-principale.vue | 13 +- .../base-components/inputSottosquadra.ts | 15 ++ .../base-components/inputSottosquadra.vue | 6 +- .../components/base-components/inputTermo.ts | 14 ++ .../components/base-components/inputTermo.vue | 4 +- .../base-components/setupSottosquadra.ts | 2 + .../components/base-components/setupTermo.ts | 8 +- .../opzioni/components/sottosquadra-stampo.ts | 207 ++++++++++++++++++ .../components/sottosquadra-stampo.vue | 110 +++++++--- .../opzioni/components/termoregolatori.ts | 197 +++++++++++++++++ .../opzioni/components/termoregolatori.vue | 140 +++++++++--- .../components/base-components/ventilatori.ts | 29 +++ .../base-components/ventilatori.vue | 8 +- .../components/show-raffreddamento-info.vue | 2 +- .../vuoto/base-components/vuoto-principale.ts | 80 ++++++- .../base-components/vuoto-principale.vue | 42 +++- 20 files changed, 997 insertions(+), 85 deletions(-) diff --git a/Thermo.Active/wwwroot/src/@types/recipe-current.d.ts b/Thermo.Active/wwwroot/src/@types/recipe-current.d.ts index ac8d196d..c3591087 100644 --- a/Thermo.Active/wwwroot/src/@types/recipe-current.d.ts +++ b/Thermo.Active/wwwroot/src/@types/recipe-current.d.ts @@ -19,6 +19,37 @@ declare module Recipe{ } interface IRecipe{ + 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, @@ -50,7 +81,123 @@ declare module Recipe{ vacuum_pre_2_chart_setpointx?:IValue, vacuum_pre_2_chart_setpointy?:IValue, vacuum_pre_3_chart_setpointx?:IValue, - vacuum_pre_3_chart_setpointy?: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?:IStatus, + options_thermoregulator_1_setpoint?:IValue, + options_thermoregulator_2_enabled?:IStatus, + options_thermoregulator_2_setpoint?:IValue, + options_thermoregulator_3_enabled?:IStatus, + options_thermoregulator_3_setpoint?:IValue, + options_thermoregulator_4_enabled?:IStatus, + options_thermoregulator_4_setpoint?:IValue, + options_thermoregulator_5_enabled?:IStatus, + options_thermoregulator_5_setpoint?:IValue, + options_thermoregulator_6_enabled?:IStatus, + options_thermoregulator_6_setpoint?:IValue, + options_thermoregulator_7_enabled?:IStatus, + options_thermoregulator_7_setpoint?:IValue, + options_thermoregulator_8_enabled?:IStatus, + options_thermoregulator_8_setpoint?:IValue, + options_thermoregulator_9_enabled?:IStatus, + options_thermoregulator_9_setpoint?:IValue, + options_thermoregulator_10_enabled?:IStatus, + options_thermoregulator_10_setpoint?:IValue, } diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts index 4445e464..9c88d5be 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts @@ -10,6 +10,16 @@ export default class Scheda extends Vue{ portata:number; @Prop({default:0}) durata:number; + @Prop({default:0}) + min_portata:number; + @Prop({default:0}) + max_portata:number; + @Prop({default:0}) + min_durata:number; + @Prop({default:0}) + max_durata:number; + @Prop({default:""}) + unitMeasure:string; mock_portata:number=this.portata; mock_durata:number=this.durata; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue index 55746085..16b9eeb8 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue @@ -5,12 +5,12 @@
- +
- + 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..e474b29b 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,6 +11,48 @@ slider:Slider}}) export default class EstrazionePrincipale extends Vue{ + 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 + } + }; + @Prop({default:0}) ritardo:number; 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 9a5ad91f..eafdf147 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 @@ -4,9 +4,9 @@
- +
- +
- +
- +
- + \ 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 495aa7bf..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 @@ -15,9 +15,17 @@ export default class Termoragolatori extends Vue { recipe:Recipe.IRecipe={ options_thermoregulator_1_enabled:{ - visible:true, - enabled:true, - hasError:false + range:{ + min:5, + max:171 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:132 }, options_thermoregulator_1_setpoint:{ range:{ @@ -34,9 +42,17 @@ export default class Termoragolatori extends Vue { }, options_thermoregulator_2_enabled:{ - visible:true, - enabled:true, - hasError:false + range:{ + min:8, + max:107 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:53 }, options_thermoregulator_2_setpoint:{ range:{ @@ -53,9 +69,17 @@ export default class Termoragolatori extends Vue { }, options_thermoregulator_3_enabled:{ - visible:true, - enabled:true, - hasError:false + range:{ + min:7, + max:112 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:30 }, options_thermoregulator_3_setpoint:{ range:{ @@ -72,9 +96,17 @@ export default class Termoragolatori extends Vue { }, options_thermoregulator_4_enabled:{ - visible:true, - enabled:true, - hasError:false + range:{ + min:1, + max:166 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:148 }, options_thermoregulator_4_setpoint:{ range:{ @@ -91,9 +123,17 @@ export default class Termoragolatori extends Vue { }, options_thermoregulator_5_enabled:{ - visible:true, - enabled:true, - hasError:false + range:{ + min:3, + max:134 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:42 }, options_thermoregulator_5_setpoint:{ range:{ @@ -110,9 +150,17 @@ export default class Termoragolatori extends Vue { }, options_thermoregulator_6_enabled:{ - visible:true, - enabled:true, - hasError:false + range:{ + min:0, + max:178 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:130 }, options_thermoregulator_6_setpoint:{ range:{ @@ -129,9 +177,17 @@ export default class Termoragolatori extends Vue { }, options_thermoregulator_7_enabled:{ - visible:true, - enabled:true, - hasError:false + range:{ + min:3, + max:163 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:120 }, options_thermoregulator_7_setpoint:{ range:{ @@ -148,9 +204,17 @@ export default class Termoragolatori extends Vue { }, options_thermoregulator_8_enabled:{ - visible:true, - enabled:true, - hasError:false + range:{ + min:9, + max:158 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:101 }, options_thermoregulator_8_setpoint:{ range:{ @@ -167,9 +231,17 @@ export default class Termoragolatori extends Vue { }, options_thermoregulator_9_enabled:{ - visible:true, - enabled:true, - hasError:false + range:{ + min:6, + max:112 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:43 }, options_thermoregulator_9_setpoint:{ range:{ @@ -186,9 +258,17 @@ export default class Termoragolatori extends Vue { }, options_thermoregulator_10_enabled:{ - visible:true, - enabled:true, - hasError:false + range:{ + min:7, + max:147 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:8 }, options_thermoregulator_10_setpoint:{ range:{ 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 a19c25a2..7d158e54 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 @@ @@ -78,111 +78,81 @@
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 ef52de5b..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 @@ -20,6 +20,7 @@ export default class ShowOpzioniInfo extends Vue { annulla() { ModalHelper.HideModal(); + messageService.publishToChannel('show-estrazione-info'); }; conferma() { 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/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() {