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 @@ + + + + \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/index.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/index.ts index c14e9efe..63c85329 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/index.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/index.ts @@ -3,12 +3,14 @@ import slider from "./slider.vue"; import Vue from "vue"; import keyboard from "./keyboard.vue"; import clock from "./clock.vue"; +import combo from "./combo.vue" export default { numeric, slider, keyboard, - clock + clock, + combo } Vue.directive('focusOn', { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.vue index 0962d5ac..804e6bd7 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/ciclo-formatura.vue @@ -4,28 +4,28 @@