diff --git a/Thermo.Active/wwwroot/assets/icons/svg/disegno-quote-velocita-stampo.svg b/Thermo.Active/wwwroot/assets/icons/svg/disegno-quote-velocita-stampo.svg new file mode 100644 index 00000000..d3cde82c --- /dev/null +++ b/Thermo.Active/wwwroot/assets/icons/svg/disegno-quote-velocita-stampo.svg @@ -0,0 +1,549 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less index 25576f17..0a987645 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less +++ b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less @@ -26,7 +26,7 @@ } - } + .specific{ @@ -41,8 +41,16 @@ height: 800px; } + .disegnoStampo{ + flex-shrink: 0; + margin-left: 680px; + width: 1200px; + height: 795px; + } + .input-circles{ + span{ object-fit: contain; font-size: 22px; @@ -57,6 +65,8 @@ } .circle{ + width: 147px; + height: 60px; flex-direction: column; div{ @@ -117,6 +127,71 @@ } + .circle-stampo-1{ + position: relative; + top: 115px; + right: 1212px; + } + + .circle-stampo-2{ + position: relative; + top: 140px; + right: 1130px; + } + + .circle-stampo-3{ + position: relative; + top: 4px; + right: 730px; + } + + .circle-stampo-4{ + position: relative; + top: -64px; + right: 925px; + } + + .circle-stampo-5{ + position: relative; + top: -10px; + right: 740px; + } + + .circle-stampo-6{ + position: relative; + top: 205px; + right: 1115px; + } + + .circle-stampo-7{ + position: relative; + top: 50px; + right: 125px; + } + + .circle-stampo-8{ + position: relative; + top: -210px; + right: 550px; + } + + .circle-stampo-9{ + position: relative; + top: -90px; + right: 560px; + } + + .circle-stampo-10{ + position: relative; + bottom: 557px; + right: 769px; + } + + .circle-stampo-11{ + position: relative; + top: 38px; + right: 781px; + } } button{ diff --git a/Thermo.Active/wwwroot/assets/styles/base/setup.less b/Thermo.Active/wwwroot/assets/styles/base/setup.less index df275470..5ee37eb3 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/setup.less +++ b/Thermo.Active/wwwroot/assets/styles/base/setup.less @@ -90,7 +90,7 @@ label { margin: auto; object-fit: contain; - font-size: 22px; + font-size: 20px; font-weight: 500; font-stretch: normal; font-style: normal; diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index 4b79d880..6beef1c2 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -4155,7 +4155,7 @@ .setup .modal section.body section .specific .svg-area .input-circles label { margin: auto; object-fit: contain; - font-size: 22px; + font-size: 20px; font-weight: 500; font-stretch: normal; font-style: normal; @@ -4620,7 +4620,13 @@ width: 800px; height: 800px; } -.modal.quote-velocita-info section .specific .svg-area .input-circles span { +.modal.quote-velocita-info .specific .svg-area .disegnoStampo { + flex-shrink: 0; + margin-left: 680px; + width: 1200px; + height: 795px; +} +.modal.quote-velocita-info .specific .svg-area .input-circles span { object-fit: contain; font-size: 22px; font-weight: 500; @@ -4632,7 +4638,9 @@ color: white; background-color: #979797; } -.modal.quote-velocita-info section .specific .svg-area .input-circles .circle { +.modal.quote-velocita-info .specific .svg-area .input-circles .circle { + width: 147px; + height: 60px; flex-direction: column; } .modal.quote-velocita-info section .specific .svg-area .input-circles .circle div { @@ -4680,7 +4688,62 @@ top: 320px; right: 220px; } -.modal.quote-velocita-info section .specific button { +.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-1 { + position: relative; + top: 115px; + right: 1212px; +} +.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-2 { + position: relative; + top: 140px; + right: 1130px; +} +.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-3 { + position: relative; + top: 4px; + right: 730px; +} +.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-4 { + position: relative; + top: -64px; + right: 925px; +} +.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-5 { + position: relative; + top: -10px; + right: 740px; +} +.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-6 { + position: relative; + top: 205px; + right: 1115px; +} +.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-7 { + position: relative; + top: 50px; + right: 125px; +} +.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-8 { + position: relative; + top: -210px; + right: 550px; +} +.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-9 { + position: relative; + top: -90px; + right: 560px; +} +.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-10 { + position: relative; + bottom: 557px; + right: 769px; +} +.modal.quote-velocita-info .specific .svg-area .input-circles .circle-stampo-11 { + position: relative; + top: 38px; + right: 781px; +} +.modal.quote-velocita-info .specific button { margin-left: 10px; width: 48px; height: 48px; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.ts new file mode 100644 index 00000000..b2739e23 --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.ts @@ -0,0 +1,14 @@ +import Vue from 'vue'; +import Component from 'vue-class-component'; +import {Prop} from 'vue-property-decorator'; + +@Component({}) +export default class QuoteVelocita extends Vue{ + @Prop({default:0}) + x:number; + @Prop({default:0}) + y:number; + @Prop({default:0}) + spes:number; + +} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue new file mode 100644 index 00000000..fee6eb5c --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/stampo.vue @@ -0,0 +1,81 @@ + + + \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.ts new file mode 100644 index 00000000..7fe81e7e --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.ts @@ -0,0 +1,20 @@ +import Vue from "vue"; +import Component from "vue-class-component"; +import { Prop } from 'vue-property-decorator'; +import Slider from "@/app_modules_thermo/components/slider.vue" +import StampoSVG from "./SVG_Components/stampo.vue"; + +@Component({name:"salita-stampo", components:{slider:Slider, stampoSVG: StampoSVG}}) +export default class DiscesaCornice extends Vue { + + @Prop({default:0}) + ritardo:number; + @Prop({default:0}) + corsa:number; + @Prop({default:0}) + velSalita:number; + @Prop({default:0}) + ralSalita:number; + @Prop({default:0}) + velSalitaLenta:number; +} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue new file mode 100644 index 00000000..71b2341f --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/salita-stampo.vue @@ -0,0 +1,64 @@ + + + \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts index 291d0a3f..8a5cf7cf 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.ts @@ -3,12 +3,14 @@ import { Modal, ModalHelper } from "@/components/modals"; import { Factory, messageService, awaiter } from "@/_base"; import Component from "vue-class-component"; import DiscesaCornice from "./discesa-cornice.vue"; +import SalitaStampo from "./salita-stampo.vue"; import StepFooter from "@/app_modules_thermo/setup/components/step-footer.vue" @Component({ components: { modal: Modal, discesacornice: DiscesaCornice, + salitaStampo: SalitaStampo, stepfooter: StepFooter } }) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue index c5f01074..b0cbed52 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue @@ -11,6 +11,7 @@ +