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/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/src/@types/recipe-current.d.ts b/Thermo.Active/wwwroot/src/@types/recipe-current.d.ts index c456245f..8f1ab5ec 100644 --- a/Thermo.Active/wwwroot/src/@types/recipe-current.d.ts +++ b/Thermo.Active/wwwroot/src/@types/recipe-current.d.ts @@ -154,6 +154,186 @@ declare module Recipe { 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/app_modules_thermo/components/scheda.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts index 33409b3c..e7840ff1 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts @@ -11,4 +11,5 @@ export default class Scheda extends Vue{ @Prop({default:0}) durata:Recipe.IValue; + } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue index 9ea6e0a9..c97d74cd 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue @@ -20,63 +20,63 @@ @click="sendMessage('show-ciclo-info')" :phase="3" title="Ciclo" - statusImage="fa fa-minus-circle" + statusImage="fa fa-check-circle undone-step" >
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts index 81ef6dff..49a756e9 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 @@ -16,6 +16,48 @@ recipe:Recipe.IRecipe={ } + 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/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..a3e81c01 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,49 @@
- + +
- + +
- + +
- + +
- + +
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..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 @@ @@ -77,34 +77,84 @@
- + +
- + +
- + +
- + +
- + +
- + +
- + +
- + +
- + +
- + +
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/raffreddamento/components/base-components/ventilatori.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.ts index d8281b6e..82d425e3 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.ts @@ -10,6 +10,35 @@ components: { }) export default class Ventilatori extends Vue{ + recipe:Recipe.IRecipe={ + cooling_blowing_delay:{ + range:{ + min:5, + max:132 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:102 + }, + cooling_blowing_time:{ + range:{ + min:6, + max:138 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:33 + } + }; + @Prop({default:0}) durata:number; @Prop({default:0}) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.vue index 027c39e3..56e8fb85 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.vue @@ -10,14 +10,14 @@
- +
- +
- +
- + 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/raffreddamento/components/show-raffreddamento-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue index e19c0a5b..6dd8bf9b 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue @@ -19,7 +19,7 @@ Conferma - + 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..034a30f1 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,42 @@
- +
- +
- +
- +
- - - + + +
- +
- +
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() {