From b4b44a765c839717afc275e5b68cf85b25fbe3a8 Mon Sep 17 00:00:00 2001 From: = Date: Mon, 13 Jul 2020 18:52:01 +0200 Subject: [PATCH] items lavorati... last --- .../wwwroot/assets/styles/base/dashboard.less | 72 +++++++++++++++++++ Thermo.Active/wwwroot/assets/styles/style.css | 60 ++++++++++++++++ .../dashboard/base-components/item.ts | 12 ++++ .../dashboard/base-components/item.vue | 69 ++++++++++++++++++ .../app_modules_thermo/dashboard/dashboard.ts | 8 ++- .../dashboard/dashboard.vue | 1 + 6 files changed, 221 insertions(+), 1 deletion(-) create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.ts create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.vue diff --git a/Thermo.Active/wwwroot/assets/styles/base/dashboard.less b/Thermo.Active/wwwroot/assets/styles/base/dashboard.less index ee9d4de9..238288e6 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/dashboard.less +++ b/Thermo.Active/wwwroot/assets/styles/base/dashboard.less @@ -377,4 +377,76 @@ } } } +} + +.history-item { + + display: flex; + flex-flow: column nowrap; + align-items: center; + justify-content: flex-end; + + .body { + display: grid; + grid-template-columns: 1fr 1fr 1fr 1fr 25px; + width: 630px; + align-items: center; + height: 84px; + background-color: #e8e8e8; + border-bottom: 1px solid #4b4b4b; + } + + .subitems { + + width: 630px; + + .row { + display: grid; + grid-template-columns: 1fr 1fr 1fr; + height: 60px; + margin-left: 151px; + width: calc(100% - 151px - 25px); + background-color: #e8e8e8; + border-bottom: 1px solid #4b4b4b; + } + } + + label { + text-align: right; + font-size: 54px; + font-weight: 500; + } + + .col { + display: flex; + flex-flow: column; + align-items: center; + justify-content: space-evenly; + height: 100%; + + small { + font-size: 12px; + font-weight: 500; + text-transform: uppercase; + text-align: center; + } + + span { + font-size: 25px; + font-weight: 500px; + } + + i { + font-size: 32px; + cursor: pointer; + } + } + + button.trash { + border-radius: 25px; + width: 50px; + height: 50px; + border: 2px solid #4b4b4b; + box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.5); + } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index 5bcf45dc..9f74a0ec 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -4433,6 +4433,66 @@ article .box .body { margin-top: 10px; height: calc(100% - 78px); } +.history-item { + display: flex; + flex-flow: column nowrap; + align-items: center; + justify-content: flex-end; +} +.history-item .body { + display: grid; + grid-template-columns: 1fr 1fr 1fr 1fr 25px; + width: 630px; + align-items: center; + height: 84px; + background-color: #e8e8e8; + border-bottom: 1px solid #4b4b4b; +} +.history-item .subitems { + width: 630px; +} +.history-item .subitems .row { + display: grid; + grid-template-columns: 1fr 1fr 1fr; + height: 60px; + margin-left: 151px; + width: calc(100% - 151px - 25px); + background-color: #e8e8e8; + border-bottom: 1px solid #4b4b4b; +} +.history-item label { + text-align: right; + font-size: 54px; + font-weight: 500; +} +.history-item .col { + display: flex; + flex-flow: column; + align-items: center; + justify-content: space-evenly; + height: 100%; +} +.history-item .col small { + font-size: 12px; + font-weight: 500; + text-transform: uppercase; + text-align: center; +} +.history-item .col span { + font-size: 25px; + font-weight: 500px; +} +.history-item .col i { + font-size: 32px; + cursor: pointer; +} +.history-item button.trash { + border-radius: 25px; + width: 50px; + height: 50px; + border: 2px solid #4b4b4b; + box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.5); +} .warmers { position: relative; } diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.ts new file mode 100644 index 00000000..3ff4d325 --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.ts @@ -0,0 +1,12 @@ +import Component from "vue-class-component"; +import Vue from "vue"; +import { Prop } from "vue-property-decorator"; + +@Component({}) +export default class Item extends Vue { + + @Prop() + value: Prod.IProd; + + showDetails: boolean = false; +} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.vue new file mode 100644 index 00000000..b6173af5 --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/base-components/item.vue @@ -0,0 +1,69 @@ + + \ No newline at end of file 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 7512fed8..455a26be 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts @@ -11,6 +11,7 @@ import gauge from "./base-components/gauge.vue"; import { prodService } from '@/services/prodService'; import moment from 'moment'; import stats from "./base-components/stats.vue"; +import hitem from "./base-components/item.vue"; @Component({ components: { @@ -18,7 +19,8 @@ import stats from "./base-components/stats.vue"; archInterface: ArchInterface, alarmList, gauge, - stats + stats, + hitem } }) export default class Dashboard extends Vue { @@ -28,6 +30,10 @@ export default class Dashboard extends Vue { return (this.$store.state as AppModel).prod.panel; } + get lastItem() { + return (this.$store.state as AppModel).prod.prod; + } + now = moment(); get elapsed() { 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 0847154e..3b21225a 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.vue @@ -148,6 +148,7 @@ +