diff --git a/Step/wwwroot/assets/styles/base/card.less b/Step/wwwroot/assets/styles/base/card.less index ee802544..ad7e48ff 100644 --- a/Step/wwwroot/assets/styles/base/card.less +++ b/Step/wwwroot/assets/styles/base/card.less @@ -608,6 +608,7 @@ margin-left: 16px; } .card-folder-path-name{ + width: 100%; margin-left: 21px; } .card-folder-path-arrow{ @@ -616,4 +617,46 @@ margin-right: 21px; justify-content: flex-end; } + } + + .card-element-queue{ + width: 352px; + height: 64px; + display: flex; + flex-flow: row; + border-radius: 2px; + background-color: @color-background-white; + box-shadow: 0 1px 2px 0 @color-black-40; + .card-element-queue-name{ + width: 100%; + display: flex; + align-items: center; + justify-content: flex-start; + margin-left: 14px; + color: @color-darkish-blue; + } + .card-element-queue-right{ + width: 100%; + display: flex; + align-items: center; + justify-content: flex-end; + .square-number{ + width: 48px; + height: 48px; + background-color: @color-duck-egg-blue; + text-align: center; + line-height: 48px; + margin-right: 8px; + label{ + font-size: 18px; + color: @color-darkish-blue; + } + } + button.btn { + padding: 0 17px; + i.fa.fa-trash{ + font-size: 24px; + } + } + } } \ No newline at end of file diff --git a/Step/wwwroot/assets/styles/base/create-queue.less b/Step/wwwroot/assets/styles/base/create-queue.less index 230cd1eb..40946c7f 100644 --- a/Step/wwwroot/assets/styles/base/create-queue.less +++ b/Step/wwwroot/assets/styles/base/create-queue.less @@ -69,7 +69,7 @@ display: flex; flex-flow: row; .first-column{ - height: 100%; + height: calc(~'100% - 19px'); width: 188px; border-right: solid 2px @color-whitethree; display: flex; @@ -82,11 +82,38 @@ } } .second-column{ - height: 100%; + height: calc(~'100% - 19px'); width: 343px; border-right: solid 2px @color-whitethree; display: flex; flex-flow: column; + padding-top: 19px; + .content{ + width: 94%; + height: 100%; + .card-folder-path{ + width: 280px; + display: flex; + margin-top: 8px 0 8px 8px; + } + } + } + .third-column{ + height: calc(~'100% - 19px'); + width: 343px; + border-right: solid 2px @color-whitethree; + display: flex; + flex-flow: column; + padding-top: 19px; + .content{ + width: 94%; + height: 100%; + .card-folder-path{ + width: 280px; + display: flex; + margin-top: 8px 0 8px 8px; + } + } } } .create-queue-add-queue-footer{ diff --git a/Step/wwwroot/assets/styles/base/maintenance.less b/Step/wwwroot/assets/styles/base/maintenance.less index 6d270e0b..90d6f037 100644 --- a/Step/wwwroot/assets/styles/base/maintenance.less +++ b/Step/wwwroot/assets/styles/base/maintenance.less @@ -89,6 +89,7 @@ position: relative; border: solid 1px @color-label-grey; table{ + table-layout: fixed; width: 100%; border-collapse: collapse; thead tr{ @@ -100,8 +101,27 @@ tr:nth-child(even) {background: #dddddd} tr:nth-child(odd) {background: #FFF} - th,td{ - width: 20%; + th:nth-child(1), td:nth-child(1){ + width:190px; + } + + th:nth-child(2), td:nth-child(2){ + width:300px; + } + th:nth-child(3), td:nth-child(3){ + width:150px; + } + th:nth-child(4), td:nth-child(4){ + width:150px; + } + th:nth-child(5){ + width:162px; + } + td:nth-child(5){ + width:126px; + } + th, td{ + overflow: hidden; } tbody{ display: block; diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index 942b5981..8b8a085a 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -3813,6 +3813,7 @@ footer .container button.big:before { margin-left: 16px; } .card-folder-path .card-folder-path-name { + width: 100%; margin-left: 21px; } .card-folder-path .card-folder-path-arrow { @@ -3821,6 +3822,47 @@ footer .container button.big:before { margin-right: 21px; justify-content: flex-end; } +.card-element-queue { + width: 352px; + height: 64px; + display: flex; + flex-flow: row; + border-radius: 2px; + background-color: #fff; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); +} +.card-element-queue .card-element-queue-name { + width: 100%; + display: flex; + align-items: center; + justify-content: flex-start; + margin-left: 14px; + color: #002680; +} +.card-element-queue .card-element-queue-right { + width: 100%; + display: flex; + align-items: center; + justify-content: flex-end; +} +.card-element-queue .card-element-queue-right .square-number { + width: 48px; + height: 48px; + background-color: #e5f1f9; + text-align: center; + line-height: 48px; + margin-right: 8px; +} +.card-element-queue .card-element-queue-right .square-number label { + font-size: 18px; + color: #002680; +} +.card-element-queue .card-element-queue-right button.btn { + padding: 0 17px; +} +.card-element-queue .card-element-queue-right button.btn i.fa.fa-trash { + font-size: 24px; +} @keyframes selectedanimation { 0% { box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); @@ -8044,6 +8086,7 @@ footer .container button.big:before { border: solid 1px #979797; } .maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table { + table-layout: fixed; width: 100%; border-collapse: collapse; } @@ -8059,9 +8102,31 @@ footer .container button.big:before { .maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table tr:nth-child(odd) { background: #FFF; } +.maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table th:nth-child(1), +.maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table td:nth-child(1) { + width: 190px; +} +.maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table th:nth-child(2), +.maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table td:nth-child(2) { + width: 300px; +} +.maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table th:nth-child(3), +.maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table td:nth-child(3) { + width: 150px; +} +.maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table th:nth-child(4), +.maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table td:nth-child(4) { + width: 150px; +} +.maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table th:nth-child(5) { + width: 162px; +} +.maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table td:nth-child(5) { + width: 126px; +} .maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table th, .maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table td { - width: 20%; + overflow: hidden; } .maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table tbody { display: block; @@ -9347,7 +9412,7 @@ footer .container button.big:before { flex-flow: row; } .create-queue-container .create-queue-add-queue .create-queue-add-queue-body .first-column { - height: 100%; + height: calc(100% - 19px); width: 188px; border-right: solid 2px #e7e7e7; display: flex; @@ -9360,11 +9425,38 @@ footer .container button.big:before { margin-top: 8px 0 8px 5px; } .create-queue-container .create-queue-add-queue .create-queue-add-queue-body .second-column { - height: 100%; + height: calc(100% - 19px); width: 343px; border-right: solid 2px #e7e7e7; display: flex; flex-flow: column; + padding-top: 19px; +} +.create-queue-container .create-queue-add-queue .create-queue-add-queue-body .second-column .content { + width: 94%; + height: 100%; +} +.create-queue-container .create-queue-add-queue .create-queue-add-queue-body .second-column .content .card-folder-path { + width: 280px; + display: flex; + margin-top: 8px 0 8px 8px; +} +.create-queue-container .create-queue-add-queue .create-queue-add-queue-body .third-column { + height: calc(100% - 19px); + width: 343px; + border-right: solid 2px #e7e7e7; + display: flex; + flex-flow: column; + padding-top: 19px; +} +.create-queue-container .create-queue-add-queue .create-queue-add-queue-body .third-column .content { + width: 94%; + height: 100%; +} +.create-queue-container .create-queue-add-queue .create-queue-add-queue-body .third-column .content .card-folder-path { + width: 280px; + display: flex; + margin-top: 8px 0 8px 8px; } .create-queue-container .create-queue-add-queue .create-queue-add-queue-footer { height: 79px; diff --git a/Step/wwwroot/src/app.modules.js b/Step/wwwroot/src/app.modules.js index e2621d17..acc1b9fb 100644 --- a/Step/wwwroot/src/app.modules.js +++ b/Step/wwwroot/src/app.modules.js @@ -120,6 +120,9 @@ export const CardAxesProduction = () => export const CardFolderPath = () => import ("./modules/base-components/cards/card-folder-path.vue"); +export const CardElementQueue = () => + import ("./modules/base-components/cards/card-element-queue.vue"); + // Test pages export const TestLoader = () => import ("./components/test-loader.vue"); diff --git a/Step/wwwroot/src/app.routes.js b/Step/wwwroot/src/app.routes.js index d4199cfb..816ec798 100644 --- a/Step/wwwroot/src/app.routes.js +++ b/Step/wwwroot/src/app.routes.js @@ -35,7 +35,8 @@ import { HeadProduction, CardAxesProduction, CardFolderPath, - ModalIframe + ModalIframe, + CardElementQueue } from "./app.modules"; export let routes = [ @@ -64,6 +65,7 @@ export let routes = [ { path: "/card-axes-production", component: CardAxesProduction, meta: { title: "Step - Card-Axes-Production", area: "card-axes-production" } }, { path: "/card-folder-path", component: CardFolderPath, meta: { title: "Step - Card-Folder-Path", area: "card-folder-path" } }, + { path: "/card-element-queue", component: CardElementQueue, meta: { title: "Step - Card-Element-Queue", area: "card-element-queue" } }, { path: "/card-assisted-tooling", component: CardAssistedTooling, meta: { title: "Step - Card-Assisted-Tooling", area: "card-assisted-tooling" } }, diff --git a/Step/wwwroot/src/components/create-queue.vue b/Step/wwwroot/src/components/create-queue.vue index 2f266bfb..9002fda7 100644 --- a/Step/wwwroot/src/components/create-queue.vue +++ b/Step/wwwroot/src/components/create-queue.vue @@ -22,11 +22,18 @@