From 06419a7d6f767b36a2e1ebede66fffe7db58e273 Mon Sep 17 00:00:00 2001
From: pengm <674192343@qq.com>
Date: Fri, 19 Sep 2025 10:01:47 +0800
Subject: [PATCH] 1.修复计划任务的转产,设备停机状态告知翻译
---
src/mes/indexMes/index.js | 36 +++++++++++++++++++++++++-----------
src/mes/scheduledTasks/machineTasks/index.js | 10 ++++++----
2 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/src/mes/indexMes/index.js b/src/mes/indexMes/index.js
index f9cb7d8..2e9b52b 100644
--- a/src/mes/indexMes/index.js
+++ b/src/mes/indexMes/index.js
@@ -688,7 +688,21 @@ const MachineMessageComponent = ({ e , shutDown, props }) => {
const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消');
const confirmState = commonFunc.showLocalMessage(props, 'confirmState', '确认退出该状态?');
- const handleMenuClose = () => {
+ const equipmentShutdown = commonFunc.showLocalMessage(props, 'equipmentShutdown', '设备停机状态告知');
+ const beginTime = commonFunc.showLocalMessage(props, 'startTime', '开始时间');
+ const downtimeDuration = commonFunc.showLocalMessage(props, 'downtimeDuration', '停机耗时');
+ const hour = commonFunc.showLocalMessage(props, 'hour', '时');
+ const min = commonFunc.showLocalMessage(props, 'min', '分');
+ const second = commonFunc.showLocalMessage(props, 'second', '秒');
+ const ExitLogin = commonFunc.showLocalMessage(props, 'ExitLogin', '退出');
+ const minimize = commonFunc.showLocalMessage(props, 'minimize', '最小化');
+
+ const sct = commonFunc.showLocalMessage(props, 'sct', '系统当前时间:');
+ const DowntimeStartTime = commonFunc.showLocalMessage(props, 'DowntimeStartTime', '停机开始时间:');
+ const cdd = commonFunc.showLocalMessage(props, 'cdd', '此次停机耗时:');
+ const about = commonFunc.showLocalMessage(props, 'about', '约:');
+
+ const handleMenuClose = () => {
Modal.confirm({
title: FriendlyReminder,
content:
{confirmState}
,
@@ -730,8 +744,8 @@ const MachineMessageComponent = ({ e , shutDown, props }) => {
isMinMax.current = 'max'}>
{conent2}
-
开始时间 {startTime}
-
停机耗时:{diffHours}时 {diffMins}分 {diffSecs}秒
+
{beginTime} {startTime}
+
{downtimeDuration}{diffHours}{second} {diffMins}{min} {diffSecs}{second}
@@ -741,28 +755,28 @@ const MachineMessageComponent = ({ e , shutDown, props }) => {
:
-
设备停机状态告知
+
{equipmentShutdown}
{conent2}
- 停机开始时间:
+ {DowntimeStartTime}
{startTime}
- 系统当前时间:
+ {sct}
{currentTime}
- 此次停机耗时:
+ {cdd}
- 约:
- {diffHours}时 {diffMins}分 {diffSecs}秒
+ {about}
+ {diffHours}{hour} {diffMins}{min} {diffSecs}{second}
-
-
+
+
}
diff --git a/src/mes/scheduledTasks/machineTasks/index.js b/src/mes/scheduledTasks/machineTasks/index.js
index f95c40a..1f99005 100644
--- a/src/mes/scheduledTasks/machineTasks/index.js
+++ b/src/mes/scheduledTasks/machineTasks/index.js
@@ -784,7 +784,7 @@
{taskInfoData.sStatusNameTitle}:
{taskInfoData.sStatusNameConent}
-
+
@@ -962,12 +962,12 @@
};
// 全屏状态
- const StatusBtnComponent = (props) => {
+ const StatusBtnComponent = ({props}) => {
const test = commonFunc.showLocalMessage(props, 'test', '测试');
- const switchProduction = commonFunc.showLocalMessage(props, 'switchProduction', '转产');
+ const switchProduction = commonFunc.showLocalMessage(props, 'switchProduction', '转111产');
const maintain = commonFunc.showLocalMessage(props, 'maintain', '保养');
- const productSampling = commonFunc.showLocalMessage(props, 'productSampling', '产品打样');
+ const productSampling = commonFunc.showLocalMessage(props, 'productSampling', '产品打111样');
const processTesting = commonFunc.showLocalMessage(props, 'processTesting', '工艺测试');
const dailyMaintenance = commonFunc.showLocalMessage(props, 'dailyMaintenance', '日常保养');
const firstMaintenance = commonFunc.showLocalMessage(props, 'firstMaintenance', '日常保养');
@@ -975,6 +975,8 @@
const FSMaintenance = commonFunc.showLocalMessage(props, 'FSMaintenance', '一级+二级保养');
const annualMaintenance = commonFunc.showLocalMessage(props, 'annualMaintenance', '年度保养');
+ console.log('2222', switchProduction, props);
+
const items = [
{
key: "4",
--
libgit2 0.22.2