Commit 58323b2cde6b492273c31779e0938c8cd0823898

Authored by zhangzzzz
1 parent 2311225c

回滚;

src/mes/common/siderInfoComponent/index.js
@@ -771,9 +771,11 @@ const TeamInfoComponent = () => { @@ -771,9 +771,11 @@ const TeamInfoComponent = () => {
771 <Col flex={"160px"}> 771 <Col flex={"160px"}>
772 <Row style={rowStyle}> 772 <Row style={rowStyle}>
773 <Col flex={1}> 773 <Col flex={1}>
774 - {props.app.userinfo.sJzPicturePath ? ( 774 + {sEmployeeNo ? (
775 <img 775 <img
776 - src={`${commonConfig.file_host}file/download?savePathStr=${props.app.userinfo.sJzPicturePath}&sModelsId=100&token=${props.token}`} 776 + src={`${
  777 + commonConfig.interface_host
  778 + }api/ZEBC_042/${sActualEmployeeNo || sEmployeeNo}`}
777 onError={event => { 779 onError={event => {
778 event.target.src = iocnObj.userImg; 780 event.target.src = iocnObj.userImg;
779 }} 781 }}
src/mes/login/index.js
@@ -179,10 +179,10 @@ const useLoginEvent = props =&gt; { @@ -179,10 +179,10 @@ const useLoginEvent = props =&gt; {
179 message.error("请输入密码!"); 179 message.error("请输入密码!");
180 return; 180 return;
181 } 181 }
182 - // if (sShift === undefined) {  
183 - // message.error("请选择班次!");  
184 - // return;  
185 - // } 182 + if (sShift === undefined) {
  183 + message.error("请选择班次!");
  184 + return;
  185 + }
186 if (!sTeamId) { 186 if (!sTeamId) {
187 message.error("请选择班组!"); 187 message.error("请选择班组!");
188 return; 188 return;
@@ -228,12 +228,11 @@ const useLoginEvent = props =&gt; { @@ -228,12 +228,11 @@ const useLoginEvent = props =&gt; {
228 statusData, 228 statusData,
229 managementData, 229 managementData,
230 fileData, 230 fileData,
231 - bDelayedOvertime,  
232 - sJzPicturePath 231 + bDelayedOvertime
233 } = dataReturn.dataset.rows[0]; 232 } = dataReturn.dataset.rows[0];
234 233
235 gdslogininfo.bDelayedOvertime = bDelayedOvertime; 234 gdslogininfo.bDelayedOvertime = bDelayedOvertime;
236 - const userinfo = { ...teamInfo, ...gdslogininfo, sJzPicturePath }; 235 + const userinfo = { ...teamInfo, ...gdslogininfo };
237 const { 236 const {
238 sTeamShift: sShift1, 237 sTeamShift: sShift1,
239 sShift: sShift2, 238 sShift: sShift2,
src/mes/teamInfo/index.js
@@ -545,12 +545,19 @@ const TeamInfo = baseProps =&gt; { @@ -545,12 +545,19 @@ const TeamInfo = baseProps =&gt; {
545 </h2> 545 </h2>
546 <div className="userWorkBox"> 546 <div className="userWorkBox">
547 <div className="workTop"> 547 <div className="workTop">
548 - {props.app.userinfo.sJzPicturePath ? ( 548 + {sTeamEmployeeNo ? (
549 <img 549 <img
550 - src={`${commonConfig.file_host}file/download?savePathStr=${props.app.userinfo.sJzPicturePath}&sModelsId=100&token=${props.token}`} 550 + src={`${
  551 + commonConfig.interface_host
  552 + }api/ZEBC_042/${ sActualEmployeeNo || sTeamEmployeeNo}`}
551 onError={event => { 553 onError={event => {
552 event.target.src = userImgs; 554 event.target.src = userImgs;
553 }} 555 }}
  556 + onDoubleClick={event => {
  557 + event.target.src = `${
  558 + commonConfig.interface_host
  559 + }api/ZEBC_042/11123`;
  560 + }}
554 /> 561 />
555 ) : ( 562 ) : (
556 <img src={userImgs} /> 563 <img src={userImgs} />