diff --git a/Thermo.Active/wwwroot/assets/styles/base/setup.less b/Thermo.Active/wwwroot/assets/styles/base/setup.less index 653fad4d..8c7db1e4 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/setup.less +++ b/Thermo.Active/wwwroot/assets/styles/base/setup.less @@ -119,7 +119,7 @@ div { display: grid; - grid-template-columns: auto 1f auto; + grid-template-columns: auto 1fr auto; img { grid-column: 1; @@ -407,7 +407,6 @@ article { &.transparent { .body { border: none; - } } @@ -420,6 +419,14 @@ article { width: 500px; } + &.color_2{ + background-color: #e5f3ff; + } + + &.color_3{ + background-color: #b3dbff; + } + .header { display: flex; align-items: center; @@ -443,8 +450,6 @@ article { border: 2px solid #979797; } - - .submit { margin: auto; width: 90px; diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index 7bca4547..41337e6b 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -104,7 +104,7 @@ } .setup .modal section.body section article .svg-area .borded_label div { display: grid; - grid-template-columns: auto 1f auto; + grid-template-columns: auto 1fr auto; } .setup .modal section.body section article .svg-area .borded_label div img { grid-column: 1; @@ -333,6 +333,12 @@ article .box .body { .box.box-500 { width: 500px; } +.box.color_2 { + background-color: #e5f3ff; +} +.box.color_3 { + background-color: #b3dbff; +} .box .header { display: flex; align-items: center; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/@types/svgChart.bar.d.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/@types/svgChart.bar.d.ts new file mode 100644 index 00000000..68f0e061 --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/@types/svgChart.bar.d.ts @@ -0,0 +1,8 @@ +declare module svg { + interface BarChartInfo { + borderColor: string; + backgroundColor: string; + width: number; + height: number; + } +} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.ts new file mode 100644 index 00000000..cbfd056d --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.ts @@ -0,0 +1,37 @@ +import Component from "vue-class-component"; + +import Vue from "vue"; +import { Prop } from "vue-property-decorator"; + +@Component({}) +export default class SVGChart extends Vue { + + @Prop() + lineBarColor: string; + + @Prop({ default: [] }) + bars: svg.BarChartInfo[]; + + step: number = 50; + + startXOf(barindex: number) { + return this.bars.slice(0, barindex).reduce((p, c) => c.width + p, 0); + } + + get maxX() { + return Math.max(this.bars.reduce((p, c) => c.width + p, 0), 1); + } + + get maxY() { + return Math.max(...this.bars.map(i => i.height), 1); + } + + scaleX(value: number) { + return value * 1000 / this.maxX; + } + + scaleY(value: number) { + return value * 1000 / this.maxY; + } +} + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.vue new file mode 100644 index 00000000..e1518a79 --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.vue @@ -0,0 +1,37 @@ + + + \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-produzione/avvio-produzione.ts similarity index 90% rename from Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.ts rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-produzione/avvio-produzione.ts index 27127d22..58fb1bca 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-produzione/avvio-produzione.ts @@ -3,19 +3,17 @@ import { Modal, ModalHelper } from "@/components/modals"; import { Factory, messageService, awaiter } from "@/_base"; import Component from "vue-class-component"; import { Prop } from 'vue-property-decorator'; -import Tastierino from "@/app_modules_thermo/components/tastierino.vue"; import { appModelActions } from "@/store/app.store"; @Component({ components: { modal: Modal, - tastierino: Tastierino } }) export default class AvvioProduzione extends Vue { enabling: boolean = true; - @Prop({}) + @Prop({default:0}) pieces: number; mock_pieces: number = this.pieces; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-produzione/avvio-produzione.vue similarity index 72% rename from Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.vue rename to Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-produzione/avvio-produzione.vue index db43aff0..b83046b4 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-pruduzione/avvio-produzione.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/avvio-produzione/avvio-produzione.vue @@ -7,18 +7,16 @@
-
+
- -
+
- +
- -
+