From 9c6b79d18e9145fa38c0c10653948c706906d7e8 Mon Sep 17 00:00:00 2001 From: Alessandro Date: Wed, 23 Jan 2019 10:30:51 +0100 Subject: [PATCH 1/9] start refactoring --- Step/wwwroot/assets/styles/base/card.less | 631 +++++++++++++++++ Step/wwwroot/assets/styles/style.css | 664 ++++++++++++++++++ .../components/card-report-production.ts | 80 +++ .../components/card-report-production.vue | 384 ++++++++++ .../app_modules/reports/components/reports.ts | 5 +- .../reports/components/reports.vue | 402 +---------- 6 files changed, 1772 insertions(+), 394 deletions(-) create mode 100644 Step/wwwroot/src/app_modules/reports/components/card-report-production.ts create mode 100644 Step/wwwroot/src/app_modules/reports/components/card-report-production.vue diff --git a/Step/wwwroot/assets/styles/base/card.less b/Step/wwwroot/assets/styles/base/card.less index 5bafcd78..55daa6fc 100644 --- a/Step/wwwroot/assets/styles/base/card.less +++ b/Step/wwwroot/assets/styles/base/card.less @@ -1793,3 +1793,634 @@ align-items: center; } } + +.card-report-production{ + width: 100%; + height: 100%; + display: flex; + .reports-box-body-left { + width: 1455px; + height: 100%; + .body-left-header, .body-left-header-machinestatus{ + width: 100%; + height: 70px; + display: flex; + flex-flow: row; + margin-top: 18px; + border-right: solid 2px @color-whitegrey; + position: relative; + margin-bottom: 16px; + .mx-datepicker-range{ + width: 170px; + height: 70px; + .mx-input-wrapper{ + margin-right: 24px; + width: 253px; + .mx-input{ + width: 253px; + height: 50px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 @color-black-40; + border: solid 1px @color-silver; + font-size: 18px; + line-height: 1.11; + color: @color-greyish-brown; + padding-left: 16px; + } + } + } + > div { + display: flex; + flex-flow: column; + height: 70px; + margin-right: 24px; + label.intervaldate{ + width: 253px; + } + select{ + width: 192px; + height: 48px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 @color-black-40; + border: solid 1px @color-silver; + font-size: 18px; + line-height: 1.11; + color: @color-greyish-brown; + padding-left: 16px; + } + div.interval-time{ + display: flex; + flex-flow: row; + input[type="time"]{ + width: 112px; + height: 48px; + border-radius: 2px; + box-shadow: inset 0 1px 3px 0 @color-black-50; + font-size: 18px; + line-height: 1.11; + color: @color-silver; + border: none; + } + input[type="time"]:first-child{ + margin-right: 16px; + } + input[type="time"]::-webkit-inner-spin-button { + -webkit-appearance: none; + display: none; + border:none; + } + } + input.program{ + width: 256px; + height: 48px; + border-radius: 2px; + box-shadow: inset 0 1px 3px 0 @color-black-50; + font-size: 18px; + line-height: 1.11; + color: @color-silver; + padding-left: 16px; + border: none; + } + .reports-select-operator{ + width: 192px; + height: 48px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 @color-black-40; + font-size: 18px; + line-height: 1.11; + color: @color-greyish-brown; + } + .reports-select-shift{ + width: 144px; + height: 48px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 @color-black-40; + } + label.label_advanced_filters{ + margin-top: 35px; + font-size: 18px; + line-height: 1; + color: @color-darkish-blue; + cursor: pointer; + span{ + text-decoration-line: underline; + text-decoration-color: @color-darkish-blue; + text-decoration-style: solid; + } + } + } + div.advanced-filters{ + z-index: 100; + height: 80px; + width: 100%; + display: flex; + flex-flow: row; + background-color: @color-background-white; + position: absolute; + top: 80px; + > div { + display: flex; + flex-flow: column; + height: 70px; + margin-right: 24px; + label.intervaldate{ + width: 253px; + } + select{ + width: 192px; + height: 48px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 @color-black-40; + border: solid 1px @color-silver; + font-size: 18px; + line-height: 1.11; + color: @color-greyish-brown; + padding-left: 16px; + } + div.interval-time{ + display: flex; + flex-flow: row; + input[type="time"]{ + width: 112px; + height: 48px; + border-radius: 2px; + box-shadow: inset 0 1px 3px 0 @color-black-50; + font-size: 18px; + line-height: 1.11; + color: @color-silver; + border: none; + } + input[type="time"]:first-child{ + margin-right: 16px; + } + input[type="time"]::-webkit-inner-spin-button { + -webkit-appearance: none; + display: none; + border:none; + } + } + input.program{ + width: 256px; + height: 48px; + border-radius: 2px; + box-shadow: inset 0 1px 3px 0 @color-black-50; + font-size: 18px; + line-height: 1.11; + color: @color-silver; + padding-left: 16px; + border: none; + } + .reports-select-operator{ + width: 192px; + height: 48px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 @color-black-40; + font-size: 18px; + line-height: 1.11; + color: @color-greyish-brown; + } + .reports-select-shift{ + width: 144px; + height: 48px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 @color-black-40; + } + label.label_advanced_filters{ + margin-top: 35px; + font-size: 18px; + line-height: 1; + color: @color-darkish-blue; + span{ + text-decoration-line: underline; + text-decoration-color: @color-darkish-blue; + text-decoration-style: solid; + } + } + } + } + } + .body-left-header-machinestatus{ + border-right: 0px; + } + .body-left-center { + width: 1448px; + max-height: 681px; + display: flex; + flex-flow: column; + .body-left-center-container{ + width: 100%; + table{ + table-layout: fixed; + width: 100%; + border-collapse: collapse; + } + thead{ + border-bottom: solid 2px @color-label-grey; + font-size: 14px; + line-height: 1.29; + color: @color-darkish-blue; + display: block; + width: 1431px; + } + thead tr th{ + height: 48px; + } + tr:nth-child(even) {background: #FFF } + tr:nth-child(odd) {background: #dddddd } + + // thead tr{ + // width: 1448px; + // } + + thead tr:nth-child(odd){ + background: #FFF + } + + th:nth-child(1), td:nth-child(1){ + width:162px; + max-width: 162px; + text-align: center; + } + th:nth-child(2), td:nth-child(2){ + width:139px; + max-width: 139px; + text-align: center; + } + th:nth-child(3), td:nth-child(3){ + width:83px; + max-width:83px; + text-align: center; + } + th:nth-child(4), td:nth-child(4){ + width:83px; + max-width:83px; + text-align: center; + } + th:nth-child(5), td:nth-child(5){ + width:83px; + max-width:83px; + text-align: center; + } + th:nth-child(6), td:nth-child(6){ + width:83px; + max-width:83px; + text-align: center; + } + th:nth-child(7), td:nth-child(7){ + width:97px; + max-width:97px; + text-align: center; + } + th:nth-child(8), td:nth-child(8){ + width:97px; + max-width:97px; + text-align: center; + } + th:nth-child(9), td:nth-child(9){ + width:97px; + max-width:97px; + text-align: center; + } + th:nth-child(10), td:nth-child(10){ + width:115px; + max-width:115px; + text-align: center; + } + th:nth-child(11), td:nth-child(11){ + width:97px; + max-width:97px; + text-align: center; + } + th:nth-child(12), td:nth-child(12){ + width:148px; + max-width:148px; + text-align: center; + } + th:nth-child(13), td:nth-child(13){ + width:97px; + max-width:97px; + text-align: center; + } + th:last-child{ + font-size: 23px; + font-weight: bold; + cursor: pointer; + } + th, td{ + overflow: hidden; + div{ + overflow: hidden; + max-height: 64px; + } + } + tbody{ + display: block; + height: 631px; + width: 1448px; + overflow: scroll; + tr{ + cursor: pointer; + height: 64px; + padding: 10px; + font-size: 14px; + line-height: 1.29; + color: @color-greyish-brown; + td{ + text-align: center; + &.green{ + color: @color-apple-green; + } + &.red{ + color: @color-scarlet; + } + } + td:last-child{ + width: 10px; + } + &.selected{ + background-color: rgba(23, 145, 255, 0.75); + color: @color-white; + font-weight: 600; + } + } + } + .body-left-center-left{ + width: 360px; + height: 616px; + display: flex; + flex-flow: column; + align-items: center; + border: solid 1px @color-whitegrey; + overflow-y: auto; + .multiselect{ + z-index: 100; + margin-bottom: 24px; + margin-top: 16px; + label{ + font-size: 14px; + line-height: 1.29; + color: @color-warm-grey; + } + } + .selectBox{ + position: relative; + width: 328px; + height: 64px; + } + .selectBox select{ + width: 100%; + padding: 8px; + cursor: pointer; + height: 64px; + font-size: 18px; + line-height: 1.11; + color: @color-greyish-brown; + margin-bottom: 0; + margin-top: 0; + option{ + display: none; + } + } + .overSelect{ + position: absolute; + left: 0; + right: 0; + top: 0; + bottom: 0; + } + .checkboxes, .checkboxesU{ + display: none; + } + .checkboxesView, .checkboxesViewUser{ + width: calc(~"100% - 8px");; + background-color: #fff; + display: block; + z-index: 100; + padding: 6px 4px; + box-shadow: 0 3px 5px 0 @color-black-40; + label{ + font-size: 18px; + margin:2px; + display: flex; + flex-flow: row; + } + .label-state{ + margin-left: 12px; + } + } + div{ + select{ + width: 328px; + height: 48px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 @color-black-40; + margin-bottom: 24px; + margin-top: 16px; + padding-left: 16px; + font-size: 18px; + line-height: 1.11; + color: @color-greyish-brown; + } + .accordion-dropdown{ + header { + height: 64px; + width: 312px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); + display: flex; + justify-content: space-between; + align-items: center; + color: @color-darkish-blue; + line-height: 1; + font-size: 18px; + padding-left: 16px; + cursor: pointer; + span { + width: 100%; + } + .expander { + margin: 0 12px; + line-height: 28px; + height: 28px; + width: 28px; + font-size: 28px; + } + } + section { + width: 328px; + min-height: 0; + max-height: 0; + transition: max-height 100ms ease-in-out, min-height 200ms ease-in-out; + overflow: hidden; + &.expanded { + min-height: 64px; + background-color: rgba(255, 255, 255, 0.1); + max-height: 1000px; + } + .item { + height: 64px; + width: 100%; + line-height: 64px; + background-color: @color-white2; + } + + .dropdown{ + // background-color: @color-white2; + height: 100%; + margin-top: 2px; + .filename{ + display: flex; + height: 64px; + align-items: center; + cursor: pointer; + i{ + color: @color-cyan-blue; + margin: 0 20px 0 20px; + } + span{ + width: 100%; + font-size: 18px; + line-height: 1; + color: @color-darkish-blue; + } + + &.selected{ + span, i{ + color:#4b4b4b; + } + } + } + .filename.selected{ + background-color: rgba(255, 255, 255, 0.8); + } + + } + } + } + } + } + } + + .body-left-center-footer{ + height: 64px; + width: 100%; + border: solid 1px @color-whitegrey; + .header-title{ + width: 360px; + height: 64px; + display: flex; + flex-flow: column; + align-items: center; + justify-content: center; + .title{ + font-size: 14px; + color: @color-warm-grey; + } + .data-temporal{ + font-size: 18px; + line-height: 1; + color: @color-greyish-brown; + } + } + } + } + } + .reports-box-body-right { + width: 327px; + height: 100%; + .body-right-header{ + width: 100%; + height: 70px; + display: flex; + flex-flow: row; + margin-top: 18px; + justify-content: flex-end; + .body-right-header-left { + width: 158px; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + border-right: solid 2px @color-whitegrey; + button{ + width: 48px; + height: 48px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 @color-black-40; + background-image: linear-gradient(to bottom,@color-white2, @color-silver); + border: none; + } + button.active{ + width: 48px; + height: 48px; + border-radius: 2px; + box-shadow: inset 0 1px 3px 0 @color-black-40; + background-image: linear-gradient(to bottom, @color-silver, @color-white2 ); + color: @color-clear-blue; + border: none; + } + } + .body-right-header-right { + width: calc(~"100% - 158px"); + height: 100%; + display: flex; + align-items: center; + justify-content: center; + button{ + width: 48px; + height: 48px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 @color-black-40; + background-image: linear-gradient(to bottom,@color-white2, @color-silver); + border:none; + } + button:first-child{ + margin-right: 16px; + } + button:active{ + width: 48px; + height: 48px; + border-radius: 2px; + box-shadow: inset 0 1px 3px 0 @color-black-40; + background-image: linear-gradient(to bottom, @color-silver, @color-white2 ); + border: none; + } + } + } + .body-right-card{ + width: 100%; + height: calc(~"100% - 70px"); + display: flex; + flex-flow: column; + align-items: center; + .card-report{ + > section { + display: flex; + align-items: center; + justify-content: center; + .rectangle_gray{ + width: 256px; + height: 120px; + border-radius: 2px; + display: flex; + flex-flow: column; + align-items: center; + justify-content: center; + background-color: @color-white2; + label{ + font-size: 18px; + color: @color-warm-grey; + margin-bottom: 30px; + } + span{ + font-size: 48px; + font-weight: bold; + line-height: 0.38; + color: @color-clear-blue; + } + } + } + } + } + } +} \ No newline at end of file diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index 3ecea226..159977b5 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -7947,6 +7947,670 @@ footer .container button.big:before { justify-content: center; align-items: center; } +.card-report-production { + width: 100%; + height: 100%; + display: flex; +} +.card-report-production .reports-box-body-left { + width: 1455px; + height: 100%; +} +.card-report-production .reports-box-body-left .body-left-header, +.card-report-production .reports-box-body-left .body-left-header-machinestatus { + width: 100%; + height: 70px; + display: flex; + flex-flow: row; + margin-top: 18px; + border-right: solid 2px #dddddd; + position: relative; + margin-bottom: 16px; +} +.card-report-production .reports-box-body-left .body-left-header .mx-datepicker-range, +.card-report-production .reports-box-body-left .body-left-header-machinestatus .mx-datepicker-range { + width: 170px; + height: 70px; +} +.card-report-production .reports-box-body-left .body-left-header .mx-datepicker-range .mx-input-wrapper, +.card-report-production .reports-box-body-left .body-left-header-machinestatus .mx-datepicker-range .mx-input-wrapper { + margin-right: 24px; + width: 253px; +} +.card-report-production .reports-box-body-left .body-left-header .mx-datepicker-range .mx-input-wrapper .mx-input, +.card-report-production .reports-box-body-left .body-left-header-machinestatus .mx-datepicker-range .mx-input-wrapper .mx-input { + width: 253px; + height: 50px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); + border: solid 1px #bbbcbc; + font-size: 18px; + line-height: 1.11; + color: #4b4b4b; + padding-left: 16px; +} +.card-report-production .reports-box-body-left .body-left-header > div, +.card-report-production .reports-box-body-left .body-left-header-machinestatus > div { + display: flex; + flex-flow: column; + height: 70px; + margin-right: 24px; +} +.card-report-production .reports-box-body-left .body-left-header > div label.intervaldate, +.card-report-production .reports-box-body-left .body-left-header-machinestatus > div label.intervaldate { + width: 253px; +} +.card-report-production .reports-box-body-left .body-left-header > div select, +.card-report-production .reports-box-body-left .body-left-header-machinestatus > div select { + width: 192px; + height: 48px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); + border: solid 1px #bbbcbc; + font-size: 18px; + line-height: 1.11; + color: #4b4b4b; + padding-left: 16px; +} +.card-report-production .reports-box-body-left .body-left-header > div div.interval-time, +.card-report-production .reports-box-body-left .body-left-header-machinestatus > div div.interval-time { + display: flex; + flex-flow: row; +} +.card-report-production .reports-box-body-left .body-left-header > div div.interval-time input[type="time"], +.card-report-production .reports-box-body-left .body-left-header-machinestatus > div div.interval-time input[type="time"] { + width: 112px; + height: 48px; + border-radius: 2px; + box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5); + font-size: 18px; + line-height: 1.11; + color: #bbbcbc; + border: none; +} +.card-report-production .reports-box-body-left .body-left-header > div div.interval-time input[type="time"]:first-child, +.card-report-production .reports-box-body-left .body-left-header-machinestatus > div div.interval-time input[type="time"]:first-child { + margin-right: 16px; +} +.card-report-production .reports-box-body-left .body-left-header > div div.interval-time input[type="time"]::-webkit-inner-spin-button, +.card-report-production .reports-box-body-left .body-left-header-machinestatus > div div.interval-time input[type="time"]::-webkit-inner-spin-button { + -webkit-appearance: none; + display: none; + border: none; +} +.card-report-production .reports-box-body-left .body-left-header > div input.program, +.card-report-production .reports-box-body-left .body-left-header-machinestatus > div input.program { + width: 256px; + height: 48px; + border-radius: 2px; + box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5); + font-size: 18px; + line-height: 1.11; + color: #bbbcbc; + padding-left: 16px; + border: none; +} +.card-report-production .reports-box-body-left .body-left-header > div .reports-select-operator, +.card-report-production .reports-box-body-left .body-left-header-machinestatus > div .reports-select-operator { + width: 192px; + height: 48px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); + font-size: 18px; + line-height: 1.11; + color: #4b4b4b; +} +.card-report-production .reports-box-body-left .body-left-header > div .reports-select-shift, +.card-report-production .reports-box-body-left .body-left-header-machinestatus > div .reports-select-shift { + width: 144px; + height: 48px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); +} +.card-report-production .reports-box-body-left .body-left-header > div label.label_advanced_filters, +.card-report-production .reports-box-body-left .body-left-header-machinestatus > div label.label_advanced_filters { + margin-top: 35px; + font-size: 18px; + line-height: 1; + color: #002680; + cursor: pointer; +} +.card-report-production .reports-box-body-left .body-left-header > div label.label_advanced_filters span, +.card-report-production .reports-box-body-left .body-left-header-machinestatus > div label.label_advanced_filters span { + text-decoration-line: underline; + text-decoration-color: #002680; + text-decoration-style: solid; +} +.card-report-production .reports-box-body-left .body-left-header div.advanced-filters, +.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters { + z-index: 100; + height: 80px; + width: 100%; + display: flex; + flex-flow: row; + background-color: #fff; + position: absolute; + top: 80px; +} +.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div, +.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div { + display: flex; + flex-flow: column; + height: 70px; + margin-right: 24px; +} +.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div label.intervaldate, +.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div label.intervaldate { + width: 253px; +} +.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div select, +.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div select { + width: 192px; + height: 48px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); + border: solid 1px #bbbcbc; + font-size: 18px; + line-height: 1.11; + color: #4b4b4b; + padding-left: 16px; +} +.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div div.interval-time, +.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div div.interval-time { + display: flex; + flex-flow: row; +} +.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div div.interval-time input[type="time"], +.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div div.interval-time input[type="time"] { + width: 112px; + height: 48px; + border-radius: 2px; + box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5); + font-size: 18px; + line-height: 1.11; + color: #bbbcbc; + border: none; +} +.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div div.interval-time input[type="time"]:first-child, +.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div div.interval-time input[type="time"]:first-child { + margin-right: 16px; +} +.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div div.interval-time input[type="time"]::-webkit-inner-spin-button, +.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div div.interval-time input[type="time"]::-webkit-inner-spin-button { + -webkit-appearance: none; + display: none; + border: none; +} +.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div input.program, +.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div input.program { + width: 256px; + height: 48px; + border-radius: 2px; + box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5); + font-size: 18px; + line-height: 1.11; + color: #bbbcbc; + padding-left: 16px; + border: none; +} +.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div .reports-select-operator, +.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div .reports-select-operator { + width: 192px; + height: 48px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); + font-size: 18px; + line-height: 1.11; + color: #4b4b4b; +} +.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div .reports-select-shift, +.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div .reports-select-shift { + width: 144px; + height: 48px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); +} +.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div label.label_advanced_filters, +.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div label.label_advanced_filters { + margin-top: 35px; + font-size: 18px; + line-height: 1; + color: #002680; +} +.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div label.label_advanced_filters span, +.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div label.label_advanced_filters span { + text-decoration-line: underline; + text-decoration-color: #002680; + text-decoration-style: solid; +} +.card-report-production .reports-box-body-left .body-left-header-machinestatus { + border-right: 0px; +} +.card-report-production .reports-box-body-left .body-left-center { + width: 1448px; + max-height: 681px; + display: flex; + flex-flow: column; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container { + width: 100%; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container table { + table-layout: fixed; + width: 100%; + border-collapse: collapse; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container thead { + border-bottom: solid 2px #979797; + font-size: 14px; + line-height: 1.29; + color: #002680; + display: block; + width: 1431px; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container thead tr th { + height: 48px; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container tr:nth-child(even) { + background: #FFF; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container tr:nth-child(odd) { + background: #dddddd; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container thead tr:nth-child(odd) { + background: #FFF; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container th:nth-child(1), +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container td:nth-child(1) { + width: 162px; + max-width: 162px; + text-align: center; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container th:nth-child(2), +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container td:nth-child(2) { + width: 139px; + max-width: 139px; + text-align: center; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container th:nth-child(3), +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container td:nth-child(3) { + width: 83px; + max-width: 83px; + text-align: center; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container th:nth-child(4), +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container td:nth-child(4) { + width: 83px; + max-width: 83px; + text-align: center; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container th:nth-child(5), +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container td:nth-child(5) { + width: 83px; + max-width: 83px; + text-align: center; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container th:nth-child(6), +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container td:nth-child(6) { + width: 83px; + max-width: 83px; + text-align: center; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container th:nth-child(7), +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container td:nth-child(7) { + width: 97px; + max-width: 97px; + text-align: center; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container th:nth-child(8), +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container td:nth-child(8) { + width: 97px; + max-width: 97px; + text-align: center; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container th:nth-child(9), +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container td:nth-child(9) { + width: 97px; + max-width: 97px; + text-align: center; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container th:nth-child(10), +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container td:nth-child(10) { + width: 115px; + max-width: 115px; + text-align: center; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container th:nth-child(11), +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container td:nth-child(11) { + width: 97px; + max-width: 97px; + text-align: center; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container th:nth-child(12), +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container td:nth-child(12) { + width: 148px; + max-width: 148px; + text-align: center; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container th:nth-child(13), +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container td:nth-child(13) { + width: 97px; + max-width: 97px; + text-align: center; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container th:last-child { + font-size: 23px; + font-weight: bold; + cursor: pointer; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container th, +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container td { + overflow: hidden; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container th div, +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container td div { + overflow: hidden; + max-height: 64px; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container tbody { + display: block; + height: 631px; + width: 1448px; + overflow: scroll; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container tbody tr { + cursor: pointer; + height: 64px; + padding: 10px; + font-size: 14px; + line-height: 1.29; + color: #4b4b4b; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container tbody tr td { + text-align: center; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container tbody tr td.green { + color: #7ed321; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container tbody tr td.red { + color: #d0021b; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container tbody tr td:last-child { + width: 10px; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container tbody tr.selected { + background-color: rgba(23, 145, 255, 0.75); + color: #fff; + font-weight: 600; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left { + width: 360px; + height: 616px; + display: flex; + flex-flow: column; + align-items: center; + border: solid 1px #dddddd; + overflow-y: auto; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left .multiselect { + z-index: 100; + margin-bottom: 24px; + margin-top: 16px; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left .multiselect label { + font-size: 14px; + line-height: 1.29; + color: #878787; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left .selectBox { + position: relative; + width: 328px; + height: 64px; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left .selectBox select { + width: 100%; + padding: 8px; + cursor: pointer; + height: 64px; + font-size: 18px; + line-height: 1.11; + color: #4b4b4b; + margin-bottom: 0; + margin-top: 0; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left .selectBox select option { + display: none; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left .overSelect { + position: absolute; + left: 0; + right: 0; + top: 0; + bottom: 0; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left .checkboxes, +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left .checkboxesU { + display: none; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left .checkboxesView, +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left .checkboxesViewUser { + width: calc(100% - 8px); + background-color: #fff; + display: block; + z-index: 100; + padding: 6px 4px; + box-shadow: 0 3px 5px 0 rgba(0, 0, 0, 0.4); +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left .checkboxesView label, +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left .checkboxesViewUser label { + font-size: 18px; + margin: 2px; + display: flex; + flex-flow: row; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left .checkboxesView .label-state, +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left .checkboxesViewUser .label-state { + margin-left: 12px; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left div select { + width: 328px; + height: 48px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); + margin-bottom: 24px; + margin-top: 16px; + padding-left: 16px; + font-size: 18px; + line-height: 1.11; + color: #4b4b4b; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left div .accordion-dropdown header { + height: 64px; + width: 312px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); + display: flex; + justify-content: space-between; + align-items: center; + color: #002680; + line-height: 1; + font-size: 18px; + padding-left: 16px; + cursor: pointer; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left div .accordion-dropdown header span { + width: 100%; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left div .accordion-dropdown header .expander { + margin: 0 12px; + line-height: 28px; + height: 28px; + width: 28px; + font-size: 28px; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left div .accordion-dropdown section { + width: 328px; + min-height: 0; + max-height: 0; + transition: max-height 100ms ease-in-out, min-height 200ms ease-in-out; + overflow: hidden; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left div .accordion-dropdown section.expanded { + min-height: 64px; + background-color: rgba(255, 255, 255, 0.1); + max-height: 1000px; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left div .accordion-dropdown section .item { + height: 64px; + width: 100%; + line-height: 64px; + background-color: #f1f1f1; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left div .accordion-dropdown section .dropdown { + height: 100%; + margin-top: 2px; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left div .accordion-dropdown section .dropdown .filename { + display: flex; + height: 64px; + align-items: center; + cursor: pointer; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left div .accordion-dropdown section .dropdown .filename i { + color: #002e6e; + margin: 0 20px 0 20px; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left div .accordion-dropdown section .dropdown .filename span { + width: 100%; + font-size: 18px; + line-height: 1; + color: #002680; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left div .accordion-dropdown section .dropdown .filename.selected span, +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left div .accordion-dropdown section .dropdown .filename.selected i { + color: #4b4b4b; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-container .body-left-center-left div .accordion-dropdown section .dropdown .filename.selected { + background-color: rgba(255, 255, 255, 0.8); +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-footer { + height: 64px; + width: 100%; + border: solid 1px #dddddd; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-footer .header-title { + width: 360px; + height: 64px; + display: flex; + flex-flow: column; + align-items: center; + justify-content: center; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-footer .header-title .title { + font-size: 14px; + color: #878787; +} +.card-report-production .reports-box-body-left .body-left-center .body-left-center-footer .header-title .data-temporal { + font-size: 18px; + line-height: 1; + color: #4b4b4b; +} +.card-report-production .reports-box-body-right { + width: 327px; + height: 100%; +} +.card-report-production .reports-box-body-right .body-right-header { + width: 100%; + height: 70px; + display: flex; + flex-flow: row; + margin-top: 18px; + justify-content: flex-end; +} +.card-report-production .reports-box-body-right .body-right-header .body-right-header-left { + width: 158px; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + border-right: solid 2px #dddddd; +} +.card-report-production .reports-box-body-right .body-right-header .body-right-header-left button { + width: 48px; + height: 48px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, #f1f1f1, #bbbcbc); + border: none; +} +.card-report-production .reports-box-body-right .body-right-header .body-right-header-left button.active { + width: 48px; + height: 48px; + border-radius: 2px; + box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, #bbbcbc, #f1f1f1); + color: #1791ff; + border: none; +} +.card-report-production .reports-box-body-right .body-right-header .body-right-header-right { + width: calc(100% - 158px); + height: 100%; + display: flex; + align-items: center; + justify-content: center; +} +.card-report-production .reports-box-body-right .body-right-header .body-right-header-right button { + width: 48px; + height: 48px; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, #f1f1f1, #bbbcbc); + border: none; +} +.card-report-production .reports-box-body-right .body-right-header .body-right-header-right button:first-child { + margin-right: 16px; +} +.card-report-production .reports-box-body-right .body-right-header .body-right-header-right button:active { + width: 48px; + height: 48px; + border-radius: 2px; + box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, #bbbcbc, #f1f1f1); + border: none; +} +.card-report-production .reports-box-body-right .body-right-card { + width: 100%; + height: calc(100% - 70px); + display: flex; + flex-flow: column; + align-items: center; +} +.card-report-production .reports-box-body-right .body-right-card .card-report > section { + display: flex; + align-items: center; + justify-content: center; +} +.card-report-production .reports-box-body-right .body-right-card .card-report > section .rectangle_gray { + width: 256px; + height: 120px; + border-radius: 2px; + display: flex; + flex-flow: column; + align-items: center; + justify-content: center; + background-color: #f1f1f1; +} +.card-report-production .reports-box-body-right .body-right-card .card-report > section .rectangle_gray label { + font-size: 18px; + color: #878787; + margin-bottom: 30px; +} +.card-report-production .reports-box-body-right .body-right-card .card-report > section .rectangle_gray span { + font-size: 48px; + font-weight: bold; + line-height: 0.38; + color: #1791ff; +} @keyframes selectedanimation { 0% { box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); diff --git a/Step/wwwroot/src/app_modules/reports/components/card-report-production.ts b/Step/wwwroot/src/app_modules/reports/components/card-report-production.ts new file mode 100644 index 00000000..33f29418 --- /dev/null +++ b/Step/wwwroot/src/app_modules/reports/components/card-report-production.ts @@ -0,0 +1,80 @@ +import Vue from "vue"; +import Component from "vue-class-component"; +import {cardReport} from "../../../modules/base-components/cards/index"; +import accordionDropdown from "../../../modules/base-components/accordion-dropdown.vue"; +import modalReportSelectColumn from "../../../modules/base-components/modal-report-select-column.vue"; +import { Accordion } from "src/modules/base-components"; +import DatePicker from "vue2-datepicker"; +import moment from "moment"; +import { ModalHelper } from "src/components/modals"; + +declare let $: any; +@Component({ components: { datePicker: DatePicker, cardReport: cardReport, accordionDropdown: accordionDropdown, accordion: Accordion } }) +export default class CardReportProduction extends Vue { + + lang = { + days: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'], + months: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], + pickers: ['next 7 days', 'next 30 days', 'previous 7 days', 'previous 30 days'], + placeholder: { + date: 'Select Date', + dateRange: 'Select Date Range' + } + } + + filter: { + interval?: Date[], + timelineMacro: Array + } = { + timelineMacro: ["Eventi","Allarmi","Stato macchina","Programmi"], + interval: [new Date(new Date().setDate(new Date().getDate() - 6)), new Date(new Date().setDate(new Date().getDate() + 1))] + }; + + + public selectedTab: string = "Production"; + selectDiagram: boolean = false; + selectMoreFilter: boolean = false; + selectTable: boolean = true; + + public selectTab(value){ + this.selectedTab = value; + } + timeformat() { + return (moment() as any)._locale._longDateFormat.LT; + } + + viewDiagram(){ + if(!this.selectDiagram){ + this.selectDiagram = true; + this.selectTable = false; + } + console.log("Diagram active"); + } + + viewTable(){ + if(!this.selectTable){ + this.selectDiagram = false; + this.selectTable = true; + } + console.log("Diagram active"); + } + + viewMoreFilter(){ + if(!this.selectMoreFilter){ + this.selectMoreFilter = true; + } + else{ + this.selectMoreFilter = false; + } + } + + openModalSelectField(){ + ModalHelper.ShowModal(modalReportSelectColumn); + } + public openSelectState() { + if (!$('.checkboxes').hasClass('checkboxesView')) + $('.checkboxes').addClass('checkboxesView'); + else + $('.checkboxes').removeClass('checkboxesView'); + } +} \ No newline at end of file diff --git a/Step/wwwroot/src/app_modules/reports/components/card-report-production.vue b/Step/wwwroot/src/app_modules/reports/components/card-report-production.vue new file mode 100644 index 00000000..8aad7800 --- /dev/null +++ b/Step/wwwroot/src/app_modules/reports/components/card-report-production.vue @@ -0,0 +1,384 @@ + + + \ No newline at end of file diff --git a/Step/wwwroot/src/app_modules/reports/components/reports.ts b/Step/wwwroot/src/app_modules/reports/components/reports.ts index e1da5ca9..0ba7340f 100644 --- a/Step/wwwroot/src/app_modules/reports/components/reports.ts +++ b/Step/wwwroot/src/app_modules/reports/components/reports.ts @@ -8,8 +8,11 @@ import DatePicker from "vue2-datepicker"; import moment from "moment"; import { ModalHelper } from "src/components/modals"; +import cardReportProduction from "src/app_modules/reports/components/card-report-production.vue"; + declare let $: any; -@Component({ components: { datePicker: DatePicker, cardReport: cardReport, accordionDropdown: accordionDropdown, accordion: Accordion } }) +@Component({ components: { datePicker: DatePicker, cardReport: cardReport, + accordionDropdown: accordionDropdown, accordion: Accordion, cardReportProduction: cardReportProduction } }) export default class Reports extends Vue { lang = { diff --git a/Step/wwwroot/src/app_modules/reports/components/reports.vue b/Step/wwwroot/src/app_modules/reports/components/reports.vue index 74d7b5cf..c4c598cd 100644 --- a/Step/wwwroot/src/app_modules/reports/components/reports.vue +++ b/Step/wwwroot/src/app_modules/reports/components/reports.vue @@ -20,387 +20,10 @@
-
-
-
- - -
-
- - -
-
- - -
-
- - -
-
-
- -
- - -
-
-
- - -
-
- - -
-
- - -
-
-
-
-
- - -
-
- -
- - -
-
-
- - -
-
- - -
-
- - -
-
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{'reports_table_program_name' | localize("Nome programma")}}{{'reports_table_dimensions' | localize("Dimensioni")}}{{'reports_table_quantity' | localize("Quantity")}}{{'reports_table_start_now' | localize("Ora inizio")}}{{'reports_table_end_time' | localize("Ora fine")}}{{'reports_table_date' | localize("Data")}}{{'reports_table_effective_time' | localize("T effettivo")}}{{'reports_table_average_time' | localize("T medio")}}{{'reports_table_theoretical_time' | localize("T teorico")}}{{'reports_table_deviation' | localize("Scostamento")}}{{'reports_table_quality' | localize("Qualità")}}{{'reports_table_operator_name' | localize("Nome operatore")}}{{'reports_table_shift' | localize("Turno")}}
Finestra02.pgmX: 1210; Y:900; Z: 63111:25:0013:10:0012/04/201701:45:0001:25:0001:20:00+00:20:00BuonoNome utente
Finestra02.pgmX: 1210; Y:900; Z: 63111:25:0013:10:0012/04/201701:45:0001:25:0001:20:00+00:20:00BuonoNome utente
Finestra02.pgmX: 1210; Y:900; Z: 63111:25:0013:10:0012/04/201701:45:0001:25:0001:20:00+00:20:00BuonoNome utente
Finestra02.pgmX: 1210; Y:900; Z: 63111:25:0013:10:0012/04/201701:45:0001:25:0001:20:00+00:20:00BuonoNome utente
Finestra02.pgmX: 1210; Y:900; Z: 63111:25:0013:10:0012/04/201701:45:0001:25:0001:20:00+00:20:00BuonoNome utente
Finestra02.pgmX: 1210; Y:900; Z: 63111:25:0013:10:0012/04/201701:45:0001:25:0001:20:00+00:20:00BuonoNome utente
Finestra02.pgmX: 1210; Y:900; Z: 63111:25:0013:10:0012/04/201701:45:0001:25:0001:20:00+00:20:00BuonoNome utente
Finestra02.pgmX: 1210; Y:900; Z: 63111:25:0013:10:0012/04/201701:45:0001:25:0001:20:00+00:20:00BuonoNome utente
Finestra02.pgmX: 1210; Y:900; Z: 63111:25:0013:10:0012/04/201701:45:0001:25:0001:20:00+00:20:00BuonoNome utente
Finestra02.pgmX: 1210; Y:900; Z: 63111:25:0013:10:0012/04/201701:45:0001:25:0001:20:00+00:20:00BuonoNome utente
Finestra02.pgmX: 1210; Y:900; Z: 63111:25:0013:10:0012/04/201701:45:0001:25:0001:20:00+00:20:00BuonoNome utente
Finestra02.pgmX: 1210; Y:900; Z: 63111:25:0013:10:0012/04/201701:45:0001:25:0001:20:00+00:20:00BuonoNome utente
Finestra02.pgmX: 1210; Y:900; Z: 63111:25:0013:10:0012/04/201701:45:0001:25:0001:20:00+00:20:00BuonoNome utente
Finestra02.pgmX: 1210; Y:900; Z: 63111:25:0013:10:0012/04/201701:45:0001:25:0001:20:00+00:20:00BuonoNome utente
Finestra02.pgmX: 1210; Y:900; Z: 63111:25:0013:10:0012/04/201701:45:0001:25:0001:20:00+00:20:00BuonoNome utente
-
-
-
-
-
-
- - -
-
- - -
-
-
- - - - -
- - 10.000 -
-
- -
- - 4 -
-
-
-
+
-
+
-
+
@@ -529,10 +148,10 @@
-
+
-->
-
+
-
+
-
+
-->
From 9ef6d77ab85c0dd1d8e39586ef20043bec336679 Mon Sep 17 00:00:00 2001 From: Alessandro Date: Wed, 23 Jan 2019 11:39:12 +0100 Subject: [PATCH 2/9] card-report-production --- Step/wwwroot/assets/styles/base/card.less | 166 +++++------ Step/wwwroot/assets/styles/style.css | 192 ++++++------ .../components/card-report-production.ts | 26 +- .../components/card-report-production.vue | 275 ++---------------- 4 files changed, 196 insertions(+), 463 deletions(-) diff --git a/Step/wwwroot/assets/styles/base/card.less b/Step/wwwroot/assets/styles/base/card.less index 55daa6fc..04fad574 100644 --- a/Step/wwwroot/assets/styles/base/card.less +++ b/Step/wwwroot/assets/styles/base/card.less @@ -1896,108 +1896,80 @@ border-radius: 2px; box-shadow: 0 1px 2px 0 @color-black-40; } - label.label_advanced_filters{ - margin-top: 35px; - font-size: 18px; - line-height: 1; - color: @color-darkish-blue; - cursor: pointer; - span{ - text-decoration-line: underline; - text-decoration-color: @color-darkish-blue; - text-decoration-style: solid; + } + + + .multiselect{ + z-index: 100; + label{ + font-size: 14px; + line-height: 1.29; + color: @color-warm-grey; } } - } - div.advanced-filters{ - z-index: 100; - height: 80px; - width: 100%; - display: flex; - flex-flow: row; - background-color: @color-background-white; - position: absolute; - top: 80px; - > div { - display: flex; - flex-flow: column; - height: 70px; - margin-right: 24px; - label.intervaldate{ - width: 253px; - } - select{ - width: 192px; - height: 48px; - border-radius: 2px; - box-shadow: 0 1px 2px 0 @color-black-40; - border: solid 1px @color-silver; - font-size: 18px; - line-height: 1.11; - color: @color-greyish-brown; - padding-left: 16px; - } - div.interval-time{ - display: flex; - flex-flow: row; - input[type="time"]{ - width: 112px; - height: 48px; - border-radius: 2px; - box-shadow: inset 0 1px 3px 0 @color-black-50; - font-size: 18px; - line-height: 1.11; - color: @color-silver; - border: none; - } - input[type="time"]:first-child{ - margin-right: 16px; - } - input[type="time"]::-webkit-inner-spin-button { - -webkit-appearance: none; - display: none; - border:none; - } - } - input.program{ - width: 256px; - height: 48px; - border-radius: 2px; - box-shadow: inset 0 1px 3px 0 @color-black-50; - font-size: 18px; - line-height: 1.11; - color: @color-silver; - padding-left: 16px; - border: none; - } - .reports-select-operator{ - width: 192px; - height: 48px; - border-radius: 2px; - box-shadow: 0 1px 2px 0 @color-black-40; - font-size: 18px; - line-height: 1.11; - color: @color-greyish-brown; - } - .reports-select-shift{ + .selectBox{ + position: relative; width: 144px; - height: 48px; - border-radius: 2px; - box-shadow: 0 1px 2px 0 @color-black-40; - } - label.label_advanced_filters{ - margin-top: 35px; - font-size: 18px; - line-height: 1; - color: @color-darkish-blue; - span{ - text-decoration-line: underline; - text-decoration-color: @color-darkish-blue; - text-decoration-style: solid; - } - } } + .selectBox select{ + width: 100%; + padding: 8px; + cursor: pointer; + height: 49px; + font-size: 18px; + line-height: 1.11; + color: @color-greyish-brown; + box-shadow: 0 1px 2px @color-black-40; + border-radius: 2px; + option{ + display: none; + } + } + .selectBoxU{ + position: relative; + width: 180px; } + .selectBoxU select{ + width: 100%; + padding: 8px; + cursor: pointer; + height: 49px; + font-size: 18px; + line-height: 1.11; + color: @color-greyish-brown; + box-shadow: 0 1px 2px @color-black-40; + border-radius: 2px; + option{ + display: none; + } + } + .overSelect{ + position: absolute; + left: 0; + right: 0; + top: 0; + bottom: 0; + } + .checkboxes, .checkboxesU{ + display: none; + } + .checkboxesView, .checkboxesViewUser{ + width: calc(~"100% - 8px");; + background-color: #fff; + display: block; + z-index: 100; + padding: 6px 4px; + box-shadow: 0 3px 5px 0 @color-black-40; + label{ + font-size: 18px; + margin:2px; + display: flex; + flex-flow: row; + } + .label-state{ + margin-left: 12px; + } + } } .body-left-header-machinestatus{ border-right: 0px; diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index 159977b5..1fe9f7b2 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -8067,121 +8067,97 @@ footer .container button.big:before { border-radius: 2px; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); } -.card-report-production .reports-box-body-left .body-left-header > div label.label_advanced_filters, -.card-report-production .reports-box-body-left .body-left-header-machinestatus > div label.label_advanced_filters { - margin-top: 35px; - font-size: 18px; - line-height: 1; - color: #002680; - cursor: pointer; -} -.card-report-production .reports-box-body-left .body-left-header > div label.label_advanced_filters span, -.card-report-production .reports-box-body-left .body-left-header-machinestatus > div label.label_advanced_filters span { - text-decoration-line: underline; - text-decoration-color: #002680; - text-decoration-style: solid; -} -.card-report-production .reports-box-body-left .body-left-header div.advanced-filters, -.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters { +.card-report-production .reports-box-body-left .body-left-header .multiselect, +.card-report-production .reports-box-body-left .body-left-header-machinestatus .multiselect { z-index: 100; - height: 80px; - width: 100%; - display: flex; - flex-flow: row; - background-color: #fff; - position: absolute; - top: 80px; } -.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div, -.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div { - display: flex; - flex-flow: column; - height: 70px; - margin-right: 24px; +.card-report-production .reports-box-body-left .body-left-header .multiselect label, +.card-report-production .reports-box-body-left .body-left-header-machinestatus .multiselect label { + font-size: 14px; + line-height: 1.29; + color: #878787; } -.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div label.intervaldate, -.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div label.intervaldate { - width: 253px; -} -.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div select, -.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div select { - width: 192px; - height: 48px; - border-radius: 2px; - box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); - border: solid 1px #bbbcbc; - font-size: 18px; - line-height: 1.11; - color: #4b4b4b; - padding-left: 16px; -} -.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div div.interval-time, -.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div div.interval-time { - display: flex; - flex-flow: row; -} -.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div div.interval-time input[type="time"], -.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div div.interval-time input[type="time"] { - width: 112px; - height: 48px; - border-radius: 2px; - box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5); - font-size: 18px; - line-height: 1.11; - color: #bbbcbc; - border: none; -} -.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div div.interval-time input[type="time"]:first-child, -.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div div.interval-time input[type="time"]:first-child { - margin-right: 16px; -} -.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div div.interval-time input[type="time"]::-webkit-inner-spin-button, -.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div div.interval-time input[type="time"]::-webkit-inner-spin-button { - -webkit-appearance: none; - display: none; - border: none; -} -.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div input.program, -.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div input.program { - width: 256px; - height: 48px; - border-radius: 2px; - box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5); - font-size: 18px; - line-height: 1.11; - color: #bbbcbc; - padding-left: 16px; - border: none; -} -.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div .reports-select-operator, -.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div .reports-select-operator { - width: 192px; - height: 48px; - border-radius: 2px; - box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); - font-size: 18px; - line-height: 1.11; - color: #4b4b4b; -} -.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div .reports-select-shift, -.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div .reports-select-shift { +.card-report-production .reports-box-body-left .body-left-header .selectBox, +.card-report-production .reports-box-body-left .body-left-header-machinestatus .selectBox { + position: relative; width: 144px; - height: 48px; - border-radius: 2px; - box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); } -.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div label.label_advanced_filters, -.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div label.label_advanced_filters { - margin-top: 35px; +.card-report-production .reports-box-body-left .body-left-header .selectBox select, +.card-report-production .reports-box-body-left .body-left-header-machinestatus .selectBox select { + width: 100%; + padding: 8px; + cursor: pointer; + height: 49px; font-size: 18px; - line-height: 1; - color: #002680; + line-height: 1.11; + color: #4b4b4b; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); + border-radius: 2px; } -.card-report-production .reports-box-body-left .body-left-header div.advanced-filters > div label.label_advanced_filters span, -.card-report-production .reports-box-body-left .body-left-header-machinestatus div.advanced-filters > div label.label_advanced_filters span { - text-decoration-line: underline; - text-decoration-color: #002680; - text-decoration-style: solid; +.card-report-production .reports-box-body-left .body-left-header .selectBox select option, +.card-report-production .reports-box-body-left .body-left-header-machinestatus .selectBox select option { + display: none; +} +.card-report-production .reports-box-body-left .body-left-header .selectBoxU, +.card-report-production .reports-box-body-left .body-left-header-machinestatus .selectBoxU { + position: relative; + width: 180px; +} +.card-report-production .reports-box-body-left .body-left-header .selectBoxU select, +.card-report-production .reports-box-body-left .body-left-header-machinestatus .selectBoxU select { + width: 100%; + padding: 8px; + cursor: pointer; + height: 49px; + font-size: 18px; + line-height: 1.11; + color: #4b4b4b; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); + border-radius: 2px; +} +.card-report-production .reports-box-body-left .body-left-header .selectBoxU select option, +.card-report-production .reports-box-body-left .body-left-header-machinestatus .selectBoxU select option { + display: none; +} +.card-report-production .reports-box-body-left .body-left-header .overSelect, +.card-report-production .reports-box-body-left .body-left-header-machinestatus .overSelect { + position: absolute; + left: 0; + right: 0; + top: 0; + bottom: 0; +} +.card-report-production .reports-box-body-left .body-left-header .checkboxes, +.card-report-production .reports-box-body-left .body-left-header-machinestatus .checkboxes, +.card-report-production .reports-box-body-left .body-left-header .checkboxesU, +.card-report-production .reports-box-body-left .body-left-header-machinestatus .checkboxesU { + display: none; +} +.card-report-production .reports-box-body-left .body-left-header .checkboxesView, +.card-report-production .reports-box-body-left .body-left-header-machinestatus .checkboxesView, +.card-report-production .reports-box-body-left .body-left-header .checkboxesViewUser, +.card-report-production .reports-box-body-left .body-left-header-machinestatus .checkboxesViewUser { + width: calc(100% - 8px); + background-color: #fff; + display: block; + z-index: 100; + padding: 6px 4px; + box-shadow: 0 3px 5px 0 rgba(0, 0, 0, 0.4); +} +.card-report-production .reports-box-body-left .body-left-header .checkboxesView label, +.card-report-production .reports-box-body-left .body-left-header-machinestatus .checkboxesView label, +.card-report-production .reports-box-body-left .body-left-header .checkboxesViewUser label, +.card-report-production .reports-box-body-left .body-left-header-machinestatus .checkboxesViewUser label { + font-size: 18px; + margin: 2px; + display: flex; + flex-flow: row; +} +.card-report-production .reports-box-body-left .body-left-header .checkboxesView .label-state, +.card-report-production .reports-box-body-left .body-left-header-machinestatus .checkboxesView .label-state, +.card-report-production .reports-box-body-left .body-left-header .checkboxesViewUser .label-state, +.card-report-production .reports-box-body-left .body-left-header-machinestatus .checkboxesViewUser .label-state { + margin-left: 12px; } .card-report-production .reports-box-body-left .body-left-header-machinestatus { border-right: 0px; diff --git a/Step/wwwroot/src/app_modules/reports/components/card-report-production.ts b/Step/wwwroot/src/app_modules/reports/components/card-report-production.ts index 33f29418..5ca0ae21 100644 --- a/Step/wwwroot/src/app_modules/reports/components/card-report-production.ts +++ b/Step/wwwroot/src/app_modules/reports/components/card-report-production.ts @@ -4,6 +4,7 @@ import {cardReport} from "../../../modules/base-components/cards/index"; import accordionDropdown from "../../../modules/base-components/accordion-dropdown.vue"; import modalReportSelectColumn from "../../../modules/base-components/modal-report-select-column.vue"; import { Accordion } from "src/modules/base-components"; +import { loginService } from "src/services"; import DatePicker from "vue2-datepicker"; import moment from "moment"; import { ModalHelper } from "src/components/modals"; @@ -24,9 +25,11 @@ export default class CardReportProduction extends Vue { filter: { interval?: Date[], - timelineMacro: Array + timelineMacro: Array, + multiUser: Array } = { timelineMacro: ["Eventi","Allarmi","Stato macchina","Programmi"], + multiUser: [], interval: [new Date(new Date().setDate(new Date().getDate() - 6)), new Date(new Date().setDate(new Date().getDate() + 1))] }; @@ -35,6 +38,17 @@ export default class CardReportProduction extends Vue { selectDiagram: boolean = false; selectMoreFilter: boolean = false; selectTable: boolean = true; + users: Array = []; + + get currentUser() { + return this.$store.state.currentUser; + } + + async mounted() { + this.users = await loginService.getAllUsers(); + this.users.unshift({ id: -1, username: this.$options.filters.localize("alarm_history_users_not_user", "Nessun utente") }); + this.filter.multiUser.push(this.currentUser.username); + } public selectTab(value){ this.selectedTab = value; @@ -71,10 +85,10 @@ export default class CardReportProduction extends Vue { openModalSelectField(){ ModalHelper.ShowModal(modalReportSelectColumn); } - public openSelectState() { - if (!$('.checkboxes').hasClass('checkboxesView')) - $('.checkboxes').addClass('checkboxesView'); + public openSelectStateU() { + if (!$('.checkboxesU').hasClass('checkboxesViewUser')) + $('.checkboxesU').addClass('checkboxesViewUser'); else - $('.checkboxes').removeClass('checkboxesView'); - } + $('.checkboxesU').removeClass('checkboxesViewUser'); + } } \ No newline at end of file diff --git a/Step/wwwroot/src/app_modules/reports/components/card-report-production.vue b/Step/wwwroot/src/app_modules/reports/components/card-report-production.vue index 8aad7800..cc32e686 100644 --- a/Step/wwwroot/src/app_modules/reports/components/card-report-production.vue +++ b/Step/wwwroot/src/app_modules/reports/components/card-report-production.vue @@ -14,31 +14,6 @@ -
- - -
-
-
- -
- - -
-
-
- - -
-
- - -
-
- - -
-
@@ -56,17 +31,35 @@
-
+
+ +
+ +
+ +
+
+ +
+
+
+
-
- -
@@ -122,228 +115,6 @@ 1° - - Finestra02.pgm - X: 1210; Y:900; Z: 63 - 1 - 11:25:00 - 13:10:00 - 12/04/2017 - 01:45:00 - 01:25:00 - 01:20:00 - +00:20:00 - Buono - Nome utente - 1° - - - - Finestra02.pgm - X: 1210; Y:900; Z: 63 - 1 - 11:25:00 - 13:10:00 - 12/04/2017 - 01:45:00 - 01:25:00 - 01:20:00 - +00:20:00 - Buono - Nome utente - 1° - - - - Finestra02.pgm - X: 1210; Y:900; Z: 63 - 1 - 11:25:00 - 13:10:00 - 12/04/2017 - 01:45:00 - 01:25:00 - 01:20:00 - +00:20:00 - Buono - Nome utente - 1° - - - - Finestra02.pgm - X: 1210; Y:900; Z: 63 - 1 - 11:25:00 - 13:10:00 - 12/04/2017 - 01:45:00 - 01:25:00 - 01:20:00 - +00:20:00 - Buono - Nome utente - 1° - - - - Finestra02.pgm - X: 1210; Y:900; Z: 63 - 1 - 11:25:00 - 13:10:00 - 12/04/2017 - 01:45:00 - 01:25:00 - 01:20:00 - +00:20:00 - Buono - Nome utente - 1° - - - - Finestra02.pgm - X: 1210; Y:900; Z: 63 - 1 - 11:25:00 - 13:10:00 - 12/04/2017 - 01:45:00 - 01:25:00 - 01:20:00 - +00:20:00 - Buono - Nome utente - 1° - - - - Finestra02.pgm - X: 1210; Y:900; Z: 63 - 1 - 11:25:00 - 13:10:00 - 12/04/2017 - 01:45:00 - 01:25:00 - 01:20:00 - +00:20:00 - Buono - Nome utente - 1° - - - - Finestra02.pgm - X: 1210; Y:900; Z: 63 - 1 - 11:25:00 - 13:10:00 - 12/04/2017 - 01:45:00 - 01:25:00 - 01:20:00 - +00:20:00 - Buono - Nome utente - 1° - - - - Finestra02.pgm - X: 1210; Y:900; Z: 63 - 1 - 11:25:00 - 13:10:00 - 12/04/2017 - 01:45:00 - 01:25:00 - 01:20:00 - +00:20:00 - Buono - Nome utente - 1° - - - - Finestra02.pgm - X: 1210; Y:900; Z: 63 - 1 - 11:25:00 - 13:10:00 - 12/04/2017 - 01:45:00 - 01:25:00 - 01:20:00 - +00:20:00 - Buono - Nome utente - 1° - - - - Finestra02.pgm - X: 1210; Y:900; Z: 63 - 1 - 11:25:00 - 13:10:00 - 12/04/2017 - 01:45:00 - 01:25:00 - 01:20:00 - +00:20:00 - Buono - Nome utente - 1° - - - - Finestra02.pgm - X: 1210; Y:900; Z: 63 - 1 - 11:25:00 - 13:10:00 - 12/04/2017 - 01:45:00 - 01:25:00 - 01:20:00 - +00:20:00 - Buono - Nome utente - 1° - - - - Finestra02.pgm - X: 1210; Y:900; Z: 63 - 1 - 11:25:00 - 13:10:00 - 12/04/2017 - 01:45:00 - 01:25:00 - 01:20:00 - +00:20:00 - Buono - Nome utente - 1° - - -
From d00cc5efc1cd4cce576c6d19e968fb9b1f4f22e4 Mon Sep 17 00:00:00 2001 From: Alessandro Date: Wed, 23 Jan 2019 15:11:28 +0100 Subject: [PATCH 3/9] fix modal-report-select-column --- .../components/card-report-production.vue | 2 +- .../modal-report-select-column.ts | 30 +++++ .../modal-report-select-column.vue | 104 +----------------- 3 files changed, 37 insertions(+), 99 deletions(-) diff --git a/Step/wwwroot/src/app_modules/reports/components/card-report-production.vue b/Step/wwwroot/src/app_modules/reports/components/card-report-production.vue index cc32e686..dba60ab9 100644 --- a/Step/wwwroot/src/app_modules/reports/components/card-report-production.vue +++ b/Step/wwwroot/src/app_modules/reports/components/card-report-production.vue @@ -44,7 +44,7 @@
-->
+