From 170df80d0aeabaaea084b336a0ee27151fe7f004 Mon Sep 17 00:00:00 2001 From: Alessandro Francia Date: Wed, 12 Sep 2018 10:17:31 +0200 Subject: [PATCH] queue --- Step/wwwroot/assets/styles/base/card.less | 6 + Step/wwwroot/assets/styles/base/modals.less | 8 +- Step/wwwroot/assets/styles/style.css | 258 ++++++++++++++---- Step/wwwroot/src/@types/production.d.ts | 10 + .../cards/card-element-queue.vue | 12 +- .../cards/card-job-production.vue | 1 + .../cards/card-production-cms.vue | 2 +- .../cards/card-queue-production.vue | 19 +- .../modal-add-element-queue.ts | 231 ++++++++++++++++ .../modal-add-element-queue.vue | 123 +++++++++ .../base-components/modal-load-program.ts | 1 + Step/wwwroot/src/services/hub.ts | 7 + Step/wwwroot/src/store/app.store.ts | 3 + Step/wwwroot/src/store/production.store.ts | 37 +++ 14 files changed, 648 insertions(+), 70 deletions(-) create mode 100644 Step/wwwroot/src/@types/production.d.ts create mode 100644 Step/wwwroot/src/modules/base-components/modal-add-element-queue.ts create mode 100644 Step/wwwroot/src/modules/base-components/modal-add-element-queue.vue create mode 100644 Step/wwwroot/src/store/production.store.ts diff --git a/Step/wwwroot/assets/styles/base/card.less b/Step/wwwroot/assets/styles/base/card.less index dbdf5d23..031b634e 100644 --- a/Step/wwwroot/assets/styles/base/card.less +++ b/Step/wwwroot/assets/styles/base/card.less @@ -841,6 +841,12 @@ border-radius: 2px; background-color: @color-background-white; box-shadow: 0 1px 2px 0 @color-black-40; + &.border-green{ + border: solid 2px @color-apple-green; + } + &.border-blue{ + border: solid 2px @color-clear-blue; + } .card-element-queue-name{ width: 100%; display: flex; diff --git a/Step/wwwroot/assets/styles/base/modals.less b/Step/wwwroot/assets/styles/base/modals.less index 66f6939d..de5b2987 100644 --- a/Step/wwwroot/assets/styles/base/modals.less +++ b/Step/wwwroot/assets/styles/base/modals.less @@ -798,7 +798,7 @@ } } -.@{modal}.modal-load-program { +.@{modal}.modal-load-program, .@{modal}.modal-add-element-queue { width: @modal-load-program-width; height: @modal-load-program-height; top: calc(~"50%" - @modal-load-program-height / 2); @@ -830,7 +830,7 @@ color: #fff; } } - .modal-load-program-header { + .modal-load-program-header, .modal-add-element-queue-header { height: 80px; width: 100%; display: flex; @@ -878,7 +878,7 @@ } } } - .modal-load-program-body { + .modal-load-program-body, .modal-add-element-queue-body { height: 631px; width: 100%; display: flex; @@ -1134,7 +1134,7 @@ } } } - .modal-load-program-footer { + .modal-load-program-footer, .modal-add-element-queue-footer { height: 79px; width: 100%; display: flex; diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index f4fa59c6..2a459f68 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -733,14 +733,16 @@ width: 100%; border: none; } -.modal.modal-load-program { +.modal.modal-load-program, +.modal.modal-add-element-queue { width: 1808px; height: 873px; top: calc(50% - 436.5px); left: calc(50% - 904px); background-color: #fff; } -.modal.modal-load-program header { +.modal.modal-load-program header, +.modal.modal-add-element-queue header { display: flex; align-items: center; padding-left: 24px; @@ -748,7 +750,8 @@ font-size: 20px; color: #002680; } -.modal.modal-load-program header button.close { +.modal.modal-load-program header button.close, +.modal.modal-add-element-queue header button.close { position: absolute; width: 28px; height: 28px; @@ -761,17 +764,24 @@ font-size: 16px; cursor: pointer; } -.modal.modal-load-program header button.close:active { +.modal.modal-load-program header button.close:active, +.modal.modal-add-element-queue header button.close:active { background-color: #1791ff; color: #fff; } -.modal.modal-load-program .modal-load-program-header { +.modal.modal-load-program .modal-load-program-header, +.modal.modal-add-element-queue .modal-load-program-header, +.modal.modal-load-program .modal-add-element-queue-header, +.modal.modal-add-element-queue .modal-add-element-queue-header { height: 80px; width: 100%; display: flex; flex-flow: column; } -.modal.modal-load-program .modal-load-program-header .box-search { +.modal.modal-load-program .modal-load-program-header .box-search, +.modal.modal-add-element-queue .modal-load-program-header .box-search, +.modal.modal-load-program .modal-add-element-queue-header .box-search, +.modal.modal-add-element-queue .modal-add-element-queue-header .box-search { width: 100%; height: 80px; display: flex; @@ -779,28 +789,46 @@ align-items: center; background-color: #979797; } -.modal.modal-load-program .modal-load-program-header .box-search .path { +.modal.modal-load-program .modal-load-program-header .box-search .path, +.modal.modal-add-element-queue .modal-load-program-header .box-search .path, +.modal.modal-load-program .modal-add-element-queue-header .box-search .path, +.modal.modal-add-element-queue .modal-add-element-queue-header .box-search .path { display: flex; flex-flow: row; color: #fff; margin-left: 20px; } -.modal.modal-load-program .modal-load-program-header .box-search .path .child { +.modal.modal-load-program .modal-load-program-header .box-search .path .child, +.modal.modal-add-element-queue .modal-load-program-header .box-search .path .child, +.modal.modal-load-program .modal-add-element-queue-header .box-search .path .child, +.modal.modal-add-element-queue .modal-add-element-queue-header .box-search .path .child { display: flex; flex-flow: row; } -.modal.modal-load-program .modal-load-program-header .box-search .path .child div + .fa.fa-chevron-right:first-child { +.modal.modal-load-program .modal-load-program-header .box-search .path .child div + .fa.fa-chevron-right:first-child, +.modal.modal-add-element-queue .modal-load-program-header .box-search .path .child div + .fa.fa-chevron-right:first-child, +.modal.modal-load-program .modal-add-element-queue-header .box-search .path .child div + .fa.fa-chevron-right:first-child, +.modal.modal-add-element-queue .modal-add-element-queue-header .box-search .path .child div + .fa.fa-chevron-right:first-child { display: none; } -.modal.modal-load-program .modal-load-program-header .box-search .path .child .fa { +.modal.modal-load-program .modal-load-program-header .box-search .path .child .fa, +.modal.modal-add-element-queue .modal-load-program-header .box-search .path .child .fa, +.modal.modal-load-program .modal-add-element-queue-header .box-search .path .child .fa, +.modal.modal-add-element-queue .modal-add-element-queue-header .box-search .path .child .fa { margin: 0px 22px; } -.modal.modal-load-program .modal-load-program-header .box-search .search { +.modal.modal-load-program .modal-load-program-header .box-search .search, +.modal.modal-add-element-queue .modal-load-program-header .box-search .search, +.modal.modal-load-program .modal-add-element-queue-header .box-search .search, +.modal.modal-add-element-queue .modal-add-element-queue-header .box-search .search { display: flex; width: 100%; justify-content: flex-end; } -.modal.modal-load-program .modal-load-program-header .box-search .search input { +.modal.modal-load-program .modal-load-program-header .box-search .search input, +.modal.modal-add-element-queue .modal-load-program-header .box-search .search input, +.modal.modal-load-program .modal-add-element-queue-header .box-search .search input, +.modal.modal-add-element-queue .modal-add-element-queue-header .box-search .search input { width: 688px; height: 48px; border-radius: 2px; @@ -808,28 +836,43 @@ border: solid 1px #dfdfdf; background-color: #f8f8f8; } -.modal.modal-load-program .modal-load-program-body { +.modal.modal-load-program .modal-load-program-body, +.modal.modal-add-element-queue .modal-load-program-body, +.modal.modal-load-program .modal-add-element-queue-body, +.modal.modal-add-element-queue .modal-add-element-queue-body { height: 631px; width: 100%; display: flex; flex-flow: row; } -.modal.modal-load-program .modal-load-program-body hr { +.modal.modal-load-program .modal-load-program-body hr, +.modal.modal-add-element-queue .modal-load-program-body hr, +.modal.modal-load-program .modal-add-element-queue-body hr, +.modal.modal-add-element-queue .modal-add-element-queue-body hr { width: 5%; } -.modal.modal-load-program .modal-load-program-body .first-column { +.modal.modal-load-program .modal-load-program-body .first-column, +.modal.modal-add-element-queue .modal-load-program-body .first-column, +.modal.modal-load-program .modal-add-element-queue-body .first-column, +.modal.modal-add-element-queue .modal-add-element-queue-body .first-column { min-width: 215px; border-right: solid 2px #e7e7e7; display: flex; flex-flow: column; padding-top: 19px; } -.modal.modal-load-program .modal-load-program-body .first-column .card-folder-path { +.modal.modal-load-program .modal-load-program-body .first-column .card-folder-path, +.modal.modal-add-element-queue .modal-load-program-body .first-column .card-folder-path, +.modal.modal-load-program .modal-add-element-queue-body .first-column .card-folder-path, +.modal.modal-add-element-queue .modal-add-element-queue-body .first-column .card-folder-path { width: 200px; display: flex; margin-top: 8px 0 8px 5px; } -.modal.modal-load-program .modal-load-program-body .second-column { +.modal.modal-load-program .modal-load-program-body .second-column, +.modal.modal-add-element-queue .modal-load-program-body .second-column, +.modal.modal-load-program .modal-add-element-queue-body .second-column, +.modal.modal-add-element-queue .modal-add-element-queue-body .second-column { height: calc(100% - 19px); min-width: 445px; border-right: solid 2px #e7e7e7; @@ -837,22 +880,34 @@ flex-flow: column; padding-top: 19px; } -.modal.modal-load-program .modal-load-program-body .second-column .content { +.modal.modal-load-program .modal-load-program-body .second-column .content, +.modal.modal-add-element-queue .modal-load-program-body .second-column .content, +.modal.modal-load-program .modal-add-element-queue-body .second-column .content, +.modal.modal-add-element-queue .modal-add-element-queue-body .second-column .content { width: 94%; height: 100%; } -.modal.modal-load-program .modal-load-program-body .second-column .content .card-folder-path { +.modal.modal-load-program .modal-load-program-body .second-column .content .card-folder-path, +.modal.modal-add-element-queue .modal-load-program-body .second-column .content .card-folder-path, +.modal.modal-load-program .modal-add-element-queue-body .second-column .content .card-folder-path, +.modal.modal-add-element-queue .modal-add-element-queue-body .second-column .content .card-folder-path { width: 371px; display: flex; margin-top: 8px 0 8px 8px; } -.modal.modal-load-program .modal-load-program-body .second-column .group-btn { +.modal.modal-load-program .modal-load-program-body .second-column .group-btn, +.modal.modal-add-element-queue .modal-load-program-body .second-column .group-btn, +.modal.modal-load-program .modal-add-element-queue-body .second-column .group-btn, +.modal.modal-add-element-queue .modal-add-element-queue-body .second-column .group-btn { display: flex; flex-flow: row; justify-content: center; margin-bottom: 16px; } -.modal.modal-load-program .modal-load-program-body .second-column .group-btn input { +.modal.modal-load-program .modal-load-program-body .second-column .group-btn input, +.modal.modal-add-element-queue .modal-load-program-body .second-column .group-btn input, +.modal.modal-load-program .modal-add-element-queue-body .second-column .group-btn input, +.modal.modal-add-element-queue .modal-add-element-queue-body .second-column .group-btn input { width: 360px; height: 48px; padding: 0; @@ -861,22 +916,34 @@ border: none; border-bottom: 1px solid rgba(0, 0, 0, 0.4); } -.modal.modal-load-program .modal-load-program-body .second-column .group-btn input[type="text"] { +.modal.modal-load-program .modal-load-program-body .second-column .group-btn input[type="text"], +.modal.modal-add-element-queue .modal-load-program-body .second-column .group-btn input[type="text"], +.modal.modal-load-program .modal-add-element-queue-body .second-column .group-btn input[type="text"], +.modal.modal-add-element-queue .modal-add-element-queue-body .second-column .group-btn input[type="text"] { padding-left: 5px; outline: none ; } -.modal.modal-load-program .modal-load-program-body .second-column .group-btn input:focus { +.modal.modal-load-program .modal-load-program-body .second-column .group-btn input:focus, +.modal.modal-add-element-queue .modal-load-program-body .second-column .group-btn input:focus, +.modal.modal-load-program .modal-add-element-queue-body .second-column .group-btn input:focus, +.modal.modal-add-element-queue .modal-add-element-queue-body .second-column .group-btn input:focus { border-bottom: 1px solid #1791ff; box-shadow: none; } -.modal.modal-load-program .modal-load-program-body .second-column .group-btn i { +.modal.modal-load-program .modal-load-program-body .second-column .group-btn i, +.modal.modal-add-element-queue .modal-load-program-body .second-column .group-btn i, +.modal.modal-load-program .modal-add-element-queue-body .second-column .group-btn i, +.modal.modal-add-element-queue .modal-add-element-queue-body .second-column .group-btn i { width: 44px; height: 44px; padding: 0; margin-top: 4px; color: #002680; } -.modal.modal-load-program .modal-load-program-body .third-column { +.modal.modal-load-program .modal-load-program-body .third-column, +.modal.modal-add-element-queue .modal-load-program-body .third-column, +.modal.modal-load-program .modal-add-element-queue-body .third-column, +.modal.modal-add-element-queue .modal-add-element-queue-body .third-column { height: calc(100% - 19px); min-width: 447px; border-right: solid 2px #e7e7e7; @@ -884,16 +951,25 @@ flex-flow: column; padding-top: 19px; } -.modal.modal-load-program .modal-load-program-body .third-column .content { +.modal.modal-load-program .modal-load-program-body .third-column .content, +.modal.modal-add-element-queue .modal-load-program-body .third-column .content, +.modal.modal-load-program .modal-add-element-queue-body .third-column .content, +.modal.modal-add-element-queue .modal-add-element-queue-body .third-column .content { width: 94%; height: 100%; } -.modal.modal-load-program .modal-load-program-body .third-column .content .card-folder-path { +.modal.modal-load-program .modal-load-program-body .third-column .content .card-folder-path, +.modal.modal-add-element-queue .modal-load-program-body .third-column .content .card-folder-path, +.modal.modal-load-program .modal-add-element-queue-body .third-column .content .card-folder-path, +.modal.modal-add-element-queue .modal-add-element-queue-body .third-column .content .card-folder-path { width: 371px; display: flex; margin-top: 8px 0 8px 8px; } -.modal.modal-load-program .modal-load-program-body .third-column .label-folder-empty { +.modal.modal-load-program .modal-load-program-body .third-column .label-folder-empty, +.modal.modal-add-element-queue .modal-load-program-body .third-column .label-folder-empty, +.modal.modal-load-program .modal-add-element-queue-body .third-column .label-folder-empty, +.modal.modal-add-element-queue .modal-add-element-queue-body .third-column .label-folder-empty { display: flex; width: 100%; height: 100%; @@ -902,13 +978,19 @@ color: #4b4b4b; font-size: 20px; } -.modal.modal-load-program .modal-load-program-body .third-column .group-btn { +.modal.modal-load-program .modal-load-program-body .third-column .group-btn, +.modal.modal-add-element-queue .modal-load-program-body .third-column .group-btn, +.modal.modal-load-program .modal-add-element-queue-body .third-column .group-btn, +.modal.modal-add-element-queue .modal-add-element-queue-body .third-column .group-btn { display: flex; flex-flow: row; justify-content: center; margin-bottom: 16px; } -.modal.modal-load-program .modal-load-program-body .third-column .group-btn input { +.modal.modal-load-program .modal-load-program-body .third-column .group-btn input, +.modal.modal-add-element-queue .modal-load-program-body .third-column .group-btn input, +.modal.modal-load-program .modal-add-element-queue-body .third-column .group-btn input, +.modal.modal-add-element-queue .modal-add-element-queue-body .third-column .group-btn input { width: 360px; height: 48px; padding: 0; @@ -917,22 +999,34 @@ border: none; border-bottom: 1px solid rgba(0, 0, 0, 0.4); } -.modal.modal-load-program .modal-load-program-body .third-column .group-btn input[type="text"] { +.modal.modal-load-program .modal-load-program-body .third-column .group-btn input[type="text"], +.modal.modal-add-element-queue .modal-load-program-body .third-column .group-btn input[type="text"], +.modal.modal-load-program .modal-add-element-queue-body .third-column .group-btn input[type="text"], +.modal.modal-add-element-queue .modal-add-element-queue-body .third-column .group-btn input[type="text"] { padding-left: 5px; outline: none ; } -.modal.modal-load-program .modal-load-program-body .third-column .group-btn input:focus { +.modal.modal-load-program .modal-load-program-body .third-column .group-btn input:focus, +.modal.modal-add-element-queue .modal-load-program-body .third-column .group-btn input:focus, +.modal.modal-load-program .modal-add-element-queue-body .third-column .group-btn input:focus, +.modal.modal-add-element-queue .modal-add-element-queue-body .third-column .group-btn input:focus { border-bottom: 1px solid #1791ff; box-shadow: none; } -.modal.modal-load-program .modal-load-program-body .third-column .group-btn i { +.modal.modal-load-program .modal-load-program-body .third-column .group-btn i, +.modal.modal-add-element-queue .modal-load-program-body .third-column .group-btn i, +.modal.modal-load-program .modal-add-element-queue-body .third-column .group-btn i, +.modal.modal-add-element-queue .modal-add-element-queue-body .third-column .group-btn i { width: 44px; height: 44px; padding: 0; margin-top: 4px; color: #002680; } -.modal.modal-load-program .modal-load-program-body .selected-item { +.modal.modal-load-program .modal-load-program-body .selected-item, +.modal.modal-add-element-queue .modal-load-program-body .selected-item, +.modal.modal-load-program .modal-add-element-queue-body .selected-item, +.modal.modal-add-element-queue .modal-add-element-queue-body .selected-item { width: 660px; height: 100%; display: flex; @@ -940,30 +1034,45 @@ justify-content: flex-end; padding: 0 16px 0 22px; } -.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-header { +.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-header, +.modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-header, +.modal.modal-load-program .modal-add-element-queue-body .selected-item .selected-item-header, +.modal.modal-add-element-queue .modal-add-element-queue-body .selected-item .selected-item-header { height: 78px; width: 100%; display: flex; flex-flow: row; align-items: center; } -.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-header .subtitle { +.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-header .subtitle, +.modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-header .subtitle, +.modal.modal-load-program .modal-add-element-queue-body .selected-item .selected-item-header .subtitle, +.modal.modal-add-element-queue .modal-add-element-queue-body .selected-item .selected-item-header .subtitle { display: flex; flex-flow: row; font-size: 13px; line-height: 4px; } -.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-header .subtitle .title { +.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-header .subtitle .title, +.modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-header .subtitle .title, +.modal.modal-load-program .modal-add-element-queue-body .selected-item .selected-item-header .subtitle .title, +.modal.modal-add-element-queue .modal-add-element-queue-body .selected-item .selected-item-header .subtitle .title { width: 110px; text-align: right; color: #002680; } -.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-header .subtitle .text { +.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-header .subtitle .text, +.modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-header .subtitle .text, +.modal.modal-load-program .modal-add-element-queue-body .selected-item .selected-item-header .subtitle .text, +.modal.modal-add-element-queue .modal-add-element-queue-body .selected-item .selected-item-header .subtitle .text { margin-right: 40px; color: #4b4b4b; margin-left: 5px; } -.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-header .selected-item-title { +.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-header .selected-item-title, +.modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-header .selected-item-title, +.modal.modal-load-program .modal-add-element-queue-body .selected-item .selected-item-header .selected-item-title, +.modal.modal-add-element-queue .modal-add-element-queue-body .selected-item .selected-item-header .selected-item-title { height: 100%; width: 100%; display: flex; @@ -973,17 +1082,26 @@ font-size: 26px; line-height: 55px; } -.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-header .group-button { +.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-header .group-button, +.modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-header .group-button, +.modal.modal-load-program .modal-add-element-queue-body .selected-item .selected-item-header .group-button, +.modal.modal-add-element-queue .modal-add-element-queue-body .selected-item .selected-item-header .group-button { height: 100%; width: 100%; display: flex; align-items: center; justify-content: flex-end; } -.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-header .group-button i { +.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-header .group-button i, +.modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-header .group-button i, +.modal.modal-load-program .modal-add-element-queue-body .selected-item .selected-item-header .group-button i, +.modal.modal-add-element-queue .modal-add-element-queue-body .selected-item .selected-item-header .group-button i { font-size: 24px; } -.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body { +.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body, +.modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-body, +.modal.modal-load-program .modal-add-element-queue-body .selected-item .selected-item-body, +.modal.modal-add-element-queue .modal-add-element-queue-body .selected-item .selected-item-body { width: 100%; height: calc(100% - 78px); position: relative; @@ -991,20 +1109,29 @@ display: flex; flex-flow: column; } -.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body .selected-item-body-image { +.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body .selected-item-body-image, +.modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-body .selected-item-body-image, +.modal.modal-load-program .modal-add-element-queue-body .selected-item .selected-item-body .selected-item-body-image, +.modal.modal-add-element-queue .modal-add-element-queue-body .selected-item .selected-item-body .selected-item-body-image { display: flex; width: 100%; margin-top: 10px; height: 336px; align-items: center; } -.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body .selected-item-body-image img { +.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body .selected-item-body-image img, +.modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-body .selected-item-body-image img, +.modal.modal-load-program .modal-add-element-queue-body .selected-item .selected-item-body .selected-item-body-image img, +.modal.modal-add-element-queue .modal-add-element-queue-body .selected-item .selected-item-body .selected-item-body-image img { display: block; margin: auto; max-height: 336px; box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.4); } -.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body .selected-item-body-image .noimage { +.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body .selected-item-body-image .noimage, +.modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-body .selected-item-body-image .noimage, +.modal.modal-load-program .modal-add-element-queue-body .selected-item .selected-item-body .selected-item-body-image .noimage, +.modal.modal-add-element-queue .modal-add-element-queue-body .selected-item .selected-item-body .selected-item-body-image .noimage { display: block; margin: auto; height: 290px; @@ -1016,7 +1143,10 @@ box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.4); border: 1px solid rgba(0, 0, 0, 0.1); } -.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description { +.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description, +.modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description, +.modal.modal-load-program .modal-add-element-queue-body .selected-item .selected-item-body .selected-item-body-description, +.modal.modal-add-element-queue .modal-add-element-queue-body .selected-item .selected-item-body .selected-item-body-description { display: flex; width: 100%; margin-top: 10px; @@ -1024,7 +1154,10 @@ height: calc(100% - 380px); flex-flow: column; } -.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description .row { +.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description .row, +.modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description .row, +.modal.modal-load-program .modal-add-element-queue-body .selected-item .selected-item-body .selected-item-body-description .row, +.modal.modal-add-element-queue .modal-add-element-queue-body .selected-item .selected-item-body .selected-item-body-description .row { height: 32px; min-height: 32px; display: flex; @@ -1034,18 +1167,30 @@ text-align: justify; overflow: hidden; } -.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description .row label { +.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description .row label, +.modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description .row label, +.modal.modal-load-program .modal-add-element-queue-body .selected-item .selected-item-body .selected-item-body-description .row label, +.modal.modal-add-element-queue .modal-add-element-queue-body .selected-item .selected-item-body .selected-item-body-description .row label { font-size: 18px; margin-left: 5px; white-space: nowrap; } -.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description .row:nth-child(odd) { +.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description .row:nth-child(odd), +.modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description .row:nth-child(odd), +.modal.modal-load-program .modal-add-element-queue-body .selected-item .selected-item-body .selected-item-body-description .row:nth-child(odd), +.modal.modal-add-element-queue .modal-add-element-queue-body .selected-item .selected-item-body .selected-item-body-description .row:nth-child(odd) { background-color: rgba(23, 145, 255, 0.3); } -.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description .row:nth-child(even) { +.modal.modal-load-program .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description .row:nth-child(even), +.modal.modal-add-element-queue .modal-load-program-body .selected-item .selected-item-body .selected-item-body-description .row:nth-child(even), +.modal.modal-load-program .modal-add-element-queue-body .selected-item .selected-item-body .selected-item-body-description .row:nth-child(even), +.modal.modal-add-element-queue .modal-add-element-queue-body .selected-item .selected-item-body .selected-item-body-description .row:nth-child(even) { background-color: #f3f3f3; } -.modal.modal-load-program .modal-load-program-body .selected-item .notselecteditem { +.modal.modal-load-program .modal-load-program-body .selected-item .notselecteditem, +.modal.modal-add-element-queue .modal-load-program-body .selected-item .notselecteditem, +.modal.modal-load-program .modal-add-element-queue-body .selected-item .notselecteditem, +.modal.modal-add-element-queue .modal-add-element-queue-body .selected-item .notselecteditem { position: absolute; right: 0; width: 695px; @@ -1058,7 +1203,10 @@ align-items: center; justify-content: center; } -.modal.modal-load-program .modal-load-program-footer { +.modal.modal-load-program .modal-load-program-footer, +.modal.modal-add-element-queue .modal-load-program-footer, +.modal.modal-load-program .modal-add-element-queue-footer, +.modal.modal-add-element-queue .modal-add-element-queue-footer { height: 79px; width: 100%; display: flex; @@ -5656,6 +5804,12 @@ footer .container button.big:before { background-color: #fff; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); } +.card-element-queue.border-green { + border: solid 2px #7ed321; +} +.card-element-queue.border-blue { + border: solid 2px #1791ff; +} .card-element-queue .card-element-queue-name { width: 100%; display: flex; diff --git a/Step/wwwroot/src/@types/production.d.ts b/Step/wwwroot/src/@types/production.d.ts new file mode 100644 index 00000000..50d7981f --- /dev/null +++ b/Step/wwwroot/src/@types/production.d.ts @@ -0,0 +1,10 @@ +declare module server { + export interface PartProgramModel { + absolutePath: string, + id: number, + partProgramName: string, + remainingReps: number, + reps: number, + status: number + } +} \ No newline at end of file diff --git a/Step/wwwroot/src/modules/base-components/cards/card-element-queue.vue b/Step/wwwroot/src/modules/base-components/cards/card-element-queue.vue index c58ea2b5..5b7aaac4 100644 --- a/Step/wwwroot/src/modules/base-components/cards/card-element-queue.vue +++ b/Step/wwwroot/src/modules/base-components/cards/card-element-queue.vue @@ -1,10 +1,15 @@