diff --git a/src/mes/indexMes/index.js b/src/mes/indexMes/index.js
index 0de2301..2a31b20 100644
--- a/src/mes/indexMes/index.js
+++ b/src/mes/indexMes/index.js
@@ -511,7 +511,7 @@ const HeaderConponent = () => {
const { props } = useContext(myContext);
const { app } = props;
const { userinfo, sMachineNameStr, sTeamNameSName } = app;
- const { sUserNameBak: sUserName, sShift } = userinfo;
+ const { sUserNameBak: sUserName, sShift, sCompanyName } = userinfo;
const sLanguage = userinfo.sLanguage;
let weekday = ["日", "一", "二", "三", "四", "五", "六"];
@@ -602,10 +602,11 @@ const HeaderConponent = () => {
-
{logoTitle}
+
{logoTitle +'-'+ sCompanyName}
-
+ {/* 上下两行显示的账号和机器信息 */}
+
{account}:
{sUserName}
@@ -614,6 +615,16 @@ const HeaderConponent = () => {
{machine}:
{sMachineNameStr}
+
+
+ {/**/}
+ {/* {account}:*/}
+ {/* {sUserName}*/}
+ {/*
*/}
+ {/**/}
+ {/* {machine}:*/}
+ {/* {sMachineNameStr}*/}
+ {/*
*/}
{classGroup}:
{sTeamNameSName}
diff --git a/src/mes/indexMes/index.less b/src/mes/indexMes/index.less
index a01492d..5413991 100644
--- a/src/mes/indexMes/index.less
+++ b/src/mes/indexMes/index.less
@@ -28,7 +28,7 @@
.title {
.flex(center, center);
.size(auto, 100%);
- font-size: 22px;
+ font-size: 20px;
color: @base-color;
font-weight: bold;
cursor: default;
@@ -37,11 +37,20 @@
.userInfo {
position: absolute;
top: 0;
- left: 266px;
+ left: 380px;
.size(calc(100% - 650px), 100%);
.flex(center, center);
- font-size: 20px;
+ font-size: 18px;
color: @base-color;
+ display: flex;
+ align-items: center; /* 使垂直信息块与右侧内容对齐 */
+ }
+
+ .vertical-info {
+ display: flex;
+ flex-direction: column;
+ gap: 0; /* 控制两行之间的间距 */
+ margin-right: 20px; /* 与右侧内容保持一致的间距 */
}
@media screen and (max-width: 1700px) {
diff --git a/src/mes/login/index.js b/src/mes/login/index.js
index eb688ac..f2dacc3 100644
--- a/src/mes/login/index.js
+++ b/src/mes/login/index.js
@@ -264,7 +264,7 @@ const useLoginEvent = props => {
gdslogininfo.bDelayedOvertime = bDelayedOvertime;
- const userinfo = { ...teamInfo, ...gdslogininfo };
+ const userinfo = { ...teamInfo, ...gdslogininfo, sCompanyName: props?.masterData.sFactory };
const {
sTeamShift: sShift1,
sShift: sShift2,