From 08357ad95c8b95a8dd4da0f544b5445d7b31ffa1 Mon Sep 17 00:00:00 2001 From: chenxt <10125295+chen-xintao97@user.noreply.gitee.com> Date: Wed, 21 Jan 2026 10:38:44 +0800 Subject: [PATCH] deng --- src/components/Common/CommonComponent/index.js | 5 +++-- src/index.less | 7 ++++++- src/mes/login/index.js | 7 ++++--- src/mes/scheduledTasks/machineTasks/index.js | 9 +++++---- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/components/Common/CommonComponent/index.js b/src/components/Common/CommonComponent/index.js index 43582ad..0e3607c 100644 --- a/src/components/Common/CommonComponent/index.js +++ b/src/components/Common/CommonComponent/index.js @@ -1206,8 +1206,8 @@ export default class CommonComponent extends Component { options.push(option); } else { const option = this.props.showConfig.bCanInput ? - () : - (); + () : + (); /* 返回值赋值 */ options.push(option); } @@ -1235,6 +1235,7 @@ export default class CommonComponent extends Component { } } /* 返回值 */ + return options; }; diff --git a/src/index.less b/src/index.less index ee0f595..d3f2b5d 100644 --- a/src/index.less +++ b/src/index.less @@ -4679,4 +4679,9 @@ ton:focus { input.ant-input.sStatusReject { color: #ff4D4f !important; } -} \ No newline at end of file + .huge-font-option .ant-select-item-option-content { + font-size: 24px !important; + line-height: 32px !important; + height: 32px !important; + } +} diff --git a/src/mes/login/index.js b/src/mes/login/index.js index afa8fe5..51f6fc2 100644 --- a/src/mes/login/index.js +++ b/src/mes/login/index.js @@ -386,7 +386,7 @@ const useLoginEvent = props => { }; // 遍历登录文本组件 -const handleGetFormItem = (props, item) => { +const handleGetFormItem = (props, item, isHuge) => { const { sModelsId } = initValue; const { masterData = {}, companys, faceLoginValue } = props; @@ -456,7 +456,8 @@ const handleGetFormItem = (props, item) => { onFilterDropDownData: props.onFilterDropDownData, onSaveState: props.onSaveState, bPassWord: item.sName === "sPassWord", - style: { backgroundColor: "#eaeaea" } + style: { backgroundColor: "#eaeaea" }, + dropdownClassName: isHuge ? 'huge-font-option' : '' }; const showName = sLanguage === 'sChinese' ? item.sChinese : sLanguage === 'sEnglish' ? item.sEnglish @@ -738,7 +739,7 @@ const FaceLoginAfterModal = props => {
{configs .filter(item => item.sName !== "sPassWord") - .map(item => handleGetFormItem(props, item))} + .map(item => handleGetFormItem(props, item, true))}
diff --git a/src/mes/scheduledTasks/machineTasks/index.js b/src/mes/scheduledTasks/machineTasks/index.js index 0a3dbdc..62bfb76 100644 --- a/src/mes/scheduledTasks/machineTasks/index.js +++ b/src/mes/scheduledTasks/machineTasks/index.js @@ -432,10 +432,11 @@ const useInfoEvent = props => { tempTaskId: "" }); } - props.onChangeRouter({ - type: "name", - path: ["生产执行", "生产执行"] - }); + // props.onChangeRouter({ + // type: "name", + // path: ["生产执行", "生产执行"] + // }); + handleRefresh(); } else if (code === -7) { // 如果有开工中的任务,即接口返回-7,弹出确认窗体 itemClickRef.current = { data: item }; -- libgit2 0.22.2