From 65543fc44dca21d8f5e823b8a02ff3313b2bc308 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 30 Jun 2020 11:45:54 +0200 Subject: [PATCH] inserimento combo in luogo delle select --- Thermo.Active/wwwroot/config.development.json | 3 +- .../wwwroot/src/@types/recipe-current.d.ts | 3 +- .../app_modules_thermo/components/combo.ts | 17 +++++ .../app_modules_thermo/components/combo.vue | 6 ++ .../app_modules_thermo/components/index.ts | 4 +- .../base-components/ciclo-formatura.vue | 32 ++++----- .../formatura-cristallizzazione.vue | 18 ++--- .../base-components/ciclo-controstampo.vue | 30 ++++----- .../base-components/estrazione-principale.vue | 2 +- .../setup/formato/components/cornice.vue | 33 +++++----- .../setup/formato/components/lastra.vue | 39 ++++++----- .../formato/components/piastra_riduzione.vue | 33 +++++----- .../setup/imbutitura/show-imbutitura-info.vue | 4 +- .../base-components/inputSottosquadra.vue | 2 +- .../base-components/setupSottosquadra.vue | 4 +- .../base-components/nebulizzatori.vue | 30 ++++----- .../base-components/ventilatori.vue | 30 ++++----- .../base-components/riscaldi-inferiori.vue | 4 +- .../base-components/riscaldi-superiori.vue | 4 +- .../sostentamento-decompressione.vue | 66 +++++++++---------- .../base-components/vuoto-principale.vue | 2 +- Thermo.Active/wwwroot/src/config.ts | 3 +- .../wwwroot/src/store/recipe.store.ts | 17 ++++- 23 files changed, 212 insertions(+), 174 deletions(-) create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.ts create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.vue diff --git a/Thermo.Active/wwwroot/config.development.json b/Thermo.Active/wwwroot/config.development.json index 3f9529d8..58ce0f2f 100644 --- a/Thermo.Active/wwwroot/config.development.json +++ b/Thermo.Active/wwwroot/config.development.json @@ -3,5 +3,6 @@ "api": { "enabled": true, "apiServerUrl": "http://seriate.steamware.net:9000/" - } + }, + "allUIVisible": true } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/@types/recipe-current.d.ts b/Thermo.Active/wwwroot/src/@types/recipe-current.d.ts index 1ee8b8d9..bb3c5da3 100644 --- a/Thermo.Active/wwwroot/src/@types/recipe-current.d.ts +++ b/Thermo.Active/wwwroot/src/@types/recipe-current.d.ts @@ -17,7 +17,8 @@ declare module Recipe { unitMeasure: string, setpointHMI: number, setpointPLC: number, - valueAct: number + valueAct: number, + enumVal: { [id: string]: number } } interface IRecipe { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.ts new file mode 100644 index 00000000..f9311868 --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.ts @@ -0,0 +1,17 @@ +import Component from "vue-class-component"; +import Vue from "vue"; +import { Prop } from "vue-property-decorator"; + +@Component({}) +export default class Combo extends Vue { + + @Prop() + value: Recipe.IValue; + + get options() { + let result: { id: number, label: string, animation: string }[] = []; + this.value.enumVal + return result; + } + +} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.vue new file mode 100644 index 00000000..06b46d18 --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.vue @@ -0,0 +1,6 @@ + +