From add63366a3dd4fc9b9ab2fb58eef246bd6b27eda Mon Sep 17 00:00:00 2001 From: "francesco.guerrieri" Date: Tue, 5 May 2020 15:15:13 +0200 Subject: [PATCH] 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 @@
- +
- +
- +
- +
- +