fix reference of recipe in the modals

This commit is contained in:
Alessio
2020-05-21 09:47:54 +02:00
parent d0fabaac69
commit e42266ffc2
7 changed files with 21 additions and 396 deletions
@@ -7,165 +7,8 @@ import ToggleButton from "@/components/toggleButton.vue";
@Component({ components: { ToggleButton, slider: Slider, svgcaricatore: SVGCaricatore, } })
export default class Caricatore extends Vue {
recipe:Recipe.IRecipe={
cycle_loader_enable: {
range: {
min: 6,
max: 127
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 48
},
cycle_loader_lifter_lowerposition_delay: {
range: {
min: 5,
max: 133
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 38
},
cycle_loader_lifter_upperposition_delay: {
range: {
min: 6,
max: 172
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 16
},
cycle_loader_split_sheet_time: {
range: {
min: 1,
max: 111
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 50
},
cycle_loader_ejector_position: {
range: {
min: 3,
max: 199
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 47
},
cycle_loader_pallet_height: {
range: {
min: 1,
max: 149
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 116
},
cycle_loader_center_x: {
range: {
min: 6,
max: 167
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 142
},
cycle_loader_center_y: {
range: {
min: 7,
max: 109
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 58
},
cycle_loader_checktichness_enabled: {
range: {
min: 1,
max: 197
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 113
},
cycle_loader_suckers_vacuum: {
range: {
min: 9,
max: 105
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 20
},
cycle_loader_ionizer_enabled: {
range: {
min: 3,
max: 152
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 70
},
cycle_loader_manualunloading_enabled: {
range: {
min: 2,
max: 126
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 96
}
}
@Prop()
recipe:Recipe.IRecipe;
}
@@ -6,10 +6,13 @@ import { Modal, ModalHelper } from "@/components/modals";
import { Factory, messageService, awaiter } from "@/_base";
import CicloFormatura from "./base-components/ciclo-formatura.vue";
import Caricatore from "./base-components/caricatore.vue";
import { recipeActions } from "@/store/recipe.store";
import { store } from "@/store";
@Component({ components: { modal: Modal, stepfooter: StepFooter, caricatore: Caricatore, cicloformatura: CicloFormatura } })
export default class ShowCicloInfo extends Vue {
recipe:Recipe.IRecipe=this.$store.getters.getCurrent();
show: string = "caricatore";
annulla(name:string) {
@@ -17,6 +20,7 @@ export default class ShowCicloInfo extends Vue {
};
conferma(name:string) {
recipeActions.setCurrent(store, this.recipe);
messageService.publishToChannel(name);
};
@@ -10,7 +10,7 @@
<i class="fa fa-remove"></i>
</button>
</div>
<caricatore v-if="show=='caricatore'"></caricatore>
<caricatore v-if="show=='caricatore'" :recipe="recipe"></caricatore>
<cicloformatura v-if="show=='formatura'"></cicloformatura>
<footer>
<button class="btn" @click="annulla('show-quote-velocita-info')">Annulla</button>
@@ -14,7 +14,9 @@ import LastraSVG from "./SVG_Components/lastraSVG.vue";
import PiastraSVG from "./SVG_Components/piastraSVG.vue";
import CorniceSVG from "./SVG_Components/corniceSVG.vue";
import ControstampoSVG from "./SVG_Components/controstampoSVG.vue";
import StepFooter from "@/app_modules_thermo/setup/components/step-footer.vue"
import StepFooter from "@/app_modules_thermo/setup/components/step-footer.vue";
import { recipeActions } from "@/store/recipe.store";
import { store } from "@/store";
@Component({
components: {
@@ -35,230 +37,7 @@ import StepFooter from "@/app_modules_thermo/setup/components/step-footer.vue"
})
export default class ShowFormatoInfo extends Vue {
recipe:Recipe.IRecipe={
general_area_working_dxsx: {
range: {
min: 8,
max: 197
},
status: {
visible: true,
enabled: true,
hasError: true
},
unitMeasure: "",
valueAct: 199
},
general_sizes_mould_dim_x: {
range: {
min: 3,
max: 106
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 41
},
general_sizes_mould_dim_y: {
range: {
min: 1,
max: 174
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 40
},
general_sizes_mould_max_height: {
range: {
min: 2,
max: 116
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 37
},
general_sizes_mould_base_height: {
range: {
min: 1,
max: 178
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 63
},
general_sizes_plate_type: {
range: {
min: 0,
max: 140
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 39
},
general_sizes_plate_dim_x: {
range: {
min: 6,
max: 154
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 78
},
general_sizes_plate_dim_y: {
range: {
min: 6,
max: 142
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 81
},
general_sizes_sheet_material: {
range: {
min: 3,
max: 144
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 86
},
general_sizes_sheet_dim_x: {
range: {
min: 1,
max: 168
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 90
},
general_sizes_sheet_dim_y: {
range: {
min: 2,
max: 158
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 26
},
general_sizes_sheet_thickness: {
range: {
min: 9,
max: 109
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 45
},
general_sizes_frame_traverses: {
range: {
min: 3,
max: 116
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 72
},
general_sizes_frame_dim_x: {
range: {
min: 0,
max: 129
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 7
},
general_sizes_frame_dim_y: {
range: {
min: 4,
max: 125
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 107
},
positions_mould_lower_speed: {
range: {
min: 5,
max: 140
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 28
},
general_sizes_upperplate_max_height: {
range: {
min: 2,
max: 149
},
status: {
visible: true,
enabled: true,
hasError: false
},
unitMeasure: "",
valueAct: 106
}
}
recipe:Recipe.IRecipe=this.$store.getters.getCurrent();
show:string="placeholder";
@Prop({default:0})
@@ -271,6 +50,7 @@ export default class ShowFormatoInfo extends Vue {
};
conferma(name:string) {
recipeActions.setCurrent(store, this.recipe);
messageService.publishToChannel(name);
};
-1
View File
@@ -40,7 +40,6 @@ import { routes } from "./app.routes";
try {
//debugger
if (PRODUCTION) {
Vue.config.devtools = false; // disabilita i messaggi di debug
Vue.config.performance = false; // disabilita i messaggi di tracing delle performance
@@ -1,6 +1,7 @@
import { baseRestService } from "../_base/baseRestService";
import {CONFIGURATION} from "@/config";
import {recipeStore, recipeActions } from "@/store/recipe.store";
import { recipeActions } from "@/store/recipe.store";
import { store } from "@/store";
export class RecipeService extends baseRestService {
@@ -8,15 +9,13 @@ export class RecipeService extends baseRestService {
async GetCurrent(){
let result = await this.Get((await this.BASE_URL()) + "current");
recipeActions.setCurrent(recipeStore, result);
debugger
recipeActions.setCurrent(store, result);
return result;
}
async GetOverview(){
let result = await this.Get((await this.BASE_URL()) + "overview");
recipeActions.setOverview(recipeStore, result);
debugger
recipeActions.setOverview(store, result);
return result;
}
@@ -28,12 +28,12 @@ export const recipeStore = {
mutations: {
SetCurrent(store, model: Recipe.IRecipe){
store.state.current = model;
SetCurrent(state, model: Recipe.IRecipe){
state.current = model;
},
SetOverview(store, model: Overview.IOverview){
store.state.overview = model;
SetOverview(state, model: Overview.IOverview){
state.overview = model;
},
},