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

fix offset osai

Browse Source
This commit is contained in:
Alessandro Francia
2018-08-31 16:29:12 +02:00
parent 13ae308e0f
commit 4f3dff1d7f
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/wwwroot/src/components/tooling/tooling-equipment.ts
+14 -6
View File
@@ -358,10 +358,15 @@ export default class toolingEquipment extends Vue {
}
public cancel = function () {
if (this.copySelectedTool) {
this.selectedTool = this.copySelectedTool;
toolingActions.updateTool(store, this.copySelectedTool);
debugger
if(this.isSiemens){
if (this.copySelectedTool) {
this.selectedTool = this.copySelectedTool;
toolingActions.updateTool(store, this.copySelectedTool);
}
}
else{
toolingActions.updateNcTool(store, this.selectedTool);
}
if (this.selectedTool.id == null || this.selectedTool.id == 0) {
this.selectedTool = null;
@@ -387,10 +392,11 @@ export default class toolingEquipment extends Vue {
}
public cancelNc = function () {
debugger
toolingActions.updateNcTool(store, this.selectedTool);
// if (this.copySelectedTool) {
// this.selectedTool = this.copySelectedTool;
// toolingActions.updateTool(store, this.copySelectedTool);
// toolingActions.updateNcTool(store, this.selectedTool);
// }
if (this.selectedTool.id == null || this.selectedTool.id == 0) {
this.selectedTool = null;
@@ -459,6 +465,7 @@ export default class toolingEquipment extends Vue {
obj["id"] = -1;
tool.offsetData.push(obj);
this.selectTabNc(obj);
this.disableList = true;
// ModalHelper.offsetAddModal.idTool = tool.id;
// ModalHelper.offsetAddModal.offsetData = tool.offsetData;
// ModalHelper.ShowModal(ModalAddOffsetTool);
@@ -481,6 +488,7 @@ export default class toolingEquipment extends Vue {
tool.offsetData.splice(l, 1);
}
}
toolingActions.updateNcTool(store, this.selectedTool);
this.disableList = false;
this.enableEquipment = false;
this.enableParameters = true;
Step/wwwroot/src/components/tooling/tooling-equipment.vue
+1 -1
View File
@@ -167,7 +167,7 @@
</div>
<div class="tooling-equipment-footer">
<button class="btn" v-if="!enableModify" @click="modify()">{{'tooling_equipment_button_modify' | localize("Modifica")}}</button>
<button class="btn" v-if="enableModify" @click="cancel()">{{'tooling_equipment_button_cancel' | localize("Annulla")}}</button>
<button class="btn" v-if="enableModify" @click="cancelNc()">{{'tooling_equipment_button_cancel' | localize("Annulla")}}</button>
<button class="btn blue-reverse" v-if="enableModify && selectedEquipment.id>=0" @click="buttonSave(selectedTool, selectedEquipment)">{{'tooling_equipment_button_save' | localize("Salva")}}</button>
<!-- <button class="btn blue-reverse" v-if="enableModify && (!selectedEquipment.id || selectedEquipment.id<=0)" @click="buttonSave(selectedTool, selectedEquipment)">{{'tooling_equipment_button_add' | localize("Aggiungi")}}</button> -->
</div>