From 69bccc62721a7aecbf2c4147dc50818d17950bb4 Mon Sep 17 00:00:00 2001
From: pengm <674192343@qq.com>
Date: Mon, 22 Sep 2025 14:10:03 +0800
Subject: [PATCH] 1.MES系统功能 head标题翻译 ，Tab页签悬浮提示，登录提示

---
 src/index.ejs                                |  2 +-
 src/mes/common/buttonComponent/index.js      | 40 +++++++++++++++++++++++++++++++++++++++-
 src/mes/common/commonModelComponent/index.js | 42 +++++++++++++++++++++++++++---------------
 src/mes/login/index.js                       |  2 +-
 4 files changed, 68 insertions(+), 18 deletions(-)
diff --git a/src/index.ejs b/src/index.ejs
index eb5b9d9..2064c19 100644
--- a/src/index.ejs
+++ b/src/index.ejs
@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-      <title>MES全局设备操作平台</title>
+      <title>MES Global Equipment Operation Platform</title>
       <script>
         if (!String.prototype.padStart) {
           String.prototype.padStart = function padStart(targetLength, padString) {
diff --git a/src/mes/common/buttonComponent/index.js b/src/mes/common/buttonComponent/index.js
index c36e304..0228516 100644
--- a/src/mes/common/buttonComponent/index.js
+++ b/src/mes/common/buttonComponent/index.js
@@ -274,7 +274,8 @@ const ButtonComponent = props => {
       const iconName = icon[iIndex];
       item.icon = getNavIcon(false, iconName);
       item.activeIcon = getNavIcon(true, iconName);
-      item.tipName =  chineseName !== item.name ? item.name +'-'+chineseName : item.name;
+      item.tipName = chineseName !== item.name ? item.name + '-' + chineseName : item.name;
+
       result = item;
     }
     menuList.push(result);
@@ -306,6 +307,35 @@ const ButtonComponent = props => {
       props.openFirstNotice(e);
     }
   };
+  function findTargetItem(data, targetName) {
+    // 如果不是数组，直接返回null
+    if (!Array.isArray(data)) return null;
+
+    // 遍历当前层级的每一项
+    for (const item of data) {
+      // 检查当前项的子项中是否有目标
+      const foundChild = item.children?.find(child => child.sMenuName === targetName);
+
+      // 如果在当前项的子项中找到目标，返回这个子项（第一层找到返回第二层）
+      if (foundChild) {
+        return foundChild;
+      }
+
+      // 如果当前项有子项，递归查找更深层级
+      if (item.children && item.children.length > 0) {
+        const deepFound = findTargetItem(item.children, targetName);
+        // 如果在深层级找到，直接返回（内部层找到返回内部层）
+        if (deepFound) {
+          return deepFound;
+        }
+      }
+    }
+
+    // 没找到返回null
+    return null;
+  }
+
+// 使用方法
 
   const counterInfo = props.app.counterInfo || {};
   const { table0 = 0, table1 = 0, table2 = 0, table3 = 0 } = counterInfo;
@@ -320,6 +350,14 @@ const ButtonComponent = props => {
 
     const iInterface = currentWorkOrderInfo.iInterface || userinfo.iInterface;
 
+    if (commonUtils.isEmptyObject(e.tipName)) {
+      const item  = findTargetItem(managementData, e.name);
+      if(item?.sChineseName) {
+        e.tipName =  item.sChineseName !== e.name ? e.name + '-' + item.sChineseName : e.name;
+      }
+    }
+
+
     let bHideTab = false;
     // 【踢废，拼接，倒卷，读码】完工清场记录不可点击
     if ([5, 6, 7, 8].includes(iInterface) && (
diff --git a/src/mes/common/commonModelComponent/index.js b/src/mes/common/commonModelComponent/index.js
index 116d2fe..d6f71cb 100644
--- a/src/mes/common/commonModelComponent/index.js
+++ b/src/mes/common/commonModelComponent/index.js
@@ -276,7 +276,7 @@ const useCommonModelEvent = props => {
         const pageLayoutConfig = gdsconfigformslave.find(
           item => item.sControlName === "pageLayout"
         );
-        console.log('pageLayoutConfig', pageLayoutConfig);
+
         if (pageLayoutConfig) {
           pageLayout = commonUtils.convertStrToObj(
             pageLayoutConfig.sDefault,
@@ -1259,7 +1259,7 @@ const CommonModelComponent = props => {
         bFirstComponent: level === 0 && index === -1
       };
 
-      console.log('222', sName, componentProps)
+
 
       const commonDivHeight = useComputedCommonDivHeight(componentProps);
       return (
@@ -1386,12 +1386,15 @@ const CommonModelComponent = props => {
                     )
                     .map((config, index) => {
                       const { sName, sEnglishTabName, sBig5TabName, sTabName } = config;
-                      console.log('32323', config, sLanguage);
+
                       const sTabNewName = sLanguage === 'sEnglish' ? sEnglishTabName : sLanguage ==='sBig5' ?
                         sBig5TabName : sTabName;
                       let disabled = false;
 
-                      console.log('32323', sTabNewName);
+                      const sTabTip = sEnglishTabName !== sTabName ?
+                        sEnglishTabName + '-' + sTabName : sTabNewName;  /* 悬浮提示 英文-中文 */
+
+                      console.log('sTabNewName', sTabNewName);
 
                       if (sTabName === "拼接列表" && sName === "slaveWypj3") {
                         // 特殊处理：拼接详情可保存时，拼接列表tab不可点击
@@ -1438,7 +1441,7 @@ const CommonModelComponent = props => {
 
                       return (
                         <TabPane
-                          tab={sTabNewName}
+                          tab={<span title ={sTabTip}> {sTabNewName}</span> }
                           key={`${sName}_${sTabName}`}
                           disabled={disabled}
                         >
@@ -1458,7 +1461,7 @@ const CommonModelComponent = props => {
 
 // 通用标题
 const TabTitleComponent = props => {
-  const { sTabName, bHideTitle, bFirstComponent } = props;
+  const { sTabName, bHideTitle, bFirstComponent, sTipName = '' } = props;
 
   if (!sTabName || bHideTitle) {
     if (!bFirstComponent) {
@@ -1467,15 +1470,17 @@ const TabTitleComponent = props => {
       return <div style={{ width: "100%", height: 10 }} />;
     }
   }
-  console.log('sTabNsme', sTabName);
+
 
   if (sTabName.split("_")[0] === "空" || sTabName.split("_")[0] === "Empty" ) return "";
 
   const costomTitle =
     props.costomTitle && sTabName === "下料信息" ? props.costomTitle : "";
 
+  const sTip = sTabName !== sTipName  ? sTabName + '-' + sTipName : sTabName;
+
   return (
-    <div className="tabTitle">
+    <div className="tabTitle" title={sTip}>
       {sTabName}
       {costomTitle}
       <RunningStatusConditionComponent {...props} />
@@ -1505,7 +1510,7 @@ const CommonViewTableComponent = props => {
   if (selectedRowKeys.length) {
     viewRow = dataArr.find(item => item.sId === selectedRowKeys[0]);
   }
-  console.log('111111第', sTabName)
+
   if (sTabName?.startsWith("第") && sTabName?.endsWith("转")) {
     viewRow = data.filter(item => item.sRev === sTabName)[0];
   }
@@ -1513,7 +1518,7 @@ const CommonViewTableComponent = props => {
   if (commonUtils.isEmptyObject(viewRow)) {
     viewRow = Array.isArray(data) ? data[0] || {} : data;
   }
-  console.log('viewRow', viewRow)
+
   if (
     commonUtils.isNotEmptyObject(viewRow) &&
     !selectedRowKeys[0] &&
@@ -1561,7 +1566,7 @@ const CommonViewTableComponent = props => {
   }
   const groupList = sTabName?.split(",") || [];
 
-  console.log('groupList', groupList)
+
   const viewConfigsList = groupList.map((tabName, index) => {
     if (tabName === "隐藏") {
       return [];
@@ -1583,7 +1588,7 @@ const CommonViewTableComponent = props => {
       );
     }
   });
-  console.log('viewConfigsList', viewConfigsList);
+
 
   const operationBarProps = {
     ...props,
@@ -1605,6 +1610,12 @@ const CommonViewTableComponent = props => {
   const sTabLocalName = sLanguage === 'sEnglish' ? sEnglishTabName  : sTabName;
   const groupListNew = sTabLocalName?.split(",") || [];
 
+  const groupListChinese = sTabName?.split(",") || [];
+
+
+
+
+
   return (
     <>
       {sName === "master" ? (
@@ -1636,7 +1647,7 @@ const CommonViewTableComponent = props => {
 
         return (
           <>
-            <TabTitleComponent {...props} sTabName={groupListNew[index] } />
+            <TabTitleComponent {...props} sTabName={groupListNew[index]} sTipName = {groupListChinese[index] } />
             <CommonViewTable {...viewProps} />
             <ReportInfo
                 reportInfoVisible={reportInfoVisible}
@@ -1868,7 +1879,7 @@ const CommonTableComponent = props => {
 
   const stepName = sTabName?.split("_")[1] || "";
 
-  console.log('ssss', stepName);
+
   if (stepName.startsWith("第") && stepName.endsWith("转")) {
     tableProps.data = tableProps.data.filter(item => item.sRev === stepName);
   }
@@ -1888,9 +1899,10 @@ const CommonTableComponent = props => {
   const sLanguage =  props.app.userinfo?.sLanguage;
 
   const sTabLocalName = sLanguage === 'sEnglish' ? sEnglishTabName  : sTabName;
+
   return (
     <>
-      <TabTitleComponent {...props} sTabName={sTabLocalName } />
+      <TabTitleComponent {...props} sTabName={sTabLocalName }  sTipName={sTabName } />
       <StaticEditTable {...tableProps} />
       <CommonOperationBarComponent {...operationBarProps} />
       <SwasterTypeTable
diff --git a/src/mes/login/index.js b/src/mes/login/index.js
index fe355cd..234d974 100644
--- a/src/mes/login/index.js
+++ b/src/mes/login/index.js
@@ -202,7 +202,7 @@ const useLoginEvent = props => {
       }
 
       if (!username) {
-        message.error(pleaseSelectUser);
+        message.error(pleaseSelectUser || 'Please Select User');
         return;
       }
       if (!sEmployeeNo && !password) {
--
libgit2 0.22.2

