Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-06-15 16:46:34 +02:00
parent 2043417668 d482a7551b
commit f5f41e4c65
29 changed files with 138 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active/wwwroot/assets/svg/disegno-termosuperiore.svg → Thermo.Active/wwwroot/assets/svg/disegno-termo.svg
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Thermo.Active/wwwroot/src/app_modules_thermo/components/KeyboardHelper.ts
+1 -1
View File
@@ -10,7 +10,7 @@ export class KeyboardHelper {
if (KeyboardHelper.currentKeyboard) {
KeyboardHelper.currentKeyboard.resetTo(value);
KeyboardHelper.currentKeyboard.positionX = x;
debugger
KeyboardHelper.currentKeyboard.positionY = y;
KeyboardHelper.currentKeyboard.visible = true;
}
Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.ts
+1 -1
View File
@@ -53,7 +53,7 @@ export default class ShowCicloInfo extends Vue {
cycle_loader_manualunloading_enabled: this.recipe.cycle_loader_manualunloading_enabled,
}
);
await recipeService.Confirm();
//await recipeService.Confirm();
ModalHelper.HideModal();
this.deferred.resolve(1);
};
Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.ts
+1 -1
View File
@@ -70,7 +70,7 @@ export default class ShowControstampoInfo extends Vue {
upperplate_extraction_manual: this.recipe.upperplate_extraction_manual,
}
);
await recipeService.Confirm();
//await recipeService.Confirm();
ModalHelper.HideModal();
this.deferred.resolve(1);
};
Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/show-estrazione-info.ts
+1 -1
View File
@@ -50,7 +50,7 @@ export default class ShowEstrazioneInfo extends Vue {
extraction_aux_manual: this.recipe.extraction_aux_manual,
}
);
await recipeService.Confirm();
//await recipeService.Confirm();
ModalHelper.HideModal();
this.deferred.resolve(1);
};
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.ts
+1 -1
View File
@@ -6,5 +6,5 @@ import {Prop} from 'vue-property-decorator';
export default class ControstampoSVG extends Vue{
@Prop({})
alt:Recipe.IValue;
recipe:Recipe.IRecipe;
}
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.vue
+1 -1
View File
@@ -4,7 +4,7 @@
<div class="borded_label" id="quota1">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_upperplate_max_height.valueAct}}</span>
<small>mm</small>
</div>
</div>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.ts
+1 -4
View File
@@ -4,9 +4,6 @@ import {Prop} from 'vue-property-decorator';
@Component({})
export default class CorniceSVG extends Vue{
@Prop({})
x:Recipe.IValue;
@Prop({})
y:Recipe.IValue;
recipe:Recipe.IRecipe;
}
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.vue
+2 -2
View File
@@ -4,14 +4,14 @@
<div class="borded_label" id="quota1">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_frame_dim_y.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota2">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_frame_dim_x.valueAct}}</span>
<small>mm</small>
</div>
</div>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.ts
+1 -5
View File
@@ -6,10 +6,6 @@ import {Prop} from 'vue-property-decorator';
export default class LastraSVG extends Vue{
@Prop({})
x:Recipe.IValue;
@Prop({})
y:Recipe.IValue;
@Prop({})
spes:Recipe.IValue;
recipe:Recipe.IRecipe;
}
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.vue
+3 -3
View File
@@ -4,21 +4,21 @@
<div class="borded_label" id="quota1">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_sheet_dim_x.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota2">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_sheet_dim_y.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota3">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_sheet_thickness.valueAct}}</span>
<small>mm</small>
</div>
</div>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.ts
+1 -3
View File
@@ -6,7 +6,5 @@ import {Prop} from 'vue-property-decorator';
export default class PiastraSVG extends Vue{
@Prop({})
x:Recipe.IValue;
@Prop({})
y:Recipe.IValue;
recipe:Recipe.IRecipe;
}
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.vue
+2 -2
View File
@@ -4,14 +4,14 @@
<div class="borded_label" id="quota1">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_plate_dim_y.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota2">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_plate_dim_x.valueAct}}</span>
<small>mm</small>
</div>
</div>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.ts
+1 -9
View File
@@ -6,13 +6,5 @@ import { Prop } from 'vue-property-decorator';
export default class StampoSVG extends Vue {
@Prop({})
x: Recipe.IValue;
@Prop({})
y: Recipe.IValue;
@Prop({})
alt: number;
@Prop({})
altB: Recipe.IValue;
@Prop({})
stampoNeg: number;
recipe:Recipe.IRecipe;
}
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.vue
+5 -5
View File
@@ -4,35 +4,35 @@
<div class="borded_label" id="quota1">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_mould_dim_x.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota2">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_mould_dim_y.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota3">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_mould_max_height.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota4">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_mould_base_height.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota5">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_mould_min_height.valueAct}}</span>
<small>mm</small>
</div>
</div>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts
+6 -6
View File
@@ -60,24 +60,24 @@ export default class ShowFormatoInfo extends Vue {
{
general_sizes_mould_dim_x: this.recipe.general_sizes_mould_dim_x,
general_sizes_mould_dim_y: this.recipe.general_sizes_mould_dim_y,
general_sizes_mould_max_height : this.recipe.general_sizes_mould_max_height,
general_sizes_mould_min_height : this.recipe.general_sizes_mould_min_height,
general_sizes_mould_max_height: this.recipe.general_sizes_mould_max_height,
general_sizes_mould_min_height: this.recipe.general_sizes_mould_min_height,
general_sizes_mould_base_height: this.recipe.general_sizes_mould_base_height,
general_sizes_sheet_material : this.recipe.general_sizes_sheet_material,
general_sizes_sheet_material: this.recipe.general_sizes_sheet_material,
general_sizes_sheet_dim_x: this.recipe.general_sizes_sheet_dim_x,
general_sizes_sheet_dim_y: this.recipe.general_sizes_sheet_dim_y,
general_sizes_sheet_thickness: this.recipe.general_sizes_sheet_thickness,
general_sizes_plate_type :this.recipe.general_sizes_plate_type,
general_sizes_plate_type: this.recipe.general_sizes_plate_type,
general_sizes_plate_dim_x: this.recipe.general_sizes_plate_dim_x,
general_sizes_plate_dim_y: this.recipe.general_sizes_plate_dim_y,
general_sizes_frame_traverses: this.recipe.general_sizes_frame_traverses,
general_sizes_frame_dim_x: this.recipe.general_sizes_frame_dim_x,
general_sizes_frame_dim_y: this.recipe.general_sizes_frame_dim_y,
general_sizes_upperplate_max_height: this.recipe.general_sizes_upperplate_max_height,
general_area_working_dxsx:this.recipe.general_area_working_dxsx,
general_area_working_dxsx: this.recipe.general_area_working_dxsx,
}
);
await recipeService.Confirm();
//await recipeService.Confirm();
ModalHelper.HideModal();
this.deferred.resolve(1);
};
Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts
+1 -1
View File
@@ -46,7 +46,7 @@ export default class ShowImbutituraInfo extends Vue {
drawing_mould_up_delay: this.recipe.drawing_mould_up_delay,
}
);
await recipeService.Confirm();
//await recipeService.Confirm();
ModalHelper.HideModal();
this.deferred.resolve(1);
};
Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts
+61 -61
View File
@@ -78,69 +78,69 @@ export default class ShowOpzioniInfo extends Vue {
options_undercutmould_10_position: this.recipe.options_undercutmould_10_position,
options_undercutmould_10_delay_acti: this.recipe.options_undercutmould_10_delay_acti,
options_undercutmould_10_delay_dis: this.recipe.options_undercutmould_10_delay_dis,
options_undercutupperplate_1_mode:this.recipe.options_undercutupperplate_1_mode,
options_undercutupperplate_1_position:this.recipe.options_undercutupperplate_1_position,
options_undercutupperplate_1_delay_acti:this.recipe.options_undercutupperplate_1_delay_acti,
options_undercutupperplate_1_delay_dis:this.recipe.options_undercutupperplate_1_delay_dis,
options_undercutupperplate_2_mode:this.recipe.options_undercutupperplate_2_mode,
options_undercutupperplate_2_position:this.recipe.options_undercutupperplate_2_position,
options_undercutupperplate_2_delay_acti:this.recipe.options_undercutupperplate_2_delay_acti,
options_undercutupperplate_2_delay_dis:this.recipe.options_undercutupperplate_2_delay_dis,
options_undercutupperplate_3_mode:this.recipe.options_undercutupperplate_3_mode,
options_undercutupperplate_3_position:this.recipe.options_undercutupperplate_3_position,
options_undercutupperplate_3_delay_acti:this.recipe.options_undercutupperplate_3_delay_acti,
options_undercutupperplate_3_delay_dis:this.recipe.options_undercutupperplate_3_delay_dis,
options_undercutupperplate_4_mode:this.recipe.options_undercutupperplate_4_mode,
options_undercutupperplate_4_position:this.recipe.options_undercutupperplate_4_position,
options_undercutupperplate_4_delay_acti:this.recipe.options_undercutupperplate_4_delay_acti,
options_undercutupperplate_4_delay_dis:this.recipe.options_undercutupperplate_4_delay_dis,
options_undercutupperplate_5_mode:this.recipe.options_undercutupperplate_5_mode,
options_undercutupperplate_5_position:this.recipe.options_undercutupperplate_5_position,
options_undercutupperplate_5_delay_acti:this.recipe.options_undercutupperplate_5_delay_acti,
options_undercutupperplate_5_delay_dis:this.recipe.options_undercutupperplate_5_delay_dis,
options_undercutupperplate_6_mode:this.recipe.options_undercutupperplate_6_mode,
options_undercutupperplate_6_position:this.recipe.options_undercutupperplate_6_position,
options_undercutupperplate_6_delay_acti:this.recipe.options_undercutupperplate_6_delay_acti,
options_undercutupperplate_6_delay_dis:this.recipe.options_undercutupperplate_6_delay_dis,
options_undercutupperplate_7_mode:this.recipe.options_undercutupperplate_7_mode,
options_undercutupperplate_7_position:this.recipe.options_undercutupperplate_7_position,
options_undercutupperplate_7_delay_acti:this.recipe.options_undercutupperplate_7_delay_acti,
options_undercutupperplate_7_delay_dis:this.recipe.options_undercutupperplate_7_delay_dis,
options_undercutupperplate_8_mode:this.recipe.options_undercutupperplate_8_mode,
options_undercutupperplate_8_position:this.recipe.options_undercutupperplate_8_position,
options_undercutupperplate_8_delay_acti:this.recipe.options_undercutupperplate_8_delay_acti,
options_undercutupperplate_8_delay_dis:this.recipe.options_undercutupperplate_8_delay_dis,
options_undercutupperplate_9_mode:this.recipe.options_undercutupperplate_9_mode,
options_undercutupperplate_9_position:this.recipe.options_undercutupperplate_9_position,
options_undercutupperplate_9_delay_acti:this.recipe.options_undercutupperplate_9_delay_acti,
options_undercutupperplate_9_delay_dis:this.recipe.options_undercutupperplate_9_delay_dis,
options_undercutupperplate_10_mode:this.recipe.options_undercutupperplate_10_mode,
options_undercutupperplate_10_position:this.recipe.options_undercutupperplate_10_position,
options_undercutupperplate_10_delay_acti:this.recipe.options_undercutupperplate_10_delay_acti,
options_undercutupperplate_10_delay_dis:this.recipe.options_undercutupperplate_10_delay_dis,
options_thermoregulator_1_enabled:this.recipe.options_thermoregulator_1_enabled,
options_thermoregulator_1_setpoint:this.recipe.options_thermoregulator_1_setpoint,
options_thermoregulator_2_enabled:this.recipe.options_thermoregulator_2_enabled,
options_thermoregulator_2_setpoint:this.recipe.options_thermoregulator_2_setpoint,
options_thermoregulator_3_enabled:this.recipe.options_thermoregulator_3_enabled,
options_thermoregulator_3_setpoint:this.recipe.options_thermoregulator_3_setpoint,
options_thermoregulator_4_enabled:this.recipe.options_thermoregulator_4_enabled,
options_thermoregulator_4_setpoint:this.recipe.options_thermoregulator_4_setpoint,
options_thermoregulator_5_enabled:this.recipe.options_thermoregulator_5_enabled,
options_thermoregulator_5_setpoint:this.recipe.options_thermoregulator_5_setpoint,
options_thermoregulator_6_enabled:this.recipe.options_thermoregulator_6_enabled,
options_thermoregulator_6_setpoint:this.recipe.options_thermoregulator_6_setpoint,
options_thermoregulator_7_enabled:this.recipe.options_thermoregulator_7_enabled,
options_thermoregulator_7_setpoint:this.recipe.options_thermoregulator_7_setpoint,
options_thermoregulator_8_enabled:this.recipe.options_thermoregulator_8_enabled,
options_thermoregulator_8_setpoint:this.recipe.options_thermoregulator_8_setpoint,
options_thermoregulator_9_enabled:this.recipe.options_thermoregulator_9_enabled,
options_thermoregulator_9_setpoint:this.recipe.options_thermoregulator_9_setpoint,
options_thermoregulator_10_enabled:this.recipe.options_thermoregulator_10_enabled,
options_thermoregulator_10_setpoint:this.recipe.options_thermoregulator_10_setpoint,
options_undercutupperplate_1_mode: this.recipe.options_undercutupperplate_1_mode,
options_undercutupperplate_1_position: this.recipe.options_undercutupperplate_1_position,
options_undercutupperplate_1_delay_acti: this.recipe.options_undercutupperplate_1_delay_acti,
options_undercutupperplate_1_delay_dis: this.recipe.options_undercutupperplate_1_delay_dis,
options_undercutupperplate_2_mode: this.recipe.options_undercutupperplate_2_mode,
options_undercutupperplate_2_position: this.recipe.options_undercutupperplate_2_position,
options_undercutupperplate_2_delay_acti: this.recipe.options_undercutupperplate_2_delay_acti,
options_undercutupperplate_2_delay_dis: this.recipe.options_undercutupperplate_2_delay_dis,
options_undercutupperplate_3_mode: this.recipe.options_undercutupperplate_3_mode,
options_undercutupperplate_3_position: this.recipe.options_undercutupperplate_3_position,
options_undercutupperplate_3_delay_acti: this.recipe.options_undercutupperplate_3_delay_acti,
options_undercutupperplate_3_delay_dis: this.recipe.options_undercutupperplate_3_delay_dis,
options_undercutupperplate_4_mode: this.recipe.options_undercutupperplate_4_mode,
options_undercutupperplate_4_position: this.recipe.options_undercutupperplate_4_position,
options_undercutupperplate_4_delay_acti: this.recipe.options_undercutupperplate_4_delay_acti,
options_undercutupperplate_4_delay_dis: this.recipe.options_undercutupperplate_4_delay_dis,
options_undercutupperplate_5_mode: this.recipe.options_undercutupperplate_5_mode,
options_undercutupperplate_5_position: this.recipe.options_undercutupperplate_5_position,
options_undercutupperplate_5_delay_acti: this.recipe.options_undercutupperplate_5_delay_acti,
options_undercutupperplate_5_delay_dis: this.recipe.options_undercutupperplate_5_delay_dis,
options_undercutupperplate_6_mode: this.recipe.options_undercutupperplate_6_mode,
options_undercutupperplate_6_position: this.recipe.options_undercutupperplate_6_position,
options_undercutupperplate_6_delay_acti: this.recipe.options_undercutupperplate_6_delay_acti,
options_undercutupperplate_6_delay_dis: this.recipe.options_undercutupperplate_6_delay_dis,
options_undercutupperplate_7_mode: this.recipe.options_undercutupperplate_7_mode,
options_undercutupperplate_7_position: this.recipe.options_undercutupperplate_7_position,
options_undercutupperplate_7_delay_acti: this.recipe.options_undercutupperplate_7_delay_acti,
options_undercutupperplate_7_delay_dis: this.recipe.options_undercutupperplate_7_delay_dis,
options_undercutupperplate_8_mode: this.recipe.options_undercutupperplate_8_mode,
options_undercutupperplate_8_position: this.recipe.options_undercutupperplate_8_position,
options_undercutupperplate_8_delay_acti: this.recipe.options_undercutupperplate_8_delay_acti,
options_undercutupperplate_8_delay_dis: this.recipe.options_undercutupperplate_8_delay_dis,
options_undercutupperplate_9_mode: this.recipe.options_undercutupperplate_9_mode,
options_undercutupperplate_9_position: this.recipe.options_undercutupperplate_9_position,
options_undercutupperplate_9_delay_acti: this.recipe.options_undercutupperplate_9_delay_acti,
options_undercutupperplate_9_delay_dis: this.recipe.options_undercutupperplate_9_delay_dis,
options_undercutupperplate_10_mode: this.recipe.options_undercutupperplate_10_mode,
options_undercutupperplate_10_position: this.recipe.options_undercutupperplate_10_position,
options_undercutupperplate_10_delay_acti: this.recipe.options_undercutupperplate_10_delay_acti,
options_undercutupperplate_10_delay_dis: this.recipe.options_undercutupperplate_10_delay_dis,
options_thermoregulator_1_enabled: this.recipe.options_thermoregulator_1_enabled,
options_thermoregulator_1_setpoint: this.recipe.options_thermoregulator_1_setpoint,
options_thermoregulator_2_enabled: this.recipe.options_thermoregulator_2_enabled,
options_thermoregulator_2_setpoint: this.recipe.options_thermoregulator_2_setpoint,
options_thermoregulator_3_enabled: this.recipe.options_thermoregulator_3_enabled,
options_thermoregulator_3_setpoint: this.recipe.options_thermoregulator_3_setpoint,
options_thermoregulator_4_enabled: this.recipe.options_thermoregulator_4_enabled,
options_thermoregulator_4_setpoint: this.recipe.options_thermoregulator_4_setpoint,
options_thermoregulator_5_enabled: this.recipe.options_thermoregulator_5_enabled,
options_thermoregulator_5_setpoint: this.recipe.options_thermoregulator_5_setpoint,
options_thermoregulator_6_enabled: this.recipe.options_thermoregulator_6_enabled,
options_thermoregulator_6_setpoint: this.recipe.options_thermoregulator_6_setpoint,
options_thermoregulator_7_enabled: this.recipe.options_thermoregulator_7_enabled,
options_thermoregulator_7_setpoint: this.recipe.options_thermoregulator_7_setpoint,
options_thermoregulator_8_enabled: this.recipe.options_thermoregulator_8_enabled,
options_thermoregulator_8_setpoint: this.recipe.options_thermoregulator_8_setpoint,
options_thermoregulator_9_enabled: this.recipe.options_thermoregulator_9_enabled,
options_thermoregulator_9_setpoint: this.recipe.options_thermoregulator_9_setpoint,
options_thermoregulator_10_enabled: this.recipe.options_thermoregulator_10_enabled,
options_thermoregulator_10_setpoint: this.recipe.options_thermoregulator_10_setpoint,
}
);
await recipeService.Confirm();
//await recipeService.Confirm();
ModalHelper.HideModal();
this.deferred.resolve(1);
};
Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-inferiore.vue
+7 -7
View File
@@ -1,35 +1,35 @@
<template>
<div class="svg-area">
<img src="assets/svg/disegno-termosuperiore.svg" />
<img src="assets/svg/disegno-termo.svg" />
<div class="borded_label" id="quota1">
<div>
<span>00</span>
<span>{{recipe.pyrometer_lowerthermoregulator_sleep_percentage.valueAct}}</span>
<small>%</small>
</div>
</div>
<div class="borded_label" id="quota2">
<div>
<span>00</span>
<span>{{recipe.pyrometer_lowerthermoregulator_min_percentage.valueAct}}</span>
<small>%</small>
</div>
</div>
<div class="borded_label" id="quota3">
<div>
<span>00</span>
<span>{{recipe.pyrometer_lowerthermoregulator_max_percentage.valueAct}}</span>
<small>%</small>
</div>
</div>
<div class="borded_label" id="quota4">
<div>
<img src="assets/icons/png/temperatura.png" />
<span>00</span>
<span>{{recipe.pyrometer_lowerthermoregulator_start_adjustment.valueAct}}</span>
<small>°C</small>
</div>
</div>
<div class="borded_label" id="quota5">
<div>
<img src="assets/icons/png/temperatura.png" />
<span>00</span>
<span>{{recipe.pyrometer_lowerthermoregulator_end_adjustment.valueAct}}</span>
<small>°C</small>
</div>
</div>
@@ -57,4 +57,4 @@
left: 953px;
}
</style>
<script lang="ts" src="./SVG-termo-inferiore.ts"></script>
<script lang="ts" src="./SVG-termo-superiore.ts"></script>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue
+6 -6
View File
@@ -1,35 +1,35 @@
<template>
<div class="svg-area">
<img src="assets/svg/disegno-termosuperiore.svg" />
<img src="assets/svg/disegno-termo.svg" />
<div class="borded_label" id="quota1">
<div>
<span>00</span>
<span>{{recipe.pyrometer_upperthermoregulator_sleep_percentage.valueAct}}</span>
<small>%</small>
</div>
</div>
<div class="borded_label" id="quota2">
<div>
<span>00</span>
<span>{{recipe.pyrometer_upperthermoregulator_min_percentage.valueAct}}</span>
<small>%</small>
</div>
</div>
<div class="borded_label" id="quota3">
<div>
<span>00</span>
<span>{{recipe.pyrometer_upperthermoregulator_max_percentage.valueAct}}</span>
<small>%</small>
</div>
</div>
<div class="borded_label" id="quota4">
<div>
<img src="assets/icons/png/temperatura.png" />
<span>00</span>
<span>{{recipe.pyrometer_upperthermoregulator_start_adjustment.valueAct}}</span>
<small>°C</small>
</div>
</div>
<div class="borded_label" id="quota5">
<div>
<img src="assets/icons/png/temperatura.png" />
<span>00</span>
<span>{{recipe.pyrometer_upperthermoregulator_end_adjustment.valueAct}}</span>
<small>°C</small>
</div>
</div>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts
+1 -1
View File
@@ -51,7 +51,7 @@ export default class ShowPirometroInfo extends Vue {
pyrometer_lowerthermoregulator_working_temperature: this.recipe.pyrometer_lowerthermoregulator_working_temperature,
}
);
await recipeService.Confirm();
//await recipeService.Confirm();
ModalHelper.HideModal();
this.deferred.resolve(1);
};
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue
+7 -7
View File
@@ -4,24 +4,24 @@
<div class="borded_label" id="quota1">
<div>
<img src="assets/icons/png/salita.png" />
<span>00</span>
<span>{{recipe.positions_frame_intermediate_position.valueAct}}</span>
<small>mm</small>
</div>
<div>
<img src="assets/icons/png/bassa.png" />
<span>00</span>
<span>{{recipe.positions_frame_intermediate_speed.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota2">
<div>
<img src="assets/icons/png/salita.png" />
<span>00</span>
<span>{{recipe.positions_frame_lower_position.valueAct}}</span>
<small>mm</small>
</div>
<div>
<img src="assets/icons/png/alta.png" />
<span>00</span>
<span>{{recipe.positions_frame_lower_speed.valueAct}}</span>
<small>mm</small>
</div>
</div>
@@ -52,19 +52,19 @@
<div class="borded_label" id="quota5">
<div>
<img src="assets/icons/png/discesa.png" />
<span>00</span>
<span>{{recipe.positions_frame_upper_position.valueAct}}</span>
<small>mm</small>
</div>
<div>
<img src="assets/icons/png/alta.png" />
<span>00</span>
<span>{{recipe.positions_frame_upper_speed.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota6">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.positions_frame_unload_position.valueAct}}</span>
<small>mm</small>
</div>
</div>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue
+9 -9
View File
@@ -4,7 +4,7 @@
<div class="borded_label" id="quota1">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.positions_mould_intermediate_position.valueAct}}</span>
<small>mm</small>
</div>
</div>
@@ -40,48 +40,48 @@
<div class="borded_label" id="quota6">
<div>
<img src="assets/icons/png/salita.png" />
<span>00</span>
<span>{{recipe.positions_mould_upperdeceleration_position.valueAct}}</span>
<small>mm</small>
</div>
<div>
<img src="assets/icons/png/bassa.png" />
<span>00</span>
<span>{{recipe.positions_mould_upperdeceleration_speed.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota7">
<div>
<img src="assets/icons/png/salita.png" />
<span>00</span>
<span>{{recipe.positions_mould_upper_position.valueAct}}</span>
<small>mm</small>
</div>
<div>
<img src="assets/icons/png/alta.png" />
<span>00</span>
<span>{{recipe.positions_mould_upper_speed.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota8">
<div>
<img src="assets/icons/png/discesa.png" />
<span>00</span>
<span>{{recipe.positions_mould_lowerdeceleration_position.valueAct}}</span>
<small>mm</small>
</div>
<div>
<img src="assets/icons/png/bassa.png" />
<span>00</span>
<span>{{recipe.positions_mould_lowerdeceleration_speed.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota9">
<div>
<img src="assets/icons/png/discesa.png" />
<span>00</span>
<span>{{recipe.positions_mould_lower_position.valueAct}}</span>
<small>mm</small>
</div>
<div>
<img src="assets/icons/png/alta.png" />
<span>00</span>
<span>{{recipe.positions_mould_lower_speed.valueAct}}</span>
<small>mm</small>
</div>
</div>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.vue
+8 -8
View File
@@ -4,48 +4,48 @@ e<template>
<div class="borded_label" id="quota1">
<div>
<img src="assets/icons/png/salita.png" />
<span>00</span>
<span>{{recipe.positions_upperplate_lower_position.valueAct}}</span>
<small>mm</small>
</div>
<div>
<img src="assets/icons/png/alta.png" />
<span>00</span>
<span>{{recipe.positions_upperplate_lower_speed.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota2">
<div>
<img src="assets/icons/png/salita.png" />
<span>00</span>
<span>{{recipe.positions_upperplate_lowerdeceleration_position.valueAct}}</span>
<small>mm</small>
</div>
<div>
<img src="assets/icons/png/bassa.png" />
<span>00</span>
<span>{{recipe.positions_upperplate_lowerdeceleration_speed.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota3">
<div>
<img src="assets/icons/png/discesa.png" />
<span>00</span>
<span>{{recipe.positions_upperplate_upper_position.valueAct}}</span>
<small>mm</small>
</div>
<div>
<img src="assets/icons/png/alta.png" />
<span>00</span>
<span>{{recipe.positions_upperplate_upper_speed.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota4">
<div>
<img src="assets/icons/png/discesa.png" />
<span>00</span>
<span>{{recipe.positions_upperplate_upperdeceleration_position.valueAct}}</span>
<small>mm</small>
</div>
<div>
<img src="assets/icons/png/bassa.png" />
<span>00</span>
<span>{{recipe.positions_upperplate_upperdeceleration_speed.valueAct}}</span>
<small>mm</small>
</div>
</div>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts
+1 -1
View File
@@ -64,7 +64,7 @@ export default class ShowQuoteVelocitaInfo extends Vue {
positions_upperplate_lowerdeceleration_speed: this.recipe.positions_upperplate_lowerdeceleration_speed,
}
);
await recipeService.Confirm();
//await recipeService.Confirm();
ModalHelper.HideModal();
this.deferred.resolve(1);
};
Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts
+1 -1
View File
@@ -73,7 +73,7 @@ export default class Raffreddamento extends Vue {
cooling_shutter_16_opening_perc: this.recipe.cooling_shutter_16_opening_perc,
}
);
await recipeService.Confirm();
//await recipeService.Confirm();
ModalHelper.HideModal();
this.deferred.resolve(1);
};
Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.ts
+1 -1
View File
@@ -47,7 +47,7 @@ export default class ShowRiscaldamentoSuperioreInfo extends Vue {
heats_decomsustain_smoke_function_enabled: this.recipe.heats_decomsustain_smoke_function_enabled,
}
);
await recipeService.Confirm();
//await recipeService.Confirm();
ModalHelper.HideModal();
this.deferred.resolve(1);
};
Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts
+1 -1
View File
@@ -75,7 +75,7 @@ export default class ShowVuotoInfo extends Vue {
vacuum_pre_3_chart_setpointy: this.recipe.vacuum_pre_3_chart_setpointy,
}
);
await recipeService.Confirm();
//await recipeService.Confirm();
ModalHelper.HideModal();
this.deferred.resolve(1);
};
Thermo.Active/wwwroot/src/store/recipe.store.ts
+6 -1
View File
@@ -40,7 +40,12 @@ export const recipeStore = {
},
SetOverview(state, model: Overview.IOverview) {
state.overview = model;
for (const key in model) {
if (model.hasOwnProperty(key)) {
if (model[key])
Vue.set(state.current, key, model[key]);
}
}
},
},