Fix siemens tool table

This commit is contained in:
Lucio Maranta
2019-10-03 13:01:36 +02:00
parent 256536df2f
commit 80057fc3ec
4 changed files with 7 additions and 2 deletions
Binary file not shown.
@@ -88,7 +88,7 @@ namespace Step.Model.DTOModels.ToolModels
LifeType = dtoModel.LifeType,
FamilyName = dtoModel.FamilyName,
MaxSpeed = dtoModel.MaxSpeed,
MaxAcceleration = dtoModel.MaxAcceleration,
//MaxAcceleration = dtoModel.MaxAcceleration,
IsEnabled = dtoModel.IsEnabled,
IsActive = dtoModel.IsActive,
IsInhibited = dtoModel.IsInhibited,
@@ -252,6 +252,7 @@ export default class toolingEquipment extends Vue {
this.toolsConfiguration = (this.$store.state as AppModel).tooling.toolsConfiguration;
this.edgeConfiguration = (this.$store.state as AppModel).tooling.edgesConfiguration;
this.selectedTool = Object.assign({}, item);
if(!this.isSiemens){
this.pushOffset(item);
}
@@ -260,6 +261,7 @@ export default class toolingEquipment extends Vue {
this.enableAddOffsetToTool = false;
this.enableToolModify = false;
// If an offset tab was selected, when a new tool is selected, force the focus on the same tab number (if exist)
if(!this.isSiemens && this.selectedEquipment){
if(this.selectedTool.offsetId1 > 0)
this.selectTab(this.selectedTool.offsetData[0]);
@@ -274,6 +276,7 @@ export default class toolingEquipment extends Vue {
}
if(this.isSiemens){
this.selectedEquipment = Object.assign({}, {});
if (this.selectedTool.edgesData.length < this.maxEdgesPerTools) {
this.enableAddEdge = false;
}
@@ -691,7 +694,9 @@ public isEquipmentSelected(offset){
async modifyTool(model) {
if(this.isSiemens){
await awaiter(new ToolingService().UpdateSiemensTool(model).then(response => {
var edgesData = this.selectedTool.edgesData
this.selectedTool = response;
this.selectedTool.edgesData = edgesData;
this.toolsConfiguration = (this.$store.state as AppModel).tooling.toolsConfiguration;
this.edgeConfiguration = (this.$store.state as AppModel).tooling.edgesConfiguration;
this.disableList = false;
@@ -122,7 +122,7 @@
</div>
<!-- Siemens offsets-->
<div class="box-right-body" v-if="enableOffsets && isSiemens">
<button class="btn deleteElement" :disabled="!canDeleteSelectedEdge()" @click="deleteEdgeData(selectedTool,selectedEquipment)"><i class="fa fa-trash"></i></button>
<button class="btn deleteElement" v-if="selectedEquipment && selectedEquipment.id != 1" :disabled="!canDeleteSelectedEdge()" @click="deleteEdgeData(selectedTool,selectedEquipment)"><i class="fa fa-trash"></i></button>
<div class="box-right-label-header" v-if="selectedEquipment && selectedEquipment.id > 0">{{'tooling_edgesdata_label_edit' | localize("Modifica Tagliente n. %d",selectedEquipment.id)}}</div>
<div class="box-right-label-header" v-if="selectedEquipment && !selectedEquipment.id">{{'tooling_edgesdata_label_new' | localize("Creazione nuovo Tagliente")}}</div>
<div class="list-skill-equipment scrollable">