diff --git a/Thermo.Active/wwwroot/assets/icons/png/double.png b/Thermo.Active/wwwroot/assets/icons/png/double.png new file mode 100644 index 00000000..13dc9ca6 Binary files /dev/null and b/Thermo.Active/wwwroot/assets/icons/png/double.png differ diff --git a/Thermo.Active/wwwroot/assets/icons/png/double@2x.png b/Thermo.Active/wwwroot/assets/icons/png/double@2x.png new file mode 100644 index 00000000..e37d5a2d Binary files /dev/null and b/Thermo.Active/wwwroot/assets/icons/png/double@2x.png differ diff --git a/Thermo.Active/wwwroot/assets/icons/png/double@3x.png b/Thermo.Active/wwwroot/assets/icons/png/double@3x.png new file mode 100644 index 00000000..71e51869 Binary files /dev/null and b/Thermo.Active/wwwroot/assets/icons/png/double@3x.png differ diff --git a/Thermo.Active/wwwroot/assets/icons/png/temperatura.png b/Thermo.Active/wwwroot/assets/icons/png/temperatura.png new file mode 100644 index 00000000..c16f8f77 Binary files /dev/null and b/Thermo.Active/wwwroot/assets/icons/png/temperatura.png differ diff --git a/Thermo.Active/wwwroot/assets/icons/png/temperatura@2x.png b/Thermo.Active/wwwroot/assets/icons/png/temperatura@2x.png new file mode 100644 index 00000000..b6d0c800 Binary files /dev/null and b/Thermo.Active/wwwroot/assets/icons/png/temperatura@2x.png differ diff --git a/Thermo.Active/wwwroot/assets/icons/png/temperatura@3x.png b/Thermo.Active/wwwroot/assets/icons/png/temperatura@3x.png new file mode 100644 index 00000000..39e4475c Binary files /dev/null and b/Thermo.Active/wwwroot/assets/icons/png/temperatura@3x.png differ diff --git a/Thermo.Active/wwwroot/assets/icons/svg/disegno-caricatore.svg b/Thermo.Active/wwwroot/assets/icons/svg/disegno-caricatore.svg index ab439214..b9178104 100644 --- a/Thermo.Active/wwwroot/assets/icons/svg/disegno-caricatore.svg +++ b/Thermo.Active/wwwroot/assets/icons/svg/disegno-caricatore.svg @@ -9,9 +9,9 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="1137mm" + width="1186mm" height="707mm" - viewBox="0 0 1137 707" + viewBox="0 0 1186 707" version="1.1" id="svg8" inkscape:version="0.92.4 (5da689c313, 2019-01-14)" @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.19291922" - inkscape:cx="1519.3127" - inkscape:cy="1010.0622" + inkscape:zoom="0.26" + inkscape:cx="1903.0535" + inkscape:cy="1303.7306" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" @@ -54,45 +54,45 @@ id="layer1" transform="translate(0,410)"> + width="649.02783" + height="514.02783" + x="259.69971" + y="-331.12692" /> AREA DI AREA DI CARICO + transform="matrix(0.99305617,-0.09567388,0.09032752,1.0518343,64.187449,95.57902)" /> + transform="matrix(0.41537055,-0.96018071,0.90652454,0.43995593,740.22092,1218.486)" /> + transform="matrix(0.99305618,-0.09567388,0.09032752,1.0518343,63.833654,-133.0583)" /> + transform="matrix(0.41537054,-0.96018072,0.90652454,0.43995594,739.86701,989.84794)" /> + + + + A2 + + A3 + + A4 + + A5 + + A6 + + A7 + + A8 + + A9 + + A1 + + A10 + + A11 + + A12 + + A13 + + A14 + + A15 + + A16 + + A17 + + + + B2 + + B3 + + B4 + + B5 + + B6 + + B7 + + B8 + + B9 + + B1 + + B10 + + B11 + + B12 + + B13 + + B14 + + B15 + + B16 + + B17 + + + + C2 + + C3 + + C4 + + C5 + + C6 + + C7 + + C8 + + C9 + + C1 + + C10 + + C11 + + C12 + + C13 + + C14 + + C15 + + C16 + + C17 + + + + D2 + + D3 + + D4 + + D5 + + D6 + + D7 + + D8 + + D9 + + D1 + + D10 + + D11 + + D12 + + D13 + + D14 + + D15 + + D16 + + D17 + + + + 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/icons/svg/disegno-termosuperiore.svg b/Thermo.Active/wwwroot/assets/icons/svg/disegno-termosuperiore.svg new file mode 100644 index 00000000..d0a6630e --- /dev/null +++ b/Thermo.Active/wwwroot/assets/icons/svg/disegno-termosuperiore.svg @@ -0,0 +1,308 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Thermo.Active/wwwroot/assets/styles/base/arretramento-riscaldi.less b/Thermo.Active/wwwroot/assets/styles/base/arretramento-riscaldi.less new file mode 100644 index 00000000..34dc22c6 --- /dev/null +++ b/Thermo.Active/wwwroot/assets/styles/base/arretramento-riscaldi.less @@ -0,0 +1,10 @@ +// out: false, sourceMap: false, main: ../style.less +@import "grid-system.less"; +@import "colors.less"; +@import "fonts.less"; +@modal: modal; + +.@{modal}.estrazione-info { + width: 560px; + height: 411px; +} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/base/ciclo.less b/Thermo.Active/wwwroot/assets/styles/base/ciclo.less index 514177fc..c0863f3a 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/ciclo.less +++ b/Thermo.Active/wwwroot/assets/styles/base/ciclo.less @@ -5,14 +5,91 @@ @modal: modal; .@{modal}.ciclo-info { + + section{ - .presenter { - display: flex; - flex-flow: column; - padding: 0 10px; + .specific{ + padding: 0 10px; + + .caricatore-buttons{ + + button{ + margin-right: 15px; + margin-left: 5px; + width: 48px; + height: 48px; + object-fit: contain; + border-radius: 2px; + box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.5); + border: none; + background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%); + + &:last-of-type{ + border: solid 1px #001e48; + background-image: linear-gradient(to bottom, #1756ad, #002680); + } + + } + + } + + .svg-area{ + + .disegnoCaricatore{ + flex-shrink: 0; + width: 1137px; + height: 707px; + } + + .input-circles{ + + label{ + object-fit: contain; + background-color: #979797; + } + + .circle1{ + position: relative; + top: 130px; + right: 25px; + } + + .circle2{ + position: relative; + top: 180px; + right: 25px; + } + + .circle3{ + position: relative; + top: 175px; + right: 410px; + } + + .circle4{ + position: relative; + top: 60px; + right: 180px; + } + + } + + } + + .box { + margin-bottom: 10px; + width: 500px; + + .body{ + padding: 5px 10px; + } + + } + + } - .box { - width: 500px; } - } -} \ No newline at end of file + +} + + diff --git a/Thermo.Active/wwwroot/assets/styles/base/controstamposetup.less b/Thermo.Active/wwwroot/assets/styles/base/controstamposetup.less index 1b20b462..d06c14d1 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/controstamposetup.less +++ b/Thermo.Active/wwwroot/assets/styles/base/controstamposetup.less @@ -7,86 +7,40 @@ .@{modal}.controstamposetup-info { width: 1820px; height: 980px; - header { - background-color: @color-white; - color: @color-darkish-blue; - - font-weight: 600; - font-size: 24px; - text-align: left; - padding: 0px 23px; - } - .dato{ - margin-left: 180px; + + section{ + + .controstampo-cycle{ + margin-left: 37%; + } + + .specific{ + padding-left: 5px; + + .box { + margin-bottom: 5px; + background-color: #e5f3ff; + + &:first-of-type{ + background-color: white; + } + + &:last-of-type{ + background-color: #b3dbff; + } + + } + + .input-area{ + width: 480px; + } + + } + } + } -.schedaC{ - margin-left: 10px; - margin-top: 3px; - width: 490px; - height: 263px; - border: solid #848484; - display: flex; - flex-direction: column; -} -.CC{ - width: 272px; -} -.CicloC{ - height: 65px; - width: 272px; -} -.AC{ - width: 260px; -} -.AriaC{ - height: 65px; - width: 260px; -} -.VC{ - width: 280px; -} -.VuotoC{ - height: 65px; - width: 280px; -} -.EC{ - width: 325px; -} -.EstrC{ - height: 65px; - width: 325px; -} -.divAria{ - display: flex; - margin-top: 20px; -} -.Dx1{ - margin-top: 5px; - display: flex; - flex-direction: column; -} -.Dx2{ - display: flex; - flex-direction: column; - justify-content: flex-end; -} -.DX{ - display: flex; -} -.rid{ - margin-top: 2px; -} -.s1{ - background-color: white; -} -.s2{ - background-color: #e8e8e8 ; -} -.s3{ - background-color: #d3d3d3 ; -} -.datiA{ - display: flex; - justify-content: center; -} \ No newline at end of file + + + + diff --git a/Thermo.Active/wwwroot/assets/styles/base/estrazione.less b/Thermo.Active/wwwroot/assets/styles/base/estrazione.less index af509802..b869d1b1 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/estrazione.less +++ b/Thermo.Active/wwwroot/assets/styles/base/estrazione.less @@ -5,48 +5,18 @@ @modal: modal; .@{modal}.estrazione-info { - margin-top: 100px; - width: 1370px; + width: 1820px; height: 785px; - header { - background-color: @color-white; - color: @color-darkish-blue; - - font-weight: 600; - font-size: 24px; - text-align: left; - padding: 0px 23px; - } - .sep{ - height: 606px; - } - .divSx{ - margin-left: 20px; - } - .scosdiv{ - margin-top: 20px; - margin-bottom: 20px; - } + .specific { + justify-content: flex-end; +.box{ + background-color: #e5f3ff; } -.EP{ - width: 287px; -} -.EstrP{ - width: 287px; - height: 65px; -} -.ES{ - width: 294px; -} -.EstrS{ - width: 294px; - height: 65px; -} -.schedaE{ - border: solid #30916b; - background-color: #b2e6d2; -} -.divEstr{ - margin-top: 20px; - display: flex; + +} + + + + + } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/base/formato.less b/Thermo.Active/wwwroot/assets/styles/base/formato.less index f31d189e..d3681086 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/formato.less +++ b/Thermo.Active/wwwroot/assets/styles/base/formato.less @@ -181,15 +181,6 @@ } } - - .input-circles { - - .circle{ - width: 141px; - height: 60px; - } - - } } @@ -202,20 +193,6 @@ overflow-x: auto; -webkit-overflow-scrolling: touch; - &::-webkit-scrollbar { - width: 10px; - height: 10px; - } - - &::-webkit-scrollbar-thumb { - background: @color-silver; - border-radius: 10px; - } - - &::-webkit-scrollbar-track { - background: transparent; - } - img { flex-shrink: 0; width: 215px; diff --git a/Thermo.Active/wwwroot/assets/styles/base/imbutitura.less b/Thermo.Active/wwwroot/assets/styles/base/imbutitura.less new file mode 100644 index 00000000..1c502af0 --- /dev/null +++ b/Thermo.Active/wwwroot/assets/styles/base/imbutitura.less @@ -0,0 +1,27 @@ +// out: false, sourceMap: false, main: ../style.less +@import "grid-system.less"; +@import "colors.less"; +@import "fonts.less"; + +.@{modal}.imbutitura-info { + width: 1820px; + height: 980px; + + section{ + + .specific{ + padding-left: 5px; + justify-content: flex-end; + + .box { + margin-bottom: 5px; + background-color: #e5f3ff; + } + + } + + } + + } + + diff --git a/Thermo.Active/wwwroot/assets/styles/base/layout.less b/Thermo.Active/wwwroot/assets/styles/base/layout.less index 47b69d58..f04c8c32 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/layout.less +++ b/Thermo.Active/wwwroot/assets/styles/base/layout.less @@ -6,12 +6,19 @@ @import "formato.less"; @import "slider.less"; @import "tastierino.less"; +@import "arretramento-riscaldi.less"; @import "setup.less"; @import "ciclo.less"; @import "raffreddamento.less"; +@import "processo.less"; +@import "progrprerisc.less"; @import "controstamposetup.less"; @import "quote-velocita.less"; +@import "opzioni.less"; +@import "imbutitura.less"; @import "estrazione.less"; +@import "scheda.less"; +@import "vuoto.less"; @import "popups.less"; @import "grid-system.less"; @import "input.less"; diff --git a/Thermo.Active/wwwroot/assets/styles/base/opzioni.less b/Thermo.Active/wwwroot/assets/styles/base/opzioni.less new file mode 100644 index 00000000..8259cb30 --- /dev/null +++ b/Thermo.Active/wwwroot/assets/styles/base/opzioni.less @@ -0,0 +1,90 @@ +// out: false, sourceMap: false, main: ../style.less +@import "grid-system.less"; +@import "colors.less"; +@import "fonts.less"; +@modal: modal; + +.@{modal}.opzioni-info { + width: 1820px; + height: 980px; + + hr { + width: 2px; + height: 830px; + background-color: #979797; + margin: 0; + } + + .section{ + display: flex; + + .specific{ + + &:last-of-type{ + margin-left: 100px; + width: 471px; + } + + &:first-of-type{ + + .box-color{ + background-color: #ffffff; + } + + button{ + background-color: #dddddd; + display: block; + color: #000000; + padding: 22px 16px; + width: 550px; + height: 64px; + border: none; + text-align: left; + cursor: pointer; + font-size: 17px; + } + + .active{ + background-color: rgba(23, 145, 255, 0.75); + color:#ffffff; + } + + label{ + font-size: 14px; + width: 60px; + margin-left: 5px; + margin-right: 30px; + } + + } + + } + + } + + 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; + } + + .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 ff2e0d22..ddd84787 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/pirometro.less +++ b/Thermo.Active/wwwroot/assets/styles/base/pirometro.less @@ -2,213 +2,95 @@ @import "grid-system.less"; @import "colors.less"; @import "fonts.less"; +@import "setup.less"; @modal: modal; - +@pirometro-margin: margin-left; .@{modal}.pirometro-info { width: 1820px; height: 980px; - header { - background-color: @color-white; - color: @color-darkish-blue; + 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; + } + + } + + } + + 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); + } + + } - font-weight: 600; - font-size: 24px; - text-align: left; - padding: 0px 23px; } -} -//images -img { - width: 36px; - height: 36px; - object-fit: contain; -} - -.clessidra { - width: 23px; - height: 23px; -} - - - -.btn-switch-on { - position: relative; - left: 41px; - top: 3px; - border: none; - width: 34px; - height: 34px; - border-radius: 20px; - background-color: @color-darkish-blue; -} - -.btn-switch-off { - position: relative; - left: 3px; - top: 3px; - border: none; - width: 34px; - height: 34px; - border-radius: 20px; - background-color: @color-darkish-blue; -} - -//divs -.switch-on { - width: 112px; - height: 40px; - border-radius: 20px; - box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5); - background-color: @color-clear-blue; -} - -.switch-off { - width: 112px; - height: 40px; - border-radius: 20px; - box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5); - background-color: @color-label-grey; -} - -// .rectdato { -// display: flex; -// flex-direction: column; -// justify-content: center; -// width: 63px; -// height: 48px; -// border-radius: 2px; -// box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5); -// } -//labels -.ON { - position: relative; - bottom: 4.5px; - left: 22px; - width: 29px; - height: 18px; - - font-size: 18px; - font-weight: bold; - font-stretch: normal; - font-style: normal; - line-height: 1; - letter-spacing: normal; - text-align: center; - color: @color-white; -} - -.OFF { - position: relative; - bottom: 4.5px; - left: 19px; - width: 29px; - height: 18px; - - font-size: 18px; - font-weight: bold; - font-stretch: normal; - font-style: normal; - line-height: 1; - letter-spacing: normal; - text-align: center; - color: @color-white; -} - -.Ritardo { - width: 77px; - height: 29px; - - font-size: 24px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: @color-darkish-blue; -} - -.Set-point { - margin-right: 10px; - width: 96px; - height: 29px; - - font-size: 24px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: @color-darkish-blue; -} - -.mock { - margin-left: 25px; - width: 30px; - height: 22px; - - font-size: 18px; - font-weight: bold; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: @color-silver; -} - - -.Piro { - width: 177px; - height: 65px; -} - -.P { - width: 177px; -} - -.TRiscSup { - width: 437px; - height: 65px; -} - -.TRS { - width: 437px; -} - -.TRiscInf { - width: 427px; - height: 65px; -} - -.TRI { - width: 427px; -} - -.DivP { - display: flex; - justify-content: center; -} - -.divPiro { - display: flex; - flex-direction: column; - margin-top: 45px; -} - -.datiP { - margin-top: 35px; - display: flex; - justify-content: center; -} - -.ritardo { - margin-right: 10px; -} - -.Step { - margin-top: 990px; } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/base/processo.less b/Thermo.Active/wwwroot/assets/styles/base/processo.less new file mode 100644 index 00000000..83652a1c --- /dev/null +++ b/Thermo.Active/wwwroot/assets/styles/base/processo.less @@ -0,0 +1,11 @@ +// out: false, sourceMap: false, main: ../style.less +@import "grid-system.less"; +@import "colors.less"; +@import "fonts.less"; +@modal: modal; + +.@{modal}.processo-info { + width: 1820px; + height: 980px; + margin: 150px 193px; +} \ No newline at end of file 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 6b7459d3..ac2d1a58 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less +++ b/Thermo.Active/wwwroot/assets/styles/base/quote-velocita.less @@ -9,55 +9,205 @@ width: 1820px; height: 980px; - .specific{ + section{ - .svg-area{ + aside{ - .disegnoQuoteVelocita{ - margin-left: 200px; + .box{ + + .body{ + padding:4.5px; + + .input-area{ + margin: 5px auto; + } + + } + + } + + } + + .specific{ + + .svg-area{ width: 750px; height: 750px; + + .disegnoQuoteVelocita{ + flex-shrink: 0; + margin-left: 500px; + width: 800px; + height: 800px; + } + + .disegnoStampo{ + flex-shrink: 0; + margin-left: 680px; + width: 1200px; + height: 795px; + } + + .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{ + margin: auto; + display: flex; + flex-direction: row; + } + + } + + .circle1{ + position: relative; + top: 120px; + right: 500px; + } + + .circle2{ + position: relative; + top: 140px; + right: 750px; + } + + .circle3{ + position: relative; + top: 140px; + right: 300px; + } + + .circle4{ + position: relative; + top: 395px; + right: 400px; + } + + .circle5{ + position: relative; + top: 240px; + right: 650px; + } + + .circle6{ + position: relative; + top: 305px; + right: 550px; + } + + .circle7{ + position: relative; + bottom: 380px; + right: 250px; + } + + .circle8{ + position: relative; + 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: 557px; + right: 769px; + } + + .circle-stampo-11{ + position: relative; + top: 38px; + right: 781px; + } + + } + } - .input-circles{ - - .circle{ - flex-direction: column; - } - - .circle1{ - } - - .circle2{ - } - - .circle3{ - } - - .circle4{ - } - - .circle5{ - } - - .circle6{ - } - + button{ + margin-left: 10px; + 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, @color-darkish-blue); } - - } - - button{ - margin-left: 10px; - 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, @color-darkish-blue); - } - - } + } + + } + } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/base/raffreddamento.less b/Thermo.Active/wwwroot/assets/styles/base/raffreddamento.less index 057187d2..6488575a 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/raffreddamento.less +++ b/Thermo.Active/wwwroot/assets/styles/base/raffreddamento.less @@ -8,42 +8,14 @@ margin-top: 200px; width: 626px; height: 569px; - header { - background-color: @color-white; - color: @color-darkish-blue; - - font-weight: 600; - font-size: 24px; - text-align: left; - padding: 0px 23px; - } - .Piro{ - width: 174px; - height: 65px; - } - .P{ - width: 174px; - } - .Vslider{ - margin-left: 70px; - } + + section{ + + .specific{ + margin-left: 50px; + width: 480px; } - .N{ - width: 206px; - } - .Neb{ - width: 206px; - height: 65px; - } - .V{ - width: 183px; - } - .Ventilatori{ - width: 183px; - height: 65px; - } - .divVent{ - display: flex; - flex-direction: column; - } \ No newline at end of file + } + +} \ 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 new file mode 100644 index 00000000..3b079e64 --- /dev/null +++ b/Thermo.Active/wwwroot/assets/styles/base/scheda.less @@ -0,0 +1,19 @@ +// out: false, sourceMap: false, main: ../style.less +@import "grid-system.less"; +@import "colors.less"; +@import "fonts.less"; + +.scheda{ + + .body{ + padding: 0px; + + .input-area{ + width: 480px; + margin: 3px; + margin-bottom: 0px; + } + + } + +} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/assets/styles/base/setup.less b/Thermo.Active/wwwroot/assets/styles/base/setup.less index afcf6ef1..5ee37eb3 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/setup.less +++ b/Thermo.Active/wwwroot/assets/styles/base/setup.less @@ -14,9 +14,12 @@ height: 100vh; hr { + flex-shrink: 0; background-color: #979797; - width: 100%; - height: 2px; + width: 2px; + height: 100%; + margin: 0; + margin-left: 5px; } .modal { @@ -30,12 +33,15 @@ height: 100%; display: flex; flex-flow: row nowrap; - padding: 14px; display: flex; justify-content: flex-start; width: calc(~'100% - 28px'); height: calc(~'100% - 28px - 82px'); + + .auto{ + overflow-y: auto; + } aside { display: flex; @@ -46,6 +52,15 @@ flex: 0 0 520px; overflow-y: scroll; padding-right: 10px; + + hr { + flex-shrink: 0; + background-color: #979797; + width: 100%; + height: 2px; + margin-left: 0px; + } + } .specific { @@ -61,6 +76,8 @@ flex-direction: column; .circle { + width: 141px; + height: 60px; box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.5); background-color: rgba(255, 255, 255, 0.8); display: flex; @@ -72,10 +89,8 @@ label { margin: auto; - width: 89px; - height: 25px; 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/base/vuoto.less b/Thermo.Active/wwwroot/assets/styles/base/vuoto.less index 557637bd..3d45fef1 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/vuoto.less +++ b/Thermo.Active/wwwroot/assets/styles/base/vuoto.less @@ -1,436 +1,39 @@ // out: false, sourceMap: false, main: ../style.less - .@{modal}.Vuoto-info { + @import "grid-system.less"; + @import "colors.less"; + @import "fonts.less"; + @modal: modal; + +.@{modal}.vuoto-info { width: 1820px; height: 980px; - box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.5); - background-color: @color-background-white; - } - label { //vuoto principale - width: 164px; - height: 24px; - font-family: WorkSans; - font-size: 20px; - font-weight: bold; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: @corlor-darkish-blue; - } - - label { //vuoto diretto - width: 131px; - height: 24px; - font-family: WorkSans; - font-size: 20px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color:@color-darkish-blue; - } + + section{ - label { //vuoto ausiliario - width: 154px; - height: 24px; - font-family: WorkSans; - font-size: 20px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color:@color-darkish-blue; - } - - label { //Prevuoto - width: 89px; - height: 24px; - font-family: WorkSans; - font-size: 20px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: @color-darkish-blue; - } + .specific{ + padding-left: 5px; - .close-card {//bottone di chiusura - width: 28px; - height: 28px; - object-fit: contain; - } - .Mask { - width: 521px; - height: 826px; - } - .card_bg { - width: 1820px; - height: 826px; - background-color: @color-background-white; - } - label { //partenza - width: 104px; - height: 28px; - font-family: WorkSans; - font-size: 24px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: @color-darkish-blue; - } - .textfield {//label partenza - width: 220px; - height: 48px; - object-fit: contain; - } - label { - width: 164px; - height: 21px; - font-family: WorkSans; - font-size: 18px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: @color-greyish-brown; - } - .triangle {// triangolino - width: 21px; - height: 16px; - transform: rotate(-180deg); - border-radius: 1px; - background-color: @color-darkish-blue; - } - - .button-bg { - width: 48px; - height: 48px; - object-fit: contain; - border-radius: 8px; - box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.5); - background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%); - } - - .completo { //portata in manuale - width: 471px; - height: 122px; - object-fit: contain; - } - label { //label "portata in manuale" - width: 224px; - height: 28px; - font-family: WorkSans; - font-size: 24px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: @color-darkish-blue; - } - .Rectangle { - width: 72px; - height: 48px; - border-radius: 2px; - box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5); - } - .textfield { - width: 72px; - height: 48px; - object-fit: contain; - } - label {// 50% - width: 38px; - height: 21px; - object-fit: contain; - font-family: WorkSans; - font-size: 18px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: @color-greyish-brown; - } - .Portata { - width: 78px; - height: 29px; - font-family: Lato; - font-size: 24px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: @color-darkish-blue; - } - .textfield {//quadratino in cui scritto 4 - width: 51px; - height: 48px; - object-fit: contain; - } - label { //4 - width: 17px; - height: 21px; - object-fit: contain; - font-family: WorkSans; - font-size: 18px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color:@color-greyish-brown; - } - .Durata { - width: 73px; - height: 29px; - font-family: Lato; - font-size: 24px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: @color-darkish-blue; - } - .bg { - width: 303px; - height: 6px; - object-fit: contain; - border-radius: 3px; - background-color:@color-clear-blue; - } - + .box { + margin-bottom: 5px; + background-color: #e5f3ff; - .Portata { - width: 78px; - height: 29px; - font-family: Lato; - font-size: 24px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: @color-darkish-blue; - } - .textfield { - width: 66px; - height: 48px; - object-fit: contain; - } + &:first-of-type{ + background-color: white; + } + + &:last-of-type{ + background-color: #b3dbff; + } - label {//6.5 - width: 32px; - height: 21px; - object-fit: contain; - font-family: WorkSans; - font-size: 18px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color:@color-greyish-brown; - } - .Durata { - width: 73px; - height: 29px; - font-family: Lato; - font-size: 24px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: @color-darkish-blue; - } - - .textfield { - width: 88px; - height: 48px; - object-fit: contain; - } - label {//0.23 - width: 54px; - height: 21px; - object-fit: contain; - font-family: WorkSans; - font-size: 18px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: @color-greyish-brown; - } - .button-bg { - width: 48px; - height: 48px; - object-fit: contain; - border-radius: 8px; - box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.5); - background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%); + } + + .input-area{ + width: 480px; + } + + } + } - .Portata { - width: 78px; - height: 29px; - font-family: Lato; - font-size: 24px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: @color-darkish-blue; - } - .textfield { - width: 51px; - height: 48px; - object-fit: contain; - } - label {//8 - width: 17px; - height: 21px; - object-fit: contain; - font-family: WorkSans; - font-size: 18px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: @color-greyish-brown; - } - .Durata { - width: 73px; - height: 29px; - font-family: Lato; - font-size: 24px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: @color-darkish-blue; - } - - .textfield { - width: 78px; - height: 48px; - object-fit: contain; - } - - label {//0.6 - width: 44px; - height: 21px; - object-fit: contain; - font-family: WorkSans; - font-size: 18px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: @color-greyish-brown; - - } - - .completo { - width: 471px; - height: 122px; - object-fit: contain; - } - label { - width: 192px; - height: 28px; - font-family: WorkSans; - font-size: 24px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: @color-darkish-blue; - } - .Rectangle { - width: 84px; - height: 48px; - border-radius: 2px; - box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5); - } - label { //label 1.63 nel quadratino - width: 50px; - height: 21px; - object-fit: contain; - font-family: WorkSans; - font-size: 18px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: @color-greyish-brown; - } - .button-bg { - width: 104px; - height: 48px; - object-fit: contain; - border-radius: 8px; - box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.5); - background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%); - } - label {//annulla - width: 67px; - height: 21px; - object-fit: contain; - font-family: WorkSans; - font-size: 18px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: @color-darkish-blue; - } - .button-bg { - width: 124px; - height: 48px; - object-fit: contain; - border-radius: 8px; - box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5); - border: solid 1px #001e48; - linear-gradient(to bottom, #1756ad, @color-darkish-blue); } - - label { - width: 87px; - height: 21px; - font-family: WorkSans; - font-size: 18px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color:@color-background-white; - } - + \ 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 8d04901d..9802d2cd 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -3674,164 +3674,67 @@ width: 1820px; height: 980px; } -.modal.pirometro-info header { - background-color: #fff; - color: #002680; - font-weight: 600; - font-size: 24px; - text-align: left; - padding: 0px 23px; +.modal.pirometro-info section .specific { + width: 470px; + margin-left: 37%; } -img { - width: 36px; - height: 36px; +.modal.pirometro-info section .termospecific { + margin-left: 0%; +} +.modal.pirometro-info section .termospecific .svg-area { + padding-left: 90px; + width: 1270px; + height: 800px; +} +.modal.pirometro-info section .termospecific .svg-area .disegnoTermoSuperiore { + flex-shrink: 0; + width: 1100px; + height: 750px; +} +.modal.pirometro-info 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 { + position: relative; + top: 355px; + right: 1150px; +} +.modal.pirometro-info 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 { + position: relative; + top: 470px; + right: 635px; +} +.modal.pirometro-info 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; -} -.clessidra { - width: 23px; - height: 23px; -} -.btn-switch-on { + background-color: #c03d58; position: relative; - left: 41px; - top: 3px; - border: none; - width: 34px; - height: 34px; - border-radius: 20px; - background-color: #002680; + top: 95px; + right: 125px; } -.btn-switch-off { - position: relative; - left: 3px; - top: 3px; - border: none; - width: 34px; - height: 34px; - border-radius: 20px; - background-color: #002680; -} -.switch-on { - width: 112px; - height: 40px; - border-radius: 20px; - box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5); - background-color: #1791ff; -} -.switch-off { - width: 112px; - height: 40px; - border-radius: 20px; - box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5); - background-color: #979797; -} -.ON { - position: relative; - bottom: 4.5px; - left: 22px; - width: 29px; - height: 18px; - font-size: 18px; - font-weight: bold; - font-stretch: normal; - font-style: normal; - line-height: 1; - letter-spacing: normal; - text-align: center; - color: #fff; -} -.OFF { - position: relative; - bottom: 4.5px; - left: 19px; - width: 29px; - height: 18px; - font-size: 18px; - font-weight: bold; - font-stretch: normal; - font-style: normal; - line-height: 1; - letter-spacing: normal; - text-align: center; - color: #fff; -} -.Ritardo { - width: 77px; - height: 29px; - font-size: 24px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: #002680; -} -.Set-point { - margin-right: 10px; - width: 96px; - height: 29px; - font-size: 24px; - font-weight: 500; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: center; - color: #002680; -} -.mock { - margin-left: 25px; - width: 30px; - height: 22px; - font-size: 18px; - font-weight: bold; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: #bbbcbc; -} -.Piro { - width: 177px; - height: 65px; -} -.P { - width: 177px; -} -.TRiscSup { - width: 437px; - height: 65px; -} -.TRS { - width: 437px; -} -.TRiscInf { - width: 427px; - height: 65px; -} -.TRI { - width: 427px; -} -.DivP { - display: flex; - justify-content: center; -} -.divPiro { - display: flex; - flex-direction: column; - margin-top: 45px; -} -.datiP { - margin-top: 35px; - display: flex; - justify-content: center; -} -.ritardo { - margin-right: 10px; -} -.Step { - margin-top: 990px; +.modal.pirometro-info section .termospecific 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); } .modal.riscaldi-info .presenter { position: relative; @@ -3979,10 +3882,6 @@ img { right: 730px; top: 140px; } -.modal.formato-info .specific .svg-area .input-circles .circle { - width: 141px; - height: 60px; -} .modal.formato-info .specific .slides { margin-top: 45px; margin-left: 20px; @@ -3992,17 +3891,6 @@ img { overflow-x: auto; -webkit-overflow-scrolling: touch; } -.modal.formato-info .specific .slides::-webkit-scrollbar { - width: 10px; - height: 10px; -} -.modal.formato-info .specific .slides::-webkit-scrollbar-thumb { - background: #bbbcbc; - border-radius: 10px; -} -.modal.formato-info .specific .slides::-webkit-scrollbar-track { - background: transparent; -} .modal.formato-info .specific .slides img { flex-shrink: 0; width: 215px; @@ -4184,6 +4072,10 @@ img { grid-column: 0.8; grid-row: 0.5; } +.modal.estrazione-info { + width: 560px; + height: 411px; +} .setup { padding-top: 50px; display: flex; @@ -4194,9 +4086,12 @@ img { height: 100vh; } .setup hr { + flex-shrink: 0; background-color: #979797; - width: 100%; - height: 2px; + width: 2px; + height: 100%; + margin: 0; + margin-left: 5px; } .setup .modal { width: 1820px; @@ -4214,6 +4109,9 @@ img { width: calc(100% - 28px); height: calc(100% - 28px - 82px); } +.setup .modal section.body section .auto { + overflow-y: auto; +} .setup .modal section.body section aside { display: flex; justify-content: start; @@ -4224,6 +4122,13 @@ img { overflow-y: scroll; padding-right: 10px; } +.setup .modal section.body section aside hr { + flex-shrink: 0; + background-color: #979797; + width: 100%; + height: 2px; + margin-left: 0px; +} .setup .modal section.body section .specific { display: flex; flex-direction: column; @@ -4237,6 +4142,8 @@ img { flex-direction: column; } .setup .modal section.body section .specific .svg-area .input-circles .circle { + width: 141px; + height: 60px; box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.5); background-color: rgba(255, 255, 255, 0.8); display: flex; @@ -4247,10 +4154,8 @@ img { } .setup .modal section.body section .specific .svg-area .input-circles label { margin: auto; - width: 89px; - height: 25px; object-fit: contain; - font-size: 22px; + font-size: 20px; font-weight: 500; font-stretch: normal; font-style: normal; @@ -4506,153 +4411,452 @@ img { margin: auto; display: flex; } -.modal.ciclo-info .presenter { - display: flex; - flex-flow: column; +.modal.ciclo-info section .specific { padding: 0 10px; } -.modal.ciclo-info .presenter .box { +.modal.ciclo-info section .specific .caricatore-buttons button { + margin-right: 15px; + margin-left: 5px; + width: 48px; + height: 48px; + object-fit: contain; + border-radius: 2px; + box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.5); + border: none; + background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%); +} +.modal.ciclo-info section .specific .caricatore-buttons button:last-of-type { + border: solid 1px #001e48; + background-image: linear-gradient(to bottom, #1756ad, #002680); +} +.modal.ciclo-info section .specific .svg-area .disegnoCaricatore { + flex-shrink: 0; + width: 1137px; + height: 707px; +} +.modal.ciclo-info section .specific .svg-area .input-circles label { + object-fit: contain; + background-color: #979797; +} +.modal.ciclo-info section .specific .svg-area .input-circles .circle1 { + position: relative; + top: 130px; + right: 25px; +} +.modal.ciclo-info section .specific .svg-area .input-circles .circle2 { + position: relative; + top: 180px; + right: 25px; +} +.modal.ciclo-info section .specific .svg-area .input-circles .circle3 { + position: relative; + top: 175px; + right: 410px; +} +.modal.ciclo-info section .specific .svg-area .input-circles .circle4 { + position: relative; + top: 60px; + right: 180px; +} +.modal.ciclo-info section .specific .box { + margin-bottom: 10px; width: 500px; } +.modal.ciclo-info section .specific .box .body { + padding: 5px 10px; +} .modal.raffreddamento-info { margin-top: 200px; width: 626px; height: 569px; } -.modal.raffreddamento-info header { - background-color: #fff; - color: #002680; - font-weight: 600; - font-size: 24px; - text-align: left; - padding: 0px 23px; +.modal.raffreddamento-info section .specific { + margin-left: 50px; + width: 480px; } -.modal.raffreddamento-info .Piro { - width: 174px; - height: 65px; +.modal.processo-info { + width: 1820px; + height: 980px; + margin: 150px 193px; } -.modal.raffreddamento-info .P { - width: 174px; +.modal.progr-preriscaldo-info { + width: 1639px; + height: 565px; + margin-top: 220px; } -.modal.raffreddamento-info .Vslider { - margin-left: 70px; -} -.N { - width: 206px; -} -.Neb { - width: 206px; - height: 65px; -} -.V { - width: 183px; -} -.Ventilatori { - width: 183px; - height: 65px; -} -.divVent { +.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; } -.modal.controstamposetup-info header { - background-color: #fff; - color: #002680; - font-weight: 600; - font-size: 24px; - text-align: left; - padding: 0px 23px; +.modal.controstamposetup-info section .controstampo-cycle { + margin-left: 37%; } -.modal.controstamposetup-info .dato { - margin-left: 180px; +.modal.controstamposetup-info section .specific { + padding-left: 5px; } -.schedaC { - margin-left: 10px; - margin-top: 3px; - width: 490px; - height: 263px; - border: solid #848484; - display: flex; - flex-direction: column; +.modal.controstamposetup-info section .specific .box { + margin-bottom: 5px; + background-color: #e5f3ff; } -.CC { - width: 272px; -} -.CicloC { - height: 65px; - width: 272px; -} -.AC { - width: 260px; -} -.AriaC { - height: 65px; - width: 260px; -} -.VC { - width: 280px; -} -.VuotoC { - height: 65px; - width: 280px; -} -.EC { - width: 325px; -} -.EstrC { - height: 65px; - width: 325px; -} -.divAria { - display: flex; - margin-top: 20px; -} -.Dx1 { - margin-top: 5px; - display: flex; - flex-direction: column; -} -.Dx2 { - display: flex; - flex-direction: column; - justify-content: flex-end; -} -.DX { - display: flex; -} -.rid { - margin-top: 2px; -} -.s1 { +.modal.controstamposetup-info section .specific .box:first-of-type { background-color: white; } -.s2 { - background-color: #e8e8e8; +.modal.controstamposetup-info section .specific .box:last-of-type { + background-color: #b3dbff; } -.s3 { - background-color: #d3d3d3; -} -.datiA { - display: flex; - justify-content: center; +.modal.controstamposetup-info section .specific .input-area { + width: 480px; } .modal.quote-velocita-info { width: 1820px; height: 980px; } -.modal.quote-velocita-info .specific .svg-area .disegnoQuoteVelocita { - margin-left: 200px; +.modal.quote-velocita-info section aside .box .body { + padding: 4.5px; +} +.modal.quote-velocita-info section aside .box .body .input-area { + margin: 5px auto; +} +.modal.quote-velocita-info section .specific .svg-area { width: 750px; height: 750px; } -.modal.quote-velocita-info .specific .svg-area .input-circles .circle { +.modal.quote-velocita-info section .specific .svg-area .disegnoQuoteVelocita { + flex-shrink: 0; + margin-left: 500px; + width: 800px; + height: 800px; +} +.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 .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 .input-circles .circle { + width: 147px; + height: 60px; flex-direction: column; } -.modal.quote-velocita-info .specific button { +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle div { + margin: auto; + display: flex; + flex-direction: row; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle1 { + position: relative; + top: 120px; + right: 500px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle2 { + position: relative; + top: 140px; + right: 750px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle3 { + position: relative; + top: 140px; + right: 300px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle4 { + position: relative; + top: 395px; + right: 400px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle5 { + position: relative; + top: 240px; + right: 650px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle6 { + position: relative; + top: 305px; + right: 550px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle7 { + position: relative; + bottom: 380px; + right: 250px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle8 { + position: relative; + 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: 557px; + right: 769px; +} +.modal.quote-velocita-info section .specific .svg-area .input-circles .circle-stampo-11 { + position: relative; + top: 38px; + right: 781px; +} +.modal.quote-velocita-info section .specific button { margin-left: 10px; width: 48px; height: 48px; @@ -4662,50 +4866,115 @@ img { border: solid 1px #001e48; background-image: linear-gradient(to bottom, #1756ad, #002680); } +.modal.opzioni-info { + width: 1820px; + height: 980px; +} +.modal.opzioni-info hr { + width: 2px; + height: 830px; + background-color: #979797; + margin: 0; +} +.modal.opzioni-info .section { + display: flex; +} +.modal.opzioni-info .section .specific:last-of-type { + margin-left: 100px; + width: 471px; +} +.modal.opzioni-info .section .specific:first-of-type .box-color { + background-color: #ffffff; +} +.modal.opzioni-info .section .specific:first-of-type button { + background-color: #dddddd; + display: block; + color: #000000; + padding: 22px 16px; + width: 550px; + height: 64px; + border: none; + text-align: left; + cursor: pointer; + font-size: 17px; +} +.modal.opzioni-info .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 { + font-size: 14px; + width: 60px; + margin-left: 5px; + margin-right: 30px; +} +.modal.opzioni-info 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; +} +.modal.opzioni-info aside .active { + background-color: #fff; + font-weight: bold; + border-top: 2px solid #002680; +} +.modal.imbutitura-info { + width: 1820px; + height: 980px; +} +.modal.imbutitura-info section .specific { + padding-left: 5px; + justify-content: flex-end; +} +.modal.imbutitura-info section .specific .box { + margin-bottom: 5px; + background-color: #e5f3ff; +} .modal.estrazione-info { - margin-top: 100px; - width: 1370px; + width: 1820px; height: 785px; } -.modal.estrazione-info header { - background-color: #fff; - color: #002680; - font-weight: 600; - font-size: 24px; - text-align: left; - padding: 0px 23px; +.modal.estrazione-info .specific { + justify-content: flex-end; } -.modal.estrazione-info .sep { - height: 606px; +.modal.estrazione-info .specific .box { + background-color: #e5f3ff; } -.modal.estrazione-info .divSx { - margin-left: 20px; +.scheda .body { + padding: 0px; } -.modal.estrazione-info .scosdiv { - margin-top: 20px; - margin-bottom: 20px; +.scheda .body .input-area { + width: 480px; + margin: 3px; + margin-bottom: 0px; } -.EP { - width: 287px; +.modal.vuoto-info { + width: 1820px; + height: 980px; } -.EstrP { - width: 287px; - height: 65px; +.modal.vuoto-info section .specific { + padding-left: 5px; } -.ES { - width: 294px; +.modal.vuoto-info section .specific .box { + margin-bottom: 5px; + background-color: #e5f3ff; } -.EstrS { - width: 294px; - height: 65px; +.modal.vuoto-info section .specific .box:first-of-type { + background-color: white; } -.schedaE { - border: solid #30916b; - background-color: #b2e6d2; +.modal.vuoto-info section .specific .box:last-of-type { + background-color: #b3dbff; } -.divEstr { - margin-top: 20px; - display: flex; +.modal.vuoto-info section .specific .input-area { + width: 480px; } .popup { width: 288px; diff --git a/Thermo.Active/wwwroot/config.development.json b/Thermo.Active/wwwroot/config.development.json index d7aee5c1..d47c9870 100644 --- a/Thermo.Active/wwwroot/config.development.json +++ b/Thermo.Active/wwwroot/config.development.json @@ -2,6 +2,6 @@ "env": "development", "api": { "enabled": true, - "apiServerUrl": "http://seriate.steamware.net:9000" + "apiServerUrl": "http://localhost:9000" } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app.business-logic.ts b/Thermo.Active/wwwroot/src/app.business-logic.ts index 7eaec1fe..0ea51ce9 100644 --- a/Thermo.Active/wwwroot/src/app.business-logic.ts +++ b/Thermo.Active/wwwroot/src/app.business-logic.ts @@ -5,15 +5,18 @@ import { messageService } from "@/_base/messageService"; import { store, AppModel/*, MachineStatusModel, machineStatusActions, localizationModelActions, machineInfoActions*/ } from "@/store"; import { UserInfoDialog, MachineInfoDialog, ContactInfoDialog } from "@/app_modules/machine"; -import ShowPirometroInfo from "@/app_modules_thermo/pirometro/components/show-pirometro-info.vue"; +import ShowPirometroInfo from "@/app_modules_thermo/setup/pirometro/components/show-pirometro-info.vue"; import ShowFormatoInfo from "@/app_modules_thermo/setup/formato/components/show-formato-info.vue"; import ShowRiscaldamentoInfo from "@/app_modules_thermo/setup/riscaldi/components/show-riscaldi-info.vue"; import ShowCicloInfo from "@/app_modules_thermo/setup/ciclo/components/show-ciclo-info.vue"; -import ShowRaffreddamentoInfo from "@/app_modules_thermo/raffreddamento/components/show-raffreddamento-info.vue"; -import ShowControstampoInfo from "@/app_modules_thermo/controstampo_setup/components/show-controstampo-info.vue"; +import ShowRaffreddamentoInfo from "@/app_modules_thermo/setup/raffreddamento/components/show-raffreddamento-info.vue"; +import ShowControstampoInfo from "@/app_modules_thermo/setup/controstampo_setup/components/show-controstampo-info.vue"; import ShowQuoteVelocitaInfo from "@/app_modules_thermo/setup/quote-velocita/components/show-quote-velocita-info.vue"; -import ShowEstrazioneInfo from "@/app_modules_thermo/estrazione/components/show-estrazione-info.vue"; -import ShowVuotoInfo from "@/app_modules_thermo/vuoto/show-vuoto-info.vue"; +import ShowEstrazioneInfo from "@/app_modules_thermo/setup/estrazione/components/show-estrazione-info.vue"; +import ShowVuotoInfo from "@/app_modules_thermo/setup/vuoto/show-vuoto-info.vue"; +import ShowImbutituraInfo from "@/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue"; +import ShowOpzioniInfo from "@/app_modules_thermo/setup/opzioni/show-opzioni-info.vue"; +import ShowArretramentoRiscaldiInfo from "@/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.vue"; // import { DataService } from "./services/dataService"; // import { ToolingService } from "./services/toolingService"; // import { DepotService } from "./services/depotService"; @@ -48,6 +51,8 @@ let HMIScreenshotInterval; let HMIprodTimeout; let RerenderInterval; +messageService.subscribeToChannel("show-arretramento-riscaldi-info", () => { ModalHelper.ShowModal(ShowArretramentoRiscaldiInfo); }); +messageService.subscribeToChannel("show-opzioni-info", () => { ModalHelper.ShowModal(ShowOpzioniInfo); }); messageService.subscribeToChannel("show-vuoto-info", () => { ModalHelper.ShowModal(ShowVuotoInfo); }); messageService.subscribeToChannel("show-estrazione-info", () => { ModalHelper.ShowModal(ShowEstrazioneInfo); }); messageService.subscribeToChannel("show-quote-velocita-info", () => { ModalHelper.ShowModal(ShowQuoteVelocitaInfo); }); @@ -60,6 +65,8 @@ messageService.subscribeToChannel("show-pirometro-info", () => { ModalHelper.Sho messageService.subscribeToChannel("show-user-info", () => { ModalHelper.ShowModal(UserInfoDialog); }); messageService.subscribeToChannel("show-machine-info", () => { ModalHelper.ShowModal(MachineInfoDialog); }); messageService.subscribeToChannel("show-contact-info", () => { ModalHelper.ShowModal(ContactInfoDialog); }); +messageService.subscribeToChannel("show-imbutitura-info", () => { ModalHelper.ShowModal(ShowImbutituraInfo); }); + // messageService.subscribeToChannel("show-axes-calibration", () => { ModalHelper.ShowNcModal(AxesCalibration); }); // messageService.subscribeToChannel("hide-axes-calibration", () => { ModalHelper.HideNcModal(AxesCalibration); }); // messageService.subscribeToChannel("show-m155-questions", () => { ModalHelper.ShowNextM155Modal(); }); diff --git a/Thermo.Active/wwwroot/src/app.routes.ts b/Thermo.Active/wwwroot/src/app.routes.ts index e38f562d..0d15bf8e 100644 --- a/Thermo.Active/wwwroot/src/app.routes.ts +++ b/Thermo.Active/wwwroot/src/app.routes.ts @@ -60,8 +60,9 @@ export let routes = [ import { routes as alarmRoutes } from "@/app_modules/alarms/route.js"; -// import { routes as productionRoutes } from "./app_modules/production/route"; +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"; @@ -69,8 +70,9 @@ import { routes as SetupRoutes } from "@/app_modules_thermo/setup/route.js"; // import { routes as users } from "./app_modules/users/route"; injectRoutes(routes, alarmRoutes); -// injectRoutes(routes, productionRoutes); +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/arch-interface/arch-interface.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/arch-interface/arch-interface.ts similarity index 100% rename from Thermo.Active/wwwroot/src/app_modules_thermo/arch-interface/arch-interface.ts rename to Thermo.Active/wwwroot/src/app_modules_thermo/components/arch-interface/arch-interface.ts diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/arch-interface/arch-interface.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/arch-interface/arch-interface.vue similarity index 100% rename from Thermo.Active/wwwroot/src/app_modules_thermo/arch-interface/arch-interface.vue rename to Thermo.Active/wwwroot/src/app_modules_thermo/components/arch-interface/arch-interface.vue 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 52916edc..4d529bf7 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts @@ -10,8 +10,5 @@ export default class Scheda extends Vue{ portata:number; @Prop({default:0}) durata:number; - - mockD=this.durata; - mockP=this.portata; - + } \ 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 2893e2e1..6efd40f7 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue @@ -1,23 +1,21 @@ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/aria-controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/aria-controstampo.vue deleted file mode 100644 index 6bfb678f..00000000 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/aria-controstampo.vue +++ /dev/null @@ -1,36 +0,0 @@ - - - \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/ciclo-controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/ciclo-controstampo.vue deleted file mode 100644 index e3944102..00000000 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/base-components/ciclo-controstampo.vue +++ /dev/null @@ -1,43 +0,0 @@ - - - \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/show-controstampo-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/show-controstampo-info.vue deleted file mode 100644 index e7a724db..00000000 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/controstampo_setup/components/show-controstampo-info.vue +++ /dev/null @@ -1,36 +0,0 @@ - - - \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.vue deleted file mode 100644 index 4c34283e..00000000 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/base-components/estrazione-principale.vue +++ /dev/null @@ -1,27 +0,0 @@ - - - \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.vue deleted file mode 100644 index fe20e161..00000000 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/estrazione/components/show-estrazione-info.vue +++ /dev/null @@ -1,39 +0,0 @@ - - - diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/pirometro/components/base-components/pirometro.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/pirometro/components/base-components/pirometro.vue deleted file mode 100644 index b9c56051..00000000 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/pirometro/components/base-components/pirometro.vue +++ /dev/null @@ -1,35 +0,0 @@ - - - \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/pirometro/components/show-pirometro-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/pirometro/components/show-pirometro-info.vue deleted file mode 100644 index d4b9c30f..00000000 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/pirometro/components/show-pirometro-info.vue +++ /dev/null @@ -1,31 +0,0 @@ - - - \ No newline at end of file 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 new file mode 100644 index 00000000..5d29892e --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.ts @@ -0,0 +1,39 @@ +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 { Modal, ModalHelper } from "@/components/modals"; +import { Factory, messageService, awaiter } from "@/_base"; + +@Component({components:{slider:Slider,modal:Modal}}) +export default class ArretramentoRiscaldi extends Vue{ + + @Prop({default:0}) + ritardo:number + + annulla(){ + ModalHelper.HideModal(); + }; + + conferma(){ + ModalHelper.HideModal(); + }; + + async beforeMount() { + // this.contactInfo = await awaiter(new machineService().getContactConfiguration()); + messageService.subscribeToChannel("esc_pressed", args => { + this.close(); + }); + } + + beforeDestroy() { + messageService.deleteChannel("esc_pressed"); + } + + close() { + messageService.deleteChannel("esc_pressed"); + ModalHelper.HideModal(); + } + + +} \ No newline at end of file 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 new file mode 100644 index 00000000..429bca6d --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.vue @@ -0,0 +1,31 @@ + + + \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts new file mode 100644 index 00000000..7ffb8c95 --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts @@ -0,0 +1,16 @@ +import Vue from 'vue'; +import Component from 'vue-class-component'; +import {Prop} from 'vue-property-decorator'; +import { messageService } from "@/_base/messageService"; +import { Modal, ModalHelper } from "@/components/modals"; + +@Component({ + components: { + modal: Modal + } +}) +export default class Processo extends Vue{ + public sendMessage(name: string) { + messageService.publishToChannel(name); + } +} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue new file mode 100644 index 00000000..d50267ba --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/route.js b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/route.js new file mode 100644 index 00000000..5341564c --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/route.js @@ -0,0 +1,8 @@ +import Processo from "./components/processo.vue" + +export const routes = [ + { + name: 'production', path: "/production", + meta: { title: "Production", area: "production" }, + component: Processo + }]; \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.ts new file mode 100644 index 00000000..20fe1982 --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.ts @@ -0,0 +1,30 @@ +import Vue from 'vue'; +import Component from 'vue-class-component'; +import {Prop} from 'vue-property-decorator'; +import { messageService } from "@/_base/messageService"; +import { Modal, ModalHelper } from "@/components/modals"; +import ToggleButton from "@/components/toggleButton.vue"; + +@Component({ + components: { + modal: Modal, + ToggleButton + } +}) +export default class ProgrammazionePreriscaldo extends Vue{ + + enabling:boolean=true; + risc:boolean=true; + termo:boolean=true; + block:boolean=false; + + active:string=""; + meridian:string="--"; + hours:string="00"; + + + public sendMessage(name: string) { + messageService.publishToChannel(name); + } + +} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.vue new file mode 100644 index 00000000..d771058f --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/components/programmazione-preriscaldo.vue @@ -0,0 +1,68 @@ + + + \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/route.js b/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/route.js new file mode 100644 index 00000000..9e1c0c70 --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/programmazione-preriscaldo/route.js @@ -0,0 +1,8 @@ +import ProgrammazionePreriscaldo from "./components/programmazione-preriscaldo.vue" + +export const routes = [ + { + name: 'progrprerisc', path: "/progrprerisc", + meta: { title: "Progrprerisc", area: "progrprerisc" }, + component: ProgrammazionePreriscaldo + }]; \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/base-components/ventilatori.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/base-components/ventilatori.vue deleted file mode 100644 index a092f9c8..00000000 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/base-components/ventilatori.vue +++ /dev/null @@ -1,34 +0,0 @@ - - - \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/show-raffreddamento-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/show-raffreddamento-info.vue deleted file mode 100644 index 5ad42582..00000000 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/raffreddamento/components/show-raffreddamento-info.vue +++ /dev/null @@ -1,37 +0,0 @@ - - - \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue index 5e192c0f..6d2957e1 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/SVG-Components/SVGcaricatore.vue @@ -1,18 +1,12 @@ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue index ecd51f92..0e692bcb 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/base-components/caricatore.vue @@ -1,6 +1,6 @@