diff --git a/Thermo.Active/wwwroot/assets/styles/base/dashboard.less b/Thermo.Active/wwwroot/assets/styles/base/dashboard.less index 18ee1dde..f771f748 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/dashboard.less +++ b/Thermo.Active/wwwroot/assets/styles/base/dashboard.less @@ -256,6 +256,46 @@ display : flex; flex-flow : column; + .piece_time{ + display: grid; + grid-template-rows : repeat(2,auto); + grid-template-columns: repeat(2,auto); + + .piece_hours{ + grid-row: 1; + grid-column: 1; + } + + .time_cycle{ + grid-row: 1; + grid-column: 2; + } + + div{ + display: flex; + flex-flow: column; + + span{ + font-family: "Work Sans"; + font-weight: 500; + text-align: center; + color:#4b4b4b; + + &:first-of-type{ + font-size: 26px; + text-transform: uppercase; + } + + &:last-of-type{ + font-size: 120px; + } + + } + + } + + } + .pieces { height: 400px; diff --git a/Thermo.Active/wwwroot/assets/styles/base/opzioni.less b/Thermo.Active/wwwroot/assets/styles/base/opzioni.less index 1aa3fe71..c09b64b8 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/opzioni.less +++ b/Thermo.Active/wwwroot/assets/styles/base/opzioni.less @@ -1,3 +1,26 @@ +// out: false, sourceMap: false, main: ../style.less + +.modal.opzioni-info{ + section{ + aside{ + button{ + box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.5); + width: 547px; + height: 72px; + background-color: #bbbcbc; + border:none; + text-align: left; + color: @color-darkish-blue; + font-size: 20px; + + &.active{ + background-color: white; + } + } + } + } +} + .opzionilavorazione { display: grid; grid-template-columns: 1fr 1fr; diff --git a/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less b/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less index 09c703ee..1fbe3fa0 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less +++ b/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less @@ -6,6 +6,8 @@ @heightmeridian: 300px; .modal.progr-preriscaldo-info { + margin-top: 200px; + height: 565px; header { padding-left: 31px; diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index 5baf2ce4..2df5cf5f 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -4412,6 +4412,36 @@ article .box .body { display: flex; flex-flow: column; } +.dashboard .third_col .piece_time { + display: grid; + grid-template-rows: repeat(2, auto); + grid-template-columns: repeat(2, auto); +} +.dashboard .third_col .piece_time .piece_hours { + grid-row: 1; + grid-column: 1; +} +.dashboard .third_col .piece_time .time_cycle { + grid-row: 1; + grid-column: 2; +} +.dashboard .third_col .piece_time div { + display: flex; + flex-flow: column; +} +.dashboard .third_col .piece_time div span { + font-family: "Work Sans"; + font-weight: 500; + text-align: center; + color: #4b4b4b; +} +.dashboard .third_col .piece_time div span:first-of-type { + font-size: 26px; + text-transform: uppercase; +} +.dashboard .third_col .piece_time div span:last-of-type { + font-size: 120px; +} .dashboard .third_col .pieces { height: 400px; } @@ -5000,6 +5030,10 @@ article .box .body { font-size: 32px; line-height: 1; } +.modal.progr-preriscaldo-info { + margin-top: 200px; + height: 565px; +} .modal.progr-preriscaldo-info header { padding-left: 31px; display: flex; @@ -5540,6 +5574,19 @@ select:focus { padding: 0 20px; font-size: 1rem; } +.modal.opzioni-info section aside button { + box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.5); + width: 547px; + height: 72px; + background-color: #bbbcbc; + border: none; + text-align: left; + color: #002680; + font-size: 20px; +} +.modal.opzioni-info section aside button.active { + background-color: white; +} .opzionilavorazione { display: grid; grid-template-columns: 1fr 1fr; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/piece.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/piece.ts index c8450480..b7772e09 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/piece.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/piece.ts @@ -2,10 +2,13 @@ import Vue from 'vue'; import Component from 'vue-class-component'; import { Prop } from 'vue-property-decorator'; import PieceSubMenu from "./piece-sub-menu.vue"; +import { ProdActions } from '@/store/prod.store'; @Component({components:{submenu:PieceSubMenu}}) export default class Piece extends Vue{ + prod: Prod.IProd = this.$store.getters.getProd(); + @Prop({default:0}) number:number; @Prop({default:0}) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts index 1d188e81..43b707f0 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts @@ -22,6 +22,10 @@ import Piece from "./base-components/piece.vue"; }) export default class Dashboard extends Vue { + @Prop({ default: "18,2" }) + piece_hours: string; + @Prop({ default: "3'12''" }) + time_cycle: string; @Prop({ default: 10 }) pieces:number; @Prop({ default: 280 }) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.vue index 63811fb9..e400d7da 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.vue @@ -124,6 +124,18 @@