Commit 05f3a3ea7c14e38212a9848e907ad9ef40a913cb

Authored by zhangzzzz
1 parent 21a789bc

修改班组图片地址;

src/mes/common/siderInfoComponent/index.js
... ... @@ -774,11 +774,9 @@ const TeamInfoComponent = () => {
774 774 <Col flex={"160px"}>
775 775 <Row style={rowStyle}>
776 776 <Col flex={1}>
777   - {sEmployeeNo ? (
  777 + {props.app.userinfo.sJzPicturePath ? (
778 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 780 onError={event => {
783 781 event.target.src = iocnObj.userImg;
784 782 }}
... ...
src/mes/login/index.js
... ... @@ -202,10 +202,10 @@ const useLoginEvent = props =&gt; {
202 202 message.error(pleaseInputPassword);
203 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 209 if (!sTeamId) {
210 210 message.error(pleaseSelectTeam);
211 211 return;
... ... @@ -251,11 +251,12 @@ const useLoginEvent = props =&gt; {
251 251 statusData,
252 252 managementData,
253 253 fileData,
254   - bDelayedOvertime
  254 + bDelayedOvertime,
  255 + sJzPicturePath
255 256 } = dataReturn.dataset.rows[0];
256 257  
257 258 gdslogininfo.bDelayedOvertime = bDelayedOvertime;
258   - const userinfo = { ...teamInfo, ...gdslogininfo };
  259 + const userinfo = { ...teamInfo, ...gdslogininfo, sJzPicturePath };
259 260 const {
260 261 sTeamShift: sShift1,
261 262 sShift: sShift2,
... ...
src/mes/teamInfo/index.js
... ... @@ -500,19 +500,12 @@ const TeamInfo = baseProps =&gt; {
500 500 </h2>
501 501 <div className="userWorkBox">
502 502 <div className="workTop">
503   - {sTeamEmployeeNo ? (
  503 + {props.app.userinfo.sJzPicturePath ? (
504 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 506 onError={event => {
509 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 511 <img src={userImgs} />
... ...