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

Merge remote-tracking branch 'teamdev/develop' into develop

Browse Source
This commit is contained in:
=
2020-06-15 16:10:40 +02:00
parent 9347ed95b7 90e03e2160
commit d3a9de2a3b
16 changed files with 55 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active/wwwroot/assets/svg/disegno-termosuperiore.svg → Thermo.Active/wwwroot/assets/svg/disegno-termo.svg
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.ts
+1 -1
View File
@@ -6,5 +6,5 @@ import {Prop} from 'vue-property-decorator';
export default class ControstampoSVG extends Vue{
@Prop({})
alt:Recipe.IValue;
recipe:Recipe.IRecipe;
}
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.vue
+1 -1
View File
@@ -4,7 +4,7 @@
<div class="borded_label" id="quota1">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_upperplate_max_height.valueAct}}</span>
<small>mm</small>
</div>
</div>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.ts
+1 -4
View File
@@ -4,9 +4,6 @@ import {Prop} from 'vue-property-decorator';
@Component({})
export default class CorniceSVG extends Vue{
@Prop({})
x:Recipe.IValue;
@Prop({})
y:Recipe.IValue;
recipe:Recipe.IRecipe;
}
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.vue
+2 -2
View File
@@ -4,14 +4,14 @@
<div class="borded_label" id="quota1">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_frame_dim_y.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota2">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_frame_dim_x.valueAct}}</span>
<small>mm</small>
</div>
</div>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.ts
+1 -5
View File
@@ -6,10 +6,6 @@ import {Prop} from 'vue-property-decorator';
export default class LastraSVG extends Vue{
@Prop({})
x:Recipe.IValue;
@Prop({})
y:Recipe.IValue;
@Prop({})
spes:Recipe.IValue;
recipe:Recipe.IRecipe;
}
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.vue
+3 -3
View File
@@ -4,21 +4,21 @@
<div class="borded_label" id="quota1">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_sheet_dim_x.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota2">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_sheet_dim_y.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota3">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_sheet_thickness.valueAct}}</span>
<small>mm</small>
</div>
</div>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.ts
+1 -3
View File
@@ -6,7 +6,5 @@ import {Prop} from 'vue-property-decorator';
export default class PiastraSVG extends Vue{
@Prop({})
x:Recipe.IValue;
@Prop({})
y:Recipe.IValue;
recipe:Recipe.IRecipe;
}
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.vue
+2 -2
View File
@@ -4,14 +4,14 @@
<div class="borded_label" id="quota1">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_plate_dim_y.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota2">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_plate_dim_x.valueAct}}</span>
<small>mm</small>
</div>
</div>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.ts
+1 -9
View File
@@ -6,13 +6,5 @@ import { Prop } from 'vue-property-decorator';
export default class StampoSVG extends Vue {
@Prop({})
x: Recipe.IValue;
@Prop({})
y: Recipe.IValue;
@Prop({})
alt: number;
@Prop({})
altB: Recipe.IValue;
@Prop({})
stampoNeg: number;
recipe:Recipe.IRecipe;
}
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.vue
+5 -5
View File
@@ -4,35 +4,35 @@
<div class="borded_label" id="quota1">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_mould_dim_x.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota2">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_mould_dim_y.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota3">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_mould_max_height.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota4">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_mould_base_height.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota5">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.general_sizes_mould_min_height.valueAct}}</span>
<small>mm</small>
</div>
</div>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-inferiore.vue
+7 -7
View File
@@ -1,35 +1,35 @@
<template>
<div class="svg-area">
<img src="assets/svg/disegno-termosuperiore.svg" />
<img src="assets/svg/disegno-termo.svg" />
<div class="borded_label" id="quota1">
<div>
<span>00</span>
<span>{{recipe.pyrometer_lowerthermoregulator_sleep_percentage.valueAct}}</span>
<small>%</small>
</div>
</div>
<div class="borded_label" id="quota2">
<div>
<span>00</span>
<span>{{recipe.pyrometer_lowerthermoregulator_min_percentage.valueAct}}</span>
<small>%</small>
</div>
</div>
<div class="borded_label" id="quota3">
<div>
<span>00</span>
<span>{{recipe.pyrometer_lowerthermoregulator_max_percentage.valueAct}}</span>
<small>%</small>
</div>
</div>
<div class="borded_label" id="quota4">
<div>
<img src="assets/icons/png/temperatura.png" />
<span>00</span>
<span>{{recipe.pyrometer_lowerthermoregulator_start_adjustment.valueAct}}</span>
<small>°C</small>
</div>
</div>
<div class="borded_label" id="quota5">
<div>
<img src="assets/icons/png/temperatura.png" />
<span>00</span>
<span>{{recipe.pyrometer_lowerthermoregulator_end_adjustment.valueAct}}</span>
<small>°C</small>
</div>
</div>
@@ -57,4 +57,4 @@
left: 953px;
}
</style>
<script lang="ts" src="./SVG-termo-inferiore.ts"></script>
<script lang="ts" src="./SVG-termo-superiore.ts"></script>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue
+6 -6
View File
@@ -1,35 +1,35 @@
<template>
<div class="svg-area">
<img src="assets/svg/disegno-termosuperiore.svg" />
<img src="assets/svg/disegno-termo.svg" />
<div class="borded_label" id="quota1">
<div>
<span>00</span>
<span>{{recipe.pyrometer_upperthermoregulator_sleep_percentage.valueAct}}</span>
<small>%</small>
</div>
</div>
<div class="borded_label" id="quota2">
<div>
<span>00</span>
<span>{{recipe.pyrometer_upperthermoregulator_min_percentage.valueAct}}</span>
<small>%</small>
</div>
</div>
<div class="borded_label" id="quota3">
<div>
<span>00</span>
<span>{{recipe.pyrometer_upperthermoregulator_max_percentage.valueAct}}</span>
<small>%</small>
</div>
</div>
<div class="borded_label" id="quota4">
<div>
<img src="assets/icons/png/temperatura.png" />
<span>00</span>
<span>{{recipe.pyrometer_upperthermoregulator_start_adjustment.valueAct}}</span>
<small>°C</small>
</div>
</div>
<div class="borded_label" id="quota5">
<div>
<img src="assets/icons/png/temperatura.png" />
<span>00</span>
<span>{{recipe.pyrometer_upperthermoregulator_end_adjustment.valueAct}}</span>
<small>°C</small>
</div>
</div>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue
+7 -7
View File
@@ -4,24 +4,24 @@
<div class="borded_label" id="quota1">
<div>
<img src="assets/icons/png/salita.png" />
<span>00</span>
<span>{{recipe.positions_frame_intermediate_position.valueAct}}</span>
<small>mm</small>
</div>
<div>
<img src="assets/icons/png/bassa.png" />
<span>00</span>
<span>{{recipe.positions_frame_intermediate_speed.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota2">
<div>
<img src="assets/icons/png/salita.png" />
<span>00</span>
<span>{{recipe.positions_frame_lower_position.valueAct}}</span>
<small>mm</small>
</div>
<div>
<img src="assets/icons/png/alta.png" />
<span>00</span>
<span>{{recipe.positions_frame_lower_speed.valueAct}}</span>
<small>mm</small>
</div>
</div>
@@ -52,19 +52,19 @@
<div class="borded_label" id="quota5">
<div>
<img src="assets/icons/png/discesa.png" />
<span>00</span>
<span>{{recipe.positions_frame_upper_position.valueAct}}</span>
<small>mm</small>
</div>
<div>
<img src="assets/icons/png/alta.png" />
<span>00</span>
<span>{{recipe.positions_frame_upper_speed.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota6">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.positions_frame_unload_position.valueAct}}</span>
<small>mm</small>
</div>
</div>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue
+9 -9
View File
@@ -4,7 +4,7 @@
<div class="borded_label" id="quota1">
<div>
<img src="assets/icons/png/quota.png" />
<span>00</span>
<span>{{recipe.positions_mould_intermediate_position.valueAct}}</span>
<small>mm</small>
</div>
</div>
@@ -40,48 +40,48 @@
<div class="borded_label" id="quota6">
<div>
<img src="assets/icons/png/salita.png" />
<span>00</span>
<span>{{recipe.positions_mould_upperdeceleration_position.valueAct}}</span>
<small>mm</small>
</div>
<div>
<img src="assets/icons/png/bassa.png" />
<span>00</span>
<span>{{recipe.positions_mould_upperdeceleration_speed.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota7">
<div>
<img src="assets/icons/png/salita.png" />
<span>00</span>
<span>{{recipe.positions_mould_upper_position.valueAct}}</span>
<small>mm</small>
</div>
<div>
<img src="assets/icons/png/alta.png" />
<span>00</span>
<span>{{recipe.positions_mould_upper_speed.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota8">
<div>
<img src="assets/icons/png/discesa.png" />
<span>00</span>
<span>{{recipe.positions_mould_lowerdeceleration_position.valueAct}}</span>
<small>mm</small>
</div>
<div>
<img src="assets/icons/png/bassa.png" />
<span>00</span>
<span>{{recipe.positions_mould_lowerdeceleration_speed.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota9">
<div>
<img src="assets/icons/png/discesa.png" />
<span>00</span>
<span>{{recipe.positions_mould_lower_position.valueAct}}</span>
<small>mm</small>
</div>
<div>
<img src="assets/icons/png/alta.png" />
<span>00</span>
<span>{{recipe.positions_mould_lower_speed.valueAct}}</span>
<small>mm</small>
</div>
</div>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.vue
+8 -8
View File
@@ -4,48 +4,48 @@ e<template>
<div class="borded_label" id="quota1">
<div>
<img src="assets/icons/png/salita.png" />
<span>00</span>
<span>{{recipe.positions_upperplate_lower_position.valueAct}}</span>
<small>mm</small>
</div>
<div>
<img src="assets/icons/png/alta.png" />
<span>00</span>
<span>{{recipe.positions_upperplate_lower_speed.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota2">
<div>
<img src="assets/icons/png/salita.png" />
<span>00</span>
<span>{{recipe.positions_upperplate_lowerdeceleration_position.valueAct}}</span>
<small>mm</small>
</div>
<div>
<img src="assets/icons/png/bassa.png" />
<span>00</span>
<span>{{recipe.positions_upperplate_lowerdeceleration_speed.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota3">
<div>
<img src="assets/icons/png/discesa.png" />
<span>00</span>
<span>{{recipe.positions_upperplate_upper_position.valueAct}}</span>
<small>mm</small>
</div>
<div>
<img src="assets/icons/png/alta.png" />
<span>00</span>
<span>{{recipe.positions_upperplate_upper_speed.valueAct}}</span>
<small>mm</small>
</div>
</div>
<div class="borded_label" id="quota4">
<div>
<img src="assets/icons/png/discesa.png" />
<span>00</span>
<span>{{recipe.positions_upperplate_upperdeceleration_position.valueAct}}</span>
<small>mm</small>
</div>
<div>
<img src="assets/icons/png/bassa.png" />
<span>00</span>
<span>{{recipe.positions_upperplate_upperdeceleration_speed.valueAct}}</span>
<small>mm</small>
</div>
</div>