Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring formato e chiamata modali

Browse Source
This commit is contained in:
=
2020-06-10 12:19:27 +02:00
parent 0d042b8698
commit a87b2623e0
14 changed files with 466 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active/wwwroot/assets/styles/base/formato.less
+198 -197
View File
@@ -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;
}
}
}
}
Thermo.Active/wwwroot/assets/styles/style.css
+1
View File
@@ -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;
Thermo.Active/wwwroot/src/app.business-logic.ts
+1 -26
View File
@@ -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); });
Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.ts
+48 -7
View File
@@ -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<number> {
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;
}
}
Thermo.Active/wwwroot/src/app_modules_thermo/setup/components/setup.vue
+75 -75
View File
@@ -1,89 +1,89 @@
<template>
<div class="container">
<modal type="setup-info" :title="'setup_lbl_title' | localize('Setup')">
<div class="Rectangle">
<setup-button
@click="sendMessage('show-formato-info')"
:phase="1"
title="Formato"
statusImage="fa fa-check-circle"
></setup-button>
<div class="container">
<modal type="setup-info" :title="'setup_lbl_title' | localize('Setup')">
<div class="Rectangle">
<setup-button
@click="showModalAtStep(0);"
:phase="1"
title="Formato"
statusImage="fa fa-check-circle"
></setup-button>
<setup-button
@click="sendMessage('show-quote-velocita-info')"
:phase="2"
title="Quota e velocità"
statusImage="fa fa-check-circle"
></setup-button>
<setup-button
@click="showModalAtStep(1);sendMessage('show-quote-velocita-info')"
:phase="2"
title="Quota e velocità"
statusImage="fa fa-check-circle"
></setup-button>
<setup-button
@click="sendMessage('show-ciclo-info')"
:phase="3"
title="Ciclo"
statusImage="fa fa-check-circle undone-step"
></setup-button>
<setup-button
@click="showModalAtStep(2);sendMessage('show-ciclo-info')"
:phase="3"
title="Ciclo"
statusImage="fa fa-check-circle undone-step"
></setup-button>
<setup-button
@click="sendMessage('show-riscaldi-info')"
:phase="4"
title="Riscaldi"
statusImage="fa fa-check-circle undone-step"
></setup-button>
<setup-button
@click="sshowModalAtStep(3);endMessage('show-riscaldi-info')"
:phase="4"
title="Riscaldi"
statusImage="fa fa-check-circle undone-step"
></setup-button>
<setup-button
@click="sendMessage('show-pirometro-info')"
:phase="5"
title="Pirometro"
statusImage="fa fa-check-circle undone-step"
></setup-button>
<setup-button
@click="showModalAtStep(4);sendMessage('show-pirometro-info')"
:phase="5"
title="Pirometro"
statusImage="fa fa-check-circle undone-step"
></setup-button>
<setup-button
@click="sendMessage('show-imbutitura-info')"
:phase="6"
title="Imbutitura"
statusImage="fa fa-check-circle undone-step"
></setup-button>
<setup-button
@click="showModalAtStep(5);sendMessage('show-imbutitura-info')"
:phase="6"
title="Imbutitura"
statusImage="fa fa-check-circle undone-step"
></setup-button>
<setup-button
@click="sendMessage('show-controstampo-info')"
:phase="7"
title="Controstampo"
statusImage="fa fa-check-circle undone-step"
></setup-button>
<setup-button
@click="showModalAtStep(6);sendMessage('show-controstampo-info')"
:phase="7"
title="Controstampo"
statusImage="fa fa-check-circle undone-step"
></setup-button>
<setup-button
@click="sendMessage('show-raffreddamento-info')"
:phase="8"
title="Raffreddamento"
statusImage="fa fa-check-circle undone-step"
></setup-button>
<setup-button
@click="showModalAtStep(7);sendMessage('show-raffreddamento-info')"
:phase="8"
title="Raffreddamento"
statusImage="fa fa-check-circle undone-step"
></setup-button>
<setup-button
@click="sendMessage('show-vuoto-info')"
:phase="9"
title="Vuoto"
statusImage="fa fa-check-circle undone-step"
></setup-button>
<setup-button
@click="showModalAtStep(8);sendMessage('show-vuoto-info')"
:phase="9"
title="Vuoto"
statusImage="fa fa-check-circle undone-step"
></setup-button>
<setup-button
@click="sendMessage('show-estrazione-info')"
:phase="10"
title="Estrazione"
statusImage="fa fa-check-circle undone-step"
></setup-button>
<setup-button
@click="showModalAtStep(9);sendMessage('show-estrazione-info')"
:phase="10"
title="Estrazione"
statusImage="fa fa-check-circle undone-step"
></setup-button>
<setup-button
@click="sendMessage('show-opzioni-info')"
:phase="11"
title="Opzioni di lavorazione"
statusImage="fa fa-check-circle undone-step"
></setup-button>
<setup-button
@click="showModalAtStep(10);sendMessage('show-opzioni-info')"
:phase="11"
title="Opzioni di lavorazione"
statusImage="fa fa-check-circle undone-step"
></setup-button>
<div class="setup-play" @click="sendMessage('show-avvio-produzione-info')">
<img class="dim" src="assets/icons/svg/setup-play.svg"/>
</div>
</div>
</modal>
</div>
<div class="setup-play" @click="sendMessage('show-avvio-produzione-info')">
<img class="dim" src="assets/icons/svg/setup-play.svg" />
</div>
</div>
</modal>
</div>
</template>
<script lang="ts" src="./setup.ts"></script>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.ts
+7 -1
View File
@@ -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<boolean>;
@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() {
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/show-formato-info.vue
+1 -1
View File
@@ -91,7 +91,7 @@
</section>
<footer>
<button class="btn" @click="annulla()">Annulla</button>
<button class="btn btn-success" @click="conferma('show-quote-velocita-info')">Conferma</button>
<button class="btn btn-success" @click="conferma()">Conferma</button>
</footer>
</modal>
<stepfooter></stepfooter>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.ts
+31 -25
View File
@@ -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<boolean>;
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();
}
}
Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue
+27 -25
View File
@@ -1,29 +1,31 @@
<template>
<div class="setup">
<modal type="pirometro-info">
<div class="tab-header" slot="header-buttons">
<button :class="{'active':show=='pirometro'}" @click="show='pirometro'">Pirometro</button>
<button :class="{'active':show=='termo-superiore'}" @click="show='termo-superiore'">Termoregolazione riscaldo superiore</button>
<button :class="{'active':show=='termo-inferiore'}" @click="show='termo-inferiore'">Termoregolazione riscaldo inferiore</button>
</div>
<div slot="header-buttons">
<button class="modal-close" @click="close()">
<i class="fa fa-remove"></i>
</button>
</div>
<pirometro v-if="show=='pirometro'" :recipe="recipe"></pirometro>
<termosuperiore v-if="show=='termo-superiore'" :recipe="recipe"></termosuperiore>
<footer>
<button class="btn" @click="annulla('show-riscaldi-info')">
Annulla
</button>
<button class="btn btn-success" @click="conferma('show-imbutitura-info')">
Conferma
</button>
</footer>
</modal>
<stepfooter></stepfooter>
</div>
<div class="setup">
<modal type="pirometro-info">
<div class="tab-header" slot="header-buttons">
<button :class="{'active':show=='pirometro'}" @click="show='pirometro'">Pirometro</button>
<button
:class="{'active':show=='termo-superiore'}"
@click="show='termo-superiore'"
>Termoregolazione riscaldo superiore</button>
<button
:class="{'active':show=='termo-inferiore'}"
@click="show='termo-inferiore'"
>Termoregolazione riscaldo inferiore</button>
</div>
<div slot="header-buttons">
<button class="modal-close" @click="close()">
<i class="fa fa-remove"></i>
</button>
</div>
<pirometro v-if="show=='pirometro'" :recipe="recipe"></pirometro>
<termosuperiore v-if="show=='termo-superiore'" :recipe="recipe"></termosuperiore>
<footer>
<button class="btn" @click="annulla()">Annulla</button>
<button class="btn btn-success" @click="conferma()">Conferma</button>
</footer>
</modal>
<stepfooter></stepfooter>
</div>
</template>
<script lang="ts" src="./show-pirometro-info.ts"></script>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue
+13 -13
View File
@@ -3,24 +3,24 @@
<img class="disegnoStampo" src="assets/icons/svg/disegno-quote-velocita-stampo.svg" />
<div class="input-circles">
<div class="circle circle-stampo-1">
<div @click="showtast='stampo-rallsalita'">
<div>
<img src="assets/icons/png/salita.png" />
<input type="number" v-model.number="rall_salita.valueAct" />
<label>mm</label>
</div>
<div @click="showtast='stampo-velsalitalenta'">
<div>
<img src="assets/icons/png/bassa.png" />
<input type="number" v-model.number="vel_salita_lenta.valueAct" />
<label>mm/s</label>
</div>
</div>
<div class="circle circle-stampo-2">
<div @click="showtast='stampo-corsa'">
<div>
<img src="assets/icons/png/salita.png" />
<input type="number" v-model.number="corsa.valueAct" />
<label>mm</label>
</div>
<div @click="showtast='stampo-velsalita'">
<div>
<img src="assets/icons/png/alta.png" />
<input type="number" v-model.number="vel_salita.valueAct" />
<label>mm/s</label>
@@ -29,59 +29,59 @@
<div class="circle circle-stampo-3">
<div>
<img src="assets/icons/png/discesa.png" />
<!-- <input type="number" v-model.number="" @click="showtast=true"> mancante -->
<!-- <input type="number" v-model.number="" > mancante -->
<label>mm</label>
</div>
<div>
<img src="assets/icons/png/alta.png" />
<!-- <input type="number" v-model.number="" @click="showtast=true"> mancante -->
<!-- <input type="number" v-model.number="" > mancante -->
<label>mm/s</label>
</div>
</div>
<div class="circle circle-stampo-4">
<div>
<img src="assets/icons/png/quota.png" />
<!-- <input type="number" v-model.number="" @click="showtast=true"> mancante -->
<!-- <input type="number" v-model.number="" > mancante -->
<label>mm</label>
</div>
</div>
<div class="circle circle-stampo-5">
<div>
<img src="assets/icons/png/discesa.png" />
<!-- <input type="number" v-model.number="" @click="showtast=true"> mancante -->
<!-- <input type="number" v-model.number="" > mancante -->
<label>mm</label>
</div>
<div>
<img src="assets/icons/png/alta.png" />
<!-- <input type="number" v-model.number="" @click="showtast=true"> mancante -->
<!-- <input type="number" v-model.number="" > mancante -->
<label>mm/s</label>
</div>
</div>
<div class="circle circle-stampo-6">
<div>
<img src="assets/icons/png/quota.png" />
<!-- <input type="number" v-model.number="" @click="showtast=true"> mancante -->
<!-- <input type="number" v-model.number="" > mancante -->
<label>mm</label>
</div>
</div>
<div class="circle circle-stampo-7">
<div>
<img src="assets/icons/png/quota.png" />
<!-- <input type="number" v-model.number="" @click="showtast=true"> mancante -->
<!-- <input type="number" v-model.number="" > mancante -->
<label>mm</label>
</div>
</div>
<div class="circle circle-stampo-8">
<div>
<img src="assets/icons/png/quota.png" />
<!-- <input type="number" v-model.number="" @click="showtast=true"> mancante -->
<!-- <input type="number" v-model.number="" > mancante -->
<label>mm</label>
</div>
</div>
<div class="circle circle-stampo-9">
<div>
<img src="assets/icons/png/quota.png" />
<!-- <input type="number" v-model.number="" @click="showtast=true"> mancante -->
<!-- <input type="number" v-model.number="" > mancante -->
<label>mm</label>
</div>
</div>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts
+13 -6
View File
@@ -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<boolean>;
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() {
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue
+3 -3
View File
@@ -15,10 +15,10 @@
<discesacornice v-if="show=='QC'" :recipe="recipe"></discesacornice>
<controstampo v-if="show=='QCS'" :recipe="recipe"></controstampo>
<footer>
<button class="btn" @click="annulla('show-formato-info')">Annulla</button>
<button class="btn btn-success" @click="conferma('show-ciclo-info')">Conferma</button>
<button class="btn" @click="annulla()">Annulla</button>
<button class="btn btn-success" @click="conferma()">Conferma</button>
</footer>
</modal>
</modal>
<stepfooter></stepfooter>
</div>
</template>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.ts
+40 -37
View File
@@ -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<boolean>;
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();
}
}
Thermo.Active/wwwroot/src/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue
+8 -10
View File
@@ -1,7 +1,7 @@
<template>
<div class="setup">
<modal type="raffreddamento-info">
<div class="tab-header" slot="header-buttons">
<div class="tab-header" slot="header-buttons">
<button :class="{'active':show == 'ventilatori'}" @click="show='ventilatori'">Ventilatori</button>
<button :class="{'active':show == 'pirometro'}" @click="show='pirometro'">Pirometro</button>
<button :class="{'active':show == 'nebulizzatori'}" @click="show='nebulizzatori'">Nebulizzatori</button>
@@ -10,17 +10,15 @@
<button class="modal-close" @click="close()">
<i class="fa fa-remove"></i>
</button>
</div>
<ventilatori v-if="show=='ventilatori'" :recipe="recipe"></ventilatori>
<footer>
<button class="btn" @click="annulla()">
Annulla</button>
<button class="btn btn-success" @click="conferma()">
Conferma</button>
</footer>
</div>
<ventilatori v-if="show=='ventilatori'" :recipe="recipe"></ventilatori>
<footer>
<button class="btn" @click="annulla()">Annulla</button>
<button class="btn btn-success" @click="conferma()">Conferma</button>
</footer>
</modal>
<stepfooter></stepfooter>
</div>
</div>
</template>
<script lang="ts" src="./show-raffreddamento-info.ts"></script>