diff --git a/Step/wwwroot/assets/styles/base/tooling.less b/Step/wwwroot/assets/styles/base/tooling.less index c5ae8c5e..50fb88f0 100644 --- a/Step/wwwroot/assets/styles/base/tooling.less +++ b/Step/wwwroot/assets/styles/base/tooling.less @@ -146,6 +146,18 @@ text-align: left; width: calc(~'100% - 159px'); margin-top: 11px; + ul{ + margin: 0; + padding: 0; + li{ + display: inline; + margin-right: 5px; + padding-right: 5px; + } + li:not(:last-child) { + border-right: 1px solid #4b4b4b; + } + } } .text-right{ diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index e15f7aa1..95ed7ab9 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -6952,6 +6952,18 @@ footer .container button.big:before { width: calc(100% - 159px); margin-top: 11px; } +.tool .text-body ul { + margin: 0; + padding: 0; +} +.tool .text-body ul li { + display: inline; + margin-right: 5px; + padding-right: 5px; +} +.tool .text-body ul li:not(:last-child) { + border-right: 1px solid #4b4b4b; +} .tool .text-right { display: flex; align-items: center; diff --git a/Step/wwwroot/src/app_modules/production/components/production.ts b/Step/wwwroot/src/app_modules/production/components/production.ts index a0bc2b56..c4e44b9d 100644 --- a/Step/wwwroot/src/app_modules/production/components/production.ts +++ b/Step/wwwroot/src/app_modules/production/components/production.ts @@ -123,6 +123,7 @@ export default class Production extends Vue { } getHeadstoolName(id) { var r = this.getHeadsProperty(id); + console.log(r); if(r.toolData) return r.toolData.toolName } diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts b/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts index c3c1528b..c7acdd08 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts @@ -34,23 +34,24 @@ export default class depot extends Vue { public calcItemName(shank): any { + console.log("shank",shank); if (!shank.childsTools) return this.$options.filters.localize("tooling_tool_abbreviation", 'T%d', shank.shankId); - if (shank.childsTools.length > 1) + if (shank.childsTools.length > 1 || this.multitoolOptionActive) return this.$options.filters.localize("tooling_shank_abbreviation", 'S%d', shank.id); else return this.$options.filters.localize("tooling_tool_abbreviation", 'T%d', shank.childsTools[0].id); } public calcItemTitle(shank): any { - if (shank.childsTools && shank.childsTools.length > 1) { + if ((shank.childsTools && shank.childsTools.length > 1) || this.multitoolOptionActive) { let str = "" return str; @@ -74,7 +75,11 @@ export default class depot extends Vue { public get familyOptionActive(): boolean { return (this.$store.state as AppModel).tooling.familyOptionActive; } - + + public get multitoolOptionActive(): boolean { + return (this.$store.state as AppModel).tooling.multitoolOptionActive; + } + public familyNameFromId(id): any { var found = (this.$store.state as AppModel).tooling.ncFamilies.find(k => k.id == id); if (found) @@ -255,15 +260,18 @@ export default class depot extends Vue { } // Controllo se l'utensile รจ un utensile montato nel mandrino - public checkIfToolIsMountedInSpindle(toolId) { - + public checkIfToolIsMountedInSpindle(tool) { const heads = this.$store.state.machineInfo.heads for (let i = 0; i < heads.length; i++) { const head = this.$store.getters.getHeadsProperty(heads[i].id) if(head) - if(!head.fixedHead && toolId === head.mountedTool){ - return head.id + if(!head.fixedHead){ + for (let j = 0; j < tool.childsTools.length; j++) { + if(tool.childsTools[j].id === head.mountedTool){ + return head.id + } + } } } diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.vue b/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.vue index 42e6b9d6..16894c0b 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.vue +++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.vue @@ -206,7 +206,7 @@ :title="calcItemTitle(ncToolAtPosition(pos.positionId))" :imgSource="getInfoNcShankIcon(ncToolAtPosition(pos.positionId))" :editable="editable" - :headId="checkIfToolIsMountedInSpindle(ncToolAtPosition(pos.positionId).id)" + :headId="checkIfToolIsMountedInSpindle(ncToolAtPosition(pos.positionId))" @click="removeToolsToDepot(pos.positionId, ncToolAtPosition(pos.positionId))" @clickinfo="openInfoShank(ncToolAtPosition(pos.positionId).id)">