From 0d042b86988f17fe25c4e58ac4b6e8d7e015b1be Mon Sep 17 00:00:00 2001 From: = Date: Wed, 10 Jun 2020 11:40:31 +0200 Subject: [PATCH] rimozione del tastierino ovunque --- .../components/tastierino.ts | 72 +++++++++---------- .../SVG_Components/controstampoSVG.ts | 20 ++---- .../SVG_Components/controstampoSVG.vue | 2 +- .../components/SVG_Components/corniceSVG.ts | 23 ++---- .../components/SVG_Components/corniceSVG.vue | 4 +- .../components/SVG_Components/lastraSVG.ts | 26 +++---- .../components/SVG_Components/lastraSVG.vue | 6 +- .../components/SVG_Components/piastraSVG.ts | 22 ++---- .../components/SVG_Components/piastraSVG.vue | 4 +- .../components/SVG_Components/stampoSVG.ts | 30 +++----- .../components/SVG_Components/stampoSVG.vue | 10 +-- .../formato/components/show-formato-info.ts | 26 ------- .../formato/components/show-formato-info.vue | 11 +-- .../setup/formato/components/stampo.ts | 24 +++---- .../setup/formato/components/stampo.vue | 30 ++------ .../SVG_Components/SVG-termo-superiore.ts | 36 ++++------ .../SVG_Components/SVG-termo-superiore.vue | 10 +-- .../base-components/termo-superiore.ts | 40 ++++------- .../base-components/termo-superiore.vue | 2 - .../SVG_Components/quote-velocita.ts | 30 +++----- .../SVG_Components/quote-velocita.vue | 22 +++--- .../components/SVG_Components/stampo.ts | 29 +++----- .../SVG_Components/svgcontrostampo.ts | 29 +++----- .../SVG_Components/svgcontrostampo.vue | 18 ++--- .../quote-velocita/components/controstampo.ts | 47 +++++------- .../components/controstampo.vue | 2 - .../components/discesa-cornice.ts | 40 ++++------- .../components/discesa-cornice.vue | 2 - .../components/salita-stampo.ts | 27 ++----- .../components/salita-stampo.vue | 2 - 30 files changed, 213 insertions(+), 433 deletions(-) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/tastierino.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/tastierino.ts index d6109d35..f6c8e70b 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/tastierino.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/tastierino.ts @@ -1,52 +1,44 @@ import Vue from 'vue'; -import {Prop} from 'vue-property-decorator'; +import { Prop } from 'vue-property-decorator'; import Component from 'vue-class-component'; -@Component({name:"tastierino"}) -export default class Tastierino extends Vue{ +@Component({ name: "tastierino" }) +export default class Tastierino extends Vue { - @Prop() - actualValue:Recipe.IValue; + @Prop() + actualValue: Recipe.IValue; - temp:string; - point:string; + temp: string; + point: string; - @Prop() - value: string; + @Prop() + value: string; - get showtast() { - return this.value; + del() { + this.actualValue.valueAct = 0; + } + + canc() { + this.temp = String(this.actualValue.valueAct); + this.actualValue.valueAct = Number(this.temp.slice(0, -1)) + } + + add(num: string) { + if (this.point) { + this.point += num; + this.actualValue.valueAct = Number(this.point) + } else { + this.temp = String(this.actualValue.valueAct); + this.temp += num; + this.actualValue.valueAct = Number(this.temp) } + } - set showtast(v: string) { - this.$emit('input', v); - } - - del(){ - this.actualValue.valueAct=0; - } - - canc(){ - this.temp=String(this.actualValue.valueAct); - this.actualValue.valueAct=Number(this.temp.slice(0,-1)) - } - - add(num:string){ - if(this.point){ - this.point+=num; - this.actualValue.valueAct=Number(this.point) - }else{ - this.temp=String(this.actualValue.valueAct); - this.temp+=num; - this.actualValue.valueAct=Number(this.temp) - } - } - - addpoint(){ - if(!this.point){ - this.point=String(this.actualValue.valueAct); - this.point+="."; - } + addpoint() { + if (!this.point) { + this.point = String(this.actualValue.valueAct); + this.point += "."; } + } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.ts index c68e014c..b0ea83e3 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.ts @@ -1,21 +1,9 @@ import Vue from 'vue'; import Component from 'vue-class-component'; -import {Prop} from 'vue-property-decorator'; +import { Prop } from 'vue-property-decorator'; @Component({}) -export default class ControstampoSVG extends Vue{ - - @Prop() - value: string; - - get showtast() { - return this.value; - } - - set showtast(v: string) { - this.$emit('input', v); - } - - @Prop({default:0}) - alt:Recipe.IValue; +export default class ControstampoSVG extends Vue { + @Prop({ default: 0 }) + alt: Recipe.IValue; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.vue index b74863f0..e3aa6661 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.vue @@ -2,7 +2,7 @@
-
+
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.ts index a20dbade..90b3919c 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.ts @@ -1,23 +1,12 @@ import Vue from 'vue'; import Component from 'vue-class-component'; -import {Prop} from 'vue-property-decorator'; +import { Prop } from 'vue-property-decorator'; @Component({}) -export default class CorniceSVG extends Vue{ - - @Prop() - value: string; +export default class CorniceSVG extends Vue { - get showtast() { - return this.value; - } - - set showtast(v: string) { - this.$emit('input', v); - } - - @Prop({default:0}) - x:Recipe.IValue; - @Prop({default:0}) - y:Recipe.IValue; + @Prop({ default: 0 }) + x: Recipe.IValue; + @Prop({ default: 0 }) + y: Recipe.IValue; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.vue index 2cac98f2..c8a577c3 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.vue @@ -2,12 +2,12 @@
-
+
-
+
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.ts index 39f975ce..b89df503 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.ts @@ -1,26 +1,16 @@ import Vue from 'vue'; import Component from 'vue-class-component'; -import {Prop} from 'vue-property-decorator'; +import { Prop } from 'vue-property-decorator'; @Component({}) -export default class LastraSVG extends Vue{ +export default class LastraSVG extends Vue { - @Prop() - value: string; - get showtast() { - return this.value; - } - - set showtast(v: string) { - this.$emit('input', v); - } - - @Prop({default:0}) - x:Recipe.IValue; - @Prop({default:0}) - y:Recipe.IValue; - @Prop({default:0}) - spes:Recipe.IValue; + @Prop({ default: 0 }) + x: Recipe.IValue; + @Prop({ default: 0 }) + y: Recipe.IValue; + @Prop({ default: 0 }) + spes: Recipe.IValue; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.vue index 8d2163d6..b043eb49 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.vue @@ -2,17 +2,17 @@
-
+
-
+
-
+
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.ts index 802d5fdd..4e7b9fbc 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.ts @@ -1,23 +1,13 @@ import Vue from 'vue'; import Component from 'vue-class-component'; -import {Prop} from 'vue-property-decorator'; +import { Prop } from 'vue-property-decorator'; @Component({}) -export default class PiastraSVG extends Vue{ +export default class PiastraSVG extends Vue { - @Prop() - value: string; - get showtast() { - return this.value; - } - - set showtast(v: string) { - this.$emit('input', v); - } - - @Prop({default:0}) - x:Recipe.IValue; - @Prop({default:0}) - y:Recipe.IValue; + @Prop({ default: 0 }) + x: Recipe.IValue; + @Prop({ default: 0 }) + y: Recipe.IValue; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.vue index 87974cb0..b4e4df99 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.vue @@ -2,12 +2,12 @@
-
+
-
+
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.ts index 0d31b330..8fc245b9 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.ts @@ -5,25 +5,15 @@ import { Prop } from 'vue-property-decorator'; @Component({}) export default class StampoSVG extends Vue { - @Prop() - value: string; - get showtast() { - return this.value; - } - - set showtast(v: string) { - this.$emit('input', v); - } - - @Prop({ default: 0 }) - x: Recipe.IValue; - @Prop({ default: 0 }) - y: Recipe.IValue; - @Prop({ default: 0 }) - alt: number; - @Prop({ default: 0 }) - altB: Recipe.IValue; - @Prop({ default: 0 }) - stampoNeg: number; + @Prop({ default: 0 }) + x: Recipe.IValue; + @Prop({ default: 0 }) + y: Recipe.IValue; + @Prop({ default: 0 }) + alt: number; + @Prop({ default: 0 }) + altB: Recipe.IValue; + @Prop({ default: 0 }) + stampoNeg: number; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.vue index 74fd923a..1e04fe42 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.vue @@ -2,27 +2,27 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts index 6844d773..6397f49f 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts @@ -26,7 +26,6 @@ import { store } from "@/store"; piastra: Piastra, cornice: Cornice, controstampo: Controstampo, - tastierino: Tastierino, stampoSVG: StampoSVG, lastraSVG: LastraSVG, piastraSVG: PiastraSVG, @@ -39,37 +38,12 @@ export default class ShowFormatoInfo extends Vue { recipe: Recipe.IRecipe = this.$store.getters.getCurrent(); show: string = "placeholder"; - showtast: string = ''; - @Prop({ default: 0 }) stamponeg: number; @Prop({ default: 0 }) altezza: number; - get TastActualValue(): Recipe.IValue { - if (!this.showtast) - return null; - - switch (this.showtast) { - case 'stampo-x': return this.recipe.general_sizes_mould_dim_x; - case 'stampo-y': return this.recipe.general_sizes_mould_dim_y; - // case 'stampo-alt': return this.altezza; - // case 'stampo-stamponeg': return this.stamponeg; - case 'stampo-altB': return this.recipe.general_sizes_mould_base_height; - case 'piastra-y': return this.recipe.general_sizes_plate_dim_y; - case 'piastra-x': return this.recipe.general_sizes_plate_dim_x; - case 'lastra-spes': return this.recipe.general_sizes_sheet_thickness; - case 'lastra-x': return this.recipe.general_sizes_sheet_dim_x; - case 'lastra-y': return this.recipe.general_sizes_sheet_dim_y; - case 'cornice-x': return this.recipe.general_sizes_frame_dim_x; - case 'cornice-y': return this.recipe.general_sizes_frame_dim_y; - case 'controstampo-alt': return this.recipe.general_sizes_upperplate_max_height; - default: - return null; - } - } - annulla() { ModalHelper.HideModal(); }; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.vue index e3ca3e53..75cf0083 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.vue @@ -36,7 +36,6 @@
- +
-
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/stampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/stampo.ts index 7bc7f8d6..58da4b15 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/stampo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/stampo.ts @@ -3,18 +3,18 @@ import Component from "vue-class-component"; import { Prop } from 'vue-property-decorator'; import Slider from "@/app_modules_thermo/components/slider.vue" -@Component({name:"stampo", components:{slider:Slider} }) +@Component({ name: "stampo" }) export default class Stampo extends Vue { - @Prop({default:0}) - x:Recipe.IValue; - @Prop({default:0}) - y:Recipe.IValue; - @Prop({default:0}) - alt:number; - @Prop({default:0}) - altB:Recipe.IValue; - @Prop({default:0}) - stampoNeg:number; - + @Prop() + x: Recipe.IValue; + @Prop() + y: Recipe.IValue; + @Prop() + alt: number; + @Prop() + altB: Recipe.IValue; + @Prop() + stampoNeg: number; + } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/stampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/stampo.vue index 3b1ef410..02806791 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/stampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/stampo.vue @@ -8,47 +8,27 @@
- +
- +
- +
- +
- +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.ts index a5d9fd99..c43b44a4 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.ts @@ -1,30 +1,20 @@ import Vue from 'vue'; import Component from 'vue-class-component'; -import {Prop} from 'vue-property-decorator'; +import { Prop } from 'vue-property-decorator'; -@Component({name:'svgtermosuperiore'}) -export default class SVGTermoregolazioneSuperiore extends Vue{ +@Component({ name: 'svgtermosuperiore' }) +export default class SVGTermoregolazioneSuperiore extends Vue { - @Prop() - value: string; - get showtast() { - return this.value; - } - - set showtast(v: string) { - this.$emit('input', v); - } - - @Prop({default:0}) - max:Recipe.IValue; - @Prop({default:0}) - min:Recipe.IValue; - @Prop({default:0}) - inizio:Recipe.IValue; - @Prop({default:0}) - fine:Recipe.IValue; - @Prop({default:0}) - perc_riposo:Recipe.IValue; + @Prop({ default: 0 }) + max: Recipe.IValue; + @Prop({ default: 0 }) + min: Recipe.IValue; + @Prop({ default: 0 }) + inizio: Recipe.IValue; + @Prop({ default: 0 }) + fine: Recipe.IValue; + @Prop({ default: 0 }) + perc_riposo: Recipe.IValue; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue index 5d000e7a..62afcb22 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue @@ -2,24 +2,24 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.ts index 4260cc8d..d92bdebd 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.ts @@ -1,39 +1,25 @@ import Vue from 'vue'; import Component from 'vue-class-component'; -import {Prop} from 'vue-property-decorator'; +import { Prop } from 'vue-property-decorator'; import Slider from "@/app_modules_thermo/components/slider.vue"; import ToggleButton from "@/components/toggleButton.vue"; import SVGTermoregolazioneSuperiore from './SVG_Components/SVG-termo-superiore.vue'; import Tastierino from "@/app_modules_thermo/components/tastierino.vue"; -@Component({name:'termosuperiore', - components: { - slider:Slider, - ToggleButton, - svgtermosuperiore:SVGTermoregolazioneSuperiore, - tastierino:Tastierino - }}) -export default class TermoregolazioneSuperiore extends Vue{ +@Component({ + name: 'termosuperiore', + components: { + slider: Slider, + ToggleButton, + svgtermosuperiore: SVGTermoregolazioneSuperiore, + } +}) +export default class TermoregolazioneSuperiore extends Vue { - showtast:string=''; - @Prop() - recipe:Recipe.IRecipe; + @Prop() + recipe: Recipe.IRecipe; + - get TastActualValue(): Recipe.IValue{ - if(!this.showtast) - return null; - - switch (this.showtast) { - case 'termo-max': return this.recipe.pyrometer_upperthermoregulator_max_percentage; - case 'termo-min': return this.recipe.pyrometer_upperthermoregulator_min_percentage; - case 'termo-percriposo': return this.recipe.pyrometer_upperthermoregulator_sleep_percentage; - case 'termo-inizio': return this.recipe.pyrometer_upperthermoregulator_start_adjustment; - case 'termo-fine': return this.recipe.pyrometer_upperthermoregulator_end_adjustment; - - default: - return null; - } - } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.vue index a347a044..c48d5f38 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/termo-superiore.vue @@ -85,7 +85,6 @@
- diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.ts index 47ed2dc0..81f1ecef 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.ts @@ -1,28 +1,18 @@ import Vue from 'vue'; import Component from 'vue-class-component'; -import {Prop} from 'vue-property-decorator'; +import { Prop } from 'vue-property-decorator'; @Component({}) -export default class QuoteVelocita extends Vue{ - - @Prop() - value: string; +export default class QuoteVelocita extends Vue { - get showtast() { - return this.value; - } - set showtast(v: string) { - this.$emit('input', v); - } - - @Prop({default:0}) - corsa:Recipe.IValue; - @Prop({default:0}) - vel_salita:Recipe.IValue; - @Prop({default:0}) - vel_salita_lenta:number; - @Prop({default:0}) - rall_salita:number; + @Prop({ default: 0 }) + corsa: Recipe.IValue; + @Prop({ default: 0 }) + vel_salita: Recipe.IValue; + @Prop({ default: 0 }) + vel_salita_lenta: number; + @Prop({ default: 0 }) + rall_salita: number; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue index c2d1c2b7..a4550cc7 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue @@ -3,24 +3,24 @@
-
+
-
+
-
+
-
+
@@ -29,43 +29,43 @@
- +
- +
- +
- +
- +
- +
- +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.ts index 67baa7c4..1064ae58 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.ts @@ -1,28 +1,19 @@ import Vue from 'vue'; import Component from 'vue-class-component'; -import {Prop} from 'vue-property-decorator'; +import { Prop } from 'vue-property-decorator'; @Component({}) -export default class QuoteVelocita extends Vue{ +export default class QuoteVelocita extends Vue { - @Prop() - value: string; - get showtast() { - return this.value; - } - set showtast(v: string) { - this.$emit('input', v); - } - - @Prop({default:0}) - corsa:Recipe.IValue; - @Prop({default:0}) - vel_salita:Recipe.IValue; - @Prop({default:0}) - vel_salita_lenta:Recipe.IValue; - @Prop({default:0}) - rall_salita:Recipe.IValue; + @Prop({ default: 0 }) + corsa: Recipe.IValue; + @Prop({ default: 0 }) + vel_salita: Recipe.IValue; + @Prop({ default: 0 }) + vel_salita_lenta: Recipe.IValue; + @Prop({ default: 0 }) + rall_salita: Recipe.IValue; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.ts index e3bbfbc1..a6429a9d 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.ts @@ -1,28 +1,19 @@ import Vue from 'vue'; import Component from 'vue-class-component'; -import {Prop} from 'vue-property-decorator'; +import { Prop } from 'vue-property-decorator'; @Component({}) -export default class Controstamposvg extends Vue{ - - @Prop() - value: string; +export default class Controstamposvg extends Vue { - get showtast() { - return this.value; - } - set showtast(v: string) { - this.$emit('input', v); - } - @Prop({default:0}) - corsa:Recipe.IValue; - @Prop({default:0}) - vel_discesa:Recipe.IValue; - @Prop({default:0}) - vel_discesa_lenta:number; - @Prop({default:0}) - rall_discesa:number; + @Prop({ default: 0 }) + corsa: Recipe.IValue; + @Prop({ default: 0 }) + vel_discesa: Recipe.IValue; + @Prop({ default: 0 }) + vel_discesa_lenta: number; + @Prop({ default: 0 }) + rall_discesa: number; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.vue index 264c1b28..1e36b07e 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.vue @@ -8,46 +8,46 @@ e diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.ts index f67d5f97..cf2ffee8 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.ts @@ -5,32 +5,13 @@ import Slider from "@/app_modules_thermo/components/slider.vue" import StampoSVG from "./SVG_Components/stampo.vue"; import Tastierino from "@/app_modules_thermo/components/tastierino.vue"; -@Component({name:"salita-stampo", components:{slider:Slider, tastierino:Tastierino, stampoSVG: StampoSVG}}) +@Component({ name: "salita-stampo", components: { stampoSVG: StampoSVG } }) export default class DiscesaCornice extends Vue { - @Prop({default:0}) - ritardo:number; - - showtast:string=''; - - get TastActualValue(): Recipe.IValue{ - if(!this.showtast) - return null; - - switch (this.showtast) { - case 'stampo-rallsalita': return this.recipe.positions_mould_upperdeceleration_position; - case 'stampo-velsalitalenta': return this.recipe.positions_mould_upperdeceleration_speed; - case 'stampo-corsa': return this.recipe.positions_mould_upper_position; - case 'stampo-velsalita': return this.recipe.positions_mould_upper_speed; - - default: - return null; - } - } - - mock_ritardo:number=this.ritardo; + @Prop({ default: 0 }) + ritardo: number; @Prop() - recipe:Recipe.IRecipe; + recipe: Recipe.IRecipe; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue index 6e8cdcaf..097a29fc 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue @@ -80,7 +80,6 @@
-