Added date-format in machine info modal

This commit is contained in:
Nicola Carminati
2018-06-27 12:29:21 +02:00
parent 8825ad64f5
commit d81ebae439
5 changed files with 11 additions and 4 deletions
+1
View File
@@ -55,6 +55,7 @@
<machineinfo_server_cms_version>Versione Server Step:</machineinfo_server_cms_version>
<machineinfo_core_cms_version>Versione Core Step:</machineinfo_core_cms_version>
<machineinfo_client_version>Versione Client Step:</machineinfo_client_version>
<machineinfo_dateformat>Formato delle date Step:</machineinfo_dateformat>
<!-- Head Info -->
<head_label_rpm>Rpm</head_label_rpm>
+1
View File
@@ -56,6 +56,7 @@
<machineinfo_server_cms_version>Step Server Version:</machineinfo_server_cms_version>
<machineinfo_core_cms_version>Step Core Version:</machineinfo_core_cms_version>
<machineinfo_client_version>Step Client Version:</machineinfo_client_version>
<machineinfo_dateformat>Step Data Format:</machineinfo_dateformat>
<!-- Head Info -->
<head_label_rpm>Rpm</head_label_rpm>
+1 -1
View File
@@ -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;
+2 -2
View File
@@ -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 {
@@ -26,7 +26,8 @@
<div class="details">
<label>{{'machineinfo_server_cms_version' | localize('Versione Server Step:')}} <strong>{{machineInfo.cmsServerVersion}}</strong></label>
<label>{{'machineinfo_core_cms_version' | localize('Versions Core Step:')}} <strong>{{machineInfo.cmsCoreVersion}}</strong></label>
<label>{{'machineinfo_client_version' | localize('Versione ClientSt ep:')}} <strong>{{clientVersion}}</strong></label>
<label>{{'machineinfo_client_version' | localize('Versione Client Step:')}} <strong>{{clientVersion}}</strong></label>
<label>{{'machineinfo_dateformat' | localize('Formato delle date Step:')}} <strong>{{getDateFormat}}</strong></label>
</div>
</div>
@@ -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";