Commit 6c6718d8a50dd66347cb381f0092b1114d52cc95
1 parent
21ad6b20
1.主页增加公司名称
Showing
3 changed files
with
27 additions
and
7 deletions
src/mes/indexMes/index.js
| @@ -511,7 +511,7 @@ const HeaderConponent = () => { | @@ -511,7 +511,7 @@ const HeaderConponent = () => { | ||
| 511 | const { props } = useContext(myContext); | 511 | const { props } = useContext(myContext); |
| 512 | const { app } = props; | 512 | const { app } = props; |
| 513 | const { userinfo, sMachineNameStr, sTeamNameSName } = app; | 513 | const { userinfo, sMachineNameStr, sTeamNameSName } = app; |
| 514 | - const { sUserNameBak: sUserName, sShift } = userinfo; | 514 | + const { sUserNameBak: sUserName, sShift, sCompanyName } = userinfo; |
| 515 | 515 | ||
| 516 | const sLanguage = userinfo.sLanguage; | 516 | const sLanguage = userinfo.sLanguage; |
| 517 | let weekday = ["日", "一", "二", "三", "四", "五", "六"]; | 517 | let weekday = ["日", "一", "二", "三", "四", "五", "六"]; |
| @@ -602,10 +602,11 @@ const HeaderConponent = () => { | @@ -602,10 +602,11 @@ const HeaderConponent = () => { | ||
| 602 | <img src={logo} alt="logo" /> | 602 | <img src={logo} alt="logo" /> |
| 603 | </div> | 603 | </div> |
| 604 | <div className="title"> | 604 | <div className="title"> |
| 605 | - <span>{logoTitle}</span> | 605 | + <div>{logoTitle +'-'+ sCompanyName}</div> |
| 606 | </div> | 606 | </div> |
| 607 | <div className="userInfo"> | 607 | <div className="userInfo"> |
| 608 | - <Space size={30}> | 608 | + {/* 上下两行显示的账号和机器信息 */} |
| 609 | + <div className="vertical-info"> | ||
| 609 | <div> | 610 | <div> |
| 610 | <span>{account}：</span> | 611 | <span>{account}：</span> |
| 611 | <span>{sUserName}</span> | 612 | <span>{sUserName}</span> |
| @@ -614,6 +615,16 @@ const HeaderConponent = () => { | @@ -614,6 +615,16 @@ const HeaderConponent = () => { | ||
| 614 | <span>{machine}：</span> | 615 | <span>{machine}：</span> |
| 615 | <span>{sMachineNameStr}</span> | 616 | <span>{sMachineNameStr}</span> |
| 616 | </div> | 617 | </div> |
| 618 | + </div> | ||
| 619 | + <Space size={30}> | ||
| 620 | + {/*<div>*/} | ||
| 621 | + {/* <span>{account}：</span>*/} | ||
| 622 | + {/* <span>{sUserName}</span>*/} | ||
| 623 | + {/*</div>*/} | ||
| 624 | + {/*<div>*/} | ||
| 625 | + {/* <span>{machine}：</span>*/} | ||
| 626 | + {/* <span>{sMachineNameStr}</span>*/} | ||
| 627 | + {/*</div>*/} | ||
| 617 | <div> | 628 | <div> |
| 618 | <span>{classGroup}：</span> | 629 | <span>{classGroup}：</span> |
| 619 | <span>{sTeamNameSName}</span> | 630 | <span>{sTeamNameSName}</span> |
src/mes/indexMes/index.less
| @@ -28,7 +28,7 @@ | @@ -28,7 +28,7 @@ | ||
| 28 | .title { | 28 | .title { |
| 29 | .flex(center, center); | 29 | .flex(center, center); |
| 30 | .size(auto, 100%); | 30 | .size(auto, 100%); |
| 31 | - font-size: 22px; | 31 | + font-size: 20px; |
| 32 | color: @base-color; | 32 | color: @base-color; |
| 33 | font-weight: bold; | 33 | font-weight: bold; |
| 34 | cursor: default; | 34 | cursor: default; |
| @@ -37,11 +37,20 @@ | @@ -37,11 +37,20 @@ | ||
| 37 | .userInfo { | 37 | .userInfo { |
| 38 | position: absolute; | 38 | position: absolute; |
| 39 | top: 0; | 39 | top: 0; |
| 40 | - left: 266px; | 40 | + left: 380px; |
| 41 | .size(calc(100% - 650px), 100%); | 41 | .size(calc(100% - 650px), 100%); |
| 42 | .flex(center, center); | 42 | .flex(center, center); |
| 43 | - font-size: 20px; | 43 | + font-size: 18px; |
| 44 | color: @base-color; | 44 | color: @base-color; |
| 45 | + display: flex; | ||
| 46 | + align-items: center; /* 使垂直信息块与右侧内容对齐 */ | ||
| 47 | + } | ||
| 48 | + | ||
| 49 | + .vertical-info { | ||
| 50 | + display: flex; | ||
| 51 | + flex-direction: column; | ||
| 52 | + gap: 0; /* 控制两行之间的间距 */ | ||
| 53 | + margin-right: 20px; /* 与右侧内容保持一致的间距 */ | ||
| 45 | } | 54 | } |
| 46 | 55 | ||
| 47 | @media screen and (max-width: 1700px) { | 56 | @media screen and (max-width: 1700px) { |
src/mes/login/index.js
| @@ -264,7 +264,7 @@ const useLoginEvent = props => { | @@ -264,7 +264,7 @@ const useLoginEvent = props => { | ||
| 264 | 264 | ||
| 265 | 265 | ||
| 266 | gdslogininfo.bDelayedOvertime = bDelayedOvertime; | 266 | gdslogininfo.bDelayedOvertime = bDelayedOvertime; |
| 267 | - const userinfo = { ...teamInfo, ...gdslogininfo }; | 267 | + const userinfo = { ...teamInfo, ...gdslogininfo, sCompanyName: props?.masterData.sFactory }; |
| 268 | const { | 268 | const { |
| 269 | sTeamShift: sShift1, | 269 | sTeamShift: sShift1, |
| 270 | sShift: sShift2, | 270 | sShift: sShift2, |