From d7bd6201894d51dc83574efe0fe160538119eb8f Mon Sep 17 00:00:00 2001 From: pengm <674192343@qq.com> Date: Mon, 8 Sep 2025 14:26:57 +0800 Subject: [PATCH] 1.完善字段翻译 --- src/components/Common/CommonBase.js | 2 +- src/components/Common/CommonBillEvent.js | 2 +- src/components/Common/CommonHooks/useCommonBase.js | 2 +- src/mes/common/commonModelComponent/index.js | 2 +- src/mes/common/siderInfoComponent/index.js | 8 ++++++-- src/mes/login/index.js | 1 - src/mes/operationGuide/component/FlowChart.js | 7 +++---- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/components/Common/CommonBase.js b/src/components/Common/CommonBase.js index 311238d..3b164e6 100644 --- a/src/components/Common/CommonBase.js +++ b/src/components/Common/CommonBase.js @@ -780,7 +780,7 @@ export default (ChildComponent) => { addState[`${name}DelData`] = []; } if (isWait) { - console.log(addState) + return addState; } else if (this.mounted) { this.setState(addState); diff --git a/src/components/Common/CommonBillEvent.js b/src/components/Common/CommonBillEvent.js index 8fbdf21..48fcfc0 100644 --- a/src/components/Common/CommonBillEvent.js +++ b/src/components/Common/CommonBillEvent.js @@ -501,7 +501,7 @@ export default (ChildComponent) => { }); } else if (formRoute.indexOf('productionReport') !== -1 && commonUtils.isNotEmptyArr(slaveSelectedRowKeys) && JSON.stringify(slaveSelectedRowKeys) !== JSON.stringify(currentSlaveSelectedRowKeys)) { const addState = await this.handleGetDataOne('slave0', nextProps.slave0Config, null, null, null, null, nextProps, true); - console.log(addState); + this.props.onSaveState({ ...addState, }); diff --git a/src/components/Common/CommonHooks/useCommonBase.js b/src/components/Common/CommonHooks/useCommonBase.js index e12bdea..593b84c 100644 --- a/src/components/Common/CommonHooks/useCommonBase.js +++ b/src/components/Common/CommonHooks/useCommonBase.js @@ -2395,7 +2395,7 @@ const useCommonBase = props => { } } - console.log('3333', result); + return result; }; diff --git a/src/mes/common/commonModelComponent/index.js b/src/mes/common/commonModelComponent/index.js index 6faf722..fe68d00 100644 --- a/src/mes/common/commonModelComponent/index.js +++ b/src/mes/common/commonModelComponent/index.js @@ -1216,7 +1216,7 @@ const CommonModelComponent = props => { const { tabConfig = [], level, modelStyle, app } = props; const { userinfo } = app; const sLanguage = userinfo.sLanguage; - console.log('vvv', sLanguage); + const getComponent = (config, index = 0) => { const { sName, diff --git a/src/mes/common/siderInfoComponent/index.js b/src/mes/common/siderInfoComponent/index.js index 428f94d..0141c89 100644 --- a/src/mes/common/siderInfoComponent/index.js +++ b/src/mes/common/siderInfoComponent/index.js @@ -354,7 +354,7 @@ const WorkOrderTypeComponent = () => { ); const task= commonFunc.showLocalMessage(props, 'task', '任务:工单信息'); const specialFocus= commonFunc.showLocalMessage(props, 'specialFocus', '任务:工单信息'); - const productionSchedule= commonFunc.showLocalMessage(props, 'productionSchedule', '生产进度'); + const productionSchedule= commonFunc.showLocalMessage(props, 'Schedule', '生产进度'); return (
@@ -768,6 +768,10 @@ const TeamInfoComponent = () => { const shift = commonFunc.showLocalMessage(props, 'shift', '班次'); const classGroup = commonFunc.showLocalMessage(props, 'classGroup', '班组'); + const dayShift = commonFunc.showLocalMessage(props, 'dayShift', '白班'); + const nightShift = commonFunc.showLocalMessage(props, 'nightShift', '夜班'); + + // 当前上班机长人员 const { sActualEmployeeName, sActualEmployeeNo } = tableProps.data[0] || {}; @@ -805,7 +809,7 @@ const TeamInfoComponent = () => {
{shift}: - {sShift == 1 ? "白班" : "夜班"} + {sShift == 1 ? dayShift : nightShift}
diff --git a/src/mes/login/index.js b/src/mes/login/index.js index 6c0e79b..1ccf304 100644 --- a/src/mes/login/index.js +++ b/src/mes/login/index.js @@ -262,7 +262,6 @@ const useLoginEvent = props => { } = dataReturn.dataset.rows[0]; - console.log('vvvv', managementData); gdslogininfo.bDelayedOvertime = bDelayedOvertime; const userinfo = { ...teamInfo, ...gdslogininfo }; diff --git a/src/mes/operationGuide/component/FlowChart.js b/src/mes/operationGuide/component/FlowChart.js index 5e5791e..db0f3dd 100644 --- a/src/mes/operationGuide/component/FlowChart.js +++ b/src/mes/operationGuide/component/FlowChart.js @@ -72,10 +72,9 @@ const resources = { const BroadsideCardRender = (props) => { // 获取语言设置,默认为中文 const sLanguage = props?.app?.userinfo?.sLanguage || 'sChinese'; - console.log(sLanguage, sLanguage); - console.log(3888, props); - const teamLogin = resources[sLanguage].teamLogin; - console.log(teamLogin, 'teamLogin'); + + const teamLogin = resources[sLanguage].teamLogin; + const [ loading , setloading ] = useState(true) const [ flowData , setFlowData ] = useState([ -- libgit2 0.22.2