From a61cca2ae264c95964d02dbeada9be70a8ae0f3b Mon Sep 17 00:00:00 2001 From: Alessandro Francia Date: Wed, 19 Sep 2018 10:51:41 +0200 Subject: [PATCH] fix drag box reps --- Step/wwwroot/assets/styles/base/card.less | 70 +++++++++---------- Step/wwwroot/assets/styles/style.css | 52 +++++++------- .../cards/card-element-queue.vue | 22 ++---- .../cards/card-queue-production.vue | 32 ++++++--- 4 files changed, 88 insertions(+), 88 deletions(-) diff --git a/Step/wwwroot/assets/styles/base/card.less b/Step/wwwroot/assets/styles/base/card.less index 951ee55c..afb9aa45 100644 --- a/Step/wwwroot/assets/styles/base/card.less +++ b/Step/wwwroot/assets/styles/base/card.less @@ -904,42 +904,6 @@ } } } - & .popup{ - position: absolute; - display: flex; - padding: 4px; - top: 78px; - left: 60px; - .edit-reps{ - width: 100%; - height: calc(~'100% - 26px');; - display: flex; - align-items: center; - justify-content: space-around; - } - // &:before { - // content: "\f0d8"; - // color: @color-silver; - // position: absolute; - // top: -26px; - // left: calc(~'50% - 10px'); - // font-family: 'fontawesome'; - // font-size: 38px; - // } - .group-button{ - width: 100%; - display: flex; - justify-content: flex-end; - .btn.btn-success.btn-small{ - height: 26px; - font-size: 12px; - } - } - input{ - width: 50px; - height: 30px; - } - } } .smooth-dnd-draggable-wrapper .element-queue:first-child{ margin-top: 3px; @@ -1151,6 +1115,40 @@ color: @color-greyish-brown; } } + & .popup{ + position: absolute; + display: flex; + padding: 4px; + .edit-reps{ + width: 100%; + height: calc(~'100% - 26px');; + display: flex; + align-items: center; + justify-content: space-around; + } + // &:before { + // content: "\f0d8"; + // color: @color-silver; + // position: absolute; + // top: -26px; + // left: calc(~'50% - 10px'); + // font-family: 'fontawesome'; + // font-size: 38px; + // } + .group-button{ + width: 100%; + display: flex; + justify-content: flex-end; + .btn.btn-success.btn-small{ + height: 26px; + font-size: 12px; + } + } + input{ + width: 50px; + height: 30px; + } + } } .queue-footer{ diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index c9a91355..9de3db0b 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -5965,33 +5965,6 @@ footer .container button.big:before { .card-element-queue .card-element-queue-right button.btn i.fa.fa-trash { font-size: 24px; } -.card-element-queue .popup { - position: absolute; - display: flex; - padding: 4px; - top: 78px; - left: 60px; -} -.card-element-queue .popup .edit-reps { - width: 100%; - height: calc(100% - 26px); - display: flex; - align-items: center; - justify-content: space-around; -} -.card-element-queue .popup .group-button { - width: 100%; - display: flex; - justify-content: flex-end; -} -.card-element-queue .popup .group-button .btn.btn-success.btn-small { - height: 26px; - font-size: 12px; -} -.card-element-queue .popup input { - width: 50px; - height: 30px; -} .smooth-dnd-draggable-wrapper .element-queue:first-child { margin-top: 3px; } @@ -6197,6 +6170,31 @@ footer .container button.big:before { font-size: 20px; color: #4b4b4b; } +.card-queue-production .card-queue-production-body .queue-body .popup { + position: absolute; + display: flex; + padding: 4px; +} +.card-queue-production .card-queue-production-body .queue-body .popup .edit-reps { + width: 100%; + height: calc(100% - 26px); + display: flex; + align-items: center; + justify-content: space-around; +} +.card-queue-production .card-queue-production-body .queue-body .popup .group-button { + width: 100%; + display: flex; + justify-content: flex-end; +} +.card-queue-production .card-queue-production-body .queue-body .popup .group-button .btn.btn-success.btn-small { + height: 26px; + font-size: 12px; +} +.card-queue-production .card-queue-production-body .queue-body .popup input { + width: 50px; + height: 30px; +} .card-queue-production .card-queue-production-body .queue-footer { display: flex; margin: 20px 0 0 8px; 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 ca350eca..211ef1a4 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 @@ -16,16 +16,6 @@ - - -
- - -
-
- -
-
@@ -39,14 +29,12 @@ export default { number: { default: 2}, remainingReps: {default: 0}, status: { default: 0}, - verticalIndex: {default: 0}, selectedProcess: { default: 0}, idPartProgram: {default: 0} }, data: function(){ return{ - enablePopup: false, - numberReps: this.number + enablePopup: false } }, // watch: { @@ -64,16 +52,16 @@ export default { clickReps: function(){ debugger this.enablePopup = true; - this.$emit("position", this.$el, true); + this.$emit("position", this.$el, this.enablePopup, true); }, async changeReps(value){ console.log(value); await new FileService().changeReps(this.selectedProcess, this.idPartProgram, value) this.enablePopup = false; }, - close(){ - this.enablePopup = false; - } + // close(){ + // this.enablePopup = false; + // } } }; \ No newline at end of file diff --git a/Step/wwwroot/src/modules/base-components/cards/card-queue-production.vue b/Step/wwwroot/src/modules/base-components/cards/card-queue-production.vue index 93ca6242..47cae3f3 100644 --- a/Step/wwwroot/src/modules/base-components/cards/card-queue-production.vue +++ b/Step/wwwroot/src/modules/base-components/cards/card-queue-production.vue @@ -28,13 +28,20 @@
- +
- + + +
+ + +
+
+ +
+