From 58323b2cde6b492273c31779e0938c8cd0823898 Mon Sep 17 00:00:00 2001 From: zhangzhen <525765282@qq.com> Date: Tue, 21 Oct 2025 13:38:02 +0800 Subject: [PATCH] 回滚; --- src/mes/common/siderInfoComponent/index.js | 6 ++++-- src/mes/login/index.js | 13 ++++++------- src/mes/teamInfo/index.js | 11 +++++++++-- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/mes/common/siderInfoComponent/index.js b/src/mes/common/siderInfoComponent/index.js index 707b0e9..feb333f 100644 --- a/src/mes/common/siderInfoComponent/index.js +++ b/src/mes/common/siderInfoComponent/index.js @@ -771,9 +771,11 @@ const TeamInfoComponent = () => { - {props.app.userinfo.sJzPicturePath ? ( + {sEmployeeNo ? ( { event.target.src = iocnObj.userImg; }} diff --git a/src/mes/login/index.js b/src/mes/login/index.js index fbe2921..6116b92 100644 --- a/src/mes/login/index.js +++ b/src/mes/login/index.js @@ -179,10 +179,10 @@ const useLoginEvent = props => { message.error("请输入密码!"); return; } - // if (sShift === undefined) { - // message.error("请选择班次!"); - // return; - // } + if (sShift === undefined) { + message.error("请选择班次!"); + return; + } if (!sTeamId) { message.error("请选择班组!"); return; @@ -228,12 +228,11 @@ const useLoginEvent = props => { statusData, managementData, fileData, - bDelayedOvertime, - sJzPicturePath + bDelayedOvertime } = dataReturn.dataset.rows[0]; gdslogininfo.bDelayedOvertime = bDelayedOvertime; - const userinfo = { ...teamInfo, ...gdslogininfo, sJzPicturePath }; + const userinfo = { ...teamInfo, ...gdslogininfo }; const { sTeamShift: sShift1, sShift: sShift2, diff --git a/src/mes/teamInfo/index.js b/src/mes/teamInfo/index.js index 91703d0..f16275e 100644 --- a/src/mes/teamInfo/index.js +++ b/src/mes/teamInfo/index.js @@ -545,12 +545,19 @@ const TeamInfo = baseProps => {
- {props.app.userinfo.sJzPicturePath ? ( + {sTeamEmployeeNo ? ( { event.target.src = userImgs; }} + onDoubleClick={event => { + event.target.src = `${ + commonConfig.interface_host + }api/ZEBC_042/11123`; + }} /> ) : ( -- libgit2 0.22.2