diff --git a/Thermo.Active/wwwroot/assets/styles/base/riscaldi.less b/Thermo.Active/wwwroot/assets/styles/base/riscaldi.less index 3cbf6d1b..b48d3b20 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/riscaldi.less +++ b/Thermo.Active/wwwroot/assets/styles/base/riscaldi.less @@ -63,7 +63,7 @@ grid-template-columns: 50% 50%; grid-template-rows: 70% 30%; display: grid; - font-size: 18px; + font-size: 27px; span { grid-column-start: 1; grid-column-end: -1; @@ -71,12 +71,14 @@ } small { grid-row: 2; - padding-left: 5px; - font-size: 13px; + padding-left: 10px; + font-size: 15px; + padding-bottom: 5px; &:last-of-type { + padding-left: 0px; grid-column: 2; text-align: right; - padding-right: 5px; + padding-right: 10px; } } } diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index 4f672f6f..fffdb204 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -4871,7 +4871,7 @@ article .box .body { grid-template-columns: 50% 50%; grid-template-rows: 70% 30%; display: grid; - font-size: 18px; + font-size: 27px; } .warmers svg .resistance.id span { grid-column-start: 1; @@ -4880,13 +4880,15 @@ article .box .body { } .warmers svg .resistance.id small { grid-row: 2; - padding-left: 5px; - font-size: 13px; + padding-left: 10px; + font-size: 15px; + padding-bottom: 5px; } .warmers svg .resistance.id small:last-of-type { + padding-left: 0px; grid-column: 2; text-align: right; - padding-right: 5px; + padding-right: 10px; } .warmers .icon { font-size: 30px; 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 457e0793..83e5577e 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 @@ -37,12 +37,12 @@ :current-time="gaugeData.timeAdv.value" >
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/warmers.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/warmers.ts index 90c91509..4fd6e693 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/warmers.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/warmers.ts @@ -90,6 +90,7 @@ export default class Warmers extends Vue { // Ottengo le resistenze per ogni riga resistancesPerRow(row: number) { + console.log(row,this.resistances.filter(i => i.row == row)) return this.resistances.filter(i => i.row == row); } diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Riscaldi/components/tables/riscaldi-table/riscaldi-table.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Riscaldi/components/tables/riscaldi-table/riscaldi-table.ts index e3c74f4d..12ebca0a 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Riscaldi/components/tables/riscaldi-table/riscaldi-table.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Riscaldi/components/tables/riscaldi-table/riscaldi-table.ts @@ -14,6 +14,7 @@ export default class RiscaldiTable extends Vue { } getChannelInfo(id) { + console.log(store.state.warmers.channels.filter(i => i.idChannel == 5)[0]); return store.state.warmers.channels.filter(i => i.idChannel == id)[0]; } diff --git a/Thermo.Active/wwwroot/src/store/warmers.store.ts b/Thermo.Active/wwwroot/src/store/warmers.store.ts index 0810d7e4..e95b2e46 100644 --- a/Thermo.Active/wwwroot/src/store/warmers.store.ts +++ b/Thermo.Active/wwwroot/src/store/warmers.store.ts @@ -53,7 +53,11 @@ export const warmersStore = { intModel.setpointPLC = element.setpointPLC; intModel.tCamActive = element.tCamActive; intModel.tCamTempAct = element.tCamTempAct; - intModel.tCamTempSet = element.tCamTempSet; + intModel.tCamTempSet = element.tCamTempSet; + + intModel.channelStatus = element.channelStatus; + intModel.actualCurrent = element.actualCurrent; + intModel.actualPerc = element.actualPerc; } } }