diff --git a/Thermo.Active/wwwroot/assets/icons/svg/disegno-controstampo-quote-velocita.svg b/Thermo.Active/wwwroot/assets/icons/svg/disegno-controstampo-quote-velocita.svg new file mode 100644 index 00000000..064b33cb --- /dev/null +++ b/Thermo.Active/wwwroot/assets/icons/svg/disegno-controstampo-quote-velocita.svg @@ -0,0 +1,240 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/ciclo.less b/Thermo.Active/wwwroot/assets/styles/base/ciclo.less index c0863f3a..3c7a79af 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/ciclo.less +++ b/Thermo.Active/wwwroot/assets/styles/base/ciclo.less @@ -50,26 +50,27 @@ .circle1{ position: relative; - top: 130px; + top: 200px; right: 25px; } .circle2{ position: relative; - top: 180px; + top: 400px; right: 25px; } .circle3{ + width: 135px; position: relative; - top: 175px; + top: 545px; right: 410px; } .circle4{ position: relative; - top: 60px; - right: 180px; + top: 585px; + right: 200px; } } diff --git a/Thermo.Active/wwwroot/assets/styles/base/estrazione.less b/Thermo.Active/wwwroot/assets/styles/base/estrazione.less index b869d1b1..d32bebe1 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/estrazione.less +++ b/Thermo.Active/wwwroot/assets/styles/base/estrazione.less @@ -7,16 +7,24 @@ .@{modal}.estrazione-info { width: 1820px; height: 785px; - .specific { - justify-content: flex-end; -.box{ - background-color: #e5f3ff; -} -} + section.body{ + section{ + .specific { + justify-content: flex-end; + padding-left: 10px; + + .box{ + margin:0; + background-color: #e5f3ff; + } + } + } + + } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/base/layout.less b/Thermo.Active/wwwroot/assets/styles/base/layout.less index b2f1a151..f04c8c32 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/layout.less +++ b/Thermo.Active/wwwroot/assets/styles/base/layout.less @@ -11,6 +11,7 @@ @import "ciclo.less"; @import "raffreddamento.less"; @import "processo.less"; +@import "progrprerisc.less"; @import "controstamposetup.less"; @import "quote-velocita.less"; @import "opzioni.less"; diff --git a/Thermo.Active/wwwroot/assets/styles/base/opzioni.less b/Thermo.Active/wwwroot/assets/styles/base/opzioni.less index 8259cb30..7eed4148 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/opzioni.less +++ b/Thermo.Active/wwwroot/assets/styles/base/opzioni.less @@ -15,8 +15,10 @@ margin: 0; } - .section{ - display: flex; + section.body{ + + section{ + padding: 0px; .specific{ @@ -60,31 +62,33 @@ } - } - - aside{ + aside{ - button{ - display: block; - background-color: #bbbcbc; - color: #002680; - padding: 22px 16px; - margin: 2px 0; - width: 547px; - height: 70px; - border: none; - text-align: left; - cursor: pointer; - font-size: 17px; - } + button{ + display: block; + background-color: #bbbcbc; + color: #002680; + padding: 22px 16px; + margin: 2px 0; + width: 547px; + height: 70px; + border: none; + text-align: left; + cursor: pointer; + font-size: 17px; + } + + .active{ + background-color: #fff; + font-weight: bold; + border-top: 2px solid #002680; + } - .active{ - background-color: #fff; - font-weight: bold; - border-top: 2px solid #002680; } } -} + } + + } diff --git a/Thermo.Active/wwwroot/assets/styles/base/pirometro.less b/Thermo.Active/wwwroot/assets/styles/base/pirometro.less index ddd84787..acaa83b1 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/pirometro.less +++ b/Thermo.Active/wwwroot/assets/styles/base/pirometro.less @@ -10,83 +10,84 @@ width: 1820px; height: 980px; - section{ - - .specific{ - width: 470px; - @{pirometro-margin}:37%; - } - - .termospecific{ - @{pirometro-margin}:0%; - - .svg-area{ - padding-left: 90px; - width: 1270px; - height: 800px; - - .disegnoTermoSuperiore{ - flex-shrink: 0; - width: 1100px; - height: 750px; - } - - .border-termo-superiore{ - - .circle1{ - position: relative; - top: 135px; - right: 1150px; - } - - .circle2{ - position: relative; - top: 355px; - right: 1150px; - } - - .circle3{ - position: relative; - top: 425px; - right: 1150px; - } - - .circle4{ - position: relative; - top: 470px; - right: 635px; - } - - .circle5{ - position: relative; - top: 400px; - right: 255px; - } - - .circle6{ - width: 64px; - height: 20px; - color:white; - object-fit: contain; - background-color: #c03d58; - position: relative; - top: 95px; - right: 125px; - } - - } + section.body{ + + section{ + .specific{ + width: 470px; + @{pirometro-margin}:37%; } - button{ - margin-left: 5px; - width: 48px; - height: 48px; - object-fit: contain; - border-radius: 2px; - box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5); - border: solid 1px #001e48; - background-image: linear-gradient(to bottom, #1756ad, #002680); + .termospecific{ + @{pirometro-margin}:0%; + + .svg-area{ + padding-left: 90px; + width: 1270px; + height: 800px; + + .disegnoTermoSuperiore{ + flex-shrink: 0; + width: 1100px; + height: 750px; + } + + .border-termo-superiore{ + + .circle1{ + position: relative; + top: 135px; + right: 1150px; + } + + .circle2{ + position: relative; + top: 355px; + right: 1150px; + } + + .circle3{ + position: relative; + top: 425px; + right: 1150px; + } + + .circle4{ + position: relative; + top: 470px; + right: 635px; + } + + .circle5{ + position: relative; + top: 400px; + right: 255px; + } + + .circle6{ + width: 100px; + background-color: #c03d58; + position: relative; + top: 87px; + right: 150px; + } + + } + + } + + button{ + margin-left: 5px; + width: 48px; + height: 48px; + object-fit: contain; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5); + border: solid 1px #001e48; + background-image: linear-gradient(to bottom, #1756ad, #002680); + } + } } diff --git a/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less b/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less new file mode 100644 index 00000000..934b1348 --- /dev/null +++ b/Thermo.Active/wwwroot/assets/styles/base/progrprerisc.less @@ -0,0 +1,268 @@ +// out: false, sourceMap: false, main: ../style.less +@import "grid-system.less"; +@import "colors.less"; +@import "fonts.less"; +@modal: modal; +@heightmeridian:300px; + +.@{modal}.progr-preriscaldo-info { + width: 1639px; + height: 565px; + margin-top: 220px; + + header { + padding-left: 31px; + display: flex; + align-items: center; + font-size: 20px; + font-weight: bold; + color: darkblue; + } + + section.body{ + overflow: hidden; + + section{ + padding: 0px; + width: 100%; + height: 100%; + + hr{ + border: none; + } + + aside{ + margin: 14px; + + button{ + width: 197px; + height: 48px; + object-fit: contain; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5); + border: solid 1px #001e48; + background-image: linear-gradient(to bottom, #1756ad, #002680); + font-size: 18px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + text-align: center; + color: white; + margin: auto; + } + + } + + .specific{ + margin: 0; + padding: 20px; + width: 100%; + height: 100%; + background-color: #bbbcbc; + + div{ + display: flex; + margin-bottom: 50px; + + .clock{ + border-radius: 50%; + background-color: white; + height: @heightmeridian; + width: @heightmeridian; + + span{ + flex-shrink: 0; + border-radius: 50%; + width: 20px; + height: 20px; + background-color: @color-darkish-blue; + position: relative; + top: 140px; + right: 460px; + } + + button{ + flex-shrink: 0; + border-radius: 50%; + width: 50px; + height: 50px; + background-image: none; + box-shadow: none; + background-color: white; + color: black; + font-size: 20px; + } + + .selected{ + background-color: @color-darkish-blue; + color:white; + } + + .btn1{ + position: relative; + top: 22px; + right: -188px; + } + + .btn2{ + position: relative; + top: 68px; + right: -179px; + } + + .btn3{ + position: relative; + top: 125px; + right: -149px; + } + + .btn4{ + position: relative; + top: 182px; + right: -79px; + } + + .btn5{ + position: relative; + top: 227px; + right: 12px; + } + + .btn6{ + position: relative; + top: 248.5px; + right: 125px; + } + + .btn7{ + position: relative; + top: 227px; + right: 238px; + } + + .btn8{ + position: relative; + top: 182px; + right: 329px; + } + + .btn9{ + position: relative; + top: 125px; + right: 399px; + } + + .btn10{ + position: relative; + top: 68px; + right: 429px; + } + + .btn11{ + position: relative; + top: 22px; + right: 438px; + } + + .btn12{ + position: relative; + top: 0.5px; + right: 425px; + } + + + } + + div{ + + &:first-of-type{ + flex-direction: column; + margin-right: 20px; + width: 180px; + height: @heightmeridian; + background-image: linear-gradient(to bottom, #1756ad, @color-darkish-blue); + + label{ + color: #ADD8E6; + margin: auto; + + &:first-of-type{ + font-size: 67px; + } + + &:last-of-type{ + font-size: 20px; + margin-top: -50px; + } + + } + + } + + &:last-child{ + margin-left: -50px; + height: @heightmeridian; + flex-direction: column; + + button{ + width: 50px; + background-image: none; + box-shadow: none; + background-color: #bbbcbc; + color: @color-darkish-blue; + font-size: 20px; + + &:first-of-type{ + margin-bottom: @heightmeridian - 50px; + } + + } + + } + + } + + button{ + border: none; + width: 130px; + height: 45px; + border-radius: 22.5px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, #818a8f 0%, #42494e 98%); + font-size: 18px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + text-align: center; + color: white; + } + + .active{ + box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.43); + background-image: linear-gradient(to bottom, #42494e 0%, #818a8f 98%); + } + + } + + label{ + margin-bottom: 20px; + font-size: 24px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: @color-darkish-blue; + } + + } + + } + + } + +} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less index 25576f17..7dc7a3b9 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less +++ b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less @@ -41,22 +41,25 @@ height: 800px; } + .disegnoStampo{ + flex-shrink: 0; + margin-left: 680px; + width: 1200px; + height: 795px; + } + + .disegnoControstampoQuoteVelocita{ + flex-shrink: 0; + margin-left: 600px; + width: 1156px; + height: 800px; + } + .input-circles{ - span{ - object-fit: contain; - font-size: 22px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: white; - background-color: #979797; - } - .circle{ + width: 147px; + height: 60px; flex-direction: column; div{ @@ -114,9 +117,116 @@ top: 320px; right: 220px; } + + .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: 560px; + right: 769px; + } + + .circle-stampo-11{ + position: relative; + top: 35px; + right: 781px; + } + + .circle-controstampo-1{ + position: relative; + top: 300px; + right: 1090px; + } + + .circle-controstampo-2{ + position: relative; + top: 570px; + right: 990px; + } + + .circle-controstampo-3{ + position: relative; + top: 475px; + right: 770px; + } + + .circle-controstampo-4{ + position: relative; + right: 650px; + } + + .circle-controstampo-5{ + position: relative; + top: 45px; + right: 480px; + } + + .circle-controstampo-6{ + position: relative; + top: -335px; + right: 650px; + } + + .circle-controstampo-7{ + position: relative; + top: 400px; + right: 650px; + } + + } + } button{ @@ -129,9 +239,9 @@ border: solid 1px #001e48; background-image: linear-gradient(to bottom, #1756ad, @color-darkish-blue); } - - } - - } + } + + } + } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/base/scheda.less b/Thermo.Active/wwwroot/assets/styles/base/scheda.less index 3b079e64..01ff405c 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/scheda.less +++ b/Thermo.Active/wwwroot/assets/styles/base/scheda.less @@ -10,7 +10,7 @@ .input-area{ width: 480px; - margin: 3px; + margin: 4px; margin-bottom: 0px; } diff --git a/Thermo.Active/wwwroot/assets/styles/base/setup.less b/Thermo.Active/wwwroot/assets/styles/base/setup.less index df275470..039de21d 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/setup.less +++ b/Thermo.Active/wwwroot/assets/styles/base/setup.less @@ -41,6 +41,7 @@ .auto{ overflow-y: auto; + overflow-x: hidden; } aside { @@ -75,6 +76,19 @@ display: flex; flex-direction: column; + span{ + object-fit: contain; + font-size: 22px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + text-align: center; + color: white; + background-color: #979797; + } + .circle { width: 141px; height: 60px; @@ -87,10 +101,25 @@ border: solid 4px #9b9b9b; } + input{ + width: 40px; + height: 21px; + margin: auto; + object-fit: contain; + font-size: 20px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #6d6d6d; + border: none; + } + label { margin: auto; object-fit: contain; - font-size: 22px; + font-size: 20px; font-weight: 500; font-stretch: normal; font-style: normal; @@ -390,10 +419,19 @@ } .rect { - display: flex; - align-items: center; - justify-content: flex-end; - padding-inline-end: 20px; + // display: flex; + // align-items: center; + // justify-content: flex-end; + // padding-inline-end: 20px; + object-fit: contain; + font-size: 20px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #6d6d6d; + text-align: center; width: 98px; height: 48px; border-radius: 2px; diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index 6e59be8d..c7db5ca9 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -3674,59 +3674,56 @@ width: 1820px; height: 980px; } -.modal.pirometro-info section .specific { +.modal.pirometro-info section.body section .specific { width: 470px; margin-left: 37%; } -.modal.pirometro-info section .termospecific { +.modal.pirometro-info section.body section .termospecific { margin-left: 0%; } -.modal.pirometro-info section .termospecific .svg-area { +.modal.pirometro-info section.body section .termospecific .svg-area { padding-left: 90px; width: 1270px; height: 800px; } -.modal.pirometro-info section .termospecific .svg-area .disegnoTermoSuperiore { +.modal.pirometro-info section.body section .termospecific .svg-area .disegnoTermoSuperiore { flex-shrink: 0; width: 1100px; height: 750px; } -.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle1 { +.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle1 { position: relative; top: 135px; right: 1150px; } -.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle2 { +.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle2 { position: relative; top: 355px; right: 1150px; } -.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle3 { +.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle3 { position: relative; top: 425px; right: 1150px; } -.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle4 { +.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle4 { position: relative; top: 470px; right: 635px; } -.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle5 { +.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle5 { position: relative; top: 400px; right: 255px; } -.modal.pirometro-info section .termospecific .svg-area .border-termo-superiore .circle6 { - width: 64px; - height: 20px; - color: white; - object-fit: contain; +.modal.pirometro-info section.body section .termospecific .svg-area .border-termo-superiore .circle6 { + width: 100px; background-color: #c03d58; position: relative; - top: 95px; - right: 125px; + top: 87px; + right: 150px; } -.modal.pirometro-info section .termospecific button { +.modal.pirometro-info section.body section .termospecific button { margin-left: 5px; width: 48px; height: 48px; @@ -4111,6 +4108,7 @@ } .setup .modal section.body section .auto { overflow-y: auto; + overflow-x: hidden; } .setup .modal section.body section aside { display: flex; @@ -4141,6 +4139,18 @@ display: flex; flex-direction: column; } +.setup .modal section.body section .specific .svg-area .input-circles span { + object-fit: contain; + font-size: 22px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + text-align: center; + color: white; + background-color: #979797; +} .setup .modal section.body section .specific .svg-area .input-circles .circle { width: 141px; height: 60px; @@ -4152,10 +4162,24 @@ border-radius: 40.5px; border: solid 4px #9b9b9b; } +.setup .modal section.body section .specific .svg-area .input-circles input { + width: 40px; + height: 21px; + margin: auto; + object-fit: contain; + font-size: 20px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #6d6d6d; + border: none; +} .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; @@ -4390,10 +4414,15 @@ flex: 1; } .input-area .rect { - display: flex; - align-items: center; - justify-content: flex-end; - padding-inline-end: 20px; + object-fit: contain; + font-size: 20px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #6d6d6d; + text-align: center; width: 98px; height: 48px; border-radius: 2px; @@ -4440,23 +4469,24 @@ } .modal.ciclo-info section .specific .svg-area .input-circles .circle1 { position: relative; - top: 130px; + top: 200px; right: 25px; } .modal.ciclo-info section .specific .svg-area .input-circles .circle2 { position: relative; - top: 180px; + top: 400px; right: 25px; } .modal.ciclo-info section .specific .svg-area .input-circles .circle3 { + width: 135px; position: relative; - top: 175px; + top: 545px; right: 410px; } .modal.ciclo-info section .specific .svg-area .input-circles .circle4 { position: relative; - top: 60px; - right: 180px; + top: 585px; + right: 200px; } .modal.ciclo-info section .specific .box { margin-bottom: 10px; @@ -4479,6 +4509,217 @@ height: 980px; margin: 150px 193px; } +.modal.progr-preriscaldo-info { + width: 1639px; + height: 565px; + margin-top: 220px; +} +.modal.progr-preriscaldo-info header { + padding-left: 31px; + display: flex; + align-items: center; + font-size: 20px; + font-weight: bold; + color: darkblue; +} +.modal.progr-preriscaldo-info section.body { + overflow: hidden; +} +.modal.progr-preriscaldo-info section.body section { + padding: 0px; + width: 100%; + height: 100%; +} +.modal.progr-preriscaldo-info section.body section hr { + border: none; +} +.modal.progr-preriscaldo-info section.body section aside { + margin: 14px; +} +.modal.progr-preriscaldo-info section.body section aside button { + width: 197px; + height: 48px; + object-fit: contain; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5); + border: solid 1px #001e48; + background-image: linear-gradient(to bottom, #1756ad, #002680); + font-size: 18px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + text-align: center; + color: white; + margin: auto; +} +.modal.progr-preriscaldo-info section.body section .specific { + margin: 0; + padding: 20px; + width: 100%; + height: 100%; + background-color: #bbbcbc; +} +.modal.progr-preriscaldo-info section.body section .specific div { + display: flex; + margin-bottom: 50px; +} +.modal.progr-preriscaldo-info section.body section .specific div .clock { + border-radius: 50%; + background-color: white; + height: 300px; + width: 300px; +} +.modal.progr-preriscaldo-info section.body section .specific div .clock span { + flex-shrink: 0; + border-radius: 50%; + width: 20px; + height: 20px; + background-color: #002680; + position: relative; + top: 140px; + right: 460px; +} +.modal.progr-preriscaldo-info section.body section .specific div .clock button { + flex-shrink: 0; + border-radius: 50%; + width: 50px; + height: 50px; + background-image: none; + box-shadow: none; + background-color: white; + color: black; + font-size: 20px; +} +.modal.progr-preriscaldo-info section.body section .specific div .clock .selected { + background-color: #002680; + color: white; +} +.modal.progr-preriscaldo-info section.body section .specific div .clock .btn1 { + position: relative; + top: 22px; + right: -188px; +} +.modal.progr-preriscaldo-info section.body section .specific div .clock .btn2 { + position: relative; + top: 68px; + right: -179px; +} +.modal.progr-preriscaldo-info section.body section .specific div .clock .btn3 { + position: relative; + top: 125px; + right: -149px; +} +.modal.progr-preriscaldo-info section.body section .specific div .clock .btn4 { + position: relative; + top: 182px; + right: -79px; +} +.modal.progr-preriscaldo-info section.body section .specific div .clock .btn5 { + position: relative; + top: 227px; + right: 12px; +} +.modal.progr-preriscaldo-info section.body section .specific div .clock .btn6 { + position: relative; + top: 248.5px; + right: 125px; +} +.modal.progr-preriscaldo-info section.body section .specific div .clock .btn7 { + position: relative; + top: 227px; + right: 238px; +} +.modal.progr-preriscaldo-info section.body section .specific div .clock .btn8 { + position: relative; + top: 182px; + right: 329px; +} +.modal.progr-preriscaldo-info section.body section .specific div .clock .btn9 { + position: relative; + top: 125px; + right: 399px; +} +.modal.progr-preriscaldo-info section.body section .specific div .clock .btn10 { + position: relative; + top: 68px; + right: 429px; +} +.modal.progr-preriscaldo-info section.body section .specific div .clock .btn11 { + position: relative; + top: 22px; + right: 438px; +} +.modal.progr-preriscaldo-info section.body section .specific div .clock .btn12 { + position: relative; + top: 0.5px; + right: 425px; +} +.modal.progr-preriscaldo-info section.body section .specific div div:first-of-type { + flex-direction: column; + margin-right: 20px; + width: 180px; + height: 300px; + background-image: linear-gradient(to bottom, #1756ad, #002680); +} +.modal.progr-preriscaldo-info section.body section .specific div div:first-of-type label { + color: #ADD8E6; + margin: auto; +} +.modal.progr-preriscaldo-info section.body section .specific div div:first-of-type label:first-of-type { + font-size: 67px; +} +.modal.progr-preriscaldo-info section.body section .specific div div:first-of-type label:last-of-type { + font-size: 20px; + margin-top: -50px; +} +.modal.progr-preriscaldo-info section.body section .specific div div:last-child { + margin-left: -50px; + height: 300px; + flex-direction: column; +} +.modal.progr-preriscaldo-info section.body section .specific div div:last-child button { + width: 50px; + background-image: none; + box-shadow: none; + background-color: #bbbcbc; + color: #002680; + font-size: 20px; +} +.modal.progr-preriscaldo-info section.body section .specific div div:last-child button:first-of-type { + margin-bottom: 250px; +} +.modal.progr-preriscaldo-info section.body section .specific div button { + border: none; + width: 130px; + height: 45px; + border-radius: 22.5px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, #818a8f 0%, #42494e 98%); + font-size: 18px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + text-align: center; + color: white; +} +.modal.progr-preriscaldo-info section.body section .specific div .active { + box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.43); + background-image: linear-gradient(to bottom, #42494e 0%, #818a8f 98%); +} +.modal.progr-preriscaldo-info section.body section .specific label { + margin-bottom: 20px; + font-size: 24px; + font-weight: 500; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #002680; +} .modal.controstamposetup-info { width: 1820px; height: 980px; @@ -4522,19 +4763,21 @@ width: 800px; height: 800px; } -.modal.quote-velocita-info section .specific .svg-area .input-circles span { - object-fit: contain; - font-size: 22px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: white; - background-color: #979797; +.modal.quote-velocita-info section .specific .svg-area .disegnoStampo { + flex-shrink: 0; + margin-left: 680px; + width: 1200px; + height: 795px; +} +.modal.quote-velocita-info section .specific .svg-area .disegnoControstampoQuoteVelocita { + flex-shrink: 0; + margin-left: 600px; + width: 1156px; + height: 800px; } .modal.quote-velocita-info section .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 { @@ -4582,6 +4825,95 @@ top: 320px; right: 220px; } +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-1 { + position: relative; + top: 115px; + right: 1212px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-2 { + position: relative; + top: 140px; + right: 1130px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-3 { + position: relative; + top: 4px; + right: 730px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-4 { + position: relative; + top: -64px; + right: 925px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-5 { + position: relative; + top: -10px; + right: 740px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-6 { + position: relative; + top: 205px; + right: 1115px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-7 { + position: relative; + top: 50px; + right: 125px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-8 { + position: relative; + top: -210px; + right: 550px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-9 { + position: relative; + top: -90px; + right: 560px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-10 { + position: relative; + bottom: 560px; + right: 769px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-11 { + position: relative; + top: 35px; + right: 781px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-controstampo-1 { + position: relative; + top: 300px; + right: 1090px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-controstampo-2 { + position: relative; + top: 570px; + right: 990px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-controstampo-3 { + position: relative; + top: 475px; + right: 770px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-controstampo-4 { + position: relative; + right: 650px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-controstampo-5 { + position: relative; + top: 45px; + right: 480px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-controstampo-6 { + position: relative; + top: -335px; + right: 650px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-controstampo-7 { + position: relative; + top: 400px; + right: 650px; +} .modal.quote-velocita-info section .specific button { margin-left: 10px; width: 48px; @@ -4602,17 +4934,17 @@ background-color: #979797; margin: 0; } -.modal.opzioni-info .section { - display: flex; +.modal.opzioni-info section.body section { + padding: 0px; } -.modal.opzioni-info .section .specific:last-of-type { +.modal.opzioni-info section.body section .specific:last-of-type { margin-left: 100px; width: 471px; } -.modal.opzioni-info .section .specific:first-of-type .box-color { +.modal.opzioni-info section.body section .specific:first-of-type .box-color { background-color: #ffffff; } -.modal.opzioni-info .section .specific:first-of-type button { +.modal.opzioni-info section.body section .specific:first-of-type button { background-color: #dddddd; display: block; color: #000000; @@ -4624,17 +4956,17 @@ cursor: pointer; font-size: 17px; } -.modal.opzioni-info .section .specific:first-of-type .active { +.modal.opzioni-info section.body section .specific:first-of-type .active { background-color: rgba(23, 145, 255, 0.75); color: #ffffff; } -.modal.opzioni-info .section .specific:first-of-type label { +.modal.opzioni-info section.body section .specific:first-of-type label { font-size: 14px; width: 60px; margin-left: 5px; margin-right: 30px; } -.modal.opzioni-info aside button { +.modal.opzioni-info section.body section aside button { display: block; background-color: #bbbcbc; color: #002680; @@ -4647,7 +4979,7 @@ cursor: pointer; font-size: 17px; } -.modal.opzioni-info aside .active { +.modal.opzioni-info section.body section aside .active { background-color: #fff; font-weight: bold; border-top: 2px solid #002680; @@ -4668,10 +5000,12 @@ width: 1820px; height: 785px; } -.modal.estrazione-info .specific { +.modal.estrazione-info section.body section .specific { justify-content: flex-end; + padding-left: 10px; } -.modal.estrazione-info .specific .box { +.modal.estrazione-info section.body section .specific .box { + margin: 0; background-color: #e5f3ff; } .scheda .body { @@ -4679,7 +5013,7 @@ } .scheda .body .input-area { width: 480px; - margin: 3px; + margin: 4px; margin-bottom: 0px; } .modal.vuoto-info { diff --git a/Thermo.Active/wwwroot/src/app.routes.ts b/Thermo.Active/wwwroot/src/app.routes.ts index 75594578..0d15bf8e 100644 --- a/Thermo.Active/wwwroot/src/app.routes.ts +++ b/Thermo.Active/wwwroot/src/app.routes.ts @@ -62,6 +62,7 @@ export let routes = [ import { routes as alarmRoutes } from "@/app_modules/alarms/route.js"; import { routes as productionRoutes } from "./app_modules_thermo/processo/route.js"; import { routes as SetupRoutes } from "@/app_modules_thermo/setup/route.js"; +import { routes as ProgrPreriscaldoRoutes } from "@/app_modules_thermo/programmazione-preriscaldo/route.js"; // import { routes as toolingRoutes} from "./app_modules/tooling/route"; // import { routes as maintenance } from "./app_modules/maintenance/route"; // import { routes as scada} from "./app_modules/scada/route"; @@ -71,6 +72,7 @@ import { routes as SetupRoutes } from "@/app_modules_thermo/setup/route.js"; injectRoutes(routes, alarmRoutes); injectRoutes(routes, productionRoutes); injectRoutes(routes, SetupRoutes); +injectRoutes(routes,ProgrPreriscaldoRoutes); // injectRoutes(routes, toolingRoutes); // injectRoutes(routes, maintenance); // injectRoutes(routes, scada); diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts index 4d529bf7..4445e464 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts @@ -11,4 +11,7 @@ export default class Scheda extends Vue{ @Prop({default:0}) durata:number; + mock_portata:number=this.portata; + mock_durata:number=this.durata; + } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue index 6efd40f7..55746085 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue @@ -3,18 +3,14 @@
-
- {{portata}} -
+
- +
-
- {{durata}} s -
+
- +
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.ts index 5d29892e..1622cbc3 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.ts @@ -9,7 +9,9 @@ import { Factory, messageService, awaiter } from "@/_base"; export default class ArretramentoRiscaldi extends Vue{ @Prop({default:0}) - ritardo:number + ritardo:number; + + mock_ritardo:number=this.ritardo; annulla(){ ModalHelper.HideModal(); diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.vue index 429bca6d..c77d3c4a 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.vue @@ -11,9 +11,9 @@
- {{ritardo}} s +
- +