From 6c6718d8a50dd66347cb381f0092b1114d52cc95 Mon Sep 17 00:00:00 2001
From: pengm <674192343@qq.com>
Date: Thu, 16 Oct 2025 09:32:35 +0800
Subject: [PATCH] 1.主页增加公司名称

---
 src/mes/indexMes/index.js   | 17 ++++++++++++++---
 src/mes/indexMes/index.less | 15 ++++++++++++---
 src/mes/login/index.js      |  2 +-
 3 files changed, 27 insertions(+), 7 deletions(-)

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 = () => {
         <img src={logo} alt="logo" />
       </div>
       <div className="title">
-        <span>{logoTitle}</span>
+        <div>{logoTitle +'-'+ sCompanyName}</div>
       </div>
       <div className="userInfo">
-        <Space size={30}>
+        {/* 上下两行显示的账号和机器信息 */}
+        <div className="vertical-info">
           <div>
             <span>{account}：</span>
             <span>{sUserName}</span>
@@ -614,6 +615,16 @@ const HeaderConponent = () => {
             <span>{machine}：</span>
             <span>{sMachineNameStr}</span>
           </div>
+        </div>
+        <Space size={30}>
+          {/*<div>*/}
+          {/*  <span>{account}：</span>*/}
+          {/*  <span>{sUserName}</span>*/}
+          {/*</div>*/}
+          {/*<div>*/}
+          {/*  <span>{machine}：</span>*/}
+          {/*  <span>{sMachineNameStr}</span>*/}
+          {/*</div>*/}
           <div>
             <span>{classGroup}：</span>
             <span>{sTeamNameSName}</span>
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,
--
libgit2 0.22.2