Updated Machine-info dialog. Aligned with tecnical spec.

This commit is contained in:
CMS3762\carminatini
2018-02-06 10:29:12 +01:00
parent 2d653e385f
commit eee45000e8
6 changed files with 19 additions and 7 deletions
+2
View File
@@ -36,6 +36,8 @@
<machineinfo_plc_version>Versione Plc:</machineinfo_plc_version>
<machineinfo_current_language>Lingua selezionata Cn:</machineinfo_current_language>
<machineinfo_processes>Numero di processi Cn:</machineinfo_processes>
<machineinfo_datetime>Time-Stamp Cn:</machineinfo_datetime>
<machineinfo_umeas>Unità di misura Cn:</machineinfo_umeas>
<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>
+3 -1
View File
@@ -32,10 +32,12 @@
<machine_installation_date>Installation date:</machine_installation_date>
<machineinfo_model_nc>Nc Model:</machineinfo_model_nc>
<machineinfo_serial_nc>Nc Serial Num:</machineinfo_serial_nc>
<machineinfo_firmware_version>Nc Firmware Vs:</machineinfo_firmware_version>
<machineinfo_firmware_version>Nc Firmware Version:</machineinfo_firmware_version>
<machineinfo_plc_version>Plc Version:</machineinfo_plc_version>
<machineinfo_current_language>Nc Selected Language:</machineinfo_current_language>
<machineinfo_processes>Nc Configured Processes:</machineinfo_processes>
<machineinfo_datetime>Nc Time-Stamp:</machineinfo_datetime>
<machineinfo_umeas>Nc Unit measure:</machineinfo_umeas>
<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>
+2
View File
@@ -35,6 +35,8 @@
<machineinfo_plc_version>Plc版本:</machineinfo_plc_version>
<machineinfo_current_language>數控選材語言:</machineinfo_current_language>
<machineinfo_processes>數控配置的過程:</machineinfo_processes>
<machineinfo_datetime>數控時間戳:</machineinfo_datetime>
<machineinfo_umeas>數量單位測量:</machineinfo_umeas>
<machineinfo_server_cms_version>Step 服務器版本:</machineinfo_server_cms_version>
<machineinfo_core_cms_version>Step 核心版本:</machineinfo_core_cms_version>
<machineinfo_client_version>Step 客戶端版本:</machineinfo_client_version>
@@ -17,10 +17,12 @@
<label>{{'machineinfo_plc_version' | localize('Versione Plc:')}} <strong>{{machineInfo.plcVersion}}</strong></label>
<label>{{'machineinfo_current_language' | localize('Lingua selezionata Cn:')}} <strong>{{machineInfo.defaultLanguage}}</strong></label>
<label>{{'machineinfo_processes' | localize('Numero di processi Cn:')}} <strong>{{machineInfo.processes}}</strong></label>
<hr/>
<label>{{'machineinfo_umeas' | localize('Unità di misura Cn:')}} <strong>{{machineInfo.unitOfMeasurement}}</strong></label>
<label>{{'machineinfo_datetime' | localize('Time-Stamp Cn:')}} <strong>{{machineInfo.actualDateTime | date('DD-MM-YYYY hh:mm')}}</strong></label>
<hr/>
<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 Client Step:')}} <strong>{{clientVersion}}</strong></label>
<label>{{'machineinfo_client_version' | localize('Versione ClientSt ep:')}} <strong>{{clientVersion}}</strong></label>
</div>
</div>
+6 -4
View File
@@ -28,9 +28,9 @@ export class machineService extends baseRestService {
processes: result.processNumber,
plcVersion: result.plcVersion,
cmsCoreVersion: result.coreLibraryVersion,
cmsServerVersion: result.serverVersion
cmsServerVersion: result.serverVersion,
actualDateTime: result.dateTime,
unitOfMeasurement: result.unitOfMeasurement
} as MachineInfoModel)
@@ -57,5 +57,7 @@ export interface NCInfoModel {
ncModel: string,
plcVersion: string
serverVersion: string,
coreLibraryVersion: string
coreLibraryVersion: string,
unitOfMeasurement: string
}
@@ -31,10 +31,12 @@ export const machineInfoStore = {
machineName: "Poseidon",
installationDate: null,
actualDateTime: null,
ncBrand: null,
ncModel: null,
firmwareVersion: null,
plcVersion: null,
unitOfMeasurement: null,
processes: 0,
cmsServerVersion: null,