@@ -34,8 +34,17 @@
diff --git a/Step/wwwroot/src/components/tooling-equipment.ts b/Step/wwwroot/src/components/tooling-equipment.ts
index 1cb649a6..bed8b38a 100644
--- a/Step/wwwroot/src/components/tooling-equipment.ts
+++ b/Step/wwwroot/src/components/tooling-equipment.ts
@@ -39,6 +39,7 @@ export default class toolingEquipment extends Vue {
public enableParameters: boolean = true;
public enableEquipment: boolean = false;
+ public enableModify: any = false;
async mounted() {
await new ToolingService().GetTools();
@@ -58,14 +59,20 @@ export default class toolingEquipment extends Vue {
}
public selectTool(item){
+ this.toolsConfiguration = (this.$store.state as AppModel).tooling.toolsConfiguration;
+ this.edgeConfiguration = (this.$store.state as AppModel).tooling.edgesConfiguration;
this.selectedTool = item;
this.enableParameters = true;
this.enableEquipment = false;
this.selectedEquipment = null;
+ this.enableModify = false;
}
- public addEquipment(){
- this.selectedTool = {};
+ public modify(){
+ this.enableModify = true;
+ }
+
+ public fieldTool(){
this.toolsConfiguration = [];
for(let f in (this.$store.state as AppModel).tooling.toolsConfiguration){
@@ -76,6 +83,12 @@ export default class toolingEquipment extends Vue {
}
}
+ public addEquipment(){
+ this.selectedTool = {};
+ this.enableModify = true;
+ this.fieldTool();
+ }
+
public getDynamicFields(tooltype : string): Array{
var typeid = parseInt(tooltype);
return (this.$store.state as AppModel).tooling.edgesAdditionalParamsConfiguration[typeid];
@@ -104,6 +117,7 @@ export default class toolingEquipment extends Vue {
this.enableParameters = true;
this.enableEquipment = false;
this.selectedEquipment = null;
+ this.enableModify = false;
}
else if (elem.id <= 0){
this.fieldEdge(elem);
@@ -111,6 +125,7 @@ export default class toolingEquipment extends Vue {
console.log(this.selectedEquipment);
this.enableEquipment = true;
this.enableParameters = false;
+ this.enableModify = false;
}
else if(elem.id > 0){
this.toolsConfiguration = (this.$store.state as AppModel).tooling.toolsConfiguration;
@@ -118,16 +133,18 @@ export default class toolingEquipment extends Vue {
this.selectedEquipment = elem;
this.enableEquipment = true;
this.enableParameters = false;
+ this.enableModify = false;
}
else{
this.selectedEquipment = null;
this.enableParameters = true;
this.enableEquipment = false;
+ this.enableModify = false;
}
}
- public cancel = function (path:string) {
- this.$router.push({ path: path});
+ public cancel = function (path: string) {
+ this.selectedTool = null;
}
public getToolIcon = function (id) {
@@ -143,24 +160,6 @@ export default class toolingEquipment extends Vue {
public addEdge(){
debugger
var obj = { edgeAdditionalParams:{}};
- // this.edgeConfiguration = [];
- // var obj = { edgeAdditionalParams:{}};
- // for (const key in (this.$store.state as AppModel).tooling.edgesConfiguration) {
- // const element = (this.$store.state as AppModel).tooling.edgesConfiguration[key];
- // if (!element.readOnly) {
- // this.edgeConfiguration.push(element);
- // }
- // obj[element.name] = 0;
- // }
-
- // let fields = this.getDynamicFields(this.selectedTool.toolType);
- // for (const key in fields) {
- // const element = fields[key];
- // obj.edgeAdditionalParams[element] = 0;
- // }
- // obj["id"] = -1;
- // this.selectedTool.edgesData.push(obj);
-
this.fieldEdge(obj);
obj["id"] = -1;
this.selectedTool.edgesData.push(obj);
@@ -179,7 +178,7 @@ export default class toolingEquipment extends Vue {
});
}
- async modify(model) {
+ async modifyTool(model) {
new ToolingService().UpdateSiemensTool(model).then(response => {
this.toolsConfiguration = (this.$store.state as AppModel).tooling.toolsConfiguration;
this.edgeConfiguration = (this.$store.state as AppModel).tooling.edgesConfiguration;
@@ -207,14 +206,14 @@ export default class toolingEquipment extends Vue {
async buttonSave(tool: any, edge: any){
debugger
if(tool.id){
- if(edge.id > 0){
+ if(edge && edge.id > 0){
this.modifyEdge(tool, edge);
}
- else if (edge.id <= 0){
+ else if ( edge && edge.id <= 0){
this.saveEdge(tool, edge);
}
else{
- this.modify(tool);
+ this.modifyTool(tool);
}
}
else{
diff --git a/Step/wwwroot/src/components/tooling-equipment.vue b/Step/wwwroot/src/components/tooling-equipment.vue
index f7f00784..54692e8c 100644
--- a/Step/wwwroot/src/components/tooling-equipment.vue
+++ b/Step/wwwroot/src/components/tooling-equipment.vue
@@ -43,7 +43,7 @@