diff --git a/Thermo.Active/wwwroot/assets/styles/base/formato.less b/Thermo.Active/wwwroot/assets/styles/base/formato.less index 2b8b10ef..0688b761 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/formato.less +++ b/Thermo.Active/wwwroot/assets/styles/base/formato.less @@ -7,213 +7,214 @@ .@{modal}.formato-info { - section{ - .tast{ + section { + .tast { margin-left: -300px; } } - - .radio-buttons{ - display: flex; - justify-content: flex-start; - input{ + .radio-buttons { + display: flex; + justify-content: flex-start; + align-items: center; - width: 24px; - height: 24px; - object-fit: contain; - border-radius: 12px; - background-color: #f1f1f1; + input { - } - - label{ - - font-size: 18px; - font-weight: normal; - font-stretch: normal; - font-style: normal; - line-height: 1.11; - letter-spacing: normal; - text-align: right; - color: #4b4b4b; - - &:first-of-type{ - font-size: 24px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: @color-darkish-blue; - padding-right: 200px; - padding-left: 20px; - } - - } + width: 24px; + height: 24px; + object-fit: contain; + border-radius: 12px; + background-color: #f1f1f1; } - .specific{ - margin-left: 5px; - width: 1271px; - height: 825px; - - .svg-area{ - margin-left: 120px; - margin-top: 70px; - width: 999px; - height: 527px; - - .disegnoStampo { - height: 473px; - width: 723px; - } - - .disegnoLastra { - height: 468px; - width: 854px; - } - - .disegnoPiastra { - height: 468px; - width: 751px; - } - - .disegnoCornice { - height: 468px; - width: 744px; - } - - .disegnoControstampo { - height: 468px; - width: 692px; - } - - .border-cornice { - - .circle1{ - position: relative; - right: 730px; - top: 300px; - } - - .circle2{ - position: relative; - right: 180px; - top: 230px; - } - - } - - .border-piastra { - - .circle1{ - position: relative; - right: 800px; - top: 310px; - } - - .circle2{ - position: relative; - right: 180px; - top: 220px; - } - - } - - .border-lastra { - - .circle1{ - position: relative; - right: 820px; - top: 100px; - } - - .circle2{ - position: relative; - right: 800px; - top: 240px; - } - - .circle3{ - position: relative; - right: 200px; - top: 180px; - } - - } - - .border-stampo { - - .circle1{ - position: relative; - right: 780px; - top: 80px; - } - - .circle2{ - position: relative; - right: 870px; - top: 130px; - } - - .circle3{ - position: relative; - right: 720px; - top: 240px; - } - - .circle4{ - position: relative; - right: 150px; - top: 190px; - } - - .circle5{ - position: relative; - top: -50px; - } - - } - - .border-controstampo { - - .circle1{ - position: relative; - right: 730px; - top: 140px; - } - - } - - } - - .slides { - margin-top: 45px; - margin-left: 20px; - width: 1241px; - height: 160px; - display: flex; - overflow-x: auto; - -webkit-overflow-scrolling: touch; - - img { - flex-shrink: 0; - width: 215px; - height: 140px; - margin-right: 25px; - border: 1px solid #bbbcbc; - } - - .imgborder { - border: 1px solid @color-darkish-blue; - } - - } - + label { + + font-size: 18px; + font-weight: normal; + font-stretch: normal; + font-style: normal; + line-height: 1.11; + letter-spacing: normal; + text-align: right; + color: #4b4b4b; + + &:first-of-type { + font-size: 24px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + text-align: center; + color: @color-darkish-blue; + padding-right: 200px; + padding-left: 20px; } + } + + } + + .specific { + margin-left: 5px; + width: 1271px; + height: 825px; + + .svg-area { + margin-left: 120px; + margin-top: 70px; + width: 999px; + height: 527px; + + .disegnoStampo { + height: 473px; + width: 723px; + } + + .disegnoLastra { + height: 468px; + width: 854px; + } + + .disegnoPiastra { + height: 468px; + width: 751px; + } + + .disegnoCornice { + height: 468px; + width: 744px; + } + + .disegnoControstampo { + height: 468px; + width: 692px; + } + + .border-cornice { + + .circle1 { + position: relative; + right: 730px; + top: 300px; + } + + .circle2 { + position: relative; + right: 180px; + top: 230px; + } + + } + + .border-piastra { + + .circle1 { + position: relative; + right: 800px; + top: 310px; + } + + .circle2 { + position: relative; + right: 180px; + top: 220px; + } + + } + + .border-lastra { + + .circle1 { + position: relative; + right: 820px; + top: 100px; + } + + .circle2 { + position: relative; + right: 800px; + top: 240px; + } + + .circle3 { + position: relative; + right: 200px; + top: 180px; + } + + } + + .border-stampo { + + .circle1 { + position: relative; + right: 780px; + top: 80px; + } + + .circle2 { + position: relative; + right: 870px; + top: 130px; + } + + .circle3 { + position: relative; + right: 720px; + top: 240px; + } + + .circle4 { + position: relative; + right: 150px; + top: 190px; + } + + .circle5 { + position: relative; + top: -50px; + } + + } + + .border-controstampo { + + .circle1 { + position: relative; + right: 730px; + top: 140px; + } + + } + + } + + .slides { + margin-top: 45px; + margin-left: 20px; + width: 1241px; + height: 160px; + display: flex; + overflow-x: auto; + -webkit-overflow-scrolling: touch; + + img { + flex-shrink: 0; + width: 215px; + height: 140px; + margin-right: 25px; + border: 1px solid #bbbcbc; + } + + .imgborder { + border: 1px solid @color-darkish-blue; + } + + } + + } + } \ 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 d54b34b9..c53764df 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -4687,6 +4687,7 @@ .modal.formato-info .radio-buttons { display: flex; justify-content: flex-start; + align-items: center; } .modal.formato-info .radio-buttons input { width: 24px; diff --git a/Thermo.Active/wwwroot/src/app.business-logic.ts b/Thermo.Active/wwwroot/src/app.business-logic.ts index 99391de1..c23b7bd6 100644 --- a/Thermo.Active/wwwroot/src/app.business-logic.ts +++ b/Thermo.Active/wwwroot/src/app.business-logic.ts @@ -5,19 +5,7 @@ import { messageService } from "@/_base/messageService"; import { store, AppModel/*, MachineStatusModel, machineStatusActions, localizationModelActions, machineInfoActions*/ } from "@/store"; import { UserInfoDialog, MachineInfoDialog, ContactInfoDialog } from "@/app_modules/machine"; -import ShowPirometroInfo from "@/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue"; -import ShowFormatoInfo from "@/app_modules_thermo/setup/formato/components/show-formato-info.vue"; -import ShowRiscaldamentoInfo from "@/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.vue"; -import ShowCicloInfo from "@/app_modules_thermo/setup/ciclo/components/show-ciclo-info.vue"; -import ShowRaffreddamentoInfo from "@/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue"; -import ShowControstampoInfo from "@/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.vue"; -import ShowQuoteVelocitaInfo from "@/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue"; -import ShowEstrazioneInfo from "@/app_modules_thermo/setup/estrazione/components/show-estrazione-info.vue"; -import ShowVuotoInfo from "@/app_modules_thermo/setup/vuoto/show-vuoto-info.vue"; -import ShowImbutituraInfo from "@/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue"; -import ShowOpzioniInfo from "@/app_modules_thermo/setup/opzioni/show-opzioni-info.vue"; -import AvvioProduzione from "@/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.vue"; -import ShowArretramentoRiscaldiInfo from "@/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.vue"; + // import { DataService } from "./services/dataService"; // import { ToolingService } from "./services/toolingService"; // import { DepotService } from "./services/depotService"; @@ -52,22 +40,9 @@ let HMIScreenshotInterval; let HMIprodTimeout; let RerenderInterval; -messageService.subscribeToChannel("show-avvio-produzione-info", () => { ModalHelper.ShowModal(AvvioProduzione); }); -messageService.subscribeToChannel("show-arretramento-riscaldi-info", () => { ModalHelper.ShowModal(ShowArretramentoRiscaldiInfo); }); -messageService.subscribeToChannel("show-opzioni-info", () => { ModalHelper.ShowModal(ShowOpzioniInfo); }); -messageService.subscribeToChannel("show-vuoto-info", () => { ModalHelper.ShowModal(ShowVuotoInfo); }); -messageService.subscribeToChannel("show-estrazione-info", () => { ModalHelper.ShowModal(ShowEstrazioneInfo); }); -messageService.subscribeToChannel("show-quote-velocita-info", () => { ModalHelper.ShowModal(ShowQuoteVelocitaInfo); }); -messageService.subscribeToChannel("show-controstampo-info", () => { ModalHelper.ShowModal(ShowControstampoInfo); }); -messageService.subscribeToChannel("show-raffreddamento-info", () => { ModalHelper.ShowModal(ShowRaffreddamentoInfo); }); -messageService.subscribeToChannel("show-ciclo-info", () => { ModalHelper.ShowModal(ShowCicloInfo); }); -messageService.subscribeToChannel("show-formato-info", () => { ModalHelper.ShowModal(ShowFormatoInfo); }); -messageService.subscribeToChannel("show-riscaldi-info", () => { ModalHelper.ShowModal(ShowRiscaldamentoInfo); }); -messageService.subscribeToChannel("show-pirometro-info", () => { ModalHelper.ShowModal(ShowPirometroInfo); }); messageService.subscribeToChannel("show-user-info", () => { ModalHelper.ShowModal(UserInfoDialog); }); messageService.subscribeToChannel("show-machine-info", () => { ModalHelper.ShowModal(MachineInfoDialog); }); messageService.subscribeToChannel("show-contact-info", () => { ModalHelper.ShowModal(ContactInfoDialog); }); -messageService.subscribeToChannel("show-imbutitura-info", () => { ModalHelper.ShowModal(ShowImbutituraInfo); }); // messageService.subscribeToChannel("show-axes-calibration", () => { ModalHelper.ShowNcModal(AxesCalibration); }); // messageService.subscribeToChannel("hide-axes-calibration", () => { ModalHelper.HideNcModal(AxesCalibration); }); diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.ts index 38c0bc9e..2983b3f6 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.ts @@ -4,16 +4,57 @@ import Component from 'vue-class-component'; import { messageService } from "@/_base/messageService"; import setupButton from "./setupButton.vue"; +import ShowFormatoInfo from "@/app_modules_thermo/setup/formato/components/show-formato-info.vue"; +import ShowPirometroInfo from "@/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue"; +import ShowRiscaldamentoInfo from "@/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.vue"; +import ShowCicloInfo from "@/app_modules_thermo/setup/ciclo/components/show-ciclo-info.vue"; +import ShowRaffreddamentoInfo from "@/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue"; +import ShowControstampoInfo from "@/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.vue"; +import ShowQuoteVelocitaInfo from "@/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue"; +import ShowEstrazioneInfo from "@/app_modules_thermo/setup/estrazione/components/show-estrazione-info.vue"; +import ShowVuotoInfo from "@/app_modules_thermo/setup/vuoto/show-vuoto-info.vue"; +import ShowImbutituraInfo from "@/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue"; +import ShowOpzioniInfo from "@/app_modules_thermo/setup/opzioni/show-opzioni-info.vue"; +import AvvioProduzione from "@/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.vue"; +import ShowArretramentoRiscaldiInfo from "@/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.vue"; + + @Component({ - components: { - modal: Modal, - setupButton - } + components: { + modal: Modal, + setupButton + } }) export default class Setup extends Vue { - public sendMessage(name: string) { - messageService.publishToChannel(name); + public sendMessage(name: string) { + messageService.publishToChannel(name); + } + + + async showModalAtStep(step: number) { + try { + let next = await this.showModalStep(step); + this.showModalAtStep(next); + } catch { + } + } + + showModalStep(step: number): Promise { + + switch (step) { + case 0: return ModalHelper.ShowModalAsync(ShowFormatoInfo); + case 1: return ModalHelper.ShowModalAsync(ShowQuoteVelocitaInfo); + case 2: return ModalHelper.ShowModalAsync(ShowCicloInfo); + case 3: return ModalHelper.ShowModalAsync(ShowRiscaldamentoInfo); + case 4: return ModalHelper.ShowModalAsync(ShowPirometroInfo); + case 5: return ModalHelper.ShowModalAsync(ShowImbutituraInfo); + case 6: return ModalHelper.ShowModalAsync(ShowControstampoInfo); + case 7: return ModalHelper.ShowModalAsync(ShowRaffreddamentoInfo); + case 8: return ModalHelper.ShowModalAsync(ShowVuotoInfo); + case 9: return ModalHelper.ShowModalAsync(ShowEstrazioneInfo); + case 10: return ModalHelper.ShowModalAsync(ShowOpzioniInfo); } - + return null; + } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue index 90f70437..4fe2d10e 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue @@ -1,89 +1,89 @@ 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 6397f49f..97fa98a9 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 @@ -17,6 +17,7 @@ import ControstampoSVG from "./SVG_Components/controstampoSVG.vue"; import StepFooter from "@/app_modules_thermo/setup/components/step-footer.vue"; import { recipeActions } from "@/store/recipe.store"; import { store } from "@/store"; +import { Deferred } from "@/services"; @Component({ components: { @@ -39,6 +40,9 @@ export default class ShowFormatoInfo extends Vue { recipe: Recipe.IRecipe = this.$store.getters.getCurrent(); show: string = "placeholder"; + @Prop() + deferred: Deferred; + @Prop({ default: 0 }) stamponeg: number; @Prop({ default: 0 }) @@ -46,11 +50,13 @@ export default class ShowFormatoInfo extends Vue { annulla() { ModalHelper.HideModal(); + this.deferred.resolve(-1); }; conferma(name: string) { recipeActions.setCurrent(store, this.recipe); - messageService.publishToChannel(name); + ModalHelper.HideModal(); + this.deferred.resolve(1); }; async beforeMount() { 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 75cf0083..13a6d114 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 @@ -91,7 +91,7 @@
- +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts index 5be7e3ec..f97759ff 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts @@ -8,36 +8,42 @@ import TermoregolazioneSuperiore from "./base-components/termo-superiore.vue"; import StepFooter from "@/app_modules_thermo/setup/components/step-footer.vue"; import { recipeActions } from "@/store/recipe.store"; import { store } from "@/store"; +import { Deferred } from "@/services"; -@Component({ components: { modal: Modal ,pirometro:Pirometro, stepfooter:StepFooter, termosuperiore:TermoregolazioneSuperiore} }) +@Component({ components: { modal: Modal, pirometro: Pirometro, stepfooter: StepFooter, termosuperiore: TermoregolazioneSuperiore } }) export default class ShowPirometroInfo extends Vue { - recipe:Recipe.IRecipe=this.$store.getters.getCurrent(); - show:string='termo-superiore'; + recipe: Recipe.IRecipe = this.$store.getters.getCurrent(); + show: string = 'termo-superiore'; - annulla(name:string){ - messageService.publishToChannel(name); - }; + @Prop() + deferred: Deferred; - conferma(name:string){ - recipeActions.setCurrent(store, this.recipe); - messageService.publishToChannel(name); - }; + annulla() { + ModalHelper.HideModal(); + this.deferred.resolve(-1); + }; - async beforeMount() { - // this.contactInfo = await awaiter(new machineService().getContactConfiguration()); - messageService.subscribeToChannel("esc_pressed", args => { - this.close(); - }); - } - - beforeDestroy() { - messageService.deleteChannel("esc_pressed"); - } - - close() { - messageService.deleteChannel("esc_pressed"); - ModalHelper.HideModal(); - } + conferma() { + recipeActions.setCurrent(store, this.recipe); + ModalHelper.HideModal(); + this.deferred.resolve(1); + }; + + async beforeMount() { + // this.contactInfo = await awaiter(new machineService().getContactConfiguration()); + messageService.subscribeToChannel("esc_pressed", args => { + this.close(); + }); + } + + beforeDestroy() { + messageService.deleteChannel("esc_pressed"); + } + + close() { + messageService.deleteChannel("esc_pressed"); + ModalHelper.HideModal(); + } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue index b023e8b1..052914bb 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue @@ -1,29 +1,31 @@ \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue index 54a8024d..fe1b5151 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue @@ -3,24 +3,24 @@
-
+
-
+
-
+
-
+
@@ -29,59 +29,59 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
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 92b0a9d4..de407e78 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 @@ -8,28 +8,35 @@ import Controstampo from "./controstampo.vue"; import StepFooter from "@/app_modules_thermo/setup/components/step-footer.vue"; import { recipeActions } from "@/store/recipe.store"; import { store } from "@/store"; +import { Prop } from "vue-property-decorator"; +import { Deferred } from "@/services"; @Component({ components: { modal: Modal, discesacornice: DiscesaCornice, salitaStampo: SalitaStampo, - controstampo:Controstampo, + controstampo: Controstampo, stepfooter: StepFooter } }) export default class ShowQuoteVelocitaInfo extends Vue { - recipe:Recipe.IRecipe=this.$store.getters.getCurrent(); + recipe: Recipe.IRecipe = this.$store.getters.getCurrent(); show: string = "QC"; - annulla(name:string) { - messageService.publishToChannel(name); + @Prop() + deferred: Deferred; + + annulla() { + ModalHelper.HideModal(); + this.deferred.resolve(-1); }; - conferma(name:string) { + conferma() { recipeActions.setCurrent(store, this.recipe); - messageService.publishToChannel(name); + ModalHelper.HideModal(); + this.deferred.resolve(-1); }; async beforeMount() { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue index 27846432..3a73b1dd 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue @@ -15,10 +15,10 @@
- - + +
- +
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 3e32f01e..9b915032 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 @@ -1,51 +1,54 @@ import Vue from 'vue'; import Component from 'vue-class-component'; -import {Prop} from 'vue-property-decorator'; +import { Prop } from 'vue-property-decorator'; import StepFooter from "@/app_modules_thermo/setup/components/step-footer.vue"; import { Modal, ModalHelper } from "@/components/modals"; import { Factory, messageService, awaiter } from "@/_base"; import Ventilatori from "./base-components/ventilatori.vue"; import { recipeActions } from "@/store/recipe.store"; -import { store } from "@/store"; +import { store } from "@/store"; +import { Deferred } from '@/services'; -@Component({ - components: { - modal: Modal, - ventilatori:Ventilatori, - stepfooter:StepFooter -} +@Component({ + components: { + modal: Modal, + ventilatori: Ventilatori, + stepfooter: StepFooter + } }) -export default class Raffreddamento extends Vue{ +export default class Raffreddamento extends Vue { + @Prop() + deferred: Deferred; - recipe:Recipe.IRecipe=this.$store.getters.getCurrent(); - show: string = "ventilatori"; + recipe: Recipe.IRecipe = this.$store.getters.getCurrent(); + show: string = "ventilatori"; - annulla(){ - ModalHelper.HideModal(); - messageService.publishToChannel('show-controstampo-info'); - }; - - conferma(){ - recipeActions.setCurrent(store, this.recipe); - ModalHelper.HideModal(); - messageService.publishToChannel('show-vuoto-info'); - }; - - async beforeMount() { - // this.contactInfo = await awaiter(new machineService().getContactConfiguration()); - messageService.subscribeToChannel("esc_pressed", args => { - this.close(); - }); - } - - beforeDestroy() { - messageService.deleteChannel("esc_pressed"); - } - - close() { - messageService.deleteChannel("esc_pressed"); - ModalHelper.HideModal(); - } + annulla() { + ModalHelper.HideModal(); + this.deferred.resolve(-1); + }; + + conferma() { + recipeActions.setCurrent(store, this.recipe); + ModalHelper.HideModal(); + this.deferred.resolve(1); + }; + + async beforeMount() { + // this.contactInfo = await awaiter(new machineService().getContactConfiguration()); + messageService.subscribeToChannel("esc_pressed", args => { + this.close(); + }); + } + + beforeDestroy() { + messageService.deleteChannel("esc_pressed"); + } + + close() { + messageService.deleteChannel("esc_pressed"); + ModalHelper.HideModal(); + } } \ No newline at end of file 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 99c59535..7b9e836a 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 @@ -1,7 +1,7 @@