diff --git a/Step.Utils/languages/IT.xml b/Step.Utils/languages/IT.xml index 110b2e07..4974ef84 100644 --- a/Step.Utils/languages/IT.xml +++ b/Step.Utils/languages/IT.xml @@ -55,6 +55,7 @@ Versione Server Step: Versione Core Step: Versione Client Step: + Formato delle date Step: Rpm diff --git a/Step.Utils/languages/en.xml b/Step.Utils/languages/en.xml index d091de88..91a2f784 100644 --- a/Step.Utils/languages/en.xml +++ b/Step.Utils/languages/en.xml @@ -56,6 +56,7 @@ Step Server Version: Step Core Version: Step Client Version: + Step Data Format: Rpm diff --git a/Step/wwwroot/assets/styles/base/modals.less b/Step/wwwroot/assets/styles/base/modals.less index 7f3bb9cd..619b5f4a 100644 --- a/Step/wwwroot/assets/styles/base/modals.less +++ b/Step/wwwroot/assets/styles/base/modals.less @@ -26,7 +26,7 @@ sans-serif; @modal-login-left: @modal-login-width /2; @modal-create-maintenance-width: 896px; @modal-create-maintenance-height: 696px; -@modal-machine-height: 700px; +@modal-machine-height: 730px; @modal-machine-width: 600px; @modal-machine-top: @modal-machine-height /2; @modal-machine-left: @modal-machine-width /2; diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index 15f9913d..d32bc09f 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -77,8 +77,8 @@ } .modal.machine-info { width: 600px; - height: 700px; - top: calc(50% - 350px); + height: 730px; + top: calc(50% - 365px); left: calc(50% - 300px); } .modal.machine-info header { diff --git a/Step/wwwroot/src/modules/machine-info-dialog.vue b/Step/wwwroot/src/modules/machine-info-dialog.vue index 4427c134..d1351699 100644 --- a/Step/wwwroot/src/modules/machine-info-dialog.vue +++ b/Step/wwwroot/src/modules/machine-info-dialog.vue @@ -26,7 +26,8 @@
- + +
@@ -37,6 +38,7 @@ import { Modal, ModalHelper } from "./base-components"; import { machineService } from "src/services/machineService"; import { Factory, MessageService } from "src/_base"; +import moment from "moment"; export default { components: { modal: Modal }, @@ -59,6 +61,9 @@ export default { ncReady() { return this.$store.state.machineStatus.ncReady; }, + getDateFormat() { + return moment()._locale._longDateFormat.L; + }, brandNc() { if (this.machineInfo.isSiemens) return "Siemens"; if (this.machineInfo.isFanuc) return "Fanuc";