From 61a5c504769379d3d3281173532c823d809530e2 Mon Sep 17 00:00:00 2001 From: = Date: Thu, 11 Jun 2020 12:29:30 +0200 Subject: [PATCH 1/3] formato & quote. --- .../app_modules_thermo/components/slider.vue | 7 +- .../formato/components/piastra_riduzione.vue | 4 +- .../setup/formato/components/stampo.vue | 8 +- .../SVG_Components/quote-velocita.ts | 11 +-- .../components/SVG_Components/stampo.ts | 11 +-- .../SVG_Components/svgcontrostampo.ts | 11 +-- .../quote-velocita/components/controstampo.ts | 17 ---- .../components/controstampo.vue | 29 +++--- .../components/discesa-cornice.ts | 11 --- .../components/discesa-cornice.vue | 29 +++--- .../components/salita-stampo.ts | 2 - .../components/salita-stampo.vue | 90 ++++++++----------- 12 files changed, 81 insertions(+), 149 deletions(-) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/slider.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/slider.vue index 51d2a7a4..48eae723 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/slider.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/slider.vue @@ -4,7 +4,12 @@
- +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/piastra_riduzione.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/piastra_riduzione.vue index e8626b02..35b82a4d 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/piastra_riduzione.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/piastra_riduzione.vue @@ -16,14 +16,14 @@
- +
- + 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 4ef8f777..a3890af6 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 @@ -9,20 +9,24 @@ +
- + s
+ +
- + +
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 6df39382..81ad7b7c 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 @@ -5,14 +5,7 @@ import { Prop } from 'vue-property-decorator'; @Component({}) export default class QuoteVelocita extends Vue { - - @Prop({}) - corsa: Recipe.IValue; - @Prop({}) - vel_salita: Recipe.IValue; - @Prop({}) - vel_salita_lenta: number; - @Prop({}) - rall_salita: number; + @Prop() + recipe: Recipe.IRecipe; } \ No newline at end of file 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 69414fde..c7a88272 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 @@ -6,14 +6,7 @@ import { Prop } from 'vue-property-decorator'; export default class QuoteVelocita extends Vue { - - @Prop({}) - corsa: Recipe.IValue; - @Prop({}) - vel_salita: Recipe.IValue; - @Prop({}) - vel_salita_lenta: Recipe.IValue; - @Prop({}) - rall_salita: Recipe.IValue; + @Prop() + recipe: Recipe.IRecipe; } \ 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 62dfff11..cdd2358a 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 @@ -6,14 +6,7 @@ import { Prop } from 'vue-property-decorator'; export default class Controstamposvg extends Vue { - - @Prop({}) - corsa: Recipe.IValue; - @Prop({}) - vel_discesa: Recipe.IValue; - @Prop({}) - vel_discesa_lenta: number; - @Prop({}) - rall_discesa: number; + @Prop() + recipe: Recipe.IRecipe; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/controstampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/controstampo.ts index 0072d813..cf558dc8 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/controstampo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/controstampo.ts @@ -15,23 +15,6 @@ import Tastierino from "@/app_modules_thermo/components/tastierino.vue"; }) export default class Controstampo extends Vue { - - @Prop() recipe: Recipe.IRecipe; - - @Prop({}) - ritardo: number; - - mockR: number = this.ritardo; - - @Prop({}) - rallentamento_discesa: number; - - mockRD: number = this.rallentamento_discesa; - - @Prop({}) - velocità_discesa_lenta: number; - - mockVDL: number = this.velocità_discesa_lenta; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/controstampo.vue index 36cd6057..93fb1f33 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/controstampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/controstampo.vue @@ -9,35 +9,31 @@
- +
- +
- +
- +

@@ -45,24 +41,21 @@
- +
- +
- +
- +

- + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.ts index 71f9a761..42b4db9a 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.ts @@ -12,15 +12,4 @@ export default class DiscesaCornice extends Vue { @Prop() recipe: Recipe.IRecipe; - @Prop({}) - ritardo: number; - @Prop({}) - ralSalita: number; - @Prop({}) - velSalitaLenta: number; - - mock_ritardo: number = this.ritardo; - mock_ral_salita: number = this.ralSalita; - mock_vel_salita_lenta: number = this.velSalitaLenta; - } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue index 5558bb20..0a31eac3 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue @@ -9,35 +9,31 @@
- +
- +
- +
- +

@@ -45,24 +41,21 @@
- +
- +
- +
- +

- + 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 4ee37fe0..9b708084 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 @@ -8,8 +8,6 @@ import Tastierino from "@/app_modules_thermo/components/tastierino.vue"; @Component({ name: "salita-stampo", components: { stampoSVG: StampoSVG } }) export default class DiscesaCornice extends Vue { - @Prop({}) - ritardo: number; @Prop() recipe: Recipe.IRecipe; 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 03013480..21e7a5cc 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 @@ -3,80 +3,68 @@
- + From 782caef28a74270bc1a40a27222c5d503120a8cb Mon Sep 17 00:00:00 2001 From: = Date: Thu, 11 Jun 2020 12:42:39 +0200 Subject: [PATCH 2/3] quote --- .../components/controstampo.vue | 69 ++++++++++--------- .../components/discesa-cornice.vue | 61 ++++++++-------- .../components/salita-stampo.vue | 1 + .../components/show-quote-velocita-info.ts | 2 +- 4 files changed, 71 insertions(+), 62 deletions(-) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/controstampo.vue index 93fb1f33..8a550e52 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/controstampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/controstampo.vue @@ -3,53 +3,58 @@ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue index 0a31eac3..8397c2ad 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue @@ -3,53 +3,56 @@ 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 21e7a5cc..9fee70f2 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 @@ -11,6 +11,7 @@
+
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts index 1af1a07f..816a022d 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts @@ -23,7 +23,7 @@ import { Deferred } from "@/services"; export default class ShowQuoteVelocitaInfo extends Vue { recipe: Recipe.IRecipe = this.$store.getters.getCurrent(); - show: string = "QC"; + show: string = "QS"; @Prop() deferred: Deferred; From 73be1bb58bb3ae59d3f166ff9a6b8c6d352f69e9 Mon Sep 17 00:00:00 2001 From: = Date: Thu, 11 Jun 2020 12:44:33 +0200 Subject: [PATCH 3/3] =?UTF-8?q?rimozione=20commenti=20di=20property=20non?= =?UTF-8?q?=20pi=C3=B9=20usate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/SVG_Components/quote-velocita.ts | 11 +---------- .../components/SVG_Components/stampo.ts | 13 ------------- .../components/SVG_Components/svgcontrostampo.ts | 11 ----------- 3 files changed, 1 insertion(+), 34 deletions(-) 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 a86f343e..c7a88272 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 @@ -4,16 +4,7 @@ import { Prop } from 'vue-property-decorator'; @Component({}) export default class QuoteVelocita extends Vue { - // @Prop({}) - // corsa: Recipe.IValue; - // @Prop({}) - // vel_salita: Recipe.IValue; - // @Prop({}) - // vel_salita_lenta: number; - // @Prop({}) - // rall_salita: number; - // :corsa="recipe.positions_frame_upper_position" - // :vel_salita="recipe.positions_frame_upper_speed" + @Prop() recipe: Recipe.IRecipe; 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 5a6e9c84..81ad7b7c 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 @@ -4,19 +4,6 @@ import { Prop } from 'vue-property-decorator'; @Component({}) export default class QuoteVelocita extends Vue { - // @Prop({}) - // corsa: Recipe.IValue; - // @Prop({}) - // vel_salita: Recipe.IValue; - // @Prop({}) - // vel_salita_lenta: Recipe.IValue; - // @Prop({}) - // rall_salita: Recipe.IValue; - // :corsa="recipe.positions_mould_upper_position" - // :vel_salita="recipe.positions_mould_upper_speed" - // :rall_salita="recipe.positions_mould_upperdeceleration_position" - // :vel_salita_lenta="recipe.positions_mould_upperdeceleration_speed" - @Prop() recipe: Recipe.IRecipe; 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 d673de3c..14ed376f 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 @@ -4,17 +4,6 @@ import { Prop } from 'vue-property-decorator'; @Component({}) export default class Controstamposvg extends Vue { - // @Prop({}) - // corsa: Recipe.IValue; - // @Prop({}) - // vel_discesa: Recipe.IValue; - // @Prop({}) - // vel_discesa_lenta: number; - // @Prop({}) - // rall_discesa: number; - // :corsa="recipe.positions_upperplate_lower_position" - // :vel_discesa="recipe.positions_upperplate_lower_speed" - @Prop() recipe: Recipe.IRecipe;