Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix riscaldi

Browse Source
This commit is contained in:
Thermo_SIM
2021-03-12 17:34:59 +01:00
parent 8bfd294525
commit abc8564f2f
7 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active/wwwroot/assets/styles/base/riscaldi.less
+6 -4
View File
@@ -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;
}
}
}
Thermo.Active/wwwroot/assets/styles/style.css
+6 -4
View File
@@ -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;
Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue
+4 -4
View File
@@ -37,12 +37,12 @@
:current-time="gaugeData.timeAdv.value"
></gantt>
<div class="zoom-buttons">
<button class="btn">
<i class="fa fa-search-minus" @click="zoomFactor /= zoomStep"></i>
<button class="btn" @click="zoomFactor /= zoomStep">
<i class="fa fa-search-minus"></i>
</button>
<zoom :min="0" :max="2" :value="zoomFactor"></zoom>
<button class="btn">
<i class="fa fa-search-plus" @click="zoomFactor *= zoomStep"></i>
<button class="btn" @click="zoomFactor *= zoomStep">
<i class="fa fa-search-plus" ></i>
</button>
<button
class="realign"
Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/resistance.vue
+2 -2
View File
@@ -34,9 +34,9 @@
v-else
:style="{backgroundColor:`rgb(${currentColor})`}"
>
<span>ID: {{getOutput(channel.idChannel)}}</span>
<span>Id: {{res.idGroup}} </span>
<small>Bo: {{getBoard(channel.idChannel)}}</small>
<small>Ch: {{channel.idChannel}}</small>
<small>Out: {{getOutput(channel.idChannel)}}</small>
</div>
</div>
</template>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/warmers.ts
+1
View File
@@ -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);
}
Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Riscaldi/components/tables/riscaldi-table/riscaldi-table.ts
+1
View File
@@ -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];
}
Thermo.Active/wwwroot/src/store/warmers.store.ts
+5 -1
View File
@@ -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;
}
}
}