From 8c9c2614ff758b68f6726a818c298c45d3a4b5cb Mon Sep 17 00:00:00 2001 From: = Date: Tue, 30 Jun 2020 10:12:12 +0200 Subject: [PATCH 1/3] fix modifica riscaldi --- Thermo.Active/wwwroot/config.development.json | 2 +- Thermo.Active/wwwroot/config.production.json | 2 +- Thermo.Active/wwwroot/index.html | 2 +- .../components/base-components/riscaldi-inferiori.vue | 8 ++++---- .../components/base-components/riscaldi-superiori.ts | 4 ++-- .../components/base-components/riscaldi-superiori.vue | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Thermo.Active/wwwroot/config.development.json b/Thermo.Active/wwwroot/config.development.json index 34bce964..3f9529d8 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://localhost:9000/" + "apiServerUrl": "http://seriate.steamware.net:9000/" } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/config.production.json b/Thermo.Active/wwwroot/config.production.json index 34bce964..3f9529d8 100644 --- a/Thermo.Active/wwwroot/config.production.json +++ b/Thermo.Active/wwwroot/config.production.json @@ -2,6 +2,6 @@ "env": "development", "api": { "enabled": true, - "apiServerUrl": "http://localhost:9000/" + "apiServerUrl": "http://seriate.steamware.net:9000/" } } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/index.html b/Thermo.Active/wwwroot/index.html index ef830a90..dbc47d4e 100644 --- a/Thermo.Active/wwwroot/index.html +++ b/Thermo.Active/wwwroot/index.html @@ -13,7 +13,7 @@ - + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-inferiori.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-inferiori.vue index da4af5f7..ab2e2774 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-inferiori.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-inferiori.vue @@ -48,10 +48,10 @@ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.ts index d3adf8cf..724cde04 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.ts @@ -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[]) { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.vue index 9ac5e04d..37b9a225 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.vue @@ -48,10 +48,10 @@ From c820e9840389107224e1e29767534483fd928888 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 30 Jun 2020 10:17:09 +0200 Subject: [PATCH 2/3] fix portata durata su vuoto --- .../components/base-components/riscaldi-inferiori.ts | 5 +++-- .../setup/vuoto/base-components/prevuoto.vue | 12 ++++++------ .../setup/vuoto/base-components/vuoto-ausiliario.vue | 12 ++++++------ .../setup/vuoto/base-components/vuoto-principale.vue | 12 ++++++------ 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-inferiori.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-inferiori.ts index 36d89e0c..6803e07c 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-inferiori.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-inferiori.ts @@ -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[]) { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.vue index ea0686a8..380bf382 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/prevuoto.vue @@ -25,18 +25,18 @@
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-ausiliario.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-ausiliario.vue index 2cce7608..c47896c7 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-ausiliario.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-ausiliario.vue @@ -33,18 +33,18 @@
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue index 5129abec..99c0fb63 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/vuoto/base-components/vuoto-principale.vue @@ -33,18 +33,18 @@
From a48c986086ecea422950386cbe48425d5b4005e8 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 30 Jun 2020 10:22:27 +0200 Subject: [PATCH 3/3] fix binding scheda --- .../components/base-components/aria-controstampo.vue | 12 ++++++------ .../base-components/estrazione-controstampo.vue | 4 ++-- .../base-components/vuoto-controstampo.vue | 12 ++++++------ .../base-components/estrazione-principale.vue | 4 ++-- .../base-components/estrazione-secondaria.vue | 4 ++-- .../setup/imbutitura/show-imbutitura-info.vue | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue index 516e68e6..74ad792f 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/aria-controstampo.vue @@ -31,18 +31,18 @@
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/estrazione-controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/estrazione-controstampo.vue index 6426a509..68b03399 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/estrazione-controstampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/estrazione-controstampo.vue @@ -31,8 +31,8 @@
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/vuoto-controstampo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/vuoto-controstampo.vue index d9dcc6a3..a2d7b431 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/vuoto-controstampo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/vuoto-controstampo.vue @@ -31,18 +31,18 @@
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue index 2bdae603..9f08b10f 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.vue @@ -38,8 +38,8 @@
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-secondaria.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-secondaria.vue index f63cc801..a352cd26 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-secondaria.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-secondaria.vue @@ -31,8 +31,8 @@
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue index 42a29b08..84a9ac97 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.vue @@ -66,8 +66,8 @@