From f0112ab8e39ffc4bae25fd4f171aebdb41e2311d Mon Sep 17 00:00:00 2001 From: Alessandro Francia Date: Fri, 18 May 2018 08:19:52 +0200 Subject: [PATCH] get demo 22 --- .../assets/styles/base/tooling-equipment.less | 70 ++-- Step/wwwroot/assets/styles/style.css | 313 +++++++++--------- Step/wwwroot/src/components/depot.ts | 4 +- Step/wwwroot/src/components/depot.vue | 21 +- .../src/components/tooling-equipment.ts | 51 ++- .../src/components/tooling-equipment.vue | 22 +- .../src/components/tooling-families.ts | 23 +- .../src/components/tooling-families.vue | 18 +- Step/wwwroot/src/components/tooling-magpos.ts | 13 +- .../wwwroot/src/components/tooling-magpos.vue | 9 +- Step/wwwroot/src/components/tooling-shanks.ts | 28 +- .../wwwroot/src/components/tooling-shanks.vue | 18 +- 12 files changed, 341 insertions(+), 249 deletions(-) diff --git a/Step/wwwroot/assets/styles/base/tooling-equipment.less b/Step/wwwroot/assets/styles/base/tooling-equipment.less index 33063540..ca8b9fd3 100644 --- a/Step/wwwroot/assets/styles/base/tooling-equipment.less +++ b/Step/wwwroot/assets/styles/base/tooling-equipment.less @@ -28,7 +28,7 @@ } .body{ width: 100%; - height: calc(~'100% - 161px'); + height: calc(~'100% - 83px'); border-radius:2px; background-color: @color-silver; display: flex; @@ -85,7 +85,6 @@ margin-bottom: 16px; } .footer{ - height: calc(~'100% - 646px'); display: flex; align-items: center; justify-content: center; @@ -105,15 +104,14 @@ } } .box-right{ - width: 1320px; + width: 1320px; height: 100%; background-color: @color-white4; - button{ + button.deleteElement{ float: right; width: 48px; height: 48px; padding: 0; - margin-top: 24px; margin-right: 16px; .fa{ width: 21px; @@ -131,7 +129,8 @@ } .list-skill-equipment, .list-skill-families, .list-skill-shanks, .list-skill-magpos { width: 99%; - height: calc(~'100% - 102px'); + height: calc(~'100% - 120px'); + margin-bottom: 12px; // display: flex; // flex-wrap: wrap; // align-items: center; @@ -155,20 +154,32 @@ } } } - } - } - .tooling-equipment-footer, .tooling-families-footer, .tooling-shanks-footer, .tooling-magpos-footer{ - height:80px; - float: right; - display: flex; - align-items: center; - button.blue-reverse{ - background-image: linear-gradient(to bottom,@color-nice-blue,@color-darkish-blue); - color: @color-background-white; - font-size: 18px; - font-weight: 600; - } + .list-skill-magpos{ + height: calc(~'100% - 190px'); + } + .tooling-magpos-footer{ + height:80px; + float: right; + display: flex; + align-items: center; + button.blue-reverse{ + background-image: linear-gradient(to bottom,@color-nice-blue,@color-darkish-blue); + color: @color-background-white; + font-size: 18px; + font-weight: 600; + } + button.blue-reverse:disabled{ + background-color: @color-darkish-blue-two; + color: @color-white3; + background-image: none; + } + } + + } + + } + } } @@ -211,7 +222,7 @@ position: absolute; top: calc(~'50% - 24px'); margin-left: 20px; - + padding: 0; .fa { vertical-align: middle; font-size: 21px; @@ -242,8 +253,25 @@ } .tooling-families-container .box-right .box-right-body, .tooling-shanks-container .box-right .box-right-body, .tooling-equipment-container .box-right .box-right-body{ - height: calc(~'100% - 81px'); + height: calc(~'100% - 136px'); button{ margin-top: -30px !important; } + .tooling-equipment-footer, .tooling-families-footer, .tooling-shanks-footer{ + height:80px; + float: right; + display: flex; + align-items: center; + button.blue-reverse{ + background-image: linear-gradient(to bottom,@color-nice-blue,@color-darkish-blue); + color: @color-background-white; + font-size: 18px; + font-weight: 600; + } + button.blue-reverse:disabled{ + background-color: @color-darkish-blue-two; + color: @color-white3; + background-image: none; + } + } } diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index f2af1c36..113d7fa5 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -4690,7 +4690,7 @@ footer .container button.big:before { .tooling-shanks-container .tooling-magpos-box .body, .tooling-magpos-container .tooling-magpos-box .body { width: 100%; - height: calc(100% - 161px); + height: calc(100% - 83px); border-radius: 2px; background-color: #bbbcbc; display: flex; @@ -4869,7 +4869,6 @@ footer .container button.big:before { .tooling-families-container .tooling-magpos-box .body .list-left .footer, .tooling-shanks-container .tooling-magpos-box .body .list-left .footer, .tooling-magpos-container .tooling-magpos-box .body .list-left .footer { - height: calc(100% - 646px); display: flex; align-items: center; justify-content: center; @@ -4937,45 +4936,44 @@ footer .container button.big:before { height: 100%; background-color: #f3f3f3; } -.tooling-equipment-container .tooling-equipment-box .body .box-right button, -.tooling-families-container .tooling-equipment-box .body .box-right button, -.tooling-shanks-container .tooling-equipment-box .body .box-right button, -.tooling-magpos-container .tooling-equipment-box .body .box-right button, -.tooling-equipment-container .tooling-families-box .body .box-right button, -.tooling-families-container .tooling-families-box .body .box-right button, -.tooling-shanks-container .tooling-families-box .body .box-right button, -.tooling-magpos-container .tooling-families-box .body .box-right button, -.tooling-equipment-container .tooling-shanks-box .body .box-right button, -.tooling-families-container .tooling-shanks-box .body .box-right button, -.tooling-shanks-container .tooling-shanks-box .body .box-right button, -.tooling-magpos-container .tooling-shanks-box .body .box-right button, -.tooling-equipment-container .tooling-magpos-box .body .box-right button, -.tooling-families-container .tooling-magpos-box .body .box-right button, -.tooling-shanks-container .tooling-magpos-box .body .box-right button, -.tooling-magpos-container .tooling-magpos-box .body .box-right button { +.tooling-equipment-container .tooling-equipment-box .body .box-right button.deleteElement, +.tooling-families-container .tooling-equipment-box .body .box-right button.deleteElement, +.tooling-shanks-container .tooling-equipment-box .body .box-right button.deleteElement, +.tooling-magpos-container .tooling-equipment-box .body .box-right button.deleteElement, +.tooling-equipment-container .tooling-families-box .body .box-right button.deleteElement, +.tooling-families-container .tooling-families-box .body .box-right button.deleteElement, +.tooling-shanks-container .tooling-families-box .body .box-right button.deleteElement, +.tooling-magpos-container .tooling-families-box .body .box-right button.deleteElement, +.tooling-equipment-container .tooling-shanks-box .body .box-right button.deleteElement, +.tooling-families-container .tooling-shanks-box .body .box-right button.deleteElement, +.tooling-shanks-container .tooling-shanks-box .body .box-right button.deleteElement, +.tooling-magpos-container .tooling-shanks-box .body .box-right button.deleteElement, +.tooling-equipment-container .tooling-magpos-box .body .box-right button.deleteElement, +.tooling-families-container .tooling-magpos-box .body .box-right button.deleteElement, +.tooling-shanks-container .tooling-magpos-box .body .box-right button.deleteElement, +.tooling-magpos-container .tooling-magpos-box .body .box-right button.deleteElement { float: right; width: 48px; height: 48px; padding: 0; - margin-top: 24px; margin-right: 16px; } -.tooling-equipment-container .tooling-equipment-box .body .box-right button .fa, -.tooling-families-container .tooling-equipment-box .body .box-right button .fa, -.tooling-shanks-container .tooling-equipment-box .body .box-right button .fa, -.tooling-magpos-container .tooling-equipment-box .body .box-right button .fa, -.tooling-equipment-container .tooling-families-box .body .box-right button .fa, -.tooling-families-container .tooling-families-box .body .box-right button .fa, -.tooling-shanks-container .tooling-families-box .body .box-right button .fa, -.tooling-magpos-container .tooling-families-box .body .box-right button .fa, -.tooling-equipment-container .tooling-shanks-box .body .box-right button .fa, -.tooling-families-container .tooling-shanks-box .body .box-right button .fa, -.tooling-shanks-container .tooling-shanks-box .body .box-right button .fa, -.tooling-magpos-container .tooling-shanks-box .body .box-right button .fa, -.tooling-equipment-container .tooling-magpos-box .body .box-right button .fa, -.tooling-families-container .tooling-magpos-box .body .box-right button .fa, -.tooling-shanks-container .tooling-magpos-box .body .box-right button .fa, -.tooling-magpos-container .tooling-magpos-box .body .box-right button .fa { +.tooling-equipment-container .tooling-equipment-box .body .box-right button.deleteElement .fa, +.tooling-families-container .tooling-equipment-box .body .box-right button.deleteElement .fa, +.tooling-shanks-container .tooling-equipment-box .body .box-right button.deleteElement .fa, +.tooling-magpos-container .tooling-equipment-box .body .box-right button.deleteElement .fa, +.tooling-equipment-container .tooling-families-box .body .box-right button.deleteElement .fa, +.tooling-families-container .tooling-families-box .body .box-right button.deleteElement .fa, +.tooling-shanks-container .tooling-families-box .body .box-right button.deleteElement .fa, +.tooling-magpos-container .tooling-families-box .body .box-right button.deleteElement .fa, +.tooling-equipment-container .tooling-shanks-box .body .box-right button.deleteElement .fa, +.tooling-families-container .tooling-shanks-box .body .box-right button.deleteElement .fa, +.tooling-shanks-container .tooling-shanks-box .body .box-right button.deleteElement .fa, +.tooling-magpos-container .tooling-shanks-box .body .box-right button.deleteElement .fa, +.tooling-equipment-container .tooling-magpos-box .body .box-right button.deleteElement .fa, +.tooling-families-container .tooling-magpos-box .body .box-right button.deleteElement .fa, +.tooling-shanks-container .tooling-magpos-box .body .box-right button.deleteElement .fa, +.tooling-magpos-container .tooling-magpos-box .body .box-right button.deleteElement .fa { width: 21px; height: 22px; } @@ -5068,7 +5066,8 @@ footer .container button.big:before { .tooling-shanks-container .tooling-magpos-box .body .box-right .list-skill-magpos, .tooling-magpos-container .tooling-magpos-box .body .box-right .list-skill-magpos { width: 99%; - height: calc(100% - 102px); + height: calc(100% - 120px); + margin-bottom: 12px; overflow-y: auto; } .tooling-equipment-container .tooling-equipment-box .body .box-right .list-skill-equipment .list-skill-equipment-category, @@ -6618,144 +6617,86 @@ footer .container button.big:before { .tooling-magpos-container .tooling-magpos-box .body .box-right .list-skill-magpos .list-skill-magpos-category .input-box { margin: 8px; } -.tooling-equipment-container .tooling-equipment-box .tooling-equipment-footer, -.tooling-families-container .tooling-equipment-box .tooling-equipment-footer, -.tooling-shanks-container .tooling-equipment-box .tooling-equipment-footer, -.tooling-magpos-container .tooling-equipment-box .tooling-equipment-footer, -.tooling-equipment-container .tooling-families-box .tooling-equipment-footer, -.tooling-families-container .tooling-families-box .tooling-equipment-footer, -.tooling-shanks-container .tooling-families-box .tooling-equipment-footer, -.tooling-magpos-container .tooling-families-box .tooling-equipment-footer, -.tooling-equipment-container .tooling-shanks-box .tooling-equipment-footer, -.tooling-families-container .tooling-shanks-box .tooling-equipment-footer, -.tooling-shanks-container .tooling-shanks-box .tooling-equipment-footer, -.tooling-magpos-container .tooling-shanks-box .tooling-equipment-footer, -.tooling-equipment-container .tooling-magpos-box .tooling-equipment-footer, -.tooling-families-container .tooling-magpos-box .tooling-equipment-footer, -.tooling-shanks-container .tooling-magpos-box .tooling-equipment-footer, -.tooling-magpos-container .tooling-magpos-box .tooling-equipment-footer, -.tooling-equipment-container .tooling-equipment-box .tooling-families-footer, -.tooling-families-container .tooling-equipment-box .tooling-families-footer, -.tooling-shanks-container .tooling-equipment-box .tooling-families-footer, -.tooling-magpos-container .tooling-equipment-box .tooling-families-footer, -.tooling-equipment-container .tooling-families-box .tooling-families-footer, -.tooling-families-container .tooling-families-box .tooling-families-footer, -.tooling-shanks-container .tooling-families-box .tooling-families-footer, -.tooling-magpos-container .tooling-families-box .tooling-families-footer, -.tooling-equipment-container .tooling-shanks-box .tooling-families-footer, -.tooling-families-container .tooling-shanks-box .tooling-families-footer, -.tooling-shanks-container .tooling-shanks-box .tooling-families-footer, -.tooling-magpos-container .tooling-shanks-box .tooling-families-footer, -.tooling-equipment-container .tooling-magpos-box .tooling-families-footer, -.tooling-families-container .tooling-magpos-box .tooling-families-footer, -.tooling-shanks-container .tooling-magpos-box .tooling-families-footer, -.tooling-magpos-container .tooling-magpos-box .tooling-families-footer, -.tooling-equipment-container .tooling-equipment-box .tooling-shanks-footer, -.tooling-families-container .tooling-equipment-box .tooling-shanks-footer, -.tooling-shanks-container .tooling-equipment-box .tooling-shanks-footer, -.tooling-magpos-container .tooling-equipment-box .tooling-shanks-footer, -.tooling-equipment-container .tooling-families-box .tooling-shanks-footer, -.tooling-families-container .tooling-families-box .tooling-shanks-footer, -.tooling-shanks-container .tooling-families-box .tooling-shanks-footer, -.tooling-magpos-container .tooling-families-box .tooling-shanks-footer, -.tooling-equipment-container .tooling-shanks-box .tooling-shanks-footer, -.tooling-families-container .tooling-shanks-box .tooling-shanks-footer, -.tooling-shanks-container .tooling-shanks-box .tooling-shanks-footer, -.tooling-magpos-container .tooling-shanks-box .tooling-shanks-footer, -.tooling-equipment-container .tooling-magpos-box .tooling-shanks-footer, -.tooling-families-container .tooling-magpos-box .tooling-shanks-footer, -.tooling-shanks-container .tooling-magpos-box .tooling-shanks-footer, -.tooling-magpos-container .tooling-magpos-box .tooling-shanks-footer, -.tooling-equipment-container .tooling-equipment-box .tooling-magpos-footer, -.tooling-families-container .tooling-equipment-box .tooling-magpos-footer, -.tooling-shanks-container .tooling-equipment-box .tooling-magpos-footer, -.tooling-magpos-container .tooling-equipment-box .tooling-magpos-footer, -.tooling-equipment-container .tooling-families-box .tooling-magpos-footer, -.tooling-families-container .tooling-families-box .tooling-magpos-footer, -.tooling-shanks-container .tooling-families-box .tooling-magpos-footer, -.tooling-magpos-container .tooling-families-box .tooling-magpos-footer, -.tooling-equipment-container .tooling-shanks-box .tooling-magpos-footer, -.tooling-families-container .tooling-shanks-box .tooling-magpos-footer, -.tooling-shanks-container .tooling-shanks-box .tooling-magpos-footer, -.tooling-magpos-container .tooling-shanks-box .tooling-magpos-footer, -.tooling-equipment-container .tooling-magpos-box .tooling-magpos-footer, -.tooling-families-container .tooling-magpos-box .tooling-magpos-footer, -.tooling-shanks-container .tooling-magpos-box .tooling-magpos-footer, -.tooling-magpos-container .tooling-magpos-box .tooling-magpos-footer { +.tooling-equipment-container .tooling-equipment-box .body .box-right .list-skill-magpos, +.tooling-families-container .tooling-equipment-box .body .box-right .list-skill-magpos, +.tooling-shanks-container .tooling-equipment-box .body .box-right .list-skill-magpos, +.tooling-magpos-container .tooling-equipment-box .body .box-right .list-skill-magpos, +.tooling-equipment-container .tooling-families-box .body .box-right .list-skill-magpos, +.tooling-families-container .tooling-families-box .body .box-right .list-skill-magpos, +.tooling-shanks-container .tooling-families-box .body .box-right .list-skill-magpos, +.tooling-magpos-container .tooling-families-box .body .box-right .list-skill-magpos, +.tooling-equipment-container .tooling-shanks-box .body .box-right .list-skill-magpos, +.tooling-families-container .tooling-shanks-box .body .box-right .list-skill-magpos, +.tooling-shanks-container .tooling-shanks-box .body .box-right .list-skill-magpos, +.tooling-magpos-container .tooling-shanks-box .body .box-right .list-skill-magpos, +.tooling-equipment-container .tooling-magpos-box .body .box-right .list-skill-magpos, +.tooling-families-container .tooling-magpos-box .body .box-right .list-skill-magpos, +.tooling-shanks-container .tooling-magpos-box .body .box-right .list-skill-magpos, +.tooling-magpos-container .tooling-magpos-box .body .box-right .list-skill-magpos { + height: calc(100% - 190px); +} +.tooling-equipment-container .tooling-equipment-box .body .box-right .tooling-magpos-footer, +.tooling-families-container .tooling-equipment-box .body .box-right .tooling-magpos-footer, +.tooling-shanks-container .tooling-equipment-box .body .box-right .tooling-magpos-footer, +.tooling-magpos-container .tooling-equipment-box .body .box-right .tooling-magpos-footer, +.tooling-equipment-container .tooling-families-box .body .box-right .tooling-magpos-footer, +.tooling-families-container .tooling-families-box .body .box-right .tooling-magpos-footer, +.tooling-shanks-container .tooling-families-box .body .box-right .tooling-magpos-footer, +.tooling-magpos-container .tooling-families-box .body .box-right .tooling-magpos-footer, +.tooling-equipment-container .tooling-shanks-box .body .box-right .tooling-magpos-footer, +.tooling-families-container .tooling-shanks-box .body .box-right .tooling-magpos-footer, +.tooling-shanks-container .tooling-shanks-box .body .box-right .tooling-magpos-footer, +.tooling-magpos-container .tooling-shanks-box .body .box-right .tooling-magpos-footer, +.tooling-equipment-container .tooling-magpos-box .body .box-right .tooling-magpos-footer, +.tooling-families-container .tooling-magpos-box .body .box-right .tooling-magpos-footer, +.tooling-shanks-container .tooling-magpos-box .body .box-right .tooling-magpos-footer, +.tooling-magpos-container .tooling-magpos-box .body .box-right .tooling-magpos-footer { height: 80px; float: right; display: flex; align-items: center; } -.tooling-equipment-container .tooling-equipment-box .tooling-equipment-footer button.blue-reverse, -.tooling-families-container .tooling-equipment-box .tooling-equipment-footer button.blue-reverse, -.tooling-shanks-container .tooling-equipment-box .tooling-equipment-footer button.blue-reverse, -.tooling-magpos-container .tooling-equipment-box .tooling-equipment-footer button.blue-reverse, -.tooling-equipment-container .tooling-families-box .tooling-equipment-footer button.blue-reverse, -.tooling-families-container .tooling-families-box .tooling-equipment-footer button.blue-reverse, -.tooling-shanks-container .tooling-families-box .tooling-equipment-footer button.blue-reverse, -.tooling-magpos-container .tooling-families-box .tooling-equipment-footer button.blue-reverse, -.tooling-equipment-container .tooling-shanks-box .tooling-equipment-footer button.blue-reverse, -.tooling-families-container .tooling-shanks-box .tooling-equipment-footer button.blue-reverse, -.tooling-shanks-container .tooling-shanks-box .tooling-equipment-footer button.blue-reverse, -.tooling-magpos-container .tooling-shanks-box .tooling-equipment-footer button.blue-reverse, -.tooling-equipment-container .tooling-magpos-box .tooling-equipment-footer button.blue-reverse, -.tooling-families-container .tooling-magpos-box .tooling-equipment-footer button.blue-reverse, -.tooling-shanks-container .tooling-magpos-box .tooling-equipment-footer button.blue-reverse, -.tooling-magpos-container .tooling-magpos-box .tooling-equipment-footer button.blue-reverse, -.tooling-equipment-container .tooling-equipment-box .tooling-families-footer button.blue-reverse, -.tooling-families-container .tooling-equipment-box .tooling-families-footer button.blue-reverse, -.tooling-shanks-container .tooling-equipment-box .tooling-families-footer button.blue-reverse, -.tooling-magpos-container .tooling-equipment-box .tooling-families-footer button.blue-reverse, -.tooling-equipment-container .tooling-families-box .tooling-families-footer button.blue-reverse, -.tooling-families-container .tooling-families-box .tooling-families-footer button.blue-reverse, -.tooling-shanks-container .tooling-families-box .tooling-families-footer button.blue-reverse, -.tooling-magpos-container .tooling-families-box .tooling-families-footer button.blue-reverse, -.tooling-equipment-container .tooling-shanks-box .tooling-families-footer button.blue-reverse, -.tooling-families-container .tooling-shanks-box .tooling-families-footer button.blue-reverse, -.tooling-shanks-container .tooling-shanks-box .tooling-families-footer button.blue-reverse, -.tooling-magpos-container .tooling-shanks-box .tooling-families-footer button.blue-reverse, -.tooling-equipment-container .tooling-magpos-box .tooling-families-footer button.blue-reverse, -.tooling-families-container .tooling-magpos-box .tooling-families-footer button.blue-reverse, -.tooling-shanks-container .tooling-magpos-box .tooling-families-footer button.blue-reverse, -.tooling-magpos-container .tooling-magpos-box .tooling-families-footer button.blue-reverse, -.tooling-equipment-container .tooling-equipment-box .tooling-shanks-footer button.blue-reverse, -.tooling-families-container .tooling-equipment-box .tooling-shanks-footer button.blue-reverse, -.tooling-shanks-container .tooling-equipment-box .tooling-shanks-footer button.blue-reverse, -.tooling-magpos-container .tooling-equipment-box .tooling-shanks-footer button.blue-reverse, -.tooling-equipment-container .tooling-families-box .tooling-shanks-footer button.blue-reverse, -.tooling-families-container .tooling-families-box .tooling-shanks-footer button.blue-reverse, -.tooling-shanks-container .tooling-families-box .tooling-shanks-footer button.blue-reverse, -.tooling-magpos-container .tooling-families-box .tooling-shanks-footer button.blue-reverse, -.tooling-equipment-container .tooling-shanks-box .tooling-shanks-footer button.blue-reverse, -.tooling-families-container .tooling-shanks-box .tooling-shanks-footer button.blue-reverse, -.tooling-shanks-container .tooling-shanks-box .tooling-shanks-footer button.blue-reverse, -.tooling-magpos-container .tooling-shanks-box .tooling-shanks-footer button.blue-reverse, -.tooling-equipment-container .tooling-magpos-box .tooling-shanks-footer button.blue-reverse, -.tooling-families-container .tooling-magpos-box .tooling-shanks-footer button.blue-reverse, -.tooling-shanks-container .tooling-magpos-box .tooling-shanks-footer button.blue-reverse, -.tooling-magpos-container .tooling-magpos-box .tooling-shanks-footer button.blue-reverse, -.tooling-equipment-container .tooling-equipment-box .tooling-magpos-footer button.blue-reverse, -.tooling-families-container .tooling-equipment-box .tooling-magpos-footer button.blue-reverse, -.tooling-shanks-container .tooling-equipment-box .tooling-magpos-footer button.blue-reverse, -.tooling-magpos-container .tooling-equipment-box .tooling-magpos-footer button.blue-reverse, -.tooling-equipment-container .tooling-families-box .tooling-magpos-footer button.blue-reverse, -.tooling-families-container .tooling-families-box .tooling-magpos-footer button.blue-reverse, -.tooling-shanks-container .tooling-families-box .tooling-magpos-footer button.blue-reverse, -.tooling-magpos-container .tooling-families-box .tooling-magpos-footer button.blue-reverse, -.tooling-equipment-container .tooling-shanks-box .tooling-magpos-footer button.blue-reverse, -.tooling-families-container .tooling-shanks-box .tooling-magpos-footer button.blue-reverse, -.tooling-shanks-container .tooling-shanks-box .tooling-magpos-footer button.blue-reverse, -.tooling-magpos-container .tooling-shanks-box .tooling-magpos-footer button.blue-reverse, -.tooling-equipment-container .tooling-magpos-box .tooling-magpos-footer button.blue-reverse, -.tooling-families-container .tooling-magpos-box .tooling-magpos-footer button.blue-reverse, -.tooling-shanks-container .tooling-magpos-box .tooling-magpos-footer button.blue-reverse, -.tooling-magpos-container .tooling-magpos-box .tooling-magpos-footer button.blue-reverse { +.tooling-equipment-container .tooling-equipment-box .body .box-right .tooling-magpos-footer button.blue-reverse, +.tooling-families-container .tooling-equipment-box .body .box-right .tooling-magpos-footer button.blue-reverse, +.tooling-shanks-container .tooling-equipment-box .body .box-right .tooling-magpos-footer button.blue-reverse, +.tooling-magpos-container .tooling-equipment-box .body .box-right .tooling-magpos-footer button.blue-reverse, +.tooling-equipment-container .tooling-families-box .body .box-right .tooling-magpos-footer button.blue-reverse, +.tooling-families-container .tooling-families-box .body .box-right .tooling-magpos-footer button.blue-reverse, +.tooling-shanks-container .tooling-families-box .body .box-right .tooling-magpos-footer button.blue-reverse, +.tooling-magpos-container .tooling-families-box .body .box-right .tooling-magpos-footer button.blue-reverse, +.tooling-equipment-container .tooling-shanks-box .body .box-right .tooling-magpos-footer button.blue-reverse, +.tooling-families-container .tooling-shanks-box .body .box-right .tooling-magpos-footer button.blue-reverse, +.tooling-shanks-container .tooling-shanks-box .body .box-right .tooling-magpos-footer button.blue-reverse, +.tooling-magpos-container .tooling-shanks-box .body .box-right .tooling-magpos-footer button.blue-reverse, +.tooling-equipment-container .tooling-magpos-box .body .box-right .tooling-magpos-footer button.blue-reverse, +.tooling-families-container .tooling-magpos-box .body .box-right .tooling-magpos-footer button.blue-reverse, +.tooling-shanks-container .tooling-magpos-box .body .box-right .tooling-magpos-footer button.blue-reverse, +.tooling-magpos-container .tooling-magpos-box .body .box-right .tooling-magpos-footer button.blue-reverse { background-image: linear-gradient(to bottom, #1756ad, #002680); color: #fff; font-size: 18px; font-weight: 600; } +.tooling-equipment-container .tooling-equipment-box .body .box-right .tooling-magpos-footer button.blue-reverse:disabled, +.tooling-families-container .tooling-equipment-box .body .box-right .tooling-magpos-footer button.blue-reverse:disabled, +.tooling-shanks-container .tooling-equipment-box .body .box-right .tooling-magpos-footer button.blue-reverse:disabled, +.tooling-magpos-container .tooling-equipment-box .body .box-right .tooling-magpos-footer button.blue-reverse:disabled, +.tooling-equipment-container .tooling-families-box .body .box-right .tooling-magpos-footer button.blue-reverse:disabled, +.tooling-families-container .tooling-families-box .body .box-right .tooling-magpos-footer button.blue-reverse:disabled, +.tooling-shanks-container .tooling-families-box .body .box-right .tooling-magpos-footer button.blue-reverse:disabled, +.tooling-magpos-container .tooling-families-box .body .box-right .tooling-magpos-footer button.blue-reverse:disabled, +.tooling-equipment-container .tooling-shanks-box .body .box-right .tooling-magpos-footer button.blue-reverse:disabled, +.tooling-families-container .tooling-shanks-box .body .box-right .tooling-magpos-footer button.blue-reverse:disabled, +.tooling-shanks-container .tooling-shanks-box .body .box-right .tooling-magpos-footer button.blue-reverse:disabled, +.tooling-magpos-container .tooling-shanks-box .body .box-right .tooling-magpos-footer button.blue-reverse:disabled, +.tooling-equipment-container .tooling-magpos-box .body .box-right .tooling-magpos-footer button.blue-reverse:disabled, +.tooling-families-container .tooling-magpos-box .body .box-right .tooling-magpos-footer button.blue-reverse:disabled, +.tooling-shanks-container .tooling-magpos-box .body .box-right .tooling-magpos-footer button.blue-reverse:disabled, +.tooling-magpos-container .tooling-magpos-box .body .box-right .tooling-magpos-footer button.blue-reverse:disabled { + background-color: #004990; + color: #dfdfdf; + background-image: none; +} .tooling-families-container .text-body div + div, .tooling-shanks-container .text-body div + div, .tooling-magpos-container .text-body div + div { @@ -6802,6 +6743,7 @@ footer .container button.big:before { position: absolute; top: calc(50% - 24px); margin-left: 20px; + padding: 0; } .tooling-families-container .tab-box-right .tab.plus .btn .fa, .tooling-shanks-container .tab-box-right .tab.plus .btn .fa, @@ -6840,13 +6782,54 @@ footer .container button.big:before { .tooling-families-container .box-right .box-right-body, .tooling-shanks-container .box-right .box-right-body, .tooling-equipment-container .box-right .box-right-body { - height: calc(100% - 81px); + height: calc(100% - 136px); } .tooling-families-container .box-right .box-right-body button, .tooling-shanks-container .box-right .box-right-body button, .tooling-equipment-container .box-right .box-right-body button { margin-top: -30px !important; } +.tooling-families-container .box-right .box-right-body .tooling-equipment-footer, +.tooling-shanks-container .box-right .box-right-body .tooling-equipment-footer, +.tooling-equipment-container .box-right .box-right-body .tooling-equipment-footer, +.tooling-families-container .box-right .box-right-body .tooling-families-footer, +.tooling-shanks-container .box-right .box-right-body .tooling-families-footer, +.tooling-equipment-container .box-right .box-right-body .tooling-families-footer, +.tooling-families-container .box-right .box-right-body .tooling-shanks-footer, +.tooling-shanks-container .box-right .box-right-body .tooling-shanks-footer, +.tooling-equipment-container .box-right .box-right-body .tooling-shanks-footer { + height: 80px; + float: right; + display: flex; + align-items: center; +} +.tooling-families-container .box-right .box-right-body .tooling-equipment-footer button.blue-reverse, +.tooling-shanks-container .box-right .box-right-body .tooling-equipment-footer button.blue-reverse, +.tooling-equipment-container .box-right .box-right-body .tooling-equipment-footer button.blue-reverse, +.tooling-families-container .box-right .box-right-body .tooling-families-footer button.blue-reverse, +.tooling-shanks-container .box-right .box-right-body .tooling-families-footer button.blue-reverse, +.tooling-equipment-container .box-right .box-right-body .tooling-families-footer button.blue-reverse, +.tooling-families-container .box-right .box-right-body .tooling-shanks-footer button.blue-reverse, +.tooling-shanks-container .box-right .box-right-body .tooling-shanks-footer button.blue-reverse, +.tooling-equipment-container .box-right .box-right-body .tooling-shanks-footer button.blue-reverse { + background-image: linear-gradient(to bottom, #1756ad, #002680); + color: #fff; + font-size: 18px; + font-weight: 600; +} +.tooling-families-container .box-right .box-right-body .tooling-equipment-footer button.blue-reverse:disabled, +.tooling-shanks-container .box-right .box-right-body .tooling-equipment-footer button.blue-reverse:disabled, +.tooling-equipment-container .box-right .box-right-body .tooling-equipment-footer button.blue-reverse:disabled, +.tooling-families-container .box-right .box-right-body .tooling-families-footer button.blue-reverse:disabled, +.tooling-shanks-container .box-right .box-right-body .tooling-families-footer button.blue-reverse:disabled, +.tooling-equipment-container .box-right .box-right-body .tooling-families-footer button.blue-reverse:disabled, +.tooling-families-container .box-right .box-right-body .tooling-shanks-footer button.blue-reverse:disabled, +.tooling-shanks-container .box-right .box-right-body .tooling-shanks-footer button.blue-reverse:disabled, +.tooling-equipment-container .box-right .box-right-body .tooling-shanks-footer button.blue-reverse:disabled { + background-color: #004990; + color: #dfdfdf; + background-image: none; +} .info-equipment-container { height: 100%; width: 100%; diff --git a/Step/wwwroot/src/components/depot.ts b/Step/wwwroot/src/components/depot.ts index dbb45028..b7a9b690 100644 --- a/Step/wwwroot/src/components/depot.ts +++ b/Step/wwwroot/src/components/depot.ts @@ -4,9 +4,11 @@ import { tool, detailCard, cardToolDepot } from "src/modules/base-components/car import { store, AppModel } from "src/store"; import { DepotService } from "../services/depotService"; +import VueDraggable from 'vuedraggable' + declare let $: any; -@Component({ components: { tool, detailCard, cardToolDepot } }) +@Component({ components: { tool, detailCard, cardToolDepot, VueDraggable } }) export default class depot extends Vue { public get depot(): server.DepotModel[] { return (this.$store.state as AppModel).depot.depot; } diff --git a/Step/wwwroot/src/components/depot.vue b/Step/wwwroot/src/components/depot.vue index fb132e66..1f241287 100644 --- a/Step/wwwroot/src/components/depot.vue +++ b/Step/wwwroot/src/components/depot.vue @@ -20,10 +20,10 @@ -
- - -
+ + + +
@@ -34,8 +34,17 @@
- - + + + + + + + +
+ {{item.name}} +
+
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 @@
- +
Modifica di {{selectedTool.id}} {{selectedTool.familyName}}
@@ -57,9 +57,14 @@
+
+ + + +
- +
{{'tooling_edgesdata_skill_tools' | localize("Tagliente")}} {{(selectedEquipment.id > 0 ? selectedEquipment.id : "")}}
@@ -83,13 +88,18 @@
+
+ + +
+
+ + + -
- - -
+ diff --git a/Step/wwwroot/src/components/tooling-families.ts b/Step/wwwroot/src/components/tooling-families.ts index 2eb42e51..5b4278ea 100644 --- a/Step/wwwroot/src/components/tooling-families.ts +++ b/Step/wwwroot/src/components/tooling-families.ts @@ -24,6 +24,7 @@ export default class toolingFamilies extends Vue { public enableParameters: boolean = true; public enableEquipment: boolean = false; + public enableModify: any = false; public selectedTool: any = null; @@ -45,12 +46,16 @@ export default class toolingFamilies extends Vue { e.preventDefault(); }); } + public modify(){ + this.enableModify = true; + } public selectTool(item) { this.selectedTool = item; this.enableParameters = true; this.enableEquipment = false; this.familyConfiguration = (this.$store.state as AppModel).tooling.familyConfiguration; + this.enableModify = false; } public addFamily() { @@ -69,19 +74,22 @@ export default class toolingFamilies extends Vue { if (elem == 'Parameters') { this.enableParameters = true; this.enableEquipment = false; + this.enableModify = false; } else if (Number.isInteger(elem)) { this.enableEquipment = elem; this.enableParameters = false; + this.enableModify = false; } else { this.enableParameters = true; this.enableEquipment = false; + this.enableModify = false; } } public cancel = function (path: string) { - this.$router.push({ path: path }); + this.selectedTool = null } async save(item) { @@ -95,13 +103,24 @@ export default class toolingFamilies extends Vue { }); } - async modify(model) { + async modifyFamily(model) { new ToolingService().UpdateFamily(model).then(response => { this.familyConfiguration = (this.$store.state as AppModel).tooling.familyConfiguration; }); } + + async buttonSave(tool: any){ + debugger + if(tool.id){ + this.modifyFamily(tool); + } + else{ + this.save(tool); + } + } + async deleteFamily(model) { new ToolingService().DeleteFamily(model).then(response => { this.selectedTool = null; diff --git a/Step/wwwroot/src/components/tooling-families.vue b/Step/wwwroot/src/components/tooling-families.vue index 98a4099f..ce7b1efa 100644 --- a/Step/wwwroot/src/components/tooling-families.vue +++ b/Step/wwwroot/src/components/tooling-families.vue @@ -38,7 +38,7 @@
- +
{{'tooling_families_boxright_header_modify' | localize("Modifica di")}} {{selectedTool.name}}
{{'tooling_families_boxright_header_add' | localize("Aggiungi")}} {{selectedTool.name}}
@@ -55,9 +55,14 @@
+
+ + + +
- +
{{'tooling_childtoolsfamily_skill_tools' | localize(" Utensile")}} {{enableEquipment}}
@@ -75,14 +80,15 @@
+
+ + + +
-
- - -
diff --git a/Step/wwwroot/src/components/tooling-magpos.ts b/Step/wwwroot/src/components/tooling-magpos.ts index 4cc66da9..da8c3e25 100644 --- a/Step/wwwroot/src/components/tooling-magpos.ts +++ b/Step/wwwroot/src/components/tooling-magpos.ts @@ -13,6 +13,8 @@ export default class toolingMagPos extends Vue { public selectedTool: any = null; + public enableModify: any = false; + mounted() { new ToolingService().GetMagazinesPositions(); new ToolingService().GetMagazinePosConfiguration(); @@ -21,13 +23,18 @@ export default class toolingMagPos extends Vue { public selectTool(item){ this.selectedTool = item; + this.enableModify = false; this.magposConfiguration = (this.$store.state as AppModel).tooling.magazinePosConfiguration; } - public cancel = function (path:string) { - this.$router.push({ path: path}); + public modify(){ + this.enableModify = true; } - async modify(model) { + + public cancel = function (path: string) { + this.selectedTool = null + } + async modifyMagPos(model) { new ToolingService().UpdateMagPos(model).then(response => { this.magposConfiguration = (this.$store.state as AppModel).tooling.magazinePosConfiguration; diff --git a/Step/wwwroot/src/components/tooling-magpos.vue b/Step/wwwroot/src/components/tooling-magpos.vue index fe4ccd03..c9944dcc 100644 --- a/Step/wwwroot/src/components/tooling-magpos.vue +++ b/Step/wwwroot/src/components/tooling-magpos.vue @@ -42,12 +42,13 @@ +
+ + + +
-
- - -
diff --git a/Step/wwwroot/src/components/tooling-shanks.ts b/Step/wwwroot/src/components/tooling-shanks.ts index 55bd0d47..9bebdd74 100644 --- a/Step/wwwroot/src/components/tooling-shanks.ts +++ b/Step/wwwroot/src/components/tooling-shanks.ts @@ -30,6 +30,8 @@ export default class toolingShanks extends Vue { public enableEquipment: boolean = false; public selectedTool: any = null; + public enableModify: any = false; + async mounted() { await new ToolingService().GetShanks(); await new ToolingService().GetShankConfiguration(); @@ -49,6 +51,11 @@ export default class toolingShanks extends Vue { }); } + public modify(){ + this.enableModify = true; + } + + public addShank(){ this.selectedTool = {}; this.shankConfiguration = []; @@ -66,6 +73,7 @@ export default class toolingShanks extends Vue { this.enableParameters = true; this.enableEquipment = false; this.shankConfiguration = (this.$store.state as AppModel).tooling.shankConfiguration; + this.enableModify = false; } @@ -73,19 +81,33 @@ export default class toolingShanks extends Vue { if(elem == 'Parameters'){ this.enableParameters = true; this.enableEquipment = false; + this.enableModify = false; } else if (Number.isInteger(elem)){ this.enableEquipment = elem; this.enableParameters = false; + this.enableModify = false; } else{ this.enableParameters = true; this.enableEquipment = false; + this.enableModify = false; } } - public cancel = function (path:string) { - this.$router.push({ path: path}); + public cancel = function () { + this.selectedTool = null; + } + + + async buttonSave(tool: any){ + debugger + if(tool.id){ + this.modifyShank(tool); + } + else{ + this.save(tool); + } } async save(item) { @@ -98,7 +120,7 @@ export default class toolingShanks extends Vue { }); } - async modify(model) { + async modifyShank(model) { new ToolingService().UpdateShank(model).then(response => { this.shankConfiguration = (this.$store.state as AppModel).tooling.shankConfiguration; diff --git a/Step/wwwroot/src/components/tooling-shanks.vue b/Step/wwwroot/src/components/tooling-shanks.vue index e6f6201d..c9b34ffc 100644 --- a/Step/wwwroot/src/components/tooling-shanks.vue +++ b/Step/wwwroot/src/components/tooling-shanks.vue @@ -42,7 +42,7 @@
- +
{{'tooling_shanks_boxright_header_modify' | localize("Modifica di Codolo")}} {{selectedTool.id}}
@@ -56,9 +56,14 @@
+
+ + + +
- +
{{'tooling_childtoolsshank_skill_tools' | localize(" Utensile")}} {{enableEquipment}}
@@ -74,13 +79,14 @@
+
+ + + +
-
- - -