diff --git a/Step/wwwroot/assets/styles/base/tooling-equipment.less b/Step/wwwroot/assets/styles/base/tooling-equipment.less index ca8b9fd3..e61c0e9b 100644 --- a/Step/wwwroot/assets/styles/base/tooling-equipment.less +++ b/Step/wwwroot/assets/styles/base/tooling-equipment.less @@ -275,3 +275,7 @@ } } } + +.avoid-clicks { + pointer-events: none; +} \ No newline at end of file diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index 113d7fa5..aaa3d2cc 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -6830,6 +6830,9 @@ footer .container button.big:before { color: #dfdfdf; background-image: none; } +.avoid-clicks { + pointer-events: none; +} .info-equipment-container { height: 100%; width: 100%; diff --git a/Step/wwwroot/src/components/tooling-equipment.ts b/Step/wwwroot/src/components/tooling-equipment.ts index bed8b38a..80fa0c75 100644 --- a/Step/wwwroot/src/components/tooling-equipment.ts +++ b/Step/wwwroot/src/components/tooling-equipment.ts @@ -40,6 +40,7 @@ export default class toolingEquipment extends Vue { public enableParameters: boolean = true; public enableEquipment: boolean = false; public enableModify: any = false; + public disableList: any = false; async mounted() { await new ToolingService().GetTools(); @@ -70,6 +71,7 @@ export default class toolingEquipment extends Vue { public modify(){ this.enableModify = true; + this.disableList = true; } public fieldTool(){ @@ -86,6 +88,7 @@ export default class toolingEquipment extends Vue { public addEquipment(){ this.selectedTool = {}; this.enableModify = true; + this.disableList = true; this.fieldTool(); } @@ -125,7 +128,7 @@ export default class toolingEquipment extends Vue { console.log(this.selectedEquipment); this.enableEquipment = true; this.enableParameters = false; - this.enableModify = false; + this.enableModify = true; } else if(elem.id > 0){ this.toolsConfiguration = (this.$store.state as AppModel).tooling.toolsConfiguration; @@ -143,8 +146,9 @@ export default class toolingEquipment extends Vue { } } - public cancel = function (path: string) { + public cancel = function () { this.selectedTool = null; + this.disableList = false; } public getToolIcon = function (id) { @@ -159,6 +163,8 @@ export default class toolingEquipment extends Vue { private internalCounter = -1; public addEdge(){ debugger + this.disableList = true; + this.enableModify = true; var obj = { edgeAdditionalParams:{}}; this.fieldEdge(obj); obj["id"] = -1; @@ -175,6 +181,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.disableList = false; }); } @@ -182,6 +189,7 @@ export default class toolingEquipment extends Vue { new ToolingService().UpdateSiemensTool(model).then(response => { this.toolsConfiguration = (this.$store.state as AppModel).tooling.toolsConfiguration; this.edgeConfiguration = (this.$store.state as AppModel).tooling.edgesConfiguration; + this.disableList = false; }); } @@ -192,6 +200,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.selectTab(response); + this.disableList = false; }); } @@ -200,6 +209,7 @@ export default class toolingEquipment extends Vue { new ToolingService().UpdateEdgeData(tool,model).then(response => { this.toolsConfiguration = (this.$store.state as AppModel).tooling.toolsConfiguration; this.edgeConfiguration = (this.$store.state as AppModel).tooling.edgesConfiguration; + this.disableList = false; }); } diff --git a/Step/wwwroot/src/components/tooling-equipment.vue b/Step/wwwroot/src/components/tooling-equipment.vue index 54692e8c..8ffb1f7b 100644 --- a/Step/wwwroot/src/components/tooling-equipment.vue +++ b/Step/wwwroot/src/components/tooling-equipment.vue @@ -19,18 +19,18 @@ -
+
-
+
Modifica di {{selectedTool.id}} {{selectedTool.familyName}}
-
+
{{'tooling_equipment_list_category_' + c | localize(c)}}
- +
@@ -67,7 +67,7 @@
{{'tooling_edgesdata_skill_tools' | localize("Tagliente")}} {{(selectedEquipment.id > 0 ? selectedEquipment.id : "")}}
-
+
{{'tooling_equipment_list_category_' + ce | localize(ce)}}
{ this.familyConfiguration = (this.$store.state as AppModel).tooling.familyConfiguration; + this.disableList = false; }); } diff --git a/Step/wwwroot/src/components/tooling-families.vue b/Step/wwwroot/src/components/tooling-families.vue index ce7b1efa..6cb20ea7 100644 --- a/Step/wwwroot/src/components/tooling-families.vue +++ b/Step/wwwroot/src/components/tooling-families.vue @@ -19,19 +19,19 @@
-
+
-
+
@@ -42,7 +42,7 @@
{{'tooling_families_boxright_header_modify' | localize("Modifica di")}} {{selectedTool.name}}
{{'tooling_families_boxright_header_add' | localize("Aggiungi")}} {{selectedTool.name}}
-
+
{{'tooling_families_list_category_' + c | localize(c)}}
{ this.magposConfiguration = (this.$store.state as AppModel).tooling.magazinePosConfiguration; + this.disableList = false; }); } } diff --git a/Step/wwwroot/src/components/tooling-magpos.vue b/Step/wwwroot/src/components/tooling-magpos.vue index 75af861a..55139db2 100644 --- a/Step/wwwroot/src/components/tooling-magpos.vue +++ b/Step/wwwroot/src/components/tooling-magpos.vue @@ -19,7 +19,7 @@
-
+
-->
{{'tooling_magpos_boxright_header_modify' | localize("Modifica della Manina")}} {{selectedTool.id}} {{'tooling_magpos_boxright_header_modify_mag' | localize("nel Magazzino")}} {{selectedTool.magazineId}}
-
+
{{'tooling_magpos_list_category_general' | localize("Generali")}}
{ this.shankConfiguration = (this.$store.state as AppModel).tooling.shankConfiguration; + this.disableList = false; }); } diff --git a/Step/wwwroot/src/components/tooling-shanks.vue b/Step/wwwroot/src/components/tooling-shanks.vue index c9b34ffc..f9656097 100644 --- a/Step/wwwroot/src/components/tooling-shanks.vue +++ b/Step/wwwroot/src/components/tooling-shanks.vue @@ -19,7 +19,7 @@
-
+
@@ -35,7 +35,7 @@
-
+
@@ -45,7 +45,7 @@
{{'tooling_shanks_boxright_header_modify' | localize("Modifica di Codolo")}} {{selectedTool.id}}
-
+
{{'tooling_shanks_list_category_' + c | localize(c)}}