Commit 2311225c38fb90f459b0f17d96603828dc33be23

Authored by zhangzzzz
1 parent 5b10677b

修改班组图片地址;

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