From 345918cdaf9e3f2d28191218711e307c9d165b01 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 8 Sep 2020 08:35:19 +0200 Subject: [PATCH 1/7] valueAct --- Thermo.Active/wwwroot/config.development.json | 2 +- Thermo.Active/wwwroot/index.html | 2 +- .../components/SVG_Components/controstampoSVG.vue | 2 +- .../formato/components/SVG_Components/corniceSVG.vue | 4 ++-- .../formato/components/SVG_Components/lastraSVG.vue | 6 +++--- .../formato/components/SVG_Components/piastraSVG.vue | 4 ++-- .../formato/components/SVG_Components/stampoSVG.vue | 10 +++++----- .../components/SVG_Components/quote-velocita.vue | 8 ++++---- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Thermo.Active/wwwroot/config.development.json b/Thermo.Active/wwwroot/config.development.json index 8c7723c2..58ce0f2f 100644 --- a/Thermo.Active/wwwroot/config.development.json +++ b/Thermo.Active/wwwroot/config.development.json @@ -2,7 +2,7 @@ "env": "development", "api": { "enabled": true, - "apiServerUrl": "http://localhost:9000/" + "apiServerUrl": "http://seriate.steamware.net:9000/" }, "allUIVisible": true } \ No newline at end of file diff --git a/Thermo.Active/wwwroot/index.html b/Thermo.Active/wwwroot/index.html index 06c2fb9c..f52c1422 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/formato/components/SVG_Components/controstampoSVG.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.vue index f165fff8..a330a343 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/controstampoSVG.vue @@ -4,7 +4,7 @@
- {{recipe.general_sizes_upperplate_max_height.setpointHMI}} + {{recipe.general_sizes_upperplate_max_height.valueAct}} {{recipe.general_sizes_upperplate_max_height.unitMeasure}}
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.vue index 5a55a02f..068dc2e3 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/corniceSVG.vue @@ -4,14 +4,14 @@
- {{recipe.general_sizes_frame_dim_y.setpointHMI}} + {{recipe.general_sizes_frame_dim_y.valueAct}} {{recipe.general_sizes_frame_dim_y.unitMeasure}}
- {{recipe.general_sizes_frame_dim_x.setpointHMI}} + {{recipe.general_sizes_frame_dim_x.valueAct}} {{recipe.general_sizes_frame_dim_x.unitMeasure}}
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.vue index 8f579191..be19e523 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/lastraSVG.vue @@ -4,21 +4,21 @@
- {{recipe.general_sizes_sheet_dim_x.setpointHMI}} + {{recipe.general_sizes_sheet_dim_x.valueAct}} {{recipe.general_sizes_sheet_dim_x.unitMeasure}}
- {{recipe.general_sizes_sheet_dim_y.setpointHMI}} + {{recipe.general_sizes_sheet_dim_y.valueAct}} {{recipe.general_sizes_sheet_dim_y.unitMeasure}}
- {{recipe.general_sizes_sheet_thickness.setpointHMI}} + {{recipe.general_sizes_sheet_thickness.valueAct}} {{recipe.general_sizes_sheet_thickness.unitMeasure}}
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.vue index 221446a6..0b836048 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/piastraSVG.vue @@ -4,14 +4,14 @@
- {{recipe.general_sizes_plate_dim_y.setpointHMI}} + {{recipe.general_sizes_plate_dim_y.valueAct}} {{recipe.general_sizes_plate_dim_y.unitMeasure}}
- {{recipe.general_sizes_plate_dim_x.setpointHMI}} + {{recipe.general_sizes_plate_dim_x.valueAct}} {{recipe.general_sizes_plate_dim_x.unitMeasure}}
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.vue index 0c3352ad..d888b91f 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/formato/components/SVG_Components/stampoSVG.vue @@ -4,35 +4,35 @@
- {{recipe.general_sizes_mould_dim_x.setpointHMI}} + {{recipe.general_sizes_mould_dim_x.valueAct}} {{recipe.general_sizes_mould_dim_x.unitMeasure}}
- {{recipe.general_sizes_mould_dim_y.setpointHMI}} + {{recipe.general_sizes_mould_dim_y.valueAct}} {{recipe.general_sizes_mould_dim_y.unitMeasure}}
- {{recipe.general_sizes_mould_max_height.setpointHMI}} + {{recipe.general_sizes_mould_max_height.valueAct}} {{recipe.general_sizes_mould_max_height.unitMeasure}}
- {{recipe.general_sizes_mould_base_height.setpointHMI}} + {{recipe.general_sizes_mould_base_height.valueAct}} {{recipe.general_sizes_mould_base_height.unitMeasure}}
- {{recipe.general_sizes_mould_min_height.setpointHMI}} + {{recipe.general_sizes_mould_min_height.valueAct}} {{recipe.general_sizes_mould_min_height.unitMeasure}}
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue index 9d948be0..86baf461 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/quote-velocita/components/SVG_Components/quote-velocita.vue @@ -4,24 +4,24 @@
- {{recipe.positions_frame_intermediate_position.setpointHMI}} + {{recipe.positions_frame_intermediate_position.valueAct}} {{recipe.positions_frame_intermediate_position.unitMeasure}}
- {{recipe.positions_frame_intermediate_speed.setpointHMI}} + {{recipe.positions_frame_intermediate_speed.valueAct}} {{recipe.positions_frame_intermediate_speed.unitMeasure}}
- {{recipe.positions_frame_lower_position.setpointHMI}} + {{recipe.positions_frame_lower_position.valueAct}} {{recipe.positions_frame_lower_position.unitMeasure}}
- {{recipe.positions_frame_lower_speed.setpointHMI}} + {{recipe.positions_frame_lower_speed.valueAct}} {{recipe.positions_frame_lower_speed.unitMeasure}}
From a5d2323dea38ec67c5e238f8c117d7120b7df974 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 8 Sep 2020 08:41:17 +0200 Subject: [PATCH 2/7] fix combo status --- .../wwwroot/src/app_modules_thermo/components/combo.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.vue index 73d33d87..a41ebdbf 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/combo.vue @@ -1,6 +1,10 @@