From 92b9cea7d84b0342367dc1f9fa37af85c8d8f7ba Mon Sep 17 00:00:00 2001 From: = Date: Fri, 19 Jun 2020 13:54:18 +0200 Subject: [PATCH] fix opzioni --- .../assets/styles/base/circlegantt.less | 92 -------- .../wwwroot/assets/styles/base/layout.less | 2 - .../wwwroot/assets/styles/base/opzioni.less | 91 -------- Thermo.Active/wwwroot/assets/styles/style.css | 114 ---------- .../show-arretramento-riscladi-info.ts | 41 ---- .../show-arretramento-riscladi-info.vue | 31 --- .../processo/circles-gantt/circle-gantt.ts | 17 -- .../processo/circles-gantt/circle-gantt.vue | 25 --- .../processo/components/processo.ts | 26 ++- .../processo/components/processo.vue | 45 ++-- .../base-components/inputSottosquadra.vue | 48 ++--- .../components/base-components/inputTermo.vue | 22 +- .../base-components/setupSottosquadra.vue | 16 +- .../components/base-components/setupTermo.ts | 4 +- .../components/base-components/setupTermo.vue | 15 +- .../opzioni/components/termoregolatori.ts | 15 +- .../opzioni/components/termoregolatori.vue | 204 +++++------------- .../setup/opzioni/show-opzioni-info.ts | 2 +- 18 files changed, 157 insertions(+), 653 deletions(-) delete mode 100644 Thermo.Active/wwwroot/assets/styles/base/circlegantt.less delete mode 100644 Thermo.Active/wwwroot/assets/styles/base/opzioni.less delete mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.ts delete mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.vue delete mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/processo/circles-gantt/circle-gantt.ts delete mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/processo/circles-gantt/circle-gantt.vue diff --git a/Thermo.Active/wwwroot/assets/styles/base/circlegantt.less b/Thermo.Active/wwwroot/assets/styles/base/circlegantt.less deleted file mode 100644 index 83f1a351..00000000 --- a/Thermo.Active/wwwroot/assets/styles/base/circlegantt.less +++ /dev/null @@ -1,92 +0,0 @@ -// out: false, sourceMap: false, main: ../style.less -@import "grid-system.less"; -@import "colors.less"; -@import "fonts.less"; - -.circle-gantt{ - height: 70px; - - .specific{ - - div{ - - &:first-of-type{ - display: flex; - flex-direction: column; - justify-content: flex-end; - height: 70px; - object-fit: contain; - border-radius: 2px; - background-color: #57636b; - - label{ - margin-left: 37%; - } - - } - - &:last-of-type{ - display: flex; - flex-direction: column; - justify-content: center; - margin-top: -66px; - height: 40px; - object-fit: contain; - border-radius: 2px; - background-color: #c0c7cc; - - label{ - margin-left: 25%; - } - - } - - } - - &:first-of-type{ - - div{ - - &:first-of-type{ - display: flex; - flex-direction: column; - justify-content: flex-end; - width: 34px; - height: 70px; - object-fit: contain; - border-radius: 2px; - background-color: #57636b; - - label{ - margin-left: 25%; - } - - } - - &:last-of-type{ - display: flex; - flex-direction: column; - justify-content: flex-end; - margin-top: -66px; - width: 34px; - height: 40px; - object-fit: contain; - border-radius: 2px; - background-color: #c0c7cc; - - img{ - margin-left: 25%; - flex-shrink: 0; - width: 20px; - height: 20px; - } - - } - - } - - } - - } - -} \ 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 9035b496..2dde21a9 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/layout.less +++ b/Thermo.Active/wwwroot/assets/styles/base/layout.less @@ -9,13 +9,11 @@ @import "slider.less"; @import "tastierino.less"; @import "preriscaldo-dashboard.less"; -@import "circlegantt.less"; @import "paddle.less"; @import "arch-interface.less"; @import "avvio-prod.less"; @import "processo.less"; @import "progrprerisc.less"; -@import "opzioni.less"; @import "imbutitura.less"; @import "popups.less"; @import "grid-system.less"; diff --git a/Thermo.Active/wwwroot/assets/styles/base/opzioni.less b/Thermo.Active/wwwroot/assets/styles/base/opzioni.less deleted file mode 100644 index d0adbb1e..00000000 --- a/Thermo.Active/wwwroot/assets/styles/base/opzioni.less +++ /dev/null @@ -1,91 +0,0 @@ -// out: false, sourceMap: false, main: ../style.less -@import "grid-system.less"; -@import "colors.less"; -@import "fonts.less"; - -.modal.opzioni-info { - - - hr { - width: 2px; - height: 830px; - background-color: #979797; - margin: 0; - } - - section.body { - - section { - padding: 0px; - - .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; - } - - } - - } - - } - -} \ 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 6b4ccfb9..facfb28b 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -4708,64 +4708,6 @@ article .box .body { text-align: center; color: #4b4b4b; } -.circle-gantt { - height: 70px; -} -.circle-gantt .specific div:first-of-type { - display: flex; - flex-direction: column; - justify-content: flex-end; - height: 70px; - object-fit: contain; - border-radius: 2px; - background-color: #57636b; -} -.circle-gantt .specific div:first-of-type label { - margin-left: 37%; -} -.circle-gantt .specific div:last-of-type { - display: flex; - flex-direction: column; - justify-content: center; - margin-top: -66px; - height: 40px; - object-fit: contain; - border-radius: 2px; - background-color: #c0c7cc; -} -.circle-gantt .specific div:last-of-type label { - margin-left: 25%; -} -.circle-gantt .specific:first-of-type div:first-of-type { - display: flex; - flex-direction: column; - justify-content: flex-end; - width: 34px; - height: 70px; - object-fit: contain; - border-radius: 2px; - background-color: #57636b; -} -.circle-gantt .specific:first-of-type div:first-of-type label { - margin-left: 25%; -} -.circle-gantt .specific:first-of-type div:last-of-type { - display: flex; - flex-direction: column; - justify-content: flex-end; - margin-top: -66px; - width: 34px; - height: 40px; - object-fit: contain; - border-radius: 2px; - background-color: #c0c7cc; -} -.circle-gantt .specific:first-of-type div:last-of-type img { - margin-left: 25%; - flex-shrink: 0; - width: 20px; - height: 20px; -} .container #app nav { position: absolute; right: 0; @@ -5215,62 +5157,6 @@ article .box .body { letter-spacing: normal; color: #002680; } -.modal.opzioni-info hr { - width: 2px; - height: 830px; - background-color: #979797; - margin: 0; -} -.modal.opzioni-info section.body section { - padding: 0px; -} -.modal.opzioni-info section.body section .specific:last-of-type { - margin-left: 100px; - width: 471px; -} -.modal.opzioni-info section.body section .specific:first-of-type .box-color { - background-color: #ffffff; -} -.modal.opzioni-info section.body 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.body section .specific:first-of-type .active { - background-color: rgba(23, 145, 255, 0.75); - color: #ffffff; -} -.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 section.body section 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 section.body section aside .active { - background-color: #fff; - font-weight: bold; - border-top: 2px solid #002680; -} .modal.imbutitura-info section .specific { padding-left: 5px; justify-content: flex-end; 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 deleted file mode 100644 index 1622cbc3..00000000 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-info.ts +++ /dev/null @@ -1,41 +0,0 @@ -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; - - mock_ritardo:number=this.ritardo; - - 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 deleted file mode 100644 index c77d3c4a..00000000 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/arretramento-riscaldi/show-arretramento-riscladi-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/circles-gantt/circle-gantt.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/circles-gantt/circle-gantt.ts deleted file mode 100644 index fa85e600..00000000 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/circles-gantt/circle-gantt.ts +++ /dev/null @@ -1,17 +0,0 @@ -import Vue from 'vue'; -import Component from 'vue-class-component'; -import {Prop} from 'vue-property-decorator'; - -@Component({name:"circlegantt"}) -export default class CircleGantt extends Vue{ - - @Prop({default:2}) - value:number; - @Prop({default:0}) - late:number; - @Prop({default:'s'}) - unit:string; - @Prop({default:'Discesa cornice'}) - title:string; - -} \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/circles-gantt/circle-gantt.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/circles-gantt/circle-gantt.vue deleted file mode 100644 index e8f71421..00000000 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/circles-gantt/circle-gantt.vue +++ /dev/null @@ -1,25 +0,0 @@ - - - \ 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 index 383243d1..fc9dfea1 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts @@ -1,24 +1,22 @@ import Vue from 'vue'; import Component from 'vue-class-component'; -import {Prop} from 'vue-property-decorator'; +import { Prop } from 'vue-property-decorator'; import { messageService } from "@/_base/messageService"; import { Modal, ModalHelper } from "@/components/modals"; -import CircleGantt from "../circles-gantt/circle-gantt.vue" @Component({ - components: { - modal: Modal, - circlegantt: CircleGantt - } + components: { + modal: Modal, + } }) -export default class Processo extends Vue{ +export default class Processo extends Vue { - @Prop({default:25}) - actual:number; - @Prop({default:145}) - tot:number; + @Prop({ default: 25 }) + actual: number; + @Prop({ default: 145 }) + tot: number; - public sendMessage(name: string) { - messageService.publishToChannel(name); - } + 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 index b29965a1..7b9059b2 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue @@ -1,17 +1,38 @@ \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.vue index 7e05a1d8..a0c47325 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/opzioni/components/base-components/inputSottosquadra.vue @@ -1,33 +1,33 @@