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

Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2020-06-30 11:34:16 +02:00
parent 8798a2a00f 9e08721ebc
commit 1b0432babe
16 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active/wwwroot/config.development.json
+1 -1
View File
@@ -2,6 +2,6 @@
"env": "development",
"api": {
"enabled": true,
"apiServerUrl": "http://localhost:9000/"
"apiServerUrl": "http://seriate.steamware.net:9000/"
}
}
Thermo.Active/wwwroot/config.production.json
+1 -1
View File
@@ -2,6 +2,6 @@
"env": "development",
"api": {
"enabled": true,
"apiServerUrl": "http://localhost:9000/"
"apiServerUrl": "http://seriate.steamware.net:9000/"
}
}
Thermo.Active/wwwroot/index.html
+1 -1
View File
@@ -13,7 +13,7 @@
<script src="Scripts/jquery.mousewheel.js"></script>
<script src="Scripts/jquery.signalR-2.2.2.min.js"></script>
<script src="Scripts/raphael-2.1.4.min.js"></script>
<script src="http://localhost:9000/signalr/hubs" async></script>
<script src="http://seriate.steamware.net:9000/signalr/hubs" async></script>
<link href="assets/styles/style.css" rel="stylesheet" />
</head>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue
+6 -6
View File
@@ -31,18 +31,18 @@
<article class="shrink ml-10">
<scheda
class="box-500 mb-10"
:portata="recipe.upperplate_air_1_chart_setpointx"
:durata="recipe.upperplate_air_1_chart_setpointy"
:portata="recipe.upperplate_air_1_chart_setpointy"
:durata="recipe.upperplate_air_1_chart_setpointx"
></scheda>
<scheda
class="box-500 mb-10 color_2"
:portata="recipe.upperplate_air_2_chart_setpointx"
:durata="recipe.upperplate_air_2_chart_setpointy"
:portata="recipe.upperplate_air_2_chart_setpointy"
:durata="recipe.upperplate_air_2_chart_setpointx"
></scheda>
<scheda
class="box-500 mb-10 color_3"
:portata="recipe.upperplate_air_3_chart_setpointx"
:durata="recipe.upperplate_air_3_chart_setpointy"
:portata="recipe.upperplate_air_3_chart_setpointy"
:durata="recipe.upperplate_air_3_chart_setpointx"
></scheda>
</article>
<article>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/estrazione-controstampo.vue
+2 -2
View File
@@ -31,8 +31,8 @@
<article class="shrink ml-10">
<scheda
class="box-500 color_3"
:portata="recipe.upperplate_extraction_1_chart_setpointx"
:durata="recipe.upperplate_extraction_1_chart_setpointy"
:portata="recipe.upperplate_extraction_1_chart_setpointy"
:durata="recipe.upperplate_extraction_1_chart_setpointx"
></scheda>
</article>
<article>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/vuoto-controstampo.vue
+6 -6
View File
@@ -31,18 +31,18 @@
<article class="shrink ml-10">
<scheda
class="box-500 mb-10"
:portata="recipe.upperplate_vacuum_1_chart_setpointx"
:durata="recipe.upperplate_vacuum_1_chart_setpointy"
:portata="recipe.upperplate_vacuum_1_chart_setpointy"
:durata="recipe.upperplate_vacuum_1_chart_setpointx"
></scheda>
<scheda
class="box-500 mb-10 color_2"
:portata="recipe.upperplate_vacuum_2_chart_setpointx"
:durata="recipe.upperplate_vacuum_2_chart_setpointy"
:portata="recipe.upperplate_vacuum_2_chart_setpointy"
:durata="recipe.upperplate_vacuum_2_chart_setpointx"
></scheda>
<scheda
class="box-500 mb-10 color_3"
:portata="recipe.upperplate_vacuum_3_chart_setpointx"
:durata="recipe.upperplate_vacuum_3_chart_setpointy"
:portata="recipe.upperplate_vacuum_3_chart_setpointy"
:durata="recipe.upperplate_vacuum_3_chart_setpointx"
></scheda>
</article>
<article>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue
+2 -2
View File
@@ -38,8 +38,8 @@
<article class="shrink ml-10">
<scheda
class="box-500 color_3"
:portata="recipe.extraction_main_1_chart_setpointx"
:durata="recipe.extraction_main_1_chart_setpointy"
:portata="recipe.extraction_main_1_chart_setpointy"
:durata="recipe.extraction_main_1_chart_setpointx"
></scheda>
</article>
<article>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-secondaria.vue
+2 -2
View File
@@ -31,8 +31,8 @@
<article class="shrink ml-10">
<scheda
class="box-500 color_3"
:portata="recipe.extraction_aux_1_chart_setpointx"
:durata="recipe.extraction_aux_1_chart_setpointy"
:portata="recipe.extraction_aux_1_chart_setpointy"
:durata="recipe.extraction_aux_1_chart_setpointx"
></scheda>
</article>
<article>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue
+2 -2
View File
@@ -66,8 +66,8 @@
<article class="shrink ml-10">
<scheda
class="box-500 color_3"
:portata="recipe.drawing_1_chart_setpointx"
:durata="recipe.drawing_1_chart_setpointy"
:portata="recipe.drawing_1_chart_setpointy"
:durata="recipe.drawing_1_chart_setpointx"
></scheda>
</article>
<article>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-inferiori.ts
+3 -2
View File
@@ -36,12 +36,13 @@ export default class RiscaldiInferiori extends Vue {
(this.$refs.warmers as any).zoomOut();
}
add5() {
for (const c of this.selectedChannels) c.setpointHMI += 5;
for (const c of this.selectedChannels) c.setpointHMI = parseFloat(c.setpointHMI.toString()) + 5;
}
remove5() {
for (const c of this.selectedChannels) c.setpointHMI -= 5;
for (const c of this.selectedChannels) c.setpointHMI = parseFloat(c.setpointHMI.toString()) + 5;
}
selectionChanged(selected: number[]) {
Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-inferiori.vue
+4 -4
View File
@@ -48,10 +48,10 @@
<img src="assets/icons/png/piu5.png" />
</button>
<select class="form-control" v-model="uniformChannelValue">
<option value="0">0%</option>
<option value="25">25%</option>
<option value="50">50%</option>
<option value="100">100%</option>
<option :value="0">0%</option>
<option :value="25">25%</option>
<option :value="50">50%</option>
<option :value="100">100%</option>
</select>
</div>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.ts
+2 -2
View File
@@ -37,11 +37,11 @@ export default class RiscaldiSuperiori extends Vue {
}
add5() {
for (const c of this.selectedChannels) c.setpointHMI += 5;
for (const c of this.selectedChannels) c.setpointHMI = parseFloat(c.setpointHMI.toString()) + 5;
}
remove5() {
for (const c of this.selectedChannels) c.setpointHMI -= 5;
for (const c of this.selectedChannels) c.setpointHMI = parseFloat(c.setpointHMI.toString()) + 5;
}
selectionChanged(selected: number[]) {
Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.vue
+4 -4
View File
@@ -48,10 +48,10 @@
<img src="assets/icons/png/piu5.png" />
</button>
<select class="form-control" v-model="uniformChannelValue">
<option value="0">0%</option>
<option value="25">25%</option>
<option value="50">50%</option>
<option value="100">100%</option>
<option :value="0">0%</option>
<option :value="25">25%</option>
<option :value="50">50%</option>
<option :value="100">100%</option>
</select>
</div>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.vue
+6 -6
View File
@@ -25,18 +25,18 @@
<article class="shrink ml-10">
<scheda
class="box-500 mb-10"
:portata="recipe.vacuum_pre_1_chart_setpointx"
:durata="recipe.vacuum_pre_1_chart_setpointy"
:portata="recipe.vacuum_pre_1_chart_setpointy"
:durata="recipe.vacuum_pre_1_chart_setpointx"
></scheda>
<scheda
class="box-500 mb-10 color_2"
:portata="recipe.vacuum_pre_2_chart_setpointx"
:durata="recipe.vacuum_pre_2_chart_setpointy"
:portata="recipe.vacuum_pre_2_chart_setpointy"
:durata="recipe.vacuum_pre_2_chart_setpointx"
></scheda>
<scheda
class="box-500 mb-10 color_3"
:portata="recipe.vacuum_pre_3_chart_setpointx"
:durata="recipe.vacuum_pre_3_chart_setpointy"
:portata="recipe.vacuum_pre_3_chart_setpointy"
:durata="recipe.vacuum_pre_3_chart_setpointx"
></scheda>
</article>
<article>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-ausiliario.vue
+6 -6
View File
@@ -33,18 +33,18 @@
<article class="shrink ml-10">
<scheda
class="box-500 mb-10"
:portata="recipe.vacuum_aux_1_chart_setpointx"
:durata="recipe.vacuum_aux_1_chart_setpointy"
:portata="recipe.vacuum_aux_1_chart_setpointy"
:durata="recipe.vacuum_aux_1_chart_setpointx"
></scheda>
<scheda
class="box-500 mb-10 color_2"
:portata="recipe.vacuum_aux_2_chart_setpointx"
:durata="recipe.vacuum_aux_2_chart_setpointy"
:portata="recipe.vacuum_aux_2_chart_setpointy"
:durata="recipe.vacuum_aux_2_chart_setpointx"
></scheda>
<scheda
class="box-500 mb-10 color_3"
:portata="recipe.vacuum_aux_3_chart_setpointx"
:durata="recipe.vacuum_aux_3_chart_setpointy"
:portata="recipe.vacuum_aux_3_chart_setpointy"
:durata="recipe.vacuum_aux_3_chart_setpointx"
></scheda>
</article>
<article>
Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue
+6 -6
View File
@@ -33,18 +33,18 @@
<article class="shrink ml-10">
<scheda
class="box-500 mb-10"
:portata="recipe.vacuum_main_1_chart_setpointx"
:durata="recipe.vacuum_main_1_chart_setpointy"
:portata="recipe.vacuum_main_1_chart_setpointy"
:durata="recipe.vacuum_main_1_chart_setpointx"
></scheda>
<scheda
class="box-500 mb-10 color_2"
:portata="recipe.vacuum_main_2_chart_setpointx"
:durata="recipe.vacuum_main_2_chart_setpointy"
:portata="recipe.vacuum_main_2_chart_setpointy"
:durata="recipe.vacuum_main_2_chart_setpointx"
></scheda>
<scheda
class="box-500 mb-10 color_3"
:portata="recipe.vacuum_main_3_chart_setpointx"
:durata="recipe.vacuum_main_3_chart_setpointy"
:portata="recipe.vacuum_main_3_chart_setpointy"
:durata="recipe.vacuum_main_3_chart_setpointx"
></scheda>
</article>
<article>