diff --git a/Thermo.Active.Database/Migrations/Configuration.cs b/Thermo.Active.Database/Migrations/Configuration.cs index 18c06c93..1324a84c 100644 --- a/Thermo.Active.Database/Migrations/Configuration.cs +++ b/Thermo.Active.Database/Migrations/Configuration.cs @@ -45,14 +45,17 @@ namespace Thermo.Active.Database.Migrations // Main Areas new FunctionAccessModel() { Name = "productionArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 20, ReadLevelMin = 1, PlcId = 0 }, - new FunctionAccessModel() { Name = "reportArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 30, ReadLevelMin = 1, PlcId = 0 }, new FunctionAccessModel() { Name = "alarmsArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 0 }, new FunctionAccessModel() { Name = "maintenanceArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 0 }, new FunctionAccessModel() { Name = "scadaArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 0 }, new FunctionAccessModel() { Name = "usersArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 30, ReadLevelMin = 1, PlcId = 0 }, - new FunctionAccessModel() { Name = "jobeditorArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 20, ReadLevelMin = 1, PlcId = 0 }, new FunctionAccessModel() { Name = "utilitiesArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 0 }, + new FunctionAccessModel() { Name = "setupArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 20, ReadLevelMin = 1, PlcId = 0 }, + new FunctionAccessModel() { Name = "progrpreriscArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 20, ReadLevelMin = 1, PlcId = 0 }, new FunctionAccessModel() { Name = "thermoHoodArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 30, ReadLevelMin = 1, PlcId = 0 }, + new FunctionAccessModel() { Name = "modal-load-programArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 20, ReadLevelMin = 1, PlcId = 0 }, + + // thermo functions new FunctionAccessModel() { Name = RECIPE_MANAGER, Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 1, ReadLevelMin = 1, PlcId = 0 } diff --git a/Thermo.Active/wwwroot/assets/icons/png/termo-inspection.png b/Thermo.Active/wwwroot/assets/icons/png/termo-inspection.png new file mode 100644 index 00000000..af8d440d Binary files /dev/null and b/Thermo.Active/wwwroot/assets/icons/png/termo-inspection.png differ diff --git a/Thermo.Active/wwwroot/assets/styles/base/processo.less b/Thermo.Active/wwwroot/assets/styles/base/processo.less index ea18b250..a212516d 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/processo.less +++ b/Thermo.Active/wwwroot/assets/styles/base/processo.less @@ -22,10 +22,9 @@ .tab-header { width: 70%; display: grid; - grid-template-columns: repeat(auto-fit, minmax(160px, 200px)); + display: flex; align-items: center; justify-content: flex-end; - grid-column-gap: 10px; .totp{ margin-right: 10px; @@ -36,6 +35,7 @@ border-radius: 2px; background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%); height: 48px; + width: 150px; span { margin: auto; @@ -54,6 +54,8 @@ justify-self: flex-end; font-size: 32px; line-height: 1; + width: 150px; + margin-left: 30px; div{ display: flex; justify-content: center; diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index 0b51d290..6e9f8bef 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -5463,10 +5463,9 @@ article .box .body { .modal.processo-info header .tab-header { width: 70%; display: grid; - grid-template-columns: repeat(auto-fit, minmax(160px, 200px)); + display: flex; align-items: center; justify-content: flex-end; - grid-column-gap: 10px; } .modal.processo-info header .tab-header .totp { margin-right: 10px; @@ -5476,6 +5475,7 @@ article .box .body { border-radius: 2px; background-image: linear-gradient(to bottom, #f1f1f1 0%, #bbbcbc 98%); height: 48px; + width: 150px; } .modal.processo-info header .tab-header button span { margin: auto; @@ -5491,6 +5491,8 @@ article .box .body { justify-self: flex-end; font-size: 32px; line-height: 1; + width: 150px; + margin-left: 30px; } .modal.processo-info header .tab-header label div { display: flex; diff --git a/Thermo.Active/wwwroot/src/@types/prod.cs.d.ts b/Thermo.Active/wwwroot/src/@types/prod.cs.d.ts index a89fae0f..e174c3a9 100644 --- a/Thermo.Active/wwwroot/src/@types/prod.cs.d.ts +++ b/Thermo.Active/wwwroot/src/@types/prod.cs.d.ts @@ -14,6 +14,7 @@ declare module Prod { vacuumReadVal: number; mouldEnergyOUT: number;// Generated by https://quicktype.io isScrap: boolean; + thermoImage: string; } interface IProdPanel { diff --git a/Thermo.Active/wwwroot/src/App.vue b/Thermo.Active/wwwroot/src/App.vue index 9730b272..32fdca0f 100644 --- a/Thermo.Active/wwwroot/src/App.vue +++ b/Thermo.Active/wwwroot/src/App.vue @@ -31,6 +31,7 @@ + diff --git a/Thermo.Active/wwwroot/src/app_modules/machine/components/login.ts b/Thermo.Active/wwwroot/src/app_modules/machine/components/login.ts index 1cc8fed6..2c9899d2 100644 --- a/Thermo.Active/wwwroot/src/app_modules/machine/components/login.ts +++ b/Thermo.Active/wwwroot/src/app_modules/machine/components/login.ts @@ -67,7 +67,7 @@ export default class Login extends Vue { }) } - checkIfUserIsAuthorized(): boolean { + checkIfUserIsAuthorized(): boolean { return machineStatusActions.isAreaVisible(store, this.URLS_TO_FUNCTIONS_BINDING[this.$route.path]); } @@ -75,17 +75,14 @@ export default class Login extends Vue { return machineStatusActions.isAreaVisible(store, "thermoHood"); } - URLS_TO_FUNCTIONS_BINDING = { "/production": "production", - "/tooling": "tooling", - "/report": "report", "/alarms": "alarms", "/maintenance": "maintenance", - "/scada": "scada", "/users": "users", - "/jobeditor": "job-editor", - "/utilities": "utilities" + "/setup": "setup", + "/progrprerisc": "progrprerisc", + "/modal-load-program": "modal-load-program", } } diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts index 4eb274f3..daae7f41 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.ts @@ -6,6 +6,8 @@ import Slider from "@/app_modules_thermo/components/slider.vue"; @Component({name:"scheda",components: { slider:Slider} }) export default class Scheda extends Vue{ + @Prop({}) + id:string; @Prop({}) portata:Recipe.IValue; @Prop({}) diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue index a10c278b..c79e3966 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/scheda.vue @@ -4,7 +4,7 @@ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.ts index d0cacea4..8b15a75a 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.ts @@ -27,7 +27,19 @@ export default class SVGChart extends Vue { @Prop({ default: null }) maxY: number; - step: number = 50; + step: number = 50; + + @Prop({ default: function () { return [] } }) + ids: string[] + + click(idx){ + if(idx > this.ids.length -1 ) + return + var elem = document.getElementById(this.ids[idx]); + if(elem){ + elem.focus(); + } + } startXOf(barindex: number) { return this.bars.slice(0, barindex).reduce((p, c) => c.width + p, 0); diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.vue index 13d5b1e7..9fc51e3c 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/svgChart.vue @@ -81,6 +81,9 @@ :height="scaleY(b.height)" :fill="b.backgroundColor" :stroke="b.borderColor" + stroke-width="6" + @click="click(idx)" + class="pointer" />
@@ -54,6 +57,7 @@ :bars="bars" :lines="lines" :unitx="'s'" + :ids="['upperplate_air_1_chart_setpointy','upperplate_air_2_chart_setpointy','upperplate_air_3_chart_setpointy']" :max-y="Math.max(recipe.upperplate_air_1_chart_setpointy.range.max , recipe.upperplate_air_2_chart_setpointy.range.max ,recipe.upperplate_air_3_chart_setpointy.range.max)" :max-x="Math.max(recipe.upperplate_air_1_chart_setpointx.setpointHMI+ recipe.upperplate_air_2_chart_setpointx.setpointHMI+recipe.upperplate_air_3_chart_setpointx.setpointHMI, recipe.upperplate_air_max_time.setpointHMI)" > diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/estrazione-controstampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/estrazione-controstampo.ts index f06c46c0..16237c65 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/estrazione-controstampo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/estrazione-controstampo.ts @@ -15,7 +15,7 @@ export default class EstrazioneControstampo extends Vue { return [ { backgroundColor: "#b3dbff", - borderColor: "#848484", + borderColor: "#9e9e9e", height: this.recipe.upperplate_extraction_1_chart_setpointy.setpointHMI, width: this.recipe.upperplate_extraction_1_chart_setpointx.setpointHMI } 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 126ff520..7f4c30e6 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 @@ -36,12 +36,14 @@ class="box-500 color_3" :portata="recipe.upperplate_extraction_1_chart_setpointy" :durata="recipe.upperplate_extraction_1_chart_setpointx" + id="upperplate_extraction_1_chart_setpointy" >
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/vuoto-controstampo.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/vuoto-controstampo.ts index 5e9a6a2f..6f92da94 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/vuoto-controstampo.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/controstampo_setup/components/base-components/vuoto-controstampo.ts @@ -14,20 +14,20 @@ export default class VuotoControstampo extends Vue { get bars() { return [ { - backgroundColor: "#fff", - borderColor: "#848484", + backgroundColor: "#ededed", + borderColor: "#9e9e9e", height: this.recipe.upperplate_vacuum_1_chart_setpointy.setpointHMI, width: this.recipe.upperplate_vacuum_1_chart_setpointx.setpointHMI }, { backgroundColor: "#e5f3ff", - borderColor: "#848484", + borderColor: "#79a9d2", height: this.recipe.upperplate_vacuum_2_chart_setpointy.setpointHMI, width: this.recipe.upperplate_vacuum_2_chart_setpointx.setpointHMI }, { backgroundColor: "#b3dbff", - borderColor: "#848484", + borderColor: "#538fc6", height: this.recipe.upperplate_vacuum_3_chart_setpointy.setpointHMI, width: this.recipe.upperplate_vacuum_3_chart_setpointx.setpointHMI } 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 968e3dfb..e0dea441 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 @@ -36,16 +36,19 @@ class="box-500 mb-10" :portata="recipe.upperplate_vacuum_1_chart_setpointy" :durata="recipe.upperplate_vacuum_1_chart_setpointx" + id="upperplate_vacuum_1_chart_setpointy" >
@@ -53,6 +56,7 @@ line-bar-color="#848484" :bars="bars" :lines="lines" + :ids="['upperplate_vacuum_1_chart_setpointy','upperplate_vacuum_2_chart_setpointy','upperplate_vacuum_3_chart_setpointy']" :max-y="Math.max(recipe.upperplate_vacuum_1_chart_setpointy.range.max, recipe.upperplate_vacuum_2_chart_setpointy.range.max,recipe.upperplate_vacuum_3_chart_setpointy.range.max)" :max-x="Math.max(recipe.upperplate_vacuum_1_chart_setpointx.setpointHMI +recipe.upperplate_vacuum_2_chart_setpointx.setpointHMI +recipe.upperplate_vacuum_3_chart_setpointx.setpointHMI,recipe.upperplate_vacuum_max_time.setpointHMI)" > diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts index 133b99d6..9dcc8f5a 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-principale.ts @@ -23,7 +23,7 @@ export default class EstrazionePrincipale extends Vue { return [ { backgroundColor: "#b3dbff", - borderColor: "#848484", + borderColor: "#538fc6", height: this.recipe.extraction_main_1_chart_setpointy.setpointHMI, width: this.recipe.extraction_main_1_chart_setpointx.setpointHMI } 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 b2f23f22..70a0d850 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 @@ -40,12 +40,14 @@ class="box-500 color_3" :portata="recipe.extraction_main_1_chart_setpointy" :durata="recipe.extraction_main_1_chart_setpointx" + id="extraction_main_1_chart_setpointy" >
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-secondaria.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-secondaria.ts index 2e3ec00b..2c632e95 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-secondaria.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/estrazione/components/base-components/estrazione-secondaria.ts @@ -23,7 +23,7 @@ export default class EstrazioneSecondaria extends Vue { return [ { backgroundColor: "#b3dbff", - borderColor: "#848484", + borderColor: "#538fc6", height: this.recipe.extraction_aux_1_chart_setpointy.setpointHMI, width: this.recipe.extraction_aux_1_chart_setpointx.setpointHMI } 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 c85cf350..db224179 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 @@ -36,12 +36,14 @@ class="box-500 color_3" :portata="recipe.extraction_aux_1_chart_setpointy" :durata="recipe.extraction_aux_1_chart_setpointx" + id="extraction_aux_1_chart_setpointy" >
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts index 426ff6ce..2633b997 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/imbutitura/show-imbutitura-info.ts @@ -30,7 +30,7 @@ export default class ShowImbutituraInfo extends Vue { return [ { backgroundColor: "#b3dbff", - borderColor: "#848484", + borderColor: "#538fc6", height: this.recipe.drawing_1_chart_setpointy.setpointHMI, width: this.recipe.drawing_1_chart_setpointx.setpointHMI } 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 ec52ad4e..fcd37fc2 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 @@ -71,12 +71,14 @@ class="box-500 color_3" :portata="recipe.drawing_1_chart_setpointy" :durata="recipe.drawing_1_chart_setpointx" + id="drawing_1_chart_setpointy" >
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-inferiore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-inferiore.vue index 86b68da9..bcd441f6 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-inferiore.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-inferiore.vue @@ -52,8 +52,7 @@ \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue index c037a3ab..50b7d0b3 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/SVG-termo-superiore.vue @@ -52,8 +52,7 @@ \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/termoChart.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/termoChart.vue index a3483f80..4ed808a5 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/termoChart.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/pirometro/components/base-components/SVG_Components/termoChart.vue @@ -1,6 +1,6 @@