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

Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop

Browse Source
This commit is contained in:
Lucio Maranta
2018-08-24 13:08:48 +02:00
parent 482efe5a2b 919eb11f58
commit 6e8fa6cd4b
2 changed files with 51 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/wwwroot/src/components/tooling/tooling-depot.ts
+51 -2
View File
@@ -300,7 +300,7 @@ export default class depot extends Vue {
// this.magazines;
}
public openInfoShank(id) {
public dataForOpenInfoShank(id){
let shank = (this.$store.state as AppModel).tooling.shanks.find(s => s.id == id);
console.log(ModalHelper.infoEquipmentModal.editEnabled)
ModalHelper.infoEquipmentModal.enableModalShank = true;
@@ -309,7 +309,28 @@ export default class depot extends Vue {
ModalHelper.infoEquipmentModal.editEnabled = !this.editable;
ModalHelper.ShowModal(InfoEquipment);
}
public openInfoEquipment(id) {
public dataForOpenInfoNcShank(id){
let shank = (this.$store.state as AppModel).tooling.ncShanks.find(s => s.id == id);
console.log(ModalHelper.infoEquipmentModal.editEnabled)
ModalHelper.infoEquipmentModal.enableModalShank = true;
ModalHelper.infoEquipmentModal.enableModalTool = false;
ModalHelper.infoEquipmentModal.currentShank = shank;
ModalHelper.infoEquipmentModal.editEnabled = !this.editable;
ModalHelper.ShowModal(InfoEquipment);
}
public openInfoShank(id) {
if(this.typeNc == "Demo"){
this.dataForOpenInfoShank(id);
}
else{
this.dataForOpenInfoNcShank(id);
}
}
public dataForOpenInfoEquipment(id){
let tool = (this.$store.state as AppModel).tooling.tools.find(t => t.id == id);
if (tool) {
ModalHelper.infoEquipmentModal.enableModalShank = false;
@@ -328,6 +349,34 @@ export default class depot extends Vue {
}
}
public dataForOpenInfoNcEquipment(id){
let tool = (this.$store.state as AppModel).tooling.ncTools.find(t => t.id == id);
if (tool) {
ModalHelper.infoEquipmentModal.enableModalShank = false;
ModalHelper.infoEquipmentModal.enableModalTool = true;
ModalHelper.infoEquipmentModal.currentEquipment = tool;
ModalHelper.infoEquipmentModal.editEnabled = !this.editable;
ModalHelper.ShowModal(InfoEquipment);
}
else {
let shank = (this.$store.state as AppModel).tooling.ncShanks.find(s => s.id == id);
ModalHelper.infoEquipmentModal.enableModalShank = true;
ModalHelper.infoEquipmentModal.enableModalTool = false;
ModalHelper.infoEquipmentModal.currentShank = shank;
ModalHelper.infoEquipmentModal.editEnabled = !this.editable;
ModalHelper.ShowModal(InfoEquipment);
}
}
public openInfoEquipment(id) {
if(this.typeNc == "Demo"){
this.dataForOpenInfoEquipment(id);
}
else{
this.dataForOpenInfoNcEquipment(id);
}
}
public openModalLoadDepot(positionId, positionType) {
ModalHelper.loadDepotModal.positionType = positionType;
ModalHelper.loadDepotModal.positionId = positionId;
Step/wwwroot/src/components/tooling/tooling-depot.vue
-5
View File
@@ -129,11 +129,6 @@
<tool :code="'tooling_shank_abbreviation' | localize('S%d',m.id)" :title="m.id" img-source="../assets/icons/Tools/Shanks.png" @click="openInfoShank(m.id)"></tool>
</div>
</Draggable>
<Draggable v-for="t in getNcAvaiableTools" :key="t.id">
<div >
<tool :code="'tooling_tool_abbreviation' | localize('T%d',t.id)" :title="t.familyId" :img-source="getInfoEquipmentIcon(t.toolType)" @click="openInfoEquipment(t.id)"></tool>
</div>
</Draggable>
</Container>
</div>