From cacae4eebf0ccf106678d51b2d39e63dfb0bc677 Mon Sep 17 00:00:00 2001 From: Thermo_SIM Date: Fri, 19 Mar 2021 16:40:07 +0100 Subject: [PATCH] Fix pirometro in Dashboard --- .../dashboard/base-components/stats.vue | 12 -------- .../app_modules_thermo/dashboard/dashboard.ts | 30 +++++++++++++++++-- .../dashboard/dashboard.vue | 4 ++- 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/stats.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/stats.vue index be452128..96ca7408 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/stats.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/stats.vue @@ -10,18 +10,6 @@ - diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts index 039d950e..a2d2be9f 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts @@ -204,13 +204,33 @@ export default class Dashboard extends Vue { } incrementPyr() { - this.recipe.pyrometer_pyrometer_setpoint.setpointHMI++; + this.recipe.pyrometer_pyrometer_setpoint.setpointHMI++; + this.recipe.pyrometer_upperthermoregulator_start_adjustment.setpointHMI++; + this.recipe.pyrometer_upperthermoregulator_end_adjustment.setpointHMI++; + this.recipe.pyrometer_lowerthermoregulator_start_adjustment.setpointHMI++; + this.recipe.pyrometer_lowerthermoregulator_end_adjustment.setpointHMI++; this.debouncedRecipeSave(); } decrementPyr() { - this.recipe.pyrometer_pyrometer_setpoint.setpointHMI--; + this.recipe.pyrometer_pyrometer_setpoint.setpointHMI--; + this.recipe.pyrometer_upperthermoregulator_start_adjustment.setpointHMI--; + this.recipe.pyrometer_upperthermoregulator_end_adjustment.setpointHMI--; + this.recipe.pyrometer_lowerthermoregulator_start_adjustment.setpointHMI--; + this.recipe.pyrometer_lowerthermoregulator_end_adjustment.setpointHMI--; this.debouncedRecipeSave(); } + + togglePyr() { + if(this.recipe.pyrometer_pyrometer_enabled.setpointHMI == 1) + this.recipe.pyrometer_pyrometer_enabled.setpointHMI = 0; + else + this.recipe.pyrometer_pyrometer_enabled.setpointHMI = 1; + + this.debouncedRecipeSave(); + } + get pyrOn(){ + return this.recipe.pyrometer_pyrometer_enabled.setpointHMI == 1; + } debouncedRecipeSave = debounce(this.savePyr, 1000); public async savePyr(){ @@ -229,7 +249,11 @@ export default class Dashboard extends Vue { get payload() { return { pyrometer_pyrometer_enabled: this.recipe.pyrometer_pyrometer_enabled, - pyrometer_pyrometer_setpoint: this.recipe.pyrometer_pyrometer_setpoint + pyrometer_pyrometer_setpoint: this.recipe.pyrometer_pyrometer_setpoint, + pyrometer_upperthermoregulator_start_adjustment: this.recipe.pyrometer_upperthermoregulator_start_adjustment, + pyrometer_upperthermoregulator_end_adjustment: this.recipe.pyrometer_upperthermoregulator_end_adjustment, + pyrometer_lowerthermoregulator_start_adjustment: this.recipe.pyrometer_lowerthermoregulator_start_adjustment, + pyrometer_lowerthermoregulator_end_adjustment: this.recipe.pyrometer_lowerthermoregulator_end_adjustment, } } diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.vue index cd2f2037..d37a04dc 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.vue @@ -118,9 +118,11 @@ -
+
{{'dashboard-setpoint' | localize('set point')}} {{recipe.pyrometer_pyrometer_setpoint.setpointHMI}}{{recipe.pyrometer_pyrometer_setpoint.unitMeasure}} +
ON
+
OFF