From 38311df33a4d6b49ed90b18d6f64f84e989a8c1c Mon Sep 17 00:00:00 2001 From: = Date: Thu, 11 Feb 2021 12:04:26 +0100 Subject: [PATCH 1/4] fix layout sottocofano --- .../components/tables/inputTab/input.vue | 2 + .../components/tables/outputTab/output.vue | 2 + .../sotto-cofano/sotto-cofano.css | 127 ++++++++++++++++++ .../sotto-cofano/sotto-cofano.less | 23 +++- 4 files changed, 150 insertions(+), 4 deletions(-) create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/sotto-cofano.css diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input.vue index cb9b337c..601337a6 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input.vue @@ -23,6 +23,7 @@ :item="item" v-for="(item, index) of pinned" :key="`pinned-${index}`" + :class="`back-${index%2}`" > @@ -40,6 +41,7 @@ :id="`input-${group}`" v-for="(item, index) of items[group].filter(i => i.bank == bankid)" :key="`h-${idx}-${idx2}-${index}`" + :class="`back-${index%2}`" > diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output.vue index 63f889ac..eba76ed1 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output.vue @@ -24,6 +24,7 @@ :item="item" v-for="(item, index) of pinned" :key="`pinned-${index}`" + :class="`back-${index%2}`" > @@ -41,6 +42,7 @@ :id="`output-${group}`" v-for="(item, index) of items[group].filter(i => i.bank == bankid)" :key="`h-${idx}-${idx2}-${index}`" + :class="`back-${index%2}`" > diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/sotto-cofano.css b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/sotto-cofano.css new file mode 100644 index 00000000..f44287ec --- /dev/null +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/sotto-cofano.css @@ -0,0 +1,127 @@ +.main-container { + width: 1920px; + height: 1080px; + display: grid; + grid-template-rows: 193px 1fr; + grid-template-columns: 495px 1fr; +} +.main-container table { + border-collapse: collapse; +} +.main-container table thead { + width: 674px; + height: 34px; + padding: 10px 0 0; + background-color: #4e585e; + border-bottom: 2px solid #bbbcbc; + box-sizing: border-box; +} +.main-container table thead tr th { + background-color: #4e585e; + position: sticky; + top: 0; + height: 12px; + font-size: 14px; + line-height: 34px; + text-align: left; + color: #ffffff; + min-width: 64px; +} +.main-container table .center { + text-align: center; +} +.main-container table tbody { + width: 100%; + border-collapse: collapse; + border-spacing: 0px; + margin: 0; +} +.main-container table tbody td { + height: 64px; + color: #e8e8e8; +} +.main-container table tbody tr.back-0 { + background-color: #747f85; +} +.main-container table tbody tr.back-1 { + background-color: #4e585e; +} +.main-container table tbody::-webkit-scrollbar { + width: 16px; +} +.main-container table tbody::-webkit-scrollbar-track { + margin: 20px 0px; + background-color: #5a656b; + border-radius: 15px; +} +.main-container table tbody::-webkit-scrollbar-thumb { + width: 16px; + background: #3e464a; + border: 4px solid #5a656b; + border-radius: 15px; +} +.main-container .table-container { + height: 700px; +} +.main-container .table-container tr.group-row { + height: 64px; + width: 100%; + background: transparent !important; +} +.main-container .table-container tr.group-row td { + text-align: center; + padding: 20px; + height: auto; + font-size: 16px; + color: #fff; + font-weight: bold; + text-transform: uppercase; +} +.main-container .table-container td.pointer { + text-align: center; +} +.main-container .table-container button.pointer { + width: 48px; + height: 48px; + object-fit: contain; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); + background-image: linear-gradient(to bottom, #818a8f 0%, #42494e 98%); + border: none; +} +.main-container .column-menu { + grid-row: 2; + border-top: #ffffff 2px solid; +} +.main-container .column-page { + grid-row: 2; + grid-column: 2; + width: 1424px; + height: 885px; + border-top: #ffffff 2px solid; + background-color: #657178; + display: grid; + grid-template-columns: repeat(auto-fill, minmax(600px, 1fr)); +} +.main-container .column-page-one-column { + grid-row: 2; + grid-column: 2; + width: 1384px; + height: 885px; + border-top: #ffffff 2px solid; + background-color: #657178; + display: grid; +} +.main-container .column-page-one-column > table { + margin: 20px 0 0 20px; +} +.main-container .one-column-table-container { + height: 750px; + margin: 20px 0 0 20px; +} +.main-container .one-column-table-container > table { + width: -webkit-fill-available; +} +.main-container .pointer { + cursor: pointer; +} diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/sotto-cofano.less b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/sotto-cofano.less index f4f428bb..6fcc40db 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/sotto-cofano.less +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/sotto-cofano.less @@ -11,18 +11,19 @@ table { border-collapse: collapse; + position: relative; + thead { width: 674px; height: 34px; padding: 10px 0 0; - background-color: @fill-under-grey-1-2; - border-bottom: 2px solid @light-grey-blue; box-sizing: border-box; tr { th { background-color: @fill-under-grey-1-2; + // border-bottom: 2px solid @light-grey-blue; position: sticky; top: 0; height: 12px; @@ -31,6 +32,18 @@ text-align: left; color: #ffffff; min-width: 64px; + overflow: hidden; + padding: 0; + + &:after { + content: ""; + position: absolute; + bottom: 0px; + width: 100%; + height: 2px; + background-color: @light-grey-blue; + display: block; + } } } } @@ -50,10 +63,12 @@ color: #e8e8e8; } - tr:nth-child(odd) { + // tr:nth-child(odd), + tr.back-0 { background-color: @fill-under-grey-3-2; } - tr:nth-child(even) { + // tr:nth-child(even), + tr.back-1 { background-color: @fill-under-grey-1-2; } From 0b6c5475bdc152e1bd89bc8a6fb7003fee354a80 Mon Sep 17 00:00:00 2001 From: Thermo_SIM Date: Fri, 12 Feb 2021 16:30:11 +0100 Subject: [PATCH 2/4] Fix Min-Role for using Thermo UnderTheHood --- Thermo.Active.Config/Config/areasConfig.xml | 5 +++++ .../Config/areasConfigValidator.xsd | 10 ++++++++++ Thermo.Active.Config/ServerConfig.cs | 1 + Thermo.Active.Config/ServerConfigController.cs | 4 ++++ .../Migrations/Configuration.cs | 1 + Thermo.Active.Model/Constants.cs | 1 + .../DTOModels/DTOStartupConfigurationModel.cs | 1 + .../WebApi/ConfigurationController.cs | 3 ++- .../assets/icons/png/ico-bt-dark-advanced.png | Bin 0 -> 1562 bytes .../wwwroot/assets/styles/base/buttons.less | 9 ++++++++- .../wwwroot/assets/styles/base/footer.less | 5 ++++- Thermo.Active/wwwroot/src/app.routes.ts | 4 ++-- .../src/app_modules/machine/components/login.ts | 11 ++++++++++- Thermo.Active/wwwroot/src/modules/app-footer.ts | 3 +++ Thermo.Active/wwwroot/src/modules/app-footer.vue | 12 ++++++------ 15 files changed, 58 insertions(+), 12 deletions(-) create mode 100644 Thermo.Active/wwwroot/assets/icons/png/ico-bt-dark-advanced.png diff --git a/Thermo.Active.Config/Config/areasConfig.xml b/Thermo.Active.Config/Config/areasConfig.xml index ae8abc83..434ac522 100644 --- a/Thermo.Active.Config/Config/areasConfig.xml +++ b/Thermo.Active.Config/Config/areasConfig.xml @@ -40,4 +40,9 @@ true false + + true + true + false + \ No newline at end of file diff --git a/Thermo.Active.Config/Config/areasConfigValidator.xsd b/Thermo.Active.Config/Config/areasConfigValidator.xsd index f63495a7..c774ab5b 100644 --- a/Thermo.Active.Config/Config/areasConfigValidator.xsd +++ b/Thermo.Active.Config/Config/areasConfigValidator.xsd @@ -82,6 +82,16 @@ + + + + + + + + + + diff --git a/Thermo.Active.Config/ServerConfig.cs b/Thermo.Active.Config/ServerConfig.cs index e1b1b2e2..83faa38e 100644 --- a/Thermo.Active.Config/ServerConfig.cs +++ b/Thermo.Active.Config/ServerConfig.cs @@ -47,6 +47,7 @@ namespace Thermo.Active.Config public static AreasConfigModel ScadaConfig; public static AreasConfigModel JobEditorConfig; public static AreasConfigModel UsersConfig; + public static AreasConfigModel ThermoHoodConfig; public static List ProductionScadaSchema = new List(); public static List ConfiguredScadaSchema = new List(); diff --git a/Thermo.Active.Config/ServerConfigController.cs b/Thermo.Active.Config/ServerConfigController.cs index e708013b..9fe14bcf 100644 --- a/Thermo.Active.Config/ServerConfigController.cs +++ b/Thermo.Active.Config/ServerConfigController.cs @@ -211,6 +211,10 @@ namespace Thermo.Active.Config case AREAS.USERS_KEY: SetAreaValue(ref UsersConfig, element); break; + + case AREAS.THERMO_HOOD_KEY: + SetAreaValue(ref ThermoHoodConfig, element); + break; } } diff --git a/Thermo.Active.Database/Migrations/Configuration.cs b/Thermo.Active.Database/Migrations/Configuration.cs index 5f8f9cf1..18c06c93 100644 --- a/Thermo.Active.Database/Migrations/Configuration.cs +++ b/Thermo.Active.Database/Migrations/Configuration.cs @@ -52,6 +52,7 @@ namespace Thermo.Active.Database.Migrations 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 = "thermoHoodArea", Area = GENERAL_KEY, Enabled = true, WriteLevelMin = 30, 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.Model/Constants.cs b/Thermo.Active.Model/Constants.cs index fc041bc4..68f76c62 100644 --- a/Thermo.Active.Model/Constants.cs +++ b/Thermo.Active.Model/Constants.cs @@ -263,6 +263,7 @@ namespace Thermo.Active.Model public const string USERS_KEY = "users"; public const string THERMO_KEY = "thermo"; public const string RISC_KEY = "risc"; + public const string THERMO_HOOD_KEY = "thermoHood"; } // Config File Names diff --git a/Thermo.Active.Model/DTOModels/DTOStartupConfigurationModel.cs b/Thermo.Active.Model/DTOModels/DTOStartupConfigurationModel.cs index ed8fd1a3..21a6803f 100644 --- a/Thermo.Active.Model/DTOModels/DTOStartupConfigurationModel.cs +++ b/Thermo.Active.Model/DTOModels/DTOStartupConfigurationModel.cs @@ -12,5 +12,6 @@ namespace Thermo.Active.Model.DTOModels public AreasConfigModel ScadaConfig; public AreasConfigModel JobEditorConfig; public AreasConfigModel UsersConfig; + public AreasConfigModel ThermoHoodConfig; } } diff --git a/Thermo.Active/Controllers/WebApi/ConfigurationController.cs b/Thermo.Active/Controllers/WebApi/ConfigurationController.cs index 35f08dbe..3860c24e 100644 --- a/Thermo.Active/Controllers/WebApi/ConfigurationController.cs +++ b/Thermo.Active/Controllers/WebApi/ConfigurationController.cs @@ -27,7 +27,8 @@ namespace Thermo.Active.Controllers.WebApi ReportConfig = ReportConfig, UtilitiesConfig = UtilitiesConfig, JobEditorConfig = JobEditorConfig, - UsersConfig = UsersConfig + UsersConfig = UsersConfig, + ThermoHoodConfig = ThermoHoodConfig }; return Ok(startupConfiguration); diff --git a/Thermo.Active/wwwroot/assets/icons/png/ico-bt-dark-advanced.png b/Thermo.Active/wwwroot/assets/icons/png/ico-bt-dark-advanced.png new file mode 100644 index 0000000000000000000000000000000000000000..811f63e4a74866c68335aa06b1f0f2540cebcddd GIT binary patch literal 1562 zcmV+#2IcvQP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR919iRgM1ONa40RR919RL6T0N#5RQ2+o1gh@m}R7ee#S6ysWMHHTyd-wLP z%We_3v;x{+6x;G*kYM>Sm>?RX4{Fpz9`wN^XC0=6rL`d^5XC$vj0$X&g*V z-%O-z<4m?i&Bz+VA{OQHG-u@Gx+T~2QcAt~groDBgmVrIWNznD9@F!qmPzb7LwAYi z^QYF{5c{g=s9~@gV`W2<%H^dF0UaS}p@B`XSOJ&yXPh}TZE)=vJ6!AEqViOV?A7`WfPqF^H$ozA+C7ZxP+${;^bgM5D1`SHY%RP4 zI8Z~FVG;^W35Ed#6|TfapAsxT6QpNjt93lcR0{9u{{slwjE!E*4f;YNj|yZ8iN%3c zie#uUV@iB3sV~KQxCII%VEw7=DCow*re;->8RyK-kB^RJr}I5|6UArY>jiM4BP}hhSvXuZI*r4S5fCsN8$foxA_f~|ihQ!a#2D;;e{xLuA zHVB?48~{-V%?EJqCg0fA`@1SB-dP2R8XHu_wN2yRyIbv7FurC2+1Q#mdt_X$&P`>1 zfmvOp;CP0U6X_l-nZ63Bl_(Nj7|pMQ^W~6<5mXkyPy>IQc)iuOp@Ck|D~eYJ9qSrs z7WQ>s4{AN~Z~C0%t}P2$YK<9(&9TQWrgMr!ia=;fE~iTYF=iPkWEzKDmT54pmoBbv z=DzC$W%Uc?1uf9_9i_SBB(JNFA$^e1TKj}9=pC2W>sY9ZpofMsD{_?OocrV@r4O1q#0M)cp+ZsHAl{U+()M<-8k!;ysl@ehQs< zHB{(HE=qKM{n57Z1yS=S&hrjj7q~KcxTmpSKiTy{ES{*3YEX4$^aG*3iSTi7^6W*x zGXf6w4P@Si&Z{9rZHsd`_VLPf4V5$;rlzS;~2Tf-bf^|70NJF2?xGhrBC<6pkankR-j0DWzdG5 zd9iD)4SHP>bYm->GN}0w)WM~MdQgr%@Xfy|vOKYnP_`YC%IHO?byhkfa7o*gyOZ5! zG*-u7j!^LrR00btZ9_bM-xBo&j%x!Vp`itTBf-Rh%^mTJ+K0OD&-Ayj=|{CMosW>T zX9Zm(4Fo>7Wu?`k$5DTG+Unb-(Ky!t0Qq#+oc-frm#|4&<;w64x}q1 z!+K2Xhr8;|fQ_w8isdcyUaiB(K&e~81AxE^oDzeHKT5}I*;Sd&HknEapa`J^EhG|( zIwN^f_2&MpI@8&f;7d~aUnY~c*358bF-cA{CQshfRoA;}p8sY30}T!*e4TZSga7~l M07*qoM6N<$f+Io4wEzGB literal 0 HcmV?d00001 diff --git a/Thermo.Active/wwwroot/assets/styles/base/buttons.less b/Thermo.Active/wwwroot/assets/styles/base/buttons.less index 59e126d7..7a469b1b 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/buttons.less +++ b/Thermo.Active/wwwroot/assets/styles/base/buttons.less @@ -139,7 +139,7 @@ button.btn.btn-success[disabled] { } button.under { - min-width: 118px; + min-width: 140px; height: 45px; object-fit: contain; border-radius: 100px; @@ -154,6 +154,13 @@ button.under { font-weight: 500; font-size: 18px; + &.thermoHood{ + min-width:45px; + max-width: 45px; + margin-right: 15px; + margin-left: 10px; + } + img { max-width: 178px; max-height: 45px; diff --git a/Thermo.Active/wwwroot/assets/styles/base/footer.less b/Thermo.Active/wwwroot/assets/styles/base/footer.less index 8aa6f1ac..af808782 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/footer.less +++ b/Thermo.Active/wwwroot/assets/styles/base/footer.less @@ -7,7 +7,7 @@ @footer-button-halfball-size: @footer-button-ball-size / 2; @footer-button-margin: 19px; @footer-padding: 0 0 9px 8px; -@footer-machine-area-size: 300px; +@footer-machine-area-size: 390px; footer { position: absolute; @@ -29,6 +29,9 @@ footer { img { margin: 0px 5px; } + .noThermoHood{ + min-width: 45px; + } } .container { diff --git a/Thermo.Active/wwwroot/src/app.routes.ts b/Thermo.Active/wwwroot/src/app.routes.ts index f5c4042f..2b040d00 100644 --- a/Thermo.Active/wwwroot/src/app.routes.ts +++ b/Thermo.Active/wwwroot/src/app.routes.ts @@ -1,5 +1,5 @@ import { - // Home, + Home, // CreateMaintenance, // SoftKeysPrefered, // CreateQueue, @@ -34,7 +34,7 @@ import { routes as users } from "./app_modules/users/route"; //import { routes as ioRoutes } from "@/app_modules_thermo/sotto-cofano/route"; export let routes = [ - { path: "", component: productionRoutes[0].component, name: productionRoutes[0].name, meta: { title: "Dashboard" } }, + { path: "", component: Home, name: "home", meta: { title: "Dashboard" } }, { path: "/utilities", component: Utilities, meta: { title: "Utilities", area: "utilities" } }, // { path: "/card-utilities", component: CardUtilities, meta: { title: "Card-Utilities", area: "card-utilities" } }, // { path: "/card-tool-depot", component: CardToolDepot, meta: { title: "Card-Tool-Depot", area: "card-tool-depot" } }, 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 f20ac9a6..1cc8fed6 100644 --- a/Thermo.Active/wwwroot/src/app_modules/machine/components/login.ts +++ b/Thermo.Active/wwwroot/src/app_modules/machine/components/login.ts @@ -6,7 +6,7 @@ import { Factory, messageService, awaiter } from "@/_base"; import { loginService } from "@/app.modules"; import { DataService } from 'src/services/dataService'; import iziToast, { IziToastSettings } from "izitoast"; -import { store, machineStatusActions } from "@/store"; +import { store, machineStatusActions,appModelActions } from "@/store"; @Component({ name: "login", components: { modal: Modal } }) export default class Login extends Vue { @@ -31,6 +31,10 @@ export default class Login extends Vue { if(!this.checkIfUserIsAuthorized()){ userNotAuthorized = true; } + + if(!this.checkIfUserIsAuthorizedToThermoHood()){ + appModelActions.MainViewLiftDown(this.$store); + } }).catch(() => { this.logginIn = false; this.hasError = !service.isAuthenticated; @@ -67,6 +71,11 @@ export default class Login extends Vue { return machineStatusActions.isAreaVisible(store, this.URLS_TO_FUNCTIONS_BINDING[this.$route.path]); } + checkIfUserIsAuthorizedToThermoHood(): boolean { + return machineStatusActions.isAreaVisible(store, "thermoHood"); + } + + URLS_TO_FUNCTIONS_BINDING = { "/production": "production", "/tooling": "tooling", diff --git a/Thermo.Active/wwwroot/src/modules/app-footer.ts b/Thermo.Active/wwwroot/src/modules/app-footer.ts index 795d1dfb..0dd95610 100644 --- a/Thermo.Active/wwwroot/src/modules/app-footer.ts +++ b/Thermo.Active/wwwroot/src/modules/app-footer.ts @@ -58,6 +58,9 @@ export default class AppFooter extends Vue { return machineStatusActions.isAreaVisible(store, areaname); } + isThermoHoodVisible() { + return machineStatusActions.isAreaVisible(store, "thermoHood"); + } public getUtilities(): Array { if (typeof cmsClient != "undefined") return JSON.parse(cmsClient.getConfiguredProcessesInMainMenu()); diff --git a/Thermo.Active/wwwroot/src/modules/app-footer.vue b/Thermo.Active/wwwroot/src/modules/app-footer.vue index 2f35238f..d3cff980 100644 --- a/Thermo.Active/wwwroot/src/modules/app-footer.vue +++ b/Thermo.Active/wwwroot/src/modules/app-footer.vue @@ -95,15 +95,15 @@
- + > + +
- - + + diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input-row-item.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input-row-item.vue index 156734e8..7a688c9d 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input-row-item.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/inputTab/input-row-item.vue @@ -5,7 +5,7 @@ { + await underTheHoodService.forceChannel(this.group, this.item, value); + }, null, "modal"); + }*/ } async reset() { diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output-row-item.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output-row-item.vue index da7ae59e..11d20dfc 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output-row-item.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/InputOutput/components/tables/outputTab/output-row-item.vue @@ -5,7 +5,7 @@ Date: Sat, 13 Feb 2021 18:07:36 +0100 Subject: [PATCH 4/4] Fix Style + Modal info resistenze --- .../wwwroot/assets/styles/base/modals.less | 50 +++++++++++ Thermo.Active/wwwroot/assets/styles/style.css | 41 ++++++++++ Thermo.Active/wwwroot/src/App.ts | 3 +- Thermo.Active/wwwroot/src/app.modules.ts | 4 +- .../tables/assi-table/assi-table.vue | 2 +- .../log-ciclo-automatico-table.vue | 2 +- .../log-misurazioni-table.vue | 2 +- .../tables/riscaldi-table/riscaldi-table.css | 82 +++++++++++++++++++ .../tables/riscaldi-table/riscaldi-table.ts | 13 +++ .../tables/riscaldi-table/riscaldi-table.vue | 4 +- .../sotto-cofano/sotto-cofano.css | 10 ++- .../sotto-cofano/sotto-cofano.less | 18 +++- .../src/components/modals/ModalHelper.ts | 8 ++ .../src/modules/base-components/index.ts | 4 +- .../base-components/modal-info-resistance.ts | 39 +++++++++ .../base-components/modal-info-resistance.vue | 54 ++++++++++++ 16 files changed, 322 insertions(+), 14 deletions(-) create mode 100644 Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Riscaldi/components/tables/riscaldi-table/riscaldi-table.css create mode 100644 Thermo.Active/wwwroot/src/modules/base-components/modal-info-resistance.ts create mode 100644 Thermo.Active/wwwroot/src/modules/base-components/modal-info-resistance.vue diff --git a/Thermo.Active/wwwroot/assets/styles/base/modals.less b/Thermo.Active/wwwroot/assets/styles/base/modals.less index 7ac39fcb..31cd3695 100644 --- a/Thermo.Active/wwwroot/assets/styles/base/modals.less +++ b/Thermo.Active/wwwroot/assets/styles/base/modals.less @@ -45,6 +45,8 @@ @modal-history-maintenance-height: 700px; @modal-create-user-width: 752px; @modal-create-user-height: 550px; +@modal-resistance-info-width: 450px; +@modal-resistance-info-height: 650px; @modal-machine-height: 730px; @modal-machine-width: 600px; @modal-machine-top: @modal-machine-height / 2; @@ -3904,6 +3906,54 @@ justify-content: flex-end; } } +.@{modal}.info-resistance { + width: @modal-resistance-info-width; + height: @modal-resistance-info-height; + top: calc(~"50%"- @modal-resistance-info-height / 2); + left: calc(~"50%"- @modal-resistance-info-width / 2); + + header { + background-color: @color-darkish-blue; + color: @color-white; + font-family: @font-family; + font-weight: 600; + font-size: 24px; + text-align: left; + padding: 0px 23px; + + } + + .details { + text-align: center; + color: @color-greyish-brown; + + .status{ + display: flex; + flex-flow: row; + align-items: center; + justify-content: flex-end; + + strong { + font-size: 2.5em; + margin-right: 100px; + margin-left: 10px; + width: 10%; + + .fa-check{ + color: #90c03d; + } + .fa-exclamation-triangle{ + color: #d0021b; + } + } + } + + &>hr { + border: none; + margin-bottom: 40px; + } + } +} .@{modal}.create-user { width: @modal-create-user-width; diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css index a4b86cdd..d15ea675 100644 --- a/Thermo.Active/wwwroot/assets/styles/style.css +++ b/Thermo.Active/wwwroot/assets/styles/style.css @@ -3998,6 +3998,47 @@ article .box .body { align-items: center; justify-content: flex-end; } +.modal.info-resistance { + width: 450px; + height: 650px; + top: calc(50%-650px / 2); + left: calc(50%-450px / 2); +} +.modal.info-resistance header { + background-color: #002680; + color: #fff; + font-family: 'Work Sans', sans-serif; + font-weight: 600; + font-size: 24px; + text-align: left; + padding: 0px 23px; +} +.modal.info-resistance .details { + text-align: center; + color: #4b4b4b; +} +.modal.info-resistance .details .status { + display: flex; + flex-flow: row; + align-items: center; + justify-content: flex-end; +} +.modal.info-resistance .details .status strong { + font-size: 2.5em; + margin-right: 100px; + margin-left: 10px; + width: 10%; +} +.modal.info-resistance .details .status strong .fa-check { + color: #90c03d; +} +.modal.info-resistance .details .status strong .fa-exclamation-triangle { + color: #d0021b; +} +.modal.info-resistance .details > hr { + border: none; + margin-bottom: 40px; +} .modal.create-user { width: 752px; height: 550px; diff --git a/Thermo.Active/wwwroot/src/App.ts b/Thermo.Active/wwwroot/src/App.ts index e197bd73..a055c325 100644 --- a/Thermo.Active/wwwroot/src/App.ts +++ b/Thermo.Active/wwwroot/src/App.ts @@ -283,10 +283,11 @@ export default class app extends Vue { } } applyViewPosition(position, removetransition?) { + /* NO HANDLER (this.$refs["main-view"] as any).style = (this.$refs["main-view-handler"] as any).style = "transform:translateY(" + position + "px);" + - (removetransition ? "transition:unset;" : ""); + (removetransition ? "transition:unset;" : "");*/ } }; diff --git a/Thermo.Active/wwwroot/src/app.modules.ts b/Thermo.Active/wwwroot/src/app.modules.ts index 31b2320d..587820ca 100644 --- a/Thermo.Active/wwwroot/src/app.modules.ts +++ b/Thermo.Active/wwwroot/src/app.modules.ts @@ -35,6 +35,7 @@ import ModalMissingTools from "./modules/base-components/modal-missing-tools.vue import ProgramManagement from "./modules/program-management.vue"; import ZoomImage from './modules/base-components/zoom-image.vue'; import ModalReportSelectColumn from './modules/base-components/modal-report-select-column.vue'; +import ModalInfoResistance from "./modules/base-components/modal-info-resistance.vue"; export { @@ -56,7 +57,8 @@ export { ZoomImage, ModalCreateUser, ModalPasswordUser, - ModalRoleUser + ModalRoleUser, + ModalInfoResistance } diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.vue index 9abfe243..9605e0f9 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.vue @@ -13,7 +13,7 @@ - +