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

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

Browse Source
This commit is contained in:
Alessio
2020-06-11 14:02:50 +02:00
parent 8dd26f73d1 73be1bb58b
commit ade296ce56
13 changed files with 128 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active/wwwroot/src/app_modules_thermo/components/slider.vue
+6 -1
View File
@@ -4,7 +4,12 @@
<img src="assets/icons/png/min.png" />
</button>
<div class="control">
<input :min="min" :max="max" v-model.number="actualvalue" type="range" />
<input
:min="this.value.range.min"
:max="this.value.range.max"
v-model.number="actualvalue"
type="range"
/>
<div class="lines">
<span v-for="iter in lines" :key="iter" class="line"></span>
</div>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/piastra_riduzione.vue
+2 -2
View File
@@ -16,14 +16,14 @@
<numeric v-model="recipe.general_sizes_plate_dim_x" />
</div>
<slider v-model="recipe.general_sizes_plate_dim_x"></slider>
<button class="submit" :class="{'NotSelected':notsel}">Muovi</button>
<button class="submit">Muovi</button>
<div class="input-area">
<label>{{'general_sizes_plate_dim_y' | localize('Apertura Y')}}</label>
<numeric v-model="recipe.general_sizes_plate_dim_y" />
</div>
<slider v-model="recipe.general_sizes_plate_dim_y"></slider>
<button class="submit" :class="{'NotSelected':notsel}">Muovi</button>
<button class="submit">Muovi</button>
</div>
</div>
</template>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/stampo.vue
+6 -2
View File
@@ -9,20 +9,24 @@
<numeric v-model="recipe.general_sizes_mould_dim_x" />
</div>
<slider v-model="recipe.general_sizes_mould_dim_x"></slider>
<div class="input-area">
<label>{{'general_sizes_mould_dim_y' | localize('Dimensione Y')}}</label>
<numeric v-model="recipe.general_sizes_mould_dim_y" />
</div>
<slider v-model="recipe.general_sizes_mould_dim_y"></slider>
<slider v-model="recipe.general_sizes_mould_dim_y"></slider>s
<div class="input-area">
<label>{{'general_sizes_mould_max_height' | localize("Altezza massima")}}</label>
<numeric v-model="recipe.general_sizes_mould_max_height" />
</div>
<slider v-model="recipe.general_sizes_mould_max_height"></slider>
<div class="input-area">
<label>{{'general_sizes_mould_min_height' | localize("Altezza minima negativa")}}</label>
<numeric v-model="recipe.general_sizes_mould_min_height" />
</div>
<slider v-model="recipe.general_sizes_mould_max_height"></slider>
<slider v-model="recipe.general_sizes_mould_min_height"></slider>
<div class="input-area">
<label>{{'general_sizes_mould_base_height' | localize("Altezza base")}}</label>
<numeric v-model="recipe.general_sizes_mould_base_height" />
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.ts
+4 -12
View File
@@ -4,17 +4,9 @@ import { Prop } from 'vue-property-decorator';
@Component({})
export default class QuoteVelocita extends Vue {
// @Prop({})
// corsa: Recipe.IValue;
// @Prop({})
// vel_salita: Recipe.IValue;
// @Prop({})
// vel_salita_lenta: number;
// @Prop({})
// rall_salita: number;
// :corsa="recipe.positions_frame_upper_position"
// :vel_salita="recipe.positions_frame_upper_speed"
@Prop({})
recipe:Recipe.IRecipe
@Prop()
recipe: Recipe.IRecipe;
}
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.ts
+2 -14
View File
@@ -4,20 +4,8 @@ import { Prop } from 'vue-property-decorator';
@Component({})
export default class QuoteVelocita extends Vue {
// @Prop({})
// corsa: Recipe.IValue;
// @Prop({})
// vel_salita: Recipe.IValue;
// @Prop({})
// vel_salita_lenta: Recipe.IValue;
// @Prop({})
// rall_salita: Recipe.IValue;
// :corsa="recipe.positions_mould_upper_position"
// :vel_salita="recipe.positions_mould_upper_speed"
// :rall_salita="recipe.positions_mould_upperdeceleration_position"
// :vel_salita_lenta="recipe.positions_mould_upperdeceleration_speed"
@Prop({})
recipe:Recipe.IRecipe;
@Prop()
recipe: Recipe.IRecipe;
}
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/svgcontrostampo.ts
+2 -12
View File
@@ -4,18 +4,8 @@ import { Prop } from 'vue-property-decorator';
@Component({})
export default class Controstamposvg extends Vue {
// @Prop({})
// corsa: Recipe.IValue;
// @Prop({})
// vel_discesa: Recipe.IValue;
// @Prop({})
// vel_discesa_lenta: number;
// @Prop({})
// rall_discesa: number;
// :corsa="recipe.positions_upperplate_lower_position"
// :vel_discesa="recipe.positions_upperplate_lower_speed"
@Prop({})
recipe:Recipe.IRecipe;
@Prop()
recipe: Recipe.IRecipe;
}
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/controstampo.ts
-17
View File
@@ -15,23 +15,6 @@ import Tastierino from "@/app_modules_thermo/components/tastierino.vue";
})
export default class Controstampo extends Vue {
@Prop()
recipe: Recipe.IRecipe;
@Prop({})
ritardo: number;
mockR: number = this.ritardo;
@Prop({})
rallentamento_discesa: number;
mockRD: number = this.rallentamento_discesa;
@Prop({})
velocità_discesa_lenta: number;
mockVDL: number = this.velocità_discesa_lenta;
}
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/controstampo.vue
+34 -33
View File
@@ -3,57 +3,58 @@
<aside class="scrollable">
<div class="box">
<div class="header">
<label>Discesa controstampo</label>
<label>{{'position_upperplate' | localize("Discesa Stampo")}}</label>
</div>
<div class="body">
<div class="input-area">
<img src="assets/icons/png/clessidra.png" />
<label>Ritardo</label>
<numeric v-model.number="mockR" />
<label>{{'positions_upperplate_lower_position' | localize('Quota inferiore')}}</label>
<numeric v-model="recipe.positions_upperplate_lower_position" />
</div>
<slider :min="0" :max="10" v-model.number="mockR" :unit-of-measure="'s'"></slider>
<slider v-model="recipe.positions_upperplate_lower_position"></slider>
<div class="input-area">
<label>{{'positions_upperplate_lower_speed' | localize('Velocità discesa')}}</label>
<numeric v-model="recipe.positions_upperplate_lower_speed" />
</div>
<slider v-model="recipe.positions_upperplate_lower_speed"></slider>
<hr />
<div class="input-area">
<label>{{'positions_upperplate_upper_position' | localize('Quota superiore')}}</label>
<numeric v-model="recipe.positions_upperplate_upper_position" />
</div>
<slider v-model="recipe.positions_upperplate_upper_position"></slider>
<div class="input-area">
<label>{{'positions_upperplate_upper_speed' | localize('Velocità salita')}}</label>
<numeric v-model="recipe.positions_upperplate_upper_speed" />
</div>
<slider v-model="recipe.positions_upperplate_upper_speed"></slider>
<hr />
<div class="input-area">
<img src="assets/icons/png/discesa@2x.png" />
<label>Corsa</label>
<numeric
v-model.number="recipe.positions_upperplate_lower_position"
/>
<label>{{'positions_upperplate_upperdeceleration_position' | localize('Corsa')}}</label>
<numeric v-model="recipe.positions_upperplate_upperdeceleration_position" />
</div>
<slider
:min="recipe.positions_upperplate_lower_position.range.min"
:max="recipe.positions_upperplate_lower_position.range.max"
v-model.number="recipe.positions_upperplate_lower_position.valueAct"
></slider>
<slider v-model="recipe.positions_upperplate_upperdeceleration_position"></slider>
<div class="input-area">
<img src="assets/icons/png/alta.png" />
<label>Velocità discesa</label>
<numeric
v-model.number="recipe.positions_upperplate_lower_speed"
/>
<label>{{'positions_upperplate_upperdeceleration_speed' | localize('Velocità di rallentamento salita')}}</label>
<numeric v-model="recipe.positions_upperplate_upperdeceleration_speed" />
</div>
<slider
:min="recipe.positions_upperplate_lower_speed.range.min"
:max="recipe.positions_upperplate_lower_speed.range.max"
v-model.number="recipe.positions_upperplate_lower_speed.valueAct"
></slider>
<slider v-model="recipe.positions_upperplate_upperdeceleration_speed"></slider>
<hr />
<div class="input-area">
<img src="assets/icons/png/discesa@2x.png" />
<label>Rallentamento discesa</label>
<numeric v-model.number="mockRD" />
<label>{{'positions_upperplate_lowerdeceleration_position' | localize('Corsa')}}</label>
<numeric v-model="recipe.positions_upperplate_lowerdeceleration_position" />
</div>
<slider :min="0" :max="1059" v-model.number="mockRD"></slider>
<slider v-model="recipe.positions_upperplate_lowerdeceleration_position"></slider>
<div class="input-area">
<img src="assets/icons/png/bassa.png" />
<label>Velocità discesa lenta</label>
<numeric v-model.number="mockVDL" />
<label>{{'positions_upperplate_lowerdeceleration_speed' | localize('Velocità di rallentamento discesa')}}</label>
<numeric v-model="recipe.positions_upperplate_lowerdeceleration_speed" />
</div>
<slider :min="0" :max="200" v-model.number="mockVDL"></slider>
<slider v-model="recipe.positions_upperplate_lowerdeceleration_speed"></slider>
</div>
</div>
</aside>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.ts
-11
View File
@@ -12,15 +12,4 @@ export default class DiscesaCornice extends Vue {
@Prop()
recipe: Recipe.IRecipe;
@Prop({})
ritardo: number;
@Prop({})
ralSalita: number;
@Prop({})
velSalitaLenta: number;
mock_ritardo: number = this.ritardo;
mock_ral_salita: number = this.ralSalita;
mock_vel_salita_lenta: number = this.velSalitaLenta;
}
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/discesa-cornice.vue
+32 -33
View File
@@ -3,57 +3,56 @@
<aside class="scrollable">
<div class="box">
<div class="header">
<label>Discesa Cornice</label>
<label>{{'' | localize("Discesa Cornice")}}</label>
</div>
<div class="body">
<div class="input-area">
<img src="assets/icons/png/clessidra.png" />
<label>Ritardo</label>
<numeric v-model.number="mock_ritardo" />
<label>{{'positions_frame_lower_position' | localize('Quota inferiore')}}</label>
<numeric v-model="recipe.positions_frame_lower_position" />
</div>
<slider :min="0" :max="10" v-model.number="mock_ritardo" :unit-of-measure="'s'"></slider>
<slider v-model="recipe.positions_frame_lower_position"></slider>
<div class="input-area">
<label>{{'positions_frame_lower_speed' | localize('Velocità discesa')}}</label>
<numeric v-model="recipe.positions_frame_lower_speed" />
</div>
<slider v-model="recipe.positions_frame_lower_speed"></slider>
<hr />
<div class="input-area">
<img src="assets/icons/png/salita.png" />
<label>Corsa</label>
<numeric
v-model.number="recipe.positions_frame_upper_position"
/>
<label>{{'positions_frame_intermediate_position' | localize('Quota intermedia')}}</label>
<numeric v-model="recipe.positions_frame_intermediate_position" />
</div>
<slider
:min="recipe.positions_frame_upper_position.range.min"
:max="recipe.positions_frame_upper_position.range.max"
v-model.number="recipe.positions_frame_upper_position.valueAct"
></slider>
<slider v-model="recipe.positions_frame_intermediate_position"></slider>
<div class="input-area">
<img src="assets/icons/png/alta.png" />
<label>Velocità salita</label>
<numeric
v-model.number="recipe.positions_frame_upper_speed"
/>
<label>{{'positions_frame_intermediate_speed' | localize('Velocità a quota intermedia')}}</label>
<numeric v-model="recipe.positions_frame_intermediate_speed" />
</div>
<slider
:min="recipe.positions_frame_upper_speed.range.min"
:max="recipe.positions_frame_upper_speed.range.max"
v-model.number="recipe.positions_frame_upper_speed.valueAct"
></slider>
<slider v-model="recipe.positions_frame_intermediate_speed"></slider>
<hr />
<div class="input-area">
<img src="assets/icons/png/salita.png" />
<label>Rallentamento salita</label>
<numeric v-model.number="mock_ral_salita" />
<label>{{'positions_frame_upper_position' | localize('Quota superiore')}}</label>
<numeric v-model="recipe.positions_frame_upper_position" />
</div>
<slider :min="0" :max="1059" v-model.number="mock_ral_salita"></slider>
<slider v-model="recipe.positions_frame_upper_position"></slider>
<div class="input-area">
<img src="assets/icons/png/bassa.png" />
<label>Velocità salita lenta</label>
<numeric v-model.number="mock_vel_salita_lenta" />
<label>{{'positions_frame_upper_speed' | localize('Velocità salita')}}</label>
<numeric v-model="recipe.positions_frame_upper_speed" />
</div>
<slider :min="0" :max="100" v-model.number="mock_vel_salita_lenta"></slider>
<slider v-model="recipe.positions_frame_upper_speed"></slider>
<hr />
<div class="input-area">
<label>{{'positions_frame_unload_position' | localize('Quota')}}</label>
<numeric v-model="recipe.positions_frame_unload_position" />
</div>
<slider v-model="recipe.positions_frame_unload_position"></slider>
</div>
</div>
</aside>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.ts
-2
View File
@@ -8,8 +8,6 @@ import Tastierino from "@/app_modules_thermo/components/tastierino.vue";
@Component({ name: "salita-stampo", components: { stampoSVG: StampoSVG } })
export default class DiscesaCornice extends Vue {
@Prop({})
ritardo: number;
@Prop()
recipe: Recipe.IRecipe;
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue
+39 -45
View File
@@ -3,69 +3,63 @@
<aside class="scrollable">
<div class="box">
<div class="header">
<label>Salita stampo</label>
<label>{{'position_mould' | localize("Salita Stampo")}}</label>
</div>
<div class="body">
<div class="input-area">
<img src="assets/icons/png/clessidra.png" />
<label>Ritardo</label>
<numeric v-model.number="mock_ritardo" />
<label>{{'positions_mould_lower_position' | localize('Quota inferiore')}}</label>
<numeric v-model="recipe.positions_mould_lower_position" />
</div>
<slider :min="0" :max="10" v-model.number="mock_ritardo" :unit-of-measure="'s'"></slider>
<slider v-model="recipe.positions_mould_lower_position"></slider>
<div class="input-area">
<label>{{'positions_mould_lower_speed' | localize('Velocità discesa')}}</label>
<numeric v-model="recipe.positions_mould_lower_speed" />
</div>
<slider v-model="recipe.positions_mould_lower_speed"></slider>
<hr />
<div class="input-area">
<label>{{'positions_mould_intermediate_position' | localize('Quota intermedia')}}</label>
<numeric v-model="recipe.positions_mould_intermediate_position" />
</div>
<slider v-model="recipe.positions_mould_intermediate_position"></slider>
<hr />
<div class="input-area">
<label>{{'positions_mould_upper_position' | localize('Quota superiore')}}</label>
<numeric v-model="recipe.positions_mould_upper_position" />
</div>
<slider v-model="recipe.positions_mould_upper_position"></slider>
<div class="input-area">
<label>{{'positions_mould_upper_speed' | localize('Velocità salita')}}</label>
<numeric v-model="recipe.positions_mould_upper_speed" />
</div>
<slider v-model="recipe.positions_mould_upper_speed"></slider>
<hr />
<div class="input-area">
<img src="assets/icons/png/salita.png" />
<label>Corsa</label>
<numeric
v-model.number="recipe.positions_mould_upper_position"
/>
<label>{{'positions_mould_upperdeceleration_position' | localize('Corsa')}}</label>
<numeric v-model="recipe.positions_mould_upperdeceleration_position" />
</div>
<slider
:min="recipe.positions_mould_upper_position.range.min"
:max="recipe.positions_mould_upper_position.range.max"
v-model.number="recipe.positions_mould_upper_position.valueAct"
></slider>
<slider v-model="recipe.positions_mould_upperdeceleration_position"></slider>
<div class="input-area">
<img src="assets/icons/png/alta.png" />
<label>Velocità salita</label>
<numeric
v-model.number="recipe.positions_mould_upper_speed"
/>
<label>{{'positions_mould_upperdeceleration_speed' | localize('Velocità di rallentamento salita')}}</label>
<numeric v-model="recipe.positions_mould_upperdeceleration_speed" />
</div>
<slider
:min="recipe.positions_mould_upper_speed.range.min"
:max="recipe.positions_mould_upper_speed.range.max"
v-model.number="recipe.positions_mould_upper_speed.valueAct"
></slider>
<slider v-model="recipe.positions_mould_upperdeceleration_speed"></slider>
<hr />
<div class="input-area">
<img src="assets/icons/png/salita.png" />
<label>Rallentamento salita</label>
<numeric
v-model.number="recipe.positions_mould_upperdeceleration_position"
/>
<label>{{'positions_mould_lowerdeceleration_position' | localize('Corsa')}}</label>
<numeric v-model="recipe.positions_mould_lowerdeceleration_position" />
</div>
<slider
:min="recipe.positions_mould_upperdeceleration_position.range.min"
:max="recipe.positions_mould_upperdeceleration_position.range.max"
v-model.number="recipe.positions_mould_upperdeceleration_position.valueAct"
></slider>
<slider v-model="recipe.positions_mould_lowerdeceleration_position"></slider>
<div class="input-area">
<img src="assets/icons/png/bassa.png" />
<label>Velocità salita lenta</label>
<numeric
v-model.number="recipe.positions_mould_upperdeceleration_speed"
/>
<label>{{'positions_mould_lowerdeceleration_speed' | localize('Velocità di rallentamento discesa')}}</label>
<numeric v-model="recipe.positions_mould_lowerdeceleration_speed" />
</div>
<slider
:min="recipe.positions_mould_upperdeceleration_speed.range.min"
:max="recipe.positions_mould_upperdeceleration_speed.range.max"
v-model.number="recipe.positions_mould_upperdeceleration_speed.valueAct"
></slider>
<slider v-model="recipe.positions_mould_lowerdeceleration_speed"></slider>
</div>
</div>
</aside>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts
+1 -1
View File
@@ -23,7 +23,7 @@ import { Deferred } from "@/services";
export default class ShowQuoteVelocitaInfo extends Vue {
recipe: Recipe.IRecipe = this.$store.getters.getCurrent();
show: string = "QC";
show: string = "QS";
@Prop()
deferred: Deferred<boolean>;