From f3c040fb1a1ff40c595cc342f5f3bb610bff58ac Mon Sep 17 00:00:00 2001 From: "francesco.guerrieri" Date: Mon, 27 Apr 2020 14:29:58 +0200 Subject: [PATCH 01/35] first commit paddle. create component --- Thermo.Active/wwwroot/assets/styles/base/paddle.less | 0 .../wwwroot/src/app_modules_thermo/components/paddle/burger.ts | 0 .../wwwroot/src/app_modules_thermo/components/paddle/burger.vue | 0 .../wwwroot/src/app_modules_thermo/components/paddle/sidebar.ts | 0 .../wwwroot/src/app_modules_thermo/components/paddle/sidebar.vue | 0 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Thermo.Active/wwwroot/assets/styles/base/paddle.less create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/burger.ts create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/burger.vue create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/sidebar.ts create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/sidebar.vue diff --git a/Thermo.Active/wwwroot/assets/styles/base/paddle.less b/Thermo.Active/wwwroot/assets/styles/base/paddle.less new file mode 100644 index 00000000..e69de29b diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/burger.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/burger.ts new file mode 100644 index 00000000..e69de29b diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/burger.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/burger.vue new file mode 100644 index 00000000..e69de29b diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/sidebar.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/sidebar.ts new file mode 100644 index 00000000..e69de29b diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/sidebar.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/sidebar.vue new file mode 100644 index 00000000..e69de29b From 6dfee4a431c410cc89b0c727c3e4dc6c8e81b2cf Mon Sep 17 00:00:00 2001 From: "francesco.guerrieri" Date: Mon, 27 Apr 2020 14:30:15 +0200 Subject: [PATCH 02/35] first commit paddle. create component --- .../wwwroot/assets/styles/base/paddle.less | 123 ++++++++++++++++++ Thermo.Active/wwwroot/src/App.ts | 4 + Thermo.Active/wwwroot/src/App.vue | 12 ++ .../components/paddle/burger.ts | 13 ++ .../components/paddle/burger.vue | 12 ++ .../components/paddle/sidebar.ts | 12 ++ .../components/paddle/sidebar.vue | 12 ++ 7 files changed, 188 insertions(+) diff --git a/Thermo.Active/wwwroot/assets/styles/base/paddle.less b/Thermo.Active/wwwroot/assets/styles/base/paddle.less index e69de29b..6af64d47 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/paddle.less +++ b/Thermo.Active/wwwroot/assets/styles/base/paddle.less @@ -0,0 +1,123 @@ +// out: false, sourceMap: false, main: ../style.less +@import "grid-system.less"; +@import "colors.less"; +@import "fonts.less"; + + + .hidden { + visibility: hidden; + } + + button { + cursor: pointer; + } + + /* remove blue outline */ + button:focus { + outline: 0; + } + + .burger-button { + position: relative; + height: 30px; + width: 32px; + display: block; + z-index: 999; + border: 0; + border-radius: 0; + background-color: transparent; + pointer-events: all; + transition: transform .6s cubic-bezier(.165,.84,.44,1); + } + + .burger-bar { + background-color: #130f40; + position: absolute; + top: 50%; + right: 6px; + left: 6px; + height: 2px; + width: auto; + margin-top: -1px; + transition: transform .6s cubic-bezier(.165,.84,.44,1),opacity .3s cubic-bezier(.165,.84,.44,1),background-color .6s cubic-bezier(.165,.84,.44,1); + } + + .burger-bar--1 { + -webkit-transform: translateY(-6px); + transform: translateY(-6px); + } + + .burger-bar--2 { + transform-origin: 100% 50%; + transform: scaleX(.8); + } + + .burger-button:hover .burger-bar--2 { + transform: scaleX(1); + } + + .no-touchevents .burger-bar--2:hover { + transform: scaleX(1); + } + + .burger-bar--3 { + transform: translateY(6px); + } + + #burger.active .burger-button { + transform: rotate(-180deg); + } + + #burger.active .burger-bar { + background-color: #fff; + } + + #burger.active .burger-bar--1 { + transform: rotate(45deg) + } + + #burger.active .burger-bar--2 { + opacity: 0; + } + + #burger.active .burger-bar--3 { + transform: rotate(-45deg) + } + + + + + + .slide-enter-active, + .slide-leave-active + { + transition: transform 0.2s ease; + } + + .slide-enter, + .slide-leave-to { + transform: translateX(-100%); + transition: all 150ms ease-in 0s + } + + .sidebar-backdrop { + background-color: rgba(0,0,0,.5); + width: 100vw; + height: 100vh; + position: fixed; + top: 0; + left: 0; + cursor: pointer; + } + + .sidebar-panel { + overflow-y: auto; + background-color: #130f40; + position: fixed; + left: 0; + top: 0; + height: 100vh; + z-index: 999; + padding: 3rem 20px 2rem 20px; + width: 300px; + } diff --git a/Thermo.Active/wwwroot/src/App.ts b/Thermo.Active/wwwroot/src/App.ts index a07e2fcd..5c6f93b3 100644 --- a/Thermo.Active/wwwroot/src/App.ts +++ b/Thermo.Active/wwwroot/src/App.ts @@ -10,6 +10,8 @@ import { ModalContainer, ModalNcContainer } from "./modules/base-components"; import { ModalHelper } from "@/components/modals" import { store, appModelActions, machineStatusActions } from "@/store"; import { underTheHood } from "@/app_modules/under-the-hood"; +import Burger from "@/app_modules_thermo/components/paddle/burger.vue"; +import Sidebar from "@/app_modules_thermo/components/paddle/sidebar.vue"; import * as iziToast from "izitoast"; @@ -30,6 +32,8 @@ declare var cmsClient; appFooter: Footer, modalContainer: ModalContainer, modalNcContainer: ModalNcContainer, + burger: Burger, + sidebar: Sidebar, alarmList, underTheHood, } diff --git a/Thermo.Active/wwwroot/src/App.vue b/Thermo.Active/wwwroot/src/App.vue index c8bf1de2..e12a01dd 100644 --- a/Thermo.Active/wwwroot/src/App.vue +++ b/Thermo.Active/wwwroot/src/App.vue @@ -12,6 +12,18 @@
+ + + + + +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/burger.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/burger.ts index e69de29b..f3d832c6 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/burger.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/burger.ts @@ -0,0 +1,13 @@ +import Vue from "vue"; +import Component from "vue-class-component"; + +@Component({name: 'burger'}) +export default class Burger extends Vue{ + + isBurgerActive: boolean = false; + + toggle() { + debugger + this.isBurgerActive = !this.isBurgerActive; + } +} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/burger.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/burger.vue index e69de29b..f1630633 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/burger.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/burger.vue @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112349.ts b/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112349.ts new file mode 100644 index 00000000..d1958f93 --- /dev/null +++ b/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112349.ts @@ -0,0 +1,50 @@ +import Vue from 'vue'; +import Component from 'vue-class-component'; +import {Prop} from 'vue-property-decorator'; +import Slider from "@/app_modules_thermo/components/slider.vue" +import Scheda from "@/app_modules_thermo/components/scheda.vue" + +@Component({name:'vuotoprincipale', components: { slider:Slider, scheda:Scheda}}) +export default class VuotoPrincipale extends Vue{ + + Recipe:Recipe.IRecipe={ + vacuum_main_delay:{ + range:{ + min:8, + max:105 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:57 + }, + vacuum_main_max_time:{ + range:{ + min:9, + max:127 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:30 + }, + }; + + @Prop({default:0}) + ritardo:number; + @Prop({default:0}) + percentuale:number; + @Prop({default:0}) + durata:number; + + mock_ritardo:number=this.ritardo; + mock_percentuale:number=this.percentuale; + mock_durata:number=this.durata; + +} \ No newline at end of file diff --git a/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112349.vue b/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112349.vue new file mode 100644 index 00000000..ea97211b --- /dev/null +++ b/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112349.vue @@ -0,0 +1,44 @@ + + + \ No newline at end of file diff --git a/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112646.ts b/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112646.ts new file mode 100644 index 00000000..688bc25b --- /dev/null +++ b/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112646.ts @@ -0,0 +1,63 @@ +import Vue from 'vue'; +import Component from 'vue-class-component'; +import {Prop} from 'vue-property-decorator'; +import Slider from "@/app_modules_thermo/components/slider.vue" +import Scheda from "@/app_modules_thermo/components/scheda.vue" + +@Component({name:'vuotoprincipale', components: { slider:Slider, scheda:Scheda}}) +export default class VuotoPrincipale extends Vue{ + + Recipe:Recipe.IRecipe={ + vacuum_main_delay:{ + range:{ + min:8, + max:105 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:57 + }, + vacuum_main_max_time:{ + range:{ + min:9, + max:127 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:30 + }, + vacuum_main_manual:{ + range:{ + min:4, + max:115 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:8 + }, + }; + + @Prop({default:0}) + ritardo:number; + @Prop({default:0}) + percentuale:number; + @Prop({default:0}) + durata:number; + + mock_ritardo:number=this.ritardo; + mock_percentuale:number=this.percentuale; + mock_durata:number=this.durata; + +} \ No newline at end of file diff --git a/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112646.vue b/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112646.vue new file mode 100644 index 00000000..d8394fb2 --- /dev/null +++ b/.history/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale_20200504112646.vue @@ -0,0 +1,44 @@ + + + \ 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 new file mode 100644 index 00000000..ac8d196d --- /dev/null +++ b/Thermo.Active/wwwroot/src/@types/recipe-current.d.ts @@ -0,0 +1,57 @@ +declare module Recipe{ + + interface IRange{ + min: number; + max: number; + } + + interface IStatus{ + visible: boolean; + enabled: boolean; + hasError: boolean; + } + + interface IValue{ + range:IRange, + status:IStatus, + unitMeasure:string, + valueAct: number + } + + interface IRecipe{ + vacuum_main_start?:IValue, + vacuum_main_delay?:IValue, + vacuum_main_max_time?:IValue, + vacuum_main_1_chart_setpointx?:IValue, + vacuum_main_1_chart_setpointy?:IValue, + vacuum_main_2_chart_setpointx?:IValue, + vacuum_main_2_chart_setpointy?:IValue, + vacuum_main_3_chart_setpointx?:IValue, + vacuum_main_3_chart_setpointy?:IValue, + vacuum_main_manual?:IValue, + vacuum_direct_enabled?:IValue, + vacuum_direct_delay?:IValue, + vacuum_direct_time?:IValue, + vacuum_aux_enabled?:IValue, + vacuum_aux_delay?:IValue, + vacuum_aux_max_time?:IValue, + vacuum_aux_1_chart_setpointx?:IValue, + vacuum_aux_1_chart_setpointy?:IValue, + vacuum_aux_2_chart_setpointx?:IValue, + vacuum_aux_2_chart_setpointy?:IValue, + vacuum_aux_3_chart_setpointx?:IValue, + vacuum_aux_3_chart_setpointy?:IValue, + vacuum_aux_manual?:IValue, + vacuum_pre_enabled?:IValue, + vacuum_pre_delay?:IValue, + vacuum_pre_max_time?:IValue, + vacuum_pre_1_chart_setpointx?:IValue, + vacuum_pre_1_chart_setpointy?:IValue, + vacuum_pre_2_chart_setpointx?:IValue, + vacuum_pre_2_chart_setpointy?:IValue, + vacuum_pre_3_chart_setpointx?:IValue, + vacuum_pre_3_chart_setpointy?:IValue + } + + +} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.ts index d5fe1d36..688bc25b 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.ts @@ -7,6 +7,48 @@ import Scheda from "@/app_modules_thermo/components/scheda.vue" @Component({name:'vuotoprincipale', components: { slider:Slider, scheda:Scheda}}) export default class VuotoPrincipale extends Vue{ + Recipe:Recipe.IRecipe={ + vacuum_main_delay:{ + range:{ + min:8, + max:105 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:57 + }, + vacuum_main_max_time:{ + range:{ + min:9, + max:127 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:30 + }, + vacuum_main_manual:{ + range:{ + min:4, + max:115 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:8 + }, + }; + @Prop({default:0}) ritardo:number; @Prop({default:0}) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue index 5e4c20cd..d8394fb2 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue @@ -13,17 +13,17 @@
- +
- +
- +
- +
@@ -34,9 +34,9 @@
- +
- +
From 16bda5b2a9ac8f6b641416a19aebb497c16643da Mon Sep 17 00:00:00 2001 From: Alessio Date: Mon, 4 May 2020 14:28:21 +0200 Subject: [PATCH 14/35] format and binding of the data --- .../base-components/aria-controstampo.ts | 141 ++++++++++++++++-- .../base-components/aria-controstampo.vue | 33 +++- .../base-components/ciclo-controstampo.ts | 49 +++++- .../base-components/ciclo-controstampo.vue | 18 ++- .../setup/imbutitura/show-imbutitura-info.ts | 121 +++++++++++++++ .../setup/imbutitura/show-imbutitura-info.vue | 37 +++-- .../SVG_Components/SVG-termo-superiore.ts | 6 - .../SVG_Components/SVG-termo-superiore.vue | 10 +- .../base-components/termo-superiore.ts | 19 --- .../base-components/termo-superiore.vue | 8 +- 10 files changed, 375 insertions(+), 67 deletions(-) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.ts index 659a67eb..45d47b8d 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.ts @@ -7,14 +7,137 @@ import Scheda from "@/app_modules_thermo/components/scheda.vue"; @Component({name:"ariacontrostampo", components: { scheda:Scheda,slider:Slider}}) export default class AriaControstampo extends Vue { - @Prop({default:0}) - ritardo:number; - - mockR:number=this.ritardo; - - @Prop({default:0}) - durata:number; - - mockD:number=this.durata; + recipe:Recipe.IRecipe={ + upperplate_air_enable: { + range: { + min: 8, + max: 181 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 72 + }, + upperplate_air_delay: { + range: { + min: 7, + max: 152 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 70 + }, + upperplate_air_max_time: { + range: { + min: 9, + max: 192 + }, + status: { + visible: true, + enabled: true, + hasError: true + }, + unitMeasure: "", + valueAct: 195 + }, + upperplate_air_1_chart_setpointx: { + range: { + min: 0, + max: 141 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 108 + }, + upperplate_air_1_chart_setpointy: { + range: { + min: 4, + max: 127 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 104 + }, + upperplate_air_2_chart_setpointx: { + range: { + min: 2, + max: 167 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 86 + }, + upperplate_air_2_chart_setpointy: { + range: { + min: 9, + max: 109 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 22 + }, + upperplate_air_3_chart_setpointx: { + range: { + min: 8, + max: 165 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 87 + }, + upperplate_air_3_chart_setpointy: { + range: { + min: 3, + max: 190 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 60 + }, + upperplate_air_manual: { + range: { + min: 3, + max: 191 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 28 + }, + } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue index 2be9a458..e03a56e1 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue @@ -4,22 +4,41 @@
- +
- + +
- - - + + +
- +
- + +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.ts index e8074db2..7a7c483e 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.ts @@ -13,14 +13,49 @@ import ToggleButton from "@/components/toggleButton.vue"; }) export default class CicloControstampo extends Vue { - @Prop({default:0}) - durata:number; - @Prop({default:0}) - ritardo:number; + recipe:Recipe.IRecipe={ + upperplate_cycle_type: { + range: { + min: 6, + max: 114 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 29 + }, + upperplate_cycle_delay: { + range: { + min: 9, + max: 129 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 11 + }, + upperplate_cycle_time: { + range: { + min: 5, + max: 157 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 107 + }, + + } abilit:boolean=false; - mockD:number=this.durata; - mockR:number=this.ritardo; - } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.vue index 5705eb04..7a604484 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/ciclo-controstampo.vue @@ -14,14 +14,24 @@
- +
- + +
- +
- + +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts index bdb4aefb..b79c5d43 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts @@ -17,6 +17,127 @@ import Scheda from "@/app_modules_thermo/components/scheda.vue"; }) export default class ShowImbutituraInfo extends Vue { + recipe:Recipe.IRecipe={ + drawing_type: { + range: { + min: 2, + max: 155 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 139 + }, + drawing_height: { + range: { + min: 2, + max: 169 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 115 + }, + drawing_delay: { + range: { + min: 5, + max: 146 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 87 + }, + drawing_1_chart_setpointx: { + range: { + min: 8, + max: 145 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 48 + }, + drawing_1_chart_setpointy: { + range: { + min: 6, + max: 105 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 76 + }, + drawing_photocell: { + range: { + min: 8, + max: 185 + }, + status: { + visible: true, + enabled: true, + hasError: true + }, + unitMeasure: "", + valueAct: 188 + }, + drawing_mantaining_flow: { + range: { + min: 2, + max: 143 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 137 + }, + drawing_manual: { + range: { + min: 1, + max: 138 + }, + status: { + visible: true, + enabled: true, + hasError: true + }, + unitMeasure: "", + valueAct: 141 + }, + drawing_mould_up_delay: { + range: { + min: 6, + max: 118 + }, + status: { + visible: true, + enabled: true, + hasError: false + }, + unitMeasure: "", + valueAct: 44 + }, + + } + @Prop({default:0}) ritardo:number; @Prop({default:0}) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue index 5a53aea3..0bc41162 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue @@ -11,9 +11,13 @@
- +
- + +
@@ -31,23 +35,38 @@
- +
- + +
- +
- + +
- +
- + +
- +
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 1fd94220..0d9ec9a3 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 @@ -16,10 +16,4 @@ export default class SVGTermoregolazioneSuperiore extends Vue{ @Prop({default:0}) perc_riposo:number; - mock_max:number=this.max - mock_min:number=this.min - mock_inizio:number=this.inizio - mock_fine:number=this.fine - mock_perc_riposo:number=this.perc_riposo - } \ 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 4c0d97e5..3d6b8b7a 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 @@ -3,25 +3,25 @@
- +
- +
- +
- +
- +
270 °C 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 6421412d..1e900d3b 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 @@ -115,23 +115,4 @@ export default class TermoregolazioneSuperiore extends Vue{ } }; - // @Prop({default:0}) - // inizioreg:number; - // @Prop({default:0}) - // finereg:number; - // @Prop({default:0}) - // max:number; - // @Prop({default:0}) - // min:number; - // @Prop({default:0}) - // riposo:number; - - // mock_inizioreg:number=this.inizioreg - // mock_finereg:number=this.finereg - // mock_max:number=this.max - // mock_min:number=this.min - // mock_riposo:number=this.riposo - - // enabling:boolean=true; - } \ 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 3b3582e9..e2b45b1d 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 @@ -64,7 +64,13 @@
- + From bfd963f8d723cf3fd4c29bf0eb5d2e2941d45389 Mon Sep 17 00:00:00 2001 From: Alessio Date: Mon, 4 May 2020 16:18:33 +0200 Subject: [PATCH 15/35] fix paddle --- .../wwwroot/assets/styles/base/paddle.less | 238 ++++++++------- Thermo.Active/wwwroot/assets/styles/style.css | 286 ++++++++---------- Thermo.Active/wwwroot/src/App.vue | 9 +- .../components/paddle/sidebar.vue | 2 +- .../components/paddle/switch-button.vue | 14 +- .../app_modules_thermo/components/scheda.ts | 9 + .../app_modules_thermo/components/scheda.vue | 4 +- .../base-components/aria-controstampo.vue | 12 + .../setup/imbutitura/show-imbutitura-info.vue | 4 + 9 files changed, 286 insertions(+), 292 deletions(-) diff --git a/Thermo.Active/wwwroot/assets/styles/base/paddle.less b/Thermo.Active/wwwroot/assets/styles/base/paddle.less index 2499730e..d96d7bfd 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/paddle.less +++ b/Thermo.Active/wwwroot/assets/styles/base/paddle.less @@ -6,88 +6,81 @@ html { height: 100%; overflow:hidden; - } +} body { border: 0; margin: 0; padding: 0; height: 100%; } + .hidden { + visibility: hidden; + } - .main-nav { + nav { position: absolute; top: 50%; right: 0; - } + + .active button{ + transform: translate(-761px, 0px); + } + + div{ + + button { + position: relative; + height: 30px; + width: 32px; + display: block; + z-index: 9999; + border: 0; + border-radius: 0; + pointer-events: all; + background: #dddddd; + border-bottom-left-radius: 90px; + border-top-left-radius: 90px; + height: 90px; + width: 45px; + + div{ + display: grid; + grid-template-columns: repeat(2, 1fr); + grid-template-rows: 1fr 1fr; + align-items: center; + justify-items: center; + padding: 5px; + + + div { + width: 10px; + height: 10px; + border-radius: 10px; + margin: 3px; + background: #002680; + + } + + } + + } + + } +} + +// .slide-enter-active, +// .slide-leave-active +// { +// transition: left,right 0s ease-in-out; +// } - .text-head-sidebar{ - margin: 10px auto; - font-size: 24px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: #002680; - } +// .slide-enter, +// .slide-leave-to { +// transition: right,left 0s ease-in-out +// } - .text-box-paddle{ - display: flex; - width: 268px; - height: 78px; - font-family: WorkSans; - font-size: 18px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: #ffffff; - margin: 10px; - - - label{ - width: 117px; - margin: 10px; - } - - } - - .text-box-paddle.text-soft{ - label{ - width: 100%; - align-self: center; - } - } - - .box-sidebar-panel{ - display: grid; - grid-template-columns: repeat(2, 1fr); - align-items: center; - justify-items: center; - } - - .sidebar-panel-nav{ - width: 286px; - height: 100px; - border-radius: 2px; - box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.5); - background-color: #808e96; - margin: 10px 30px; - } - - .slide-enter-active, - .slide-leave-active - { - transition: left,right 0s ease-in-out; - } - - .slide-enter, - .slide-leave-to { - transition: right,left 0s ease-in-out - } +.sidebar{ .sidebar-backdrop { width: 100vw; @@ -112,58 +105,73 @@ html { border-radius: 4px; box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5); background-color: #dddddd; - } - .hidden { - visibility: hidden; - } + .text-head-sidebar{ + margin: 10px auto; + font-size: 24px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + text-align: center; + color: #002680; + } - button { - cursor: pointer; - } + .box-sidebar-panel{ + display: grid; + grid-template-columns: repeat(2, 1fr); + align-items: center; + justify-items: center; - .switch-button { - position: relative; - height: 30px; - width: 32px; - display: block; - z-index: 9999; - border: 0; - border-radius: 0; - pointer-events: all; - background: #dddddd; - border-bottom-left-radius: 90px; - border-top-left-radius: 90px; - height: 90px; - width: 45px; - } + .sidebar-panel-nav{ + width: 286px; + height: 100px; + border-radius: 2px; + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.5); + background-color: #808e96; + margin: 10px 30px; - .circle-button { - width: 10px; - height: 10px; - border-radius: 10px; - margin: 3px; - background: #002680; + .text-box-paddle{ + display: flex; + width: 268px; + height: 78px; + font-family: WorkSans; + font-size: 18px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #ffffff; + margin: 10px; + + i{ + text-align: end; + width: 50px; + color: #bbbcbc; + } + + label{ + width: 117px; + margin: 10px; + } + + } + + .text-box-paddle.text-soft{ + label{ + width: 100%; + align-self: center; + } + } + + } + + } } - - .switch-paddle.active .switch-button { - transform: translate(-761px, 0px); - } +} - .box-circle-paddle{ - display: grid; - grid-template-columns: repeat(2, 1fr); - grid-template-rows: 1fr 1fr; - align-items: center; - justify-items: center; - padding: 5px; - } - - .gear-box-paddle{ - text-align: end; - width: 50px; - color: #bbbcbc; - } diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index c9931dc4..8873845a 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -4444,166 +4444,6 @@ grid-column: 0.8; grid-row: 0.5; } - -html { - height: 100%; - overflow: hidden; -} -body { - border: 0; - margin: 0; - padding: 0; - height: 100%; -} -.main-nav { - position: absolute; - top: 50%; - right: 0; -} -.text-head-sidebar { - margin: 10px auto; - font-size: 24px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: #002680; -} -.text-box-paddle { - display: flex; - width: 268px; - height: 78px; - font-family: WorkSans; - font-size: 18px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: #ffffff; - margin: 10px; -} -.text-box-paddle label { - width: 117px; - margin: 10px; -} -.text-box-paddle.text-soft label { - width: 100%; - align-self: center; -} -.box-sidebar-panel { - display: grid; - grid-template-columns: repeat(2, 1fr); - align-items: center; - justify-items: center; -} -.sidebar-panel-nav { - width: 286px; - height: 100px; - border-radius: 2px; - box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.5); - background-color: #808e96; - margin: 10px 30px; -} -.slide-enter-active, -.slide-leave-active { - transition: left, right 0s ease-in-out; -} -.slide-enter, -.slide-leave-to { - transition: right, left 0s ease-in-out; -} -.sidebar-backdrop { - width: 100vw; - height: 100vh; - position: fixed; - top: 0; - left: 0; - cursor: pointer; -} -.sidebar-panel { - overflow-y: auto; - background-color: #130f40; - position: fixed; - right: 0; - top: 141px; - height: 100vh; - z-index: 900; - padding: 3rem 20px 2rem 20px; - width: 721px; - height: 920px; - border-radius: 4px; - box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5); - background-color: #dddddd; -} -.hidden { - visibility: hidden; -} -button { - cursor: pointer; -} -.switch-button { - position: relative; - height: 30px; - width: 32px; - display: block; - z-index: 9999; - border: 0; - border-radius: 0; - pointer-events: all; - background: #dddddd; - border-bottom-left-radius: 90px; - border-top-left-radius: 90px; - height: 90px; - width: 45px; -} -.circle-button { - width: 10px; - height: 10px; - border-radius: 10px; - margin: 3px; - background: #002680; -} -.switch-paddle.active .switch-button { - transform: translate(-761px, 0px); -} -.box-circle-paddle { - display: grid; - grid-template-columns: repeat(2, 1fr); - grid-template-rows: 1fr 1fr; - align-items: center; - justify-items: center; - padding: 5px; -} -.gear-box-paddle { - text-align: end; - width: 50px; - color: #bbbcbc; -} -.no-touchevents .burger-bar--2:hover { - transform: scaleX(1); -} -.burger-bar--3 { - transform: translateY(6px); -} -#burger.active .burger-button { - transform: rotate(-180deg); -} -#burger.active .burger-bar { - background-color: #fff; -} -#burger.active .burger-bar--1 { - transform: rotate(45deg); -} -#burger.active .burger-bar--2 { - opacity: 0; -} -#burger.active .burger-bar--3 { - transform: rotate(-45deg); -} - .circle-gantt { height: 70px; } @@ -4662,6 +4502,132 @@ button { width: 20px; height: 20px; } +html { + height: 100%; + overflow: hidden; +} +body { + border: 0; + margin: 0; + padding: 0; + height: 100%; +} +.hidden { + visibility: hidden; +} +nav { + position: absolute; + top: 50%; + right: 0; +} +nav .active button { + transform: translate(-761px, 0px); +} +nav div button { + position: relative; + height: 30px; + width: 32px; + display: block; + z-index: 9999; + border: 0; + border-radius: 0; + pointer-events: all; + background: #dddddd; + border-bottom-left-radius: 90px; + border-top-left-radius: 90px; + height: 90px; + width: 45px; +} +nav div button div { + display: grid; + grid-template-columns: repeat(2, 1fr); + grid-template-rows: 1fr 1fr; + align-items: center; + justify-items: center; + padding: 5px; +} +nav div button div div { + width: 10px; + height: 10px; + border-radius: 10px; + margin: 3px; + background: #002680; +} +.sidebar .sidebar-backdrop { + width: 100vw; + height: 100vh; + position: fixed; + top: 0; + left: 0; + cursor: pointer; +} +.sidebar .sidebar-panel { + overflow-y: auto; + background-color: #130f40; + position: fixed; + right: 0; + top: 141px; + height: 100vh; + z-index: 900; + padding: 3rem 20px 2rem 20px; + width: 721px; + height: 920px; + border-radius: 4px; + box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5); + background-color: #dddddd; +} +.sidebar .sidebar-panel .text-head-sidebar { + margin: 10px auto; + font-size: 24px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + text-align: center; + color: #002680; +} +.sidebar .sidebar-panel .box-sidebar-panel { + display: grid; + grid-template-columns: repeat(2, 1fr); + align-items: center; + justify-items: center; +} +.sidebar .sidebar-panel .box-sidebar-panel .sidebar-panel-nav { + width: 286px; + height: 100px; + border-radius: 2px; + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.5); + background-color: #808e96; + margin: 10px 30px; +} +.sidebar .sidebar-panel .box-sidebar-panel .sidebar-panel-nav .text-box-paddle { + display: flex; + width: 268px; + height: 78px; + font-family: WorkSans; + font-size: 18px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #ffffff; + margin: 10px; +} +.sidebar .sidebar-panel .box-sidebar-panel .sidebar-panel-nav .text-box-paddle i { + text-align: end; + width: 50px; + color: #bbbcbc; +} +.sidebar .sidebar-panel .box-sidebar-panel .sidebar-panel-nav .text-box-paddle label { + width: 117px; + margin: 10px; +} +.sidebar .sidebar-panel .box-sidebar-panel .sidebar-panel-nav .text-box-paddle.text-soft label { + width: 100%; + align-self: center; +} .modal.estrazione-info { width: 560px; height: 411px; diff --git a/Thermo.Active/wwwroot/src/App.vue b/Thermo.Active/wwwroot/src/App.vue index 12f90cab..4a36198b 100644 --- a/Thermo.Active/wwwroot/src/App.vue +++ b/Thermo.Active/wwwroot/src/App.vue @@ -18,16 +18,11 @@
- -
-
+
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/switch-button.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/switch-button.vue index 88ad7eda..59161c66 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/switch-button.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/switch-button.vue @@ -1,12 +1,12 @@ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue index e03a56e1..5c87df5d 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue @@ -17,15 +17,27 @@
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue index 0bc41162..30c6423e 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue @@ -65,7 +65,11 @@
From 4f9d26c536034416dd5fe1f9336c11da0e4cb4e4 Mon Sep 17 00:00:00 2001 From: Alessio Date: Tue, 5 May 2020 11:42:03 +0200 Subject: [PATCH 16/35] fix paddle --- .../wwwroot/assets/styles/base/paddle.less | 293 +++++++++--------- Thermo.Active/wwwroot/assets/styles/style.css | 34 +- .../components/paddle/sidebar.vue | 93 +++--- 3 files changed, 215 insertions(+), 205 deletions(-) diff --git a/Thermo.Active/wwwroot/assets/styles/base/paddle.less b/Thermo.Active/wwwroot/assets/styles/base/paddle.less index d96d7bfd..e8c1944e 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/paddle.less +++ b/Thermo.Active/wwwroot/assets/styles/base/paddle.less @@ -17,161 +17,172 @@ html { visibility: hidden; } - nav { - position: absolute; - top: 50%; - right: 0; +.container{ - .active button{ - transform: translate(-761px, 0px); - } - - div{ - - button { - position: relative; - height: 30px; - width: 32px; - display: block; - z-index: 9999; - border: 0; - border-radius: 0; - pointer-events: all; - background: #dddddd; - border-bottom-left-radius: 90px; - border-top-left-radius: 90px; - height: 90px; - width: 45px; + #app{ + nav { + position: absolute; + top: 50%; + right: 0; + + .active button{ + transform: translate(-761px, 0px); + } + div{ - display: grid; - grid-template-columns: repeat(2, 1fr); - grid-template-rows: 1fr 1fr; - align-items: center; - justify-items: center; - padding: 5px; + + button { + position: relative; + height: 30px; + width: 32px; + display: block; + z-index: 9999; + border: 0; + border-radius: 0; + pointer-events: all; + background: #dddddd; + border-bottom-left-radius: 90px; + border-top-left-radius: 90px; + height: 90px; + width: 45px; + + div{ + display: grid; + grid-template-columns: repeat(2, 1fr); + grid-template-rows: 1fr 1fr; + align-items: center; + justify-items: center; + padding: 5px; + + + div { + width: 2px; + height: 2px; + border-radius: 10px; + margin: 2px; + background: #002680; + + } + + } + + } + + } + } + + + // .slide-enter-active, + // .slide-leave-active + // { + // transition: left,right 0s ease-in-out; + // } + + // .slide-enter, + // .slide-leave-to { + // transition: right,left 0s ease-in-out + // } + + .sidebar{ + + .sidebar-backdrop{ + width: 100vw; + height: 100vh; + position: fixed; + top: 0; + left: 0; + cursor: pointer; + } + .sidebar-panel{ - div { - width: 10px; - height: 10px; - border-radius: 10px; - margin: 3px; - background: #002680; - - } - - } - - } - - } -} - - -// .slide-enter-active, -// .slide-leave-active -// { -// transition: left,right 0s ease-in-out; -// } - -// .slide-enter, -// .slide-leave-to { -// transition: right,left 0s ease-in-out -// } - -.sidebar{ - - .sidebar-backdrop { - width: 100vw; - height: 100vh; - position: fixed; - top: 0; - left: 0; - cursor: pointer; - } - - .sidebar-panel { - overflow-y: auto; - background-color: #130f40; - position: fixed; - right: 0; - top: 141px; - height: 100vh; - z-index: 900; - padding: 3rem 20px 2rem 20px; - width: 721px; - height: 920px; - border-radius: 4px; - box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5); - background-color: #dddddd; - - .text-head-sidebar{ - margin: 10px auto; - font-size: 24px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: #002680; - } - - .box-sidebar-panel{ - display: grid; - grid-template-columns: repeat(2, 1fr); - align-items: center; - justify-items: center; - - .sidebar-panel-nav{ - width: 286px; - height: 100px; - border-radius: 2px; - box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.5); - background-color: #808e96; - margin: 10px 30px; - - .text-box-paddle{ - display: flex; - width: 268px; - height: 78px; - font-family: WorkSans; - font-size: 18px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: #ffffff; - margin: 10px; + overflow-y: auto; + background-color: #130f40; + position: fixed; + right: 0; + top: 141px; + height: 100vh; + z-index: 900; + padding: 3rem 20px 2rem 20px; + width: 721px; + height: 920px; + border-radius: 4px; + box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5); + background-color: #dddddd; - i{ - text-align: end; - width: 50px; - color: #bbbcbc; + .text-head-sidebar{ + margin: 10px auto; + font-size: 24px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + text-align: center; + color: #002680; } - label{ - width: 117px; - margin: 10px; + .box-sidebar-panel{ + display: grid; + grid-template-columns: repeat(2, 1fr); + align-items: center; + justify-items: center; + + .sidebar-panel-nav{ + width: 286px; + height: 100px; + border-radius: 2px; + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.5); + background-color: #808e96; + margin: 10px 30px; + + .text-box-paddle{ + display: flex; + width: 268px; + height: 78px; + font-family: WorkSans; + font-size: 18px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #ffffff; + margin: 10px; + + i{ + text-align: end; + width: 50px; + color: #bbbcbc; + } + + label{ + width: 117px; + margin: 10px; + } + + } + + .text-box-paddle.text-soft{ + label{ + width: 100%; + align-self: center; + } + } + + } + } + } + - .text-box-paddle.text-soft{ - label{ - width: 100%; - align-self: center; - } - } - - } - + } } } - - + \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index 8873845a..5cd1214d 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -4515,15 +4515,15 @@ body { .hidden { visibility: hidden; } -nav { +.container #app nav { position: absolute; top: 50%; right: 0; } -nav .active button { +.container #app nav .active button { transform: translate(-761px, 0px); } -nav div button { +.container #app nav div button { position: relative; height: 30px; width: 32px; @@ -4538,7 +4538,7 @@ nav div button { height: 90px; width: 45px; } -nav div button div { +.container #app nav div button div { display: grid; grid-template-columns: repeat(2, 1fr); grid-template-rows: 1fr 1fr; @@ -4546,14 +4546,14 @@ nav div button div { justify-items: center; padding: 5px; } -nav div button div div { - width: 10px; - height: 10px; +.container #app nav div button div div { + width: 2px; + height: 2px; border-radius: 10px; - margin: 3px; + margin: 2px; background: #002680; } -.sidebar .sidebar-backdrop { +.container #app .sidebar .sidebar-backdrop { width: 100vw; height: 100vh; position: fixed; @@ -4561,7 +4561,7 @@ nav div button div div { left: 0; cursor: pointer; } -.sidebar .sidebar-panel { +.container #app .sidebar .sidebar-panel { overflow-y: auto; background-color: #130f40; position: fixed; @@ -4576,7 +4576,7 @@ nav div button div div { box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5); background-color: #dddddd; } -.sidebar .sidebar-panel .text-head-sidebar { +.container #app .sidebar .sidebar-panel .text-head-sidebar { margin: 10px auto; font-size: 24px; font-weight: 500; @@ -4587,13 +4587,13 @@ nav div button div div { text-align: center; color: #002680; } -.sidebar .sidebar-panel .box-sidebar-panel { +.container #app .sidebar .sidebar-panel .box-sidebar-panel { display: grid; grid-template-columns: repeat(2, 1fr); align-items: center; justify-items: center; } -.sidebar .sidebar-panel .box-sidebar-panel .sidebar-panel-nav { +.container #app .sidebar .sidebar-panel .box-sidebar-panel .sidebar-panel-nav { width: 286px; height: 100px; border-radius: 2px; @@ -4601,7 +4601,7 @@ nav div button div div { background-color: #808e96; margin: 10px 30px; } -.sidebar .sidebar-panel .box-sidebar-panel .sidebar-panel-nav .text-box-paddle { +.container #app .sidebar .sidebar-panel .box-sidebar-panel .sidebar-panel-nav .text-box-paddle { display: flex; width: 268px; height: 78px; @@ -4615,16 +4615,16 @@ nav div button div div { color: #ffffff; margin: 10px; } -.sidebar .sidebar-panel .box-sidebar-panel .sidebar-panel-nav .text-box-paddle i { +.container #app .sidebar .sidebar-panel .box-sidebar-panel .sidebar-panel-nav .text-box-paddle i { text-align: end; width: 50px; color: #bbbcbc; } -.sidebar .sidebar-panel .box-sidebar-panel .sidebar-panel-nav .text-box-paddle label { +.container #app .sidebar .sidebar-panel .box-sidebar-panel .sidebar-panel-nav .text-box-paddle label { width: 117px; margin: 10px; } -.sidebar .sidebar-panel .box-sidebar-panel .sidebar-panel-nav .text-box-paddle.text-soft label { +.container #app .sidebar .sidebar-panel .box-sidebar-panel .sidebar-panel-nav .text-box-paddle.text-soft label { width: 100%; align-self: center; } diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/sidebar.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/sidebar.vue index cb43b0f4..5a6fa93f 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/sidebar.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/sidebar.vue @@ -1,7 +1,8 @@ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts index 4e649ba6..e474b29b 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts @@ -11,6 +11,48 @@ slider:Slider}}) export default class EstrazionePrincipale extends Vue{ + recipe:Recipe.IRecipe={ + extraction_main_delay:{ + range:{ + min:5, + max:155 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:15 + }, + extraction_main_1_chart_setpointx:{ + range:{ + min:0, + max:154 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:128 + }, + extraction_main_1_chart_setpointy:{ + range:{ + min:6, + max:106 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:49 + } + }; + @Prop({default:0}) ritardo:number; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue index 9a5ad91f..eafdf147 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue @@ -4,9 +4,9 @@
- +
- +
- +
- +
- +
\ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.ts index 495aa7bf..34d31368 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.ts @@ -15,9 +15,17 @@ export default class Termoragolatori extends Vue { recipe:Recipe.IRecipe={ options_thermoregulator_1_enabled:{ - visible:true, - enabled:true, - hasError:false + range:{ + min:5, + max:171 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:132 }, options_thermoregulator_1_setpoint:{ range:{ @@ -34,9 +42,17 @@ export default class Termoragolatori extends Vue { }, options_thermoregulator_2_enabled:{ - visible:true, - enabled:true, - hasError:false + range:{ + min:8, + max:107 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:53 }, options_thermoregulator_2_setpoint:{ range:{ @@ -53,9 +69,17 @@ export default class Termoragolatori extends Vue { }, options_thermoregulator_3_enabled:{ - visible:true, - enabled:true, - hasError:false + range:{ + min:7, + max:112 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:30 }, options_thermoregulator_3_setpoint:{ range:{ @@ -72,9 +96,17 @@ export default class Termoragolatori extends Vue { }, options_thermoregulator_4_enabled:{ - visible:true, - enabled:true, - hasError:false + range:{ + min:1, + max:166 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:148 }, options_thermoregulator_4_setpoint:{ range:{ @@ -91,9 +123,17 @@ export default class Termoragolatori extends Vue { }, options_thermoregulator_5_enabled:{ - visible:true, - enabled:true, - hasError:false + range:{ + min:3, + max:134 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:42 }, options_thermoregulator_5_setpoint:{ range:{ @@ -110,9 +150,17 @@ export default class Termoragolatori extends Vue { }, options_thermoregulator_6_enabled:{ - visible:true, - enabled:true, - hasError:false + range:{ + min:0, + max:178 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:130 }, options_thermoregulator_6_setpoint:{ range:{ @@ -129,9 +177,17 @@ export default class Termoragolatori extends Vue { }, options_thermoregulator_7_enabled:{ - visible:true, - enabled:true, - hasError:false + range:{ + min:3, + max:163 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:120 }, options_thermoregulator_7_setpoint:{ range:{ @@ -148,9 +204,17 @@ export default class Termoragolatori extends Vue { }, options_thermoregulator_8_enabled:{ - visible:true, - enabled:true, - hasError:false + range:{ + min:9, + max:158 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:101 }, options_thermoregulator_8_setpoint:{ range:{ @@ -167,9 +231,17 @@ export default class Termoragolatori extends Vue { }, options_thermoregulator_9_enabled:{ - visible:true, - enabled:true, - hasError:false + range:{ + min:6, + max:112 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:43 }, options_thermoregulator_9_setpoint:{ range:{ @@ -186,9 +258,17 @@ export default class Termoragolatori extends Vue { }, options_thermoregulator_10_enabled:{ - visible:true, - enabled:true, - hasError:false + range:{ + min:7, + max:147 + }, + status:{ + visible:true, + enabled:true, + hasError:false + }, + unitMeasure:"", + valueAct:8 }, options_thermoregulator_10_setpoint:{ range:{ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue index a19c25a2..7d158e54 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue @@ -4,71 +4,71 @@ @@ -78,111 +78,81 @@
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts index ef52de5b..6e4bff73 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/show-opzioni-info.ts @@ -20,6 +20,7 @@ export default class ShowOpzioniInfo extends Vue { annulla() { ModalHelper.HideModal(); + messageService.publishToChannel('show-estrazione-info'); }; conferma() { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts index 9d3608cc..f6c3c7a8 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts @@ -18,11 +18,13 @@ export default class Raffreddamento extends Vue{ show: string = "ventilatori"; annulla(){ - ModalHelper.HideModal(); + ModalHelper.HideModal(); + messageService.publishToChannel('show-controstampo-info'); }; conferma(){ ModalHelper.HideModal(); + messageService.publishToChannel('show-vuoto-info'); }; async beforeMount() { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts index 2c8b84e1..d3f396c2 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/show-vuoto-info.ts @@ -13,10 +13,12 @@ export default class ShowVuotoInfo extends Vue { annulla(){ ModalHelper.HideModal(); + messageService.publishToChannel('show-raffreddamento-info'); }; conferma(){ ModalHelper.HideModal(); + messageService.publishToChannel('show-estrazione-info'); }; async beforeMount() { From 85a387cc8657d1df65da79c2dd2fb0f7d07d85ca Mon Sep 17 00:00:00 2001 From: Alessio Date: Thu, 7 May 2020 12:22:12 +0200 Subject: [PATCH 35/35] fix merge --- .../wwwroot/assets/styles/base/paddle.css | 65 ------------------- .../base-components/estrazione-principale.ts | 8 --- .../base-components/estrazione-principale.vue | 15 +++-- .../base-components/inputSottosquadra.vue | 21 +++++- .../components/base-components/inputTermo.ts | 26 +------- .../components/base-components/inputTermo.vue | 7 +- .../base-components/setupSottosquadra.vue | 6 +- .../components/sottosquadra-stampo.vue | 35 +++++----- .../opzioni/components/termoregolatori.vue | 13 +--- .../components/base-components/ventilatori.ts | 6 -- .../base-components/ventilatori.vue | 14 +++- .../components/show-raffreddamento-info.vue | 2 +- .../base-components/vuoto-principale.vue | 17 +++-- 13 files changed, 77 insertions(+), 158 deletions(-) delete mode 100644 Thermo.Active/wwwroot/assets/styles/base/paddle.css diff --git a/Thermo.Active/wwwroot/assets/styles/base/paddle.css b/Thermo.Active/wwwroot/assets/styles/base/paddle.css deleted file mode 100644 index ecc5a8e2..00000000 --- a/Thermo.Active/wwwroot/assets/styles/base/paddle.css +++ /dev/null @@ -1,65 +0,0 @@ -.hidden { - visibility: hidden; -} -button { - cursor: pointer; -} -/* remove blue outline */ -button:focus { - outline: 0; -} -.burger-button { - position: relative; - height: 30px; - width: 32px; - display: block; - z-index: 999; - border: 0; - border-radius: 0; - background-color: transparent; - pointer-events: all; - transition: transform 0.6s cubic-bezier(0.165, 0.84, 0.44, 1); -} -.burger-bar { - background-color: #130f40; - position: absolute; - top: 50%; - right: 6px; - left: 6px; - height: 2px; - width: auto; - margin-top: -1px; - transition: transform 0.6s cubic-bezier(0.165, 0.84, 0.44, 1), opacity 0.3s cubic-bezier(0.165, 0.84, 0.44, 1), background-color 0.6s cubic-bezier(0.165, 0.84, 0.44, 1); -} -.burger-bar--1 { - -webkit-transform: translateY(-6px); - transform: translateY(-6px); -} -.burger-bar--2 { - transform-origin: 100% 50%; - transform: scaleX(0.8); -} -.burger-button:hover .burger-bar--2 { - transform: scaleX(1); -} -.no-touchevents .burger-bar--2:hover { - transform: scaleX(1); -} -.burger-bar--3 { - transform: translateY(6px); -} -#burger.active .burger-button { - transform: rotate(-180deg); -} -#burger.active .burger-bar { - background-color: #fff; -} -#burger.active .burger-bar--1 { - transform: rotate(45deg); -} -#burger.active .burger-bar--2 { - opacity: 0; -} -#burger.active .burger-bar--3 { - transform: rotate(-45deg); -} diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts index 49a756e9..7a3f942e 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts @@ -10,11 +10,6 @@ scheda:Scheda, slider:Slider}}) export default class EstrazionePrincipale extends Vue{ -recipe:Recipe.IRecipe={ - - -} - recipe:Recipe.IRecipe={ extraction_main_delay:{ @@ -58,9 +53,6 @@ recipe:Recipe.IRecipe={ } }; - @Prop({default:0}) - ritardo:number; - mockR:number=this.ritardo; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue index eafdf147..8735e2ed 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue @@ -6,7 +6,12 @@
- + +
- + +
- + +
- + + \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue index a3e81c01..231ba3e8 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/sottosquadra-stampo.vue @@ -6,9 +6,9 @@ :numSottoSq="1" status="On" modalita="Label modalità" - :quota="recipe.options_undercutupperplate_1_position.valueAct" - :ritardoAtt="recipe.options_undercutupperplate_1_delay_acti.valueAct" - :ritardoDisatt="recipe.options_undercutupperplate_1_delay_dis.valueAct" + :quota="recipe.options_undercutupperplate_1_position" + :ritardoAtt="recipe.options_undercutupperplate_1_delay_acti" + :ritardoDisatt="recipe.options_undercutupperplate_1_delay_dis" > @@ -61,7 +61,6 @@ :quota="recipe.options_undercutupperplate_1_position" :ritardoAtt="recipe.options_undercutupperplate_1_delay_acti" :ritardoDisatt="recipe.options_undercutupperplate_1_delay_dis" - :unitMeasure="recipe.options_undercutupperplate_1_position.unitMeasure" > @@ -70,7 +69,6 @@ :quota="recipe.options_undercutupperplate_2_position" :ritardoAtt="recipe.options_undercutupperplate_2_delay_acti" :ritardoDisatt="recipe.options_undercutupperplate_2_delay_dis" - :unitMeasure="recipe.options_undercutupperplate_2_position.unitMeasure" > @@ -79,7 +77,6 @@ :quota="recipe.options_undercutupperplate_3_position" :ritardoAtt="recipe.options_undercutupperplate_3_delay_acti" :ritardoDisatt="recipe.options_undercutupperplate_3_delay_dis" - :unitMeasure="recipe.options_undercutupperplate_3_position.unitMeasure" > @@ -88,7 +85,6 @@ :quota="recipe.options_undercutupperplate_4_position" :ritardoAtt="recipe.options_undercutupperplate_4_delay_acti" :ritardoDisatt="recipe.options_undercutupperplate_4_delay_dis" - :unitMeasure="recipe.options_undercutupperplate_4_position.unitMeasure" > @@ -97,7 +93,6 @@ :quota="recipe.options_undercutupperplate_5_position" :ritardoAtt="recipe.options_undercutupperplate_5_delay_acti" :ritardoDisatt="recipe.options_undercutupperplate_5_delay_dis" - :unitMeasure="recipe.options_undercutupperplate_5_position.unitMeasure" > diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue index 7d158e54..21a0691a 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/termoregolatori.vue @@ -80,15 +80,12 @@ - + >
@@ -96,7 +93,6 @@ @@ -104,7 +100,6 @@ @@ -112,7 +107,6 @@ @@ -120,7 +114,6 @@ @@ -128,7 +121,6 @@ @@ -136,7 +128,6 @@ @@ -144,7 +135,6 @@ @@ -152,7 +142,6 @@ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.ts index 82d425e3..0b45d876 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.ts @@ -39,12 +39,6 @@ export default class Ventilatori extends Vue{ } }; - @Prop({default:0}) - durata:number; - @Prop({default:0}) - ritardo:number; - mockD:number=this.durata; - mockR:number=this.ritardo; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.vue index 56e8fb85..78095f9b 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/base-components/ventilatori.vue @@ -12,12 +12,22 @@ - + +
- + + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue index 6dd8bf9b..e19c0a5b 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue @@ -19,7 +19,7 @@ Conferma - + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue index 034a30f1..71563151 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue @@ -15,7 +15,12 @@ - + +
@@ -23,24 +28,26 @@ - + +