Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into feature/recipe

This commit is contained in:
Samuele Locatelli
2020-07-21 17:46:16 +02:00
2 changed files with 12 additions and 12 deletions
@@ -13,9 +13,9 @@
<small>{{recipe.positions_frame_intermediate_speed.unitMeasure}}</small>
</div>
</div>
<div class="borded_label" id="quota2">
<div class="borded_label" id="quota5">
<div v-focus-on:positions_frame_lower_position>
<img src="assets/icons/png/salita.png" />
<img src="assets/icons/png/discesa.png" />
<span>{{recipe.positions_frame_lower_position.setpointHMI}}</span>
<small>{{recipe.positions_frame_lower_position.unitMeasure}}</small>
</div>
@@ -49,9 +49,9 @@
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota5">
<div class="borded_label" id="quota2">
<div v-focus-on:positions_frame_upper_position>
<img src="assets/icons/png/discesa.png" />
<img src="assets/icons/png/salita.png" />
<span>{{recipe.positions_frame_upper_position.setpointHMI}}</span>
<small>{{recipe.positions_frame_upper_position.unitMeasure}}</small>
</div>
@@ -1,9 +1,9 @@
e<template>
<div class="svg-area">
<img src="assets/svg/disegno-controstampo-quote-velocita.svg" />
<div class="borded_label" id="quota1">
<div class="borded_label" id="quota3">
<div v-focus-on:positions_upperplate_lower_position>
<img src="assets/icons/png/salita.png" />
<img src="assets/icons/png/discesa.png" />
<span>{{recipe.positions_upperplate_lower_position.setpointHMI}}</span>
<small>{{recipe.positions_upperplate_lower_position.unitMeasure}}</small>
</div>
@@ -13,9 +13,9 @@ e<template>
<small>{{recipe.positions_upperplate_lower_speed.unitMeasure}}</small>
</div>
</div>
<div class="borded_label" id="quota2">
<div class="borded_label" id="quota4">
<div v-focus-on:positions_upperplate_lowerdeceleration_position>
<img src="assets/icons/png/salita.png" />
<img src="assets/icons/png/discesa.png" />
<span>{{recipe.positions_upperplate_lowerdeceleration_position.setpointHMI}}</span>
<small>{{recipe.positions_upperplate_lowerdeceleration_position.unitMeasure}}</small>
</div>
@@ -25,9 +25,9 @@ e<template>
<small>{{recipe.positions_upperplate_lowerdeceleration_speed.unitMeasure}}</small>
</div>
</div>
<div class="borded_label" id="quota3">
<div class="borded_label" id="quota1">
<div v-focus-on:positions_upperplate_upper_position>
<img src="assets/icons/png/discesa.png" />
<img src="assets/icons/png/salita.png" />
<span>{{recipe.positions_upperplate_upper_position.setpointHMI}}</span>
<small>{{recipe.positions_upperplate_upper_position.unitMeasure}}</small>
</div>
@@ -37,9 +37,9 @@ e<template>
<small>{{recipe.positions_upperplate_upper_speed.unitMeasure}}</small>
</div>
</div>
<div class="borded_label" id="quota4">
<div class="borded_label" id="quota2">
<div v-focus-on:positions_upperplate_upperdeceleration_position>
<img src="assets/icons/png/discesa.png" />
<img src="assets/icons/png/salita.png" />
<span>{{recipe.positions_upperplate_upperdeceleration_position.setpointHMI}}</span>
<small>{{recipe.positions_upperplate_upperdeceleration_position.unitMeasure}}</small>
</div>