diff --git a/Step.Utils/languages/IT.xml b/Step.Utils/languages/IT.xml
index 0e29112f..34a1f4b2 100644
--- a/Step.Utils/languages/IT.xml
+++ b/Step.Utils/languages/IT.xml
@@ -36,6 +36,8 @@
Versione Plc:
Lingua selezionata Cn:
Numero di processi Cn:
+ Time-Stamp Cn:
+ Unità di misura Cn:
Versione Server Step:
Versione Core Step:
Versione Client Step:
diff --git a/Step.Utils/languages/en.xml b/Step.Utils/languages/en.xml
index 60a6b0fa..e7c8687e 100644
--- a/Step.Utils/languages/en.xml
+++ b/Step.Utils/languages/en.xml
@@ -32,10 +32,12 @@
Installation date:
Nc Model:
Nc Serial Num:
- Nc Firmware Vs:
+ Nc Firmware Version:
Plc Version:
Nc Selected Language:
Nc Configured Processes:
+ Nc Time-Stamp:
+ Nc Unit measure:
Step Server Version:
Step Core Version:
Step Client Version:
diff --git a/Step.Utils/languages/zh.xml b/Step.Utils/languages/zh.xml
index 32d1885a..5d1ca4f0 100644
--- a/Step.Utils/languages/zh.xml
+++ b/Step.Utils/languages/zh.xml
@@ -35,6 +35,8 @@
Plc版本:
數控選材語言:
數控配置的過程:
+ 數控時間戳:
+ 數量單位測量:
Step 服務器版本:
Step 核心版本:
Step 客戶端版本:
diff --git a/Step/wwwroot/src/modules/machine-info-dialog.vue b/Step/wwwroot/src/modules/machine-info-dialog.vue
index f7d0a767..0da5e0a0 100644
--- a/Step/wwwroot/src/modules/machine-info-dialog.vue
+++ b/Step/wwwroot/src/modules/machine-info-dialog.vue
@@ -17,10 +17,12 @@
-
+
+
+
-
+
diff --git a/Step/wwwroot/src/services/machineService.ts b/Step/wwwroot/src/services/machineService.ts
index 988d5af2..e4c5e15b 100644
--- a/Step/wwwroot/src/services/machineService.ts
+++ b/Step/wwwroot/src/services/machineService.ts
@@ -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
+
}
diff --git a/Step/wwwroot/src/store/machineInfo.store.ts b/Step/wwwroot/src/store/machineInfo.store.ts
index 23a1cf14..678e4967 100644
--- a/Step/wwwroot/src/store/machineInfo.store.ts
+++ b/Step/wwwroot/src/store/machineInfo.store.ts
@@ -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,