Commit 2311225c38fb90f459b0f17d96603828dc33be23
1 parent
5b10677b
修改班组图片地址；
Showing
3 changed files
with
11 additions
and
19 deletions
src/mes/common/siderInfoComponent/index.js
| @@ -771,11 +771,9 @@ const TeamInfoComponent = () => { | @@ -771,11 +771,9 @@ 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 | - {sEmployeeNo ? ( | 774 | + {props.app.userinfo.sJzPicturePath ? ( |
| 775 | <img | 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 | onError={event => { | 777 | onError={event => { |
| 780 | event.target.src = iocnObj.userImg; | 778 | event.target.src = iocnObj.userImg; |
| 781 | }} | 779 | }} |
src/mes/login/index.js
| @@ -179,10 +179,10 @@ const useLoginEvent = props => { | @@ -179,10 +179,10 @@ const useLoginEvent = props => { | ||
| 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,11 +228,12 @@ const useLoginEvent = props => { | @@ -228,11 +228,12 @@ const useLoginEvent = props => { | ||
| 228 | statusData, | 228 | statusData, |
| 229 | managementData, | 229 | managementData, |
| 230 | fileData, | 230 | fileData, |
| 231 | - bDelayedOvertime | 231 | + bDelayedOvertime, |
| 232 | + sJzPicturePath | ||
| 232 | } = dataReturn.dataset.rows[0]; | 233 | } = dataReturn.dataset.rows[0]; |
| 233 | 234 | ||
| 234 | gdslogininfo.bDelayedOvertime = bDelayedOvertime; | 235 | gdslogininfo.bDelayedOvertime = bDelayedOvertime; |
| 235 | - const userinfo = { ...teamInfo, ...gdslogininfo }; | 236 | + const userinfo = { ...teamInfo, ...gdslogininfo, sJzPicturePath }; |
| 236 | const { | 237 | const { |
| 237 | sTeamShift: sShift1, | 238 | sTeamShift: sShift1, |
| 238 | sShift: sShift2, | 239 | sShift: sShift2, |
src/mes/teamInfo/index.js
| @@ -545,19 +545,12 @@ const TeamInfo = baseProps => { | @@ -545,19 +545,12 @@ const TeamInfo = baseProps => { | ||
| 545 | </h2> | 545 | </h2> |
| 546 | <div className="userWorkBox"> | 546 | <div className="userWorkBox"> |
| 547 | <div className="workTop"> | 547 | <div className="workTop"> |
| 548 | - {sTeamEmployeeNo ? ( | 548 | + {props.app.userinfo.sJzPicturePath ? ( |
| 549 | <img | 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 | onError={event => { | 551 | onError={event => { |
| 554 | event.target.src = userImgs; | 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 | <img src={userImgs} /> | 556 | <img src={userImgs} /> |