diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/ItemProtocol.java index a1ce92a..1fbee0e 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/ItemProtocol.java @@ -11,7 +11,7 @@ import java.util.List; @Data public class ItemProtocol { - /** + /** * 心跳 */ public static String item_heartbeat = "heartbeat"; @@ -21,17 +21,17 @@ public class ItemProtocol { */ public static String item_deviceCode = "deviceCode"; - /** + /** * 工作模式 */ public static String item_mode = "mode"; /** - *作业状态 + * 作业状态 */ public static String item_command = "command"; - /** + /** * 任务号 */ public static String item_task = "task"; @@ -56,7 +56,7 @@ public class ItemProtocol { */ public static String item_y = "y"; - /** + /** * 行走开关信号 */ public static String item_move = "move"; @@ -66,12 +66,12 @@ public class ItemProtocol { */ public static String item_cargoMove = "cargoMove"; - /** + /** * 行走动作信号 */ public static String item_action = "action"; - /** + /** * 行走激光数值 */ public static String item_distancex = "distancex"; @@ -82,88 +82,88 @@ public class ItemProtocol { public static String item_distancey = "distancey"; /** - *载货台超限信号 + * 载货台超限信号 */ public static String item_cargoError = "cargoError"; /** - *货叉探货信号 + * 货叉探货信号 */ public static String item_forkCargo = "forkCargo"; /** - *货叉位置信号 + * 货叉位置信号 */ public static String item_forkLocation = "forkLocation"; /** - *货叉动作信号 + * 货叉动作信号 */ public static String item_forkAction = "forkAction"; - /** + /** * 特殊开关量1 */ public static String item_special1 = "special1"; - /** + /** * 特殊开关量2 */ public static String item_special2 = "special2"; /** - *托盘条码 + * 托盘条码 */ public static String item_trayCode = "trayCode"; - /** + /** * 水箱和消防缓存位有无货 */ public static String item_storage_cache = "storage_cache"; - /** + /** * 速度(转/分钟) */ public static String item_stacker_rpm = "stacker_rpm"; - /** + /** * 电流 */ public static String item_stacker_electricCurrent = "stacker_electric Current"; - /** + /** * 轴运行次数 */ public static String item_stacker_runing_time = "stacker_runing time"; - /** + /** * 轴工作时间(小时) */ public static String item_stacker_workingHours = "stacker_workingHours"; /** - *载货台速度(转/分钟) + * 载货台速度(转/分钟) */ public static String item_cargo_rpm = "cargo_rpm"; /** - *载货台电流 + * 载货台电流 */ public static String item_cargo_electric_Current = "cargo_electric Current"; /** - *载货台轴工作小时数 + * 载货台轴工作小时数 */ public static String item_cargo_workingHours = "cargo_workingHours"; /** - *载货台轴运行次数 + * 载货台轴运行次数 */ public static String item_cargo_runingTimes = "cargo_runingTimes"; /** - *货叉速度(转/分钟 + * 货叉速度(转/分钟 */ public static String item_fork_rpm = "fork_rpm"; /** - *货叉电流 + * 货叉电流 */ public static String item_fork_electric_Current = "fork_electric Current"; /** - *货叉轴工作时间(小时 + * 货叉轴工作时间(小时 */ public static String item_fork_workingHours = "fork_workingHours"; /** - *货叉轴运行次数 + * 货叉轴运行次数 */ public static String item_fork_runingTimes = "fork_runingTimes"; @@ -176,7 +176,7 @@ public class ItemProtocol { * 堆垛机号 */ public static String item_to_device_code = "to_device_code"; - /** + /** * 轴运行次数 */ public static String item_to_command = "to_command"; @@ -184,12 +184,12 @@ public class ItemProtocol { * 物料类型 */ public static String item_to_type = "to_type"; - /** + /** * 任务号 */ public static String item_to_task = "to_task"; /** - *作业排 + * 作业排 */ public static String item_to_z = "to_z"; /** @@ -467,5 +467,4 @@ public class ItemProtocol { public String toString() { return ""; } - } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/impl/MonitorServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/impl/MonitorServiceImpl.java index b721ec8..14a9b09 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/impl/MonitorServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/impl/MonitorServiceImpl.java @@ -20,6 +20,7 @@ import cn.hutool.core.date.DateUtil; import org.nl.common.utils.ElAdminConstant; import org.nl.common.utils.FileUtil; import org.nl.common.utils.StringUtils; +import org.nl.config.language.LangProcess; import org.nl.system.service.monitor.MonitorService; import org.springframework.stereotype.Service; import oshi.SystemInfo; @@ -145,10 +146,10 @@ public class MonitorServiceImpl implements MonitorService { private Map getCpuInfo(CentralProcessor processor) { Map cpuInfo = new LinkedHashMap<>(); cpuInfo.put("name", processor.getProcessorIdentifier().getName()); - cpuInfo.put("package", processor.getPhysicalPackageCount() + "个物理CPU"); - cpuInfo.put("core", processor.getPhysicalProcessorCount() + "个物理核心"); + cpuInfo.put("package", processor.getPhysicalPackageCount() +" " +LangProcess.msg("physical_cpu")); + cpuInfo.put("core", processor.getPhysicalProcessorCount() +" " +LangProcess.msg("physical_core")); cpuInfo.put("coreNumber", processor.getPhysicalProcessorCount()); - cpuInfo.put("logic", processor.getLogicalProcessorCount() + "个逻辑CPU"); + cpuInfo.put("logic", processor.getLogicalProcessorCount() +" " +LangProcess.msg("logical_cpu")); // CPU信息 long[] prevTicks = processor.getSystemCpuLoadTicks(); // 等待1秒... diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss.properties b/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss.properties index 1527671..b7aa0fd 100644 --- a/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss.properties +++ b/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss.properties @@ -4,3 +4,6 @@ device_checkRoute=设备{0}路由已存在,无法操作 device_checkStatus=该设备已有呼叫请求未响应,操作失败\! device_checkrelate=设备{0}关联信息{1}异常\:{2} route_isNull=路由不通 +physical_cpu=个物理CPU +physical_core=个物理核心 +logical_cpu=个逻辑CPU \ No newline at end of file diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_en_US.properties b/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_en_US.properties index 81847a9..7449017 100644 --- a/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_en_US.properties +++ b/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_en_US.properties @@ -4,3 +4,6 @@ device_checkRoute=Device {0} route already exists and cannot be operated device_checkStatus=The device has an unresponsive call request and the operation has failed\! device_checkrelate=Device {0} association information {1} exception\: {2} route_isNull=Routing not working +physical_cpu=Physical CPU +physical_core=Physical core +logical_cpu=Logical CPU \ No newline at end of file diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_in_ID.properties b/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_in_ID.properties index 81ad49d..a7ace04 100644 --- a/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_in_ID.properties +++ b/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_in_ID.properties @@ -4,3 +4,7 @@ device_checkRoute=Jalan perangkat {0} sudah ada dan tidak dapat beroperasi device_checkStatus=Perangkat memiliki permintaan panggilan yang tidak respon dan operasinya gagal\! device_checkrelate=Informasi asosiasi perangkat {0} pengecualian {1}\: {2} route_isNull=Jalan tidak bekerja +physical_cpu=CPU fisik +physical_core=CPU logis +logical_cpu=CPU logis + diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_zh_CN.properties b/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_zh_CN.properties index 1527671..05b5da2 100644 --- a/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_zh_CN.properties +++ b/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_zh_CN.properties @@ -4,3 +4,6 @@ device_checkRoute=设备{0}路由已存在,无法操作 device_checkStatus=该设备已有呼叫请求未响应,操作失败\! device_checkrelate=设备{0}关联信息{1}异常\:{2} route_isNull=路由不通 +physical_cpu=个物理CPU +physical_core=个物理核心 +logical_cpu=个逻辑CPU diff --git a/acs/nladmin-ui/src/components/Breadcrumb/index.vue b/acs/nladmin-ui/src/components/Breadcrumb/index.vue index a5d29ce..515a1ee 100644 --- a/acs/nladmin-ui/src/components/Breadcrumb/index.vue +++ b/acs/nladmin-ui/src/components/Breadcrumb/index.vue @@ -37,7 +37,7 @@ export default { const first = matched[0] if (!this.isDashboard(first)) { - matched = [{ path: '/dashboard', meta: { title: this.$t('common.home') }}].concat(matched) + matched = [{ path: '/dashboard', meta: { title: this.$t('auto.common.home') }}].concat(matched) } this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false) diff --git a/acs/nladmin-ui/src/components/Crud/CRUD.operation.vue b/acs/nladmin-ui/src/components/Crud/CRUD.operation.vue index 0f029f5..17d5d92 100644 --- a/acs/nladmin-ui/src/components/Crud/CRUD.operation.vue +++ b/acs/nladmin-ui/src/components/Crud/CRUD.operation.vue @@ -12,7 +12,7 @@ icon="el-icon-plus" @click="crud.toAdd" > - {{ $t('common.Create') }} + {{ $t('auto.common.Create') }} - {{ $t('common.Update') }} + {{ $t('auto.common.Update') }} - {{ $t('common.Delete') }} + {{ $t('auto.common.Delete') }} {{ $t('common.Export') }} + >{{ $t('auto.common.Export') }} @@ -86,7 +86,7 @@ :indeterminate="allColumnsSelectedIndeterminate" @change="handleCheckAllChange" > - {{ $t('common.SelectAll') }} + {{ $t('auto.common.SelectAll') }} { this.crud.delAllLoading = true diff --git a/acs/nladmin-ui/src/components/Crud/RR.operation.vue b/acs/nladmin-ui/src/components/Crud/RR.operation.vue index 6a94f65..4f0535c 100644 --- a/acs/nladmin-ui/src/components/Crud/RR.operation.vue +++ b/acs/nladmin-ui/src/components/Crud/RR.operation.vue @@ -5,9 +5,9 @@ 重置 --> - {{ $t('common.Query') }} + {{ $t('auto.common.Query') }} - {{ $t('common.Reset') }} + {{ $t('auto.common.Reset') }} diff --git a/acs/nladmin-ui/src/components/Crud/UD.operation.vue b/acs/nladmin-ui/src/components/Crud/UD.operation.vue index 7bd742e..66bf9b6 100644 --- a/acs/nladmin-ui/src/components/Crud/UD.operation.vue +++ b/acs/nladmin-ui/src/components/Crud/UD.operation.vue @@ -1,13 +1,13 @@