Commit 05f3a3ea7c14e38212a9848e907ad9ef40a913cb

Authored by zhangzzzz
1 parent 21a789bc

修改班组图片地址;

src/mes/common/siderInfoComponent/index.js
@@ -774,11 +774,9 @@ const TeamInfoComponent = () => { @@ -774,11 +774,9 @@ const TeamInfoComponent = () => {
774 <Col flex={"160px"}> 774 <Col flex={"160px"}>
775 <Row style={rowStyle}> 775 <Row style={rowStyle}>
776 <Col flex={1}> 776 <Col flex={1}>
777 - {sEmployeeNo ? ( 777 + {props.app.userinfo.sJzPicturePath ? (
778 <img 778 <img
779 - src={`${  
780 - commonConfig.interface_host  
781 - }api/ZEBC_042/${sEmployeeNo}`} 779 + src={`${commonConfig.file_host}file/download?savePathStr=${props.app.userinfo.sJzPicturePath}&sModelsId=100&token=${props.token}`}
782 onError={event => { 780 onError={event => {
783 event.target.src = iocnObj.userImg; 781 event.target.src = iocnObj.userImg;
784 }} 782 }}
src/mes/login/index.js
@@ -202,10 +202,10 @@ const useLoginEvent = props =&gt; { @@ -202,10 +202,10 @@ const useLoginEvent = props =&gt; {
202 message.error(pleaseInputPassword); 202 message.error(pleaseInputPassword);
203 return; 203 return;
204 } 204 }
205 - if (sShift === undefined) {  
206 - message.error(pleaseselectShift);  
207 - return;  
208 - } 205 + // if (sShift === undefined) {
  206 + // message.error(pleaseselectShift);
  207 + // return;
  208 + // }
209 if (!sTeamId) { 209 if (!sTeamId) {
210 message.error(pleaseSelectTeam); 210 message.error(pleaseSelectTeam);
211 return; 211 return;
@@ -251,11 +251,12 @@ const useLoginEvent = props =&gt; { @@ -251,11 +251,12 @@ const useLoginEvent = props =&gt; {
251 statusData, 251 statusData,
252 managementData, 252 managementData,
253 fileData, 253 fileData,
254 - bDelayedOvertime 254 + bDelayedOvertime,
  255 + sJzPicturePath
255 } = dataReturn.dataset.rows[0]; 256 } = dataReturn.dataset.rows[0];
256 257
257 gdslogininfo.bDelayedOvertime = bDelayedOvertime; 258 gdslogininfo.bDelayedOvertime = bDelayedOvertime;
258 - const userinfo = { ...teamInfo, ...gdslogininfo }; 259 + const userinfo = { ...teamInfo, ...gdslogininfo, sJzPicturePath };
259 const { 260 const {
260 sTeamShift: sShift1, 261 sTeamShift: sShift1,
261 sShift: sShift2, 262 sShift: sShift2,
src/mes/teamInfo/index.js
@@ -500,19 +500,12 @@ const TeamInfo = baseProps =&gt; { @@ -500,19 +500,12 @@ const TeamInfo = baseProps =&gt; {
500 </h2> 500 </h2>
501 <div className="userWorkBox"> 501 <div className="userWorkBox">
502 <div className="workTop"> 502 <div className="workTop">
503 - {sTeamEmployeeNo ? ( 503 + {props.app.userinfo.sJzPicturePath ? (
504 <img 504 <img
505 - src={`${  
506 - commonConfig.interface_host  
507 - }api/ZEBC_042/${sTeamEmployeeNo}`} 505 + src={`${commonConfig.file_host}file/download?savePathStr=${props.app.userinfo.sJzPicturePath}&sModelsId=100&token=${props.token}`}
508 onError={event => { 506 onError={event => {
509 event.target.src = userImgs; 507 event.target.src = userImgs;
510 }} 508 }}
511 - onDoubleClick={event => {  
512 - event.target.src = `${  
513 - commonConfig.interface_host  
514 - }api/ZEBC_042/11123`;  
515 - }}  
516 /> 509 />
517 ) : ( 510 ) : (
518 <img src={userImgs} /> 511 <img src={userImgs} />