Merge remote-tracking branch 'origin/Thermocamera' into develop

This commit is contained in:
Samuele Locatelli
2020-10-28 12:11:47 +01:00
2 changed files with 4 additions and 3 deletions
-2
View File
@@ -27,12 +27,10 @@
<button
class="gray square close"
@click="sendMessage('hide')"
:title="'header_tooltip_btn_minimize' | localize('Minimize the application')"
>-</button>
<button
class="gray square close"
@click="sendMessage('close')"
:title="'header_tooltip_btn_close' | localize('Close the application')"
>&times;</button>
</div>
<modal-container name="modal" :class="{'blur':applyBlurNc}"></modal-container>
@@ -44,7 +44,10 @@ export const warmersStore = {
state.channels.push(element);
}
else{
intModel.setpointHMI = element.setpointHMI;
intModel.setpointHMI = element.setpointHMI;
intModel.tCamActive = element.tCamActive;
intModel.tCamTempAct = element.tCamTempAct;
intModel.tCamTempSet = element.tCamTempSet;
}
}
}