Merge branch 'release/customer/2025/AJT' of http://git.xlyprint.cn/qiangmj/ebc-M…

…es into release/customer/2025/AJT

Merge branch 'release/customer/2025/AJT' of http://git.xlyprint.cn/qiangmj/ebc-M…
…es into release/customer/2025/AJT
Min
2 parents d44d67a5 7fb3580d
Showing 8 changed files with 428 additions and 268 deletions
src/components/Common/CommonInstructSet.js
src/components/Common/CommonTable/index.js
src/lang/en-lang.less
src/mes/common/commonModelComponent/index.js
src/mes/common/inputMultiModalComponent/index.js
src/mes/common/siderInfoComponent/index.js
src/mes/indexMes/index.js
src/mes/scheduledTasks/machineTasks/index.js
@@ -11,6 +11,7 @@ import * as commonBusiness from &quot;@/components/Common/commonBusiness&quot;;
 import FaceDetect from "@/components/FaceDetect";
 import ShowType from "@/components/Common/CommonComponent";
+let globalProps = {};
 let step = 1; // 步骤计数
 let exesqlTodo = []; // 最后需要一起执行的sql
 let saveDataTodo = []; // 最后需要一起保存的数据
@@ -80,14 +81,17 @@ const showMsg = value =&gt; {
     params.content = value;
   }
+  const InstructionSetErrMsg = commonFunc.showLocalMessage(globalProps, 'InstructionSetErrMsg', '指令集错误信息');
+  const InstructionSetInfoMsg = commonFunc.showLocalMessage(globalProps, 'InstructionSetInfoMsg', '指令集提示信息');
+  const knew = commonFunc.showLocalMessage(globalProps, 'knew', '知道了');
   const { type, content } = params;
-  const title = type === "error" ? "指令集错误信息" : "指令集提示信息";
+  const title = type === "error" ? InstructionSetErrMsg : InstructionSetInfoMsg;
   Modal[type]({
     width: 1000,
     title: title,
     content: <div>{content}</div>,
-    okText: "知道了"
+    okText: knew
   });
 };
@@ -103,13 +107,13 @@ const instructCheck = props =&gt; {
   }
   if (!btnConfig) {
-    showMsg("没有找到按钮配置！");
+    showMsg("Button configuration not found!");
     return false;
   }
   const { sInstruct: sInstructStr } = btnConfig;
   if (!sInstructStr) {
-    showMsg("指令集未配置！");
+    showMsg("Instruction set not configured!");
     return false;
   }
@@ -120,8 +124,8 @@ const instructCheck = props =&gt; {
       type: "error",
       content: (
         <div>
-          <div>指令集格式错误！</div>
-          <div>错误指令集内容：</div>
+          <div>Instruction set format error!</div>
+          <div>Error instruction set content:</div>
           <div>{sInstructStr}</div>
         </div>
       )
@@ -229,6 +233,8 @@ const instructSetInit = async props =&gt; {
   if (!sInstruct) return;
+  globalProps = props;
+
   // 添加额外数据
   addExtraData(props);
@@ -477,13 +483,13 @@ const handleCopy = (props, instruct) =&gt; {
       // content: "error",
       content: (
         <div>
-          <div>{`【${srcDataset}】数据源为空`}</div>
+          <div>{`[${srcDataset}] data source is empty`}</div>
           <div>请检查该复制指令集：</div>
           <div>{JSON.stringify(instruct)}</div>
         </div>
       )
     });
-    throw new Error(`【${srcDataset}】数据源为空`);
+    throw new Error(`[${srcDataset}] data source is empty`);
   }
   // 获取赋值后的数据
@@ -549,25 +555,25 @@ const handleAddNew = (props, instruct) =&gt; {
       type: "error",
       content: (
         <div>
-          <div>被新增的数据集desDataset不能为空！</div>
-          <div>请检查该新增指令集：</div>
+          <div>The newly added dataset desDataset cannot be empty!</div>
+          <div>Please check the newly added instruction set:</div>
           <div>{JSON.stringify(instruct)}</div>
         </div>
       )
     });
-    throw new Error("被新增的数据集desDataset不能为空！");
+    throw new Error("The newly added dataset desDataset cannot be empty!");
   } else if (desDataset.includes("@") || desDataset.includes(",")) {
     showMsg({
       type: "error",
       content: (
         <div>
-          <div>被新增的数据集desDataset不支持@或,写法！</div>
-          <div>请检查该新增指令集：</div>
+          <div>The newly added dataset desDataset does not support @ or ,!</div>
+          <div>Please check the newly added instruction set:</div>
           <div>{JSON.stringify(instruct)}</div>
         </div>
       )
     });
-    throw new Error("被新增的数据集desDataset不支持@或,写法！");
+    throw new Error("The newly added dataset desDataset does not support @ or ,!");
   }
   const {
@@ -908,14 +914,14 @@ const handleMesSave = (props, instruct) =&gt; {
         content: (
           <div>
             <div>
-              保存指令集data中的tablename和srcDataset为必填项，请检查该指令集配置！
+              The tablename and srcDataset fields in the save instruction set data are required. Please check the instruction set configuration!
             </div>
             <div>{JSON.stringify(instruct)}</div>
           </div>
         )
       });
       throw new Error(
-        "保存指令集data中的tablename和srcDataset为必填项，请检查该指令集配置！"
+        "The tablename and srcDataset fields in the save instruction set data are required. Please check the instruction set configuration!"
       );
     }
     const {
@@ -1004,12 +1010,12 @@ const handleMesSaveAll = async (props, onSucess) =&gt; {
       type: "error",
       content: (
         <div>
-          <div>save接口报错！</div>
-          <div>请求地址：</div>
+          <div>Save interface error!</div>
+          <div>Request address:</div>
           <div>{dataUrl}</div>
-          <div>传入参数：</div>
+          <div>Pass in parameters:</div>
           <div>{JSON.stringify(values)}</div>
-          <div>报错信息</div>
+          <div>Error message</div>
           <div>{JSON.stringify(dataReturn)}</div>
         </div>
       )
@@ -1190,12 +1196,12 @@ const handleSendMsgAll = async props =&gt; {
       type: "error",
       content: (
         <div>
-          <div>sendmsg接口报错！</div>
-          <div>请求地址：</div>
+          <div>The sendmsg interface reports an error!</div>
+          <div>Request address:</div>
           <div>{dataUrl}</div>
-          <div>传入参数：</div>
+          <div>Pass in parameters:</div>
           <div>{JSON.stringify(values)}</div>
-          <div>报错信息</div>
+          <div>Error message</div>
           <div>{JSON.stringify(dataReturn)}</div>
         </div>
       )
@@ -1231,13 +1237,13 @@ const handlePrint = (props, instruct) =&gt; {
       type: "error",
       content: (
         <div>
-          <div>报表名称不能为空！</div>
-          <div>请检查打印报表指令集：</div>
+          <div>Report name cannot be empty!</div>
+          <div>Please check the print report instruction set:</div>
           <div>{JSON.stringify(instruct)}</div>
         </div>
       )
     });
-    throw new Error("打印报表名称不能为空！");
+    throw new Error("The print report name cannot be empty!");
   }
   const dataUrl = `${
@@ -1557,13 +1563,13 @@ const handleOpenSql = async (props, instruct) =&gt; {
           type: "error",
           content: (
             <div>
-              <div>{`获取${dataNameList[index]}数据集数据为空！`}</div>
-              <div>错误指令集内容：</div>
+              <div>{`The data of ${dataNameList[index]} dataset is empty!`}</div>
+              <div>Error instruction set content:</div>
               <div>{JSON.stringify(instruct)}</div>
             </div>
           )
         });
-        throw new Error(`获取${dataNameList[index]}数据集数据为空！`);
+        throw new Error(`The data of ${dataNameList[index]} dataset is empty!`);
       }
       srcDatasetRow = {
         ...srcDatasetRow,
@@ -1647,12 +1653,12 @@ const handleGetSqlValue = async (props, data, srcDatasetRow = {}) =&gt; {
       type: "error",
       content: (
         <div>
-          <div>opensql查询接口报错！</div>
-          <div>请求地址：</div>
+          <div>opensql Query interface error！</div>
+          <div>Request address：</div>
           <div>{dataUrl}</div>
-          <div>传入参数：</div>
+          <div>Pass in parameters：</div>
           <div>{JSON.stringify(values)}</div>
-          <div>报错信息</div>
+          <div>Error message：</div>
           <div>{JSON.stringify(dataReturn)}</div>
         </div>
       )
@@ -1682,13 +1688,13 @@ const handleExeSql = (props, instruct) =&gt; {
         type: "error",
         content: (
           <div>
-            <div>{`获取${srcDataset}数据集数据为空！`}</div>
-            <div>错误指令集内容：</div>
+            <div>{`The ${srcDataset} dataset data is empty!`}</div>
+            <div>Error instruction set content:</div>
             <div>{JSON.stringify(instruct)}</div>
           </div>
         )
       });
-      throw new Error(`获取${srcDataset}数据集数据为空！`);
+      throw new Error(`The ${srcDataset} dataset data is empty!！`);
     }
     result.push({
@@ -1716,13 +1722,13 @@ const handleProcedure = async (props, instruct) =&gt; {
       type: "error",
       content: (
         <div>
-          <div>存储过程配置为空！</div>
-          <div>请检查该指令集：</div>
+          <div>The stored procedure configuration is empty!</div>
+          <div>Please check this instruction set:</div>
           <div>{JSON.stringify(instruct)}</div>
         </div>
       )
     });
-    throw new Error("存储过程配置为空！");
+    throw new Error("The stored procedure configuration is empty！");
   }
   if (bValidateList.length) {
@@ -1821,13 +1827,13 @@ const handleChangeTab = (props, instruct) =&gt; {
       type: "error",
       content: (
         <div>
-          <div>跳转tab页指令未配置tabName!</div>
-          <div>请检查该指令集：</div>
+          <div>The jump tab page instruction is not configured with tabName!</div>
+          <div>Please check this instruction set:</div>
           <div>{JSON.stringify(instruct)}</div>
         </div>
       )
     });
-    throw new Error("跳转tab页指令未配置tabName！");
+    throw new Error("The jump tab page instruction is not configured with tabName!");
   }
   changeTabName = tabName;
   return {};
@@ -1841,13 +1847,13 @@ const handleChangePage = (props, instruct) =&gt; {
       type: "error",
       content: (
         <div>
-          <div>跳转跳转页面指令未配置pagePath!</div>
-          <div>请检查该指令集：</div>
+          <div>The jump page instruction is not configured with pagePath!</div>
+          <div>Please check this instruction set:</div>
           <div>{JSON.stringify(instruct)}</div>
         </div>
       )
     });
-    throw new Error("跳转跳转页面指令未配置pagePath！");
+    throw new Error("The jump page instruction is not configured with pagePath!");
   }
   changePagePath = pagePath;
   return {};
@@ -1862,13 +1868,13 @@ const handlePoprepair = async (props, instruct) =&gt; {
       type: "error",
       content: (
         <div>
-          <div>跳转弹窗修改字段指令未配置title/fieldNames！</div>
-          <div>请检查该指令集：</div>
+          <div>The jump pop-up window to modify the field instruction is not configured with title/fieldNames!</div>
+          <div>Please check this instruction set:</div>
           <div>{JSON.stringify(instruct)}</div>
         </div>
       )
     });
-    throw new Error("跳转弹窗修改字段指令未配置title/fieldNames！");
+    throw new Error("The jump pop-up window to modify the field instruction is not configured with title/fieldNames!");
   }
   const { tableLineParams = {} } = props;
@@ -1906,14 +1912,14 @@ const handlePoprepair = async (props, instruct) =&gt; {
       content: (
         <div>
           <div
-          >{`未找到字段集合【${fieldNames}】对应的配置，请确认配置是否正确！`}</div>
-          <div>请检查该指令集：</div>
+          >{`The configuration corresponding to the field set [${fieldNames}] was not found. Please confirm whether the configuration is correct!`}</div>
+          <div>Please check this instruction set:</div>
           <div>{JSON.stringify(instruct)}</div>
         </div>
       )
     });
     throw new Error(
-      `未找到字段集合【${fieldNames}】对应的配置，请确认配置是否正确！`
+      `The configuration corresponding to the field set [${fieldNames}] was not found. Please confirm whether the configuration is correct!`
     );
   }
@@ -2057,12 +2063,12 @@ const handleExeSqlAll = async (props, onSucess) =&gt; {
       type: "error",
       content: (
         <div>
-          <div>exesql接口报错！</div>
-          <div>请求地址：</div>
+          <div>exesql interface reports an error!</div>
+          <div>Request address:</div>
           <div>{dataUrl}</div>
-          <div>传入参数：</div>
+          <div>Pass in parameters:</div>
           <div>{JSON.stringify(values)}</div>
-          <div>报错信息</div>
+          <div>Error message:</div>
           <div>{JSON.stringify(dataReturn)}</div>
         </div>
       )
@@ -2078,13 +2084,13 @@ const handleRefreshConfig = (props, instruct) =&gt; {
       type: "error",
       content: (
         <div>
-          <div>未配置srcDataset或srcDataset！</div>
-          <div>请检查该指令集：</div>
+          <div>srcDataset or srcDataset not configured!</div>
+          <div>Please check this instruction set:</div>
           <div>{JSON.stringify(instruct)}</div>
         </div>
       )
     });
-    throw new Error("未配置srcDataset或srcDataset！");
+    throw new Error("srcDataset or srcDataset not configured!");
   }
   const {
@@ -2361,19 +2367,19 @@ const handleComputeData = (props, str, datasetList) =&gt; {
       type: "error",
       content: (
         <div>
-          <div>赋值运算错误！</div>
-          <div>请检查赋值运算语法！</div>
-          <div>赋值运算内容:</div>
+          <div>Assignment operation error!</div>
+          <div>Please check the assignment syntax!</div>
+          <div>Assignment operation content:</div>
           <div>{str}</div>
-          <div>赋值运算被替代后的结果：</div>
+          <div>The result after the assignment operation is replaced:</div>
           <div>{JSON.stringify(strNew)}</div>
-          <div>赋值运算可能用到的数据集：</div>
+          <div>The data sets that may be used for the assignment operation are:</div>
           <div>{JSON.stringify(tempData)}</div>
         </div>
       )
     });
     window.debugger && console.log("=====err", { str, strNew, error });
-    throw new Error("js运算错误");
+    throw new Error("js operation error");
   }
   return result;
 };
@@ -2687,13 +2693,13 @@ const utils = {
         type: "error",
         content: (
           <div>
-            <div>数据集的赋值字段sValue不能为空！</div>
-            <div>请检查该指令集：</div>
+            <div>The assigned field sValue of the dataset cannot be empty!</div>
+            <div>Please check this instruction set:</div>
             <div>{JSON.stringify(instruct)}</div>
           </div>
         )
       });
-      throw new Error("数据集的赋值字段sValue不能为空！");
+      throw new Error("The assigned field sValue of the dataset cannot be empty!");
     }
     const {
@@ -2710,15 +2716,15 @@ const utils = {
         type: "error",
         content: (
           <div>
-            <div>{`${targetDataset}】数据源为空`}</div>
-            <div>过滤出的数据集为：</div>
+            <div>{`${targetDataset}] data source is empty`}</div>
+            <div>The filtered data sets are:</div>
             <div>{JSON.stringify(dataObj)}</div>
-            <div>请检查该指令集：</div>
+            <div>Please check this instruction set:</div>
             <div>{JSON.stringify(instruct)}</div>
           </div>
         )
       });
-      throw new Error(`${targetDataset}】数据源为空`);
+      throw new Error(`${targetDataset}] data source is empty`);
     }
     // const tableDataOld = props[`${targetDataset}Data`] || [];
@@ -2897,23 +2903,23 @@ const utils = {
         type: "error",
         content: (
           <div>
-            <div>conditon条件运算错误！</div>
-            <div>1、请检查condition语法！</div>
-            <div>2、请检查ccondition用到的数据集是否在dataset中正确配置！</div>
-            <div>conditon所在指令集：</div>
+            <div>Condition operation error!</div>
+            <div>1. Please check the condition syntax!</div>
+            <div>2. Please check whether the dataset used by ccondition is correctly configured in dataset!</div>
+            <div>Instruction set where condition is located:</div>
             <div>{JSON.stringify(instruct)}</div>
-            <div>conditon内容:</div>
+            <div>condition content:</div>
             <div>{condition}</div>
-            <div>condition被替代后的结果：</div>
+            <div>The result after condition is replaced:</div>
             <div>{JSON.stringify(conditionNew)}</div>
-            <div>condition可能用到的数据集：</div>
+            <div>The data set that condition may use is:</div>
             <div>{JSON.stringify(tempData)}</div>
           </div>
         )
       });
       window.debugger &&
         console.log("=====err", { tempData, condition, conditionNew, error });
-      throw new Error("js运算错误");
+      throw new Error("js operation error");
     }
     return bMatch;
@@ -3017,9 +3023,9 @@ const utils = {
       if (oTabs.length === 0) {
         showMsg({
           type: "error",
-          content: <div>{`未找到tab页面【${changeTabName}】`}</div>
+          content: <div>{`Tab page [${changeTabName}] not found`}</div>
         });
-        throw new error(`未找到tab页面【${changeTabName}】`);
+        throw new error(`Tab page [${changeTabName}] not found`);
       } else if (oTabs.length === 1) {
         oTab = oTabs[0];
       } else if (oTabs.length > 1) {
@@ -3034,9 +3040,9 @@ const utils = {
       if (!oTab) {
         showMsg({
           type: "error",
-          content: <div>{`未找到tab页面【${changeTabName}】`}</div>
+          content: <div>{`Tab page [${changeTabName}] not found`}</div>
         });
-        throw new error(`未找到tab页面【${changeTabName}】`);
+        throw new error(`Tab page [${changeTabName}] not found`);
       }
       oTab.click();
@@ -3192,13 +3198,13 @@ const utils = {
         type: "error",
         content: (
           <div>
-            <div>js运算错误！</div>
-            <div>请检查js运算语法！</div>
-            <div>js运算内容:</div>
+            <div>js operation error!</div>
+            <div>Please check the js operation syntax!</div>
+            <div>js operation content:</div>
             <div>{stringValue}</div>
-            <div>赋值运算被替代后的结果：</div>
+            <div>The result after the assignment operation is replaced:</div>
             <div>{JSON.stringify(strNew)}</div>
-            <div>请联系开发人员或用window.debuggerValue功能调试！</div>
+            <div>Please contact the developer or use the window.debuggerValue function to debug!</div>
           </div>
         )
       });
@@ -11456,7 +11456,7 @@ class CommonTableRc extends React.Component {
         {officePreviewVisible && <OfficePreview {...officePreviewProps} />}
         {labelColorModalVisible && (
           <Modal
-            title="标牌颜色"
+            title={commonFunc.showLocalMessage(this.props, 'signColor', '标牌颜色')}
             open={labelColorModalVisible}
             width={600}
             height={320}
@@ -11468,7 +11468,7 @@ class CommonTableRc extends React.Component {
             )}
           >
             <div className={styles.labelColorModal}>
-              {"白粉青蓝橙绿黄红".split("").map((item, index) => {
+              {commonFunc.showLocalMessage(this.props, 'eightColors', '白,粉,青,蓝,橙,绿,黄,红').split(",").map((item, index) => {
                 return (
                   <div>
                     <div
 :global {
   html[lang="sEnglish"] {
+
+    #global-mouse-tooltip {
+      position: fixed;
+      background: rgba(0, 0, 0, 0.75);
+      color: #fff;
+      padding: 4px 8px;
+      border-radius: 2px;
+      font-size: 14px;
+      // pointer-events: none;
+      z-index: 9999;
+      white-space: nowrap;
+      left: '0';
+      top: '0';
+      opacity: '0';
+      transition: opacity 0.2s;
+      box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+    }
+
+    .ant-tabs-tab {
+      flex-shrink: 0;
+    }
+
+    .ant-tabs-tab-btn {
+      font-size: 12px;
+      display: -webkit-box;
+      /*! autoprefixer: ignore next */
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 2;
+      /* 只保留 2 行 */
+      overflow: hidden;
+      text-overflow: ellipsis;
+      /* 兜底 */
+      white-space: normal;
+      /* 覆盖 antd 默认 nowrap */
+      width: 120px;
+      /* 按需调整，决定何时断行 */
+      line-height: 1;
+    }
+
+
+    .ant-table-header table {
+
+      .th-div,
+      th div:not([class]) {
+        display: -webkit-box;
+        /*! autoprefixer: ignore next */
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 1;
+        /* 只保留 2 行 */
+        overflow: hidden;
+        text-overflow: ellipsis;
+        /* 兜底 */
+        white-space: normal;
+        word-break: break-all;
+        /* 覆盖 antd 默认 nowrap */
+        // width: 120px;
+        /* 按需调整，决定何时断行 */
+        line-height: 1.2;
+      }
+    }
+
+    .ant-form-item-label {
+      display: flex;
+      align-items: center;
+      padding: 0 6px 0 16px;
+
+      label {
+        // padding: 3px;
+        height: auto;
+        font-size: 14px !important;
+        display: -webkit-box;
+        /*! autoprefixer: ignore next */
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        /* 只保留 2 行 */
+        overflow: hidden;
+        text-overflow: ellipsis;
+        /* 兜底 */
+        white-space: normal;
+        /* 覆盖 antd 默认 nowrap */
+        // width: 120px;
+        /* 按需调整，决定何时断行 */
+        line-height: 1.2;
+      }
+    }
+
+    .mesShowType .ant-form-item-label {
+      padding: 0 0 0 10px;
+      label {
+        font-size: 18px !important;
+      }
+    }
+
+
+    .ant-table-column-title {
+      overflow: initial;
+    }
+
+    .react-grid-item .ant-form-item-label>label {
+      &::before {
+        display: none;
+      }
+
+      &::after {
+        display: none;
+      }
+
+      display: flex;
+      justify-content: center;
+
+      .xly-grid-label {
+        height: auto !important;
+        font-size: 10px !important;
+        display: -webkit-box;
+        /*! autoprefixer: ignore next */
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: normal !important;
+        line-height: 1.2;
+
+        &::after {
+          content: ':';
+          position: relative;
+          top: -0.5px;
+          margin: 0 8px 0 2px;
+        }
+      }
+    }
+
+    .react-grid-item .ant-form-item-label>label.ant-form-item-required:not(.ant-form-item-required-mark-optional) {
+      .xly-grid-label {
+        &::before {
+          display: inline-block;
+          margin-right: 4px;
+          color: #ff4d4f;
+          font-size: 12px;
+          font-family: SimSun, sans-serif;
+          line-height: 1;
+          content: '*';
+        }
+      }
+    }
+
     th[width="40"] {
       .th-div {
         width: 32px;
@@ -2460,6 +2460,13 @@ const CommonParamsModalComponent = props =&gt; {
     }
   };
+  const confirm = commonFunc.showLocalMessage(props, 'confirm', '确认');
+  const BtnFirst = commonFunc.showLocalMessage(props, 'BtnFirst', '首条');
+  const BtnPrior = commonFunc.showLocalMessage(props, 'BtnPrior', '上一条');
+  const BtnNext = commonFunc.showLocalMessage(props, 'BtnNext', '下一条');
+  const BtnLast = commonFunc.showLocalMessage(props, 'BtnLast', '末条');
+  const workParam = commonFunc.showLocalMessage(props, "workParam", "工单参数");
+
   return props[modalName] ? (
     <Modal
       width="80%"
@@ -2477,7 +2484,7 @@ const CommonParamsModalComponent = props =&gt; {
             props.onSaveState({ [modalName]: false });
           }}
         >
-          确定
+          {confirm}
         </Button>
       }
     >
@@ -2490,7 +2497,7 @@ const CommonParamsModalComponent = props =&gt; {
               handleBtnParamPage("first");
             }}
           >
-            首条
+            {BtnFirst}
           </Button>
           <Button
             type="primary"
@@ -2499,7 +2506,7 @@ const CommonParamsModalComponent = props =&gt; {
               handleBtnParamPage("before");
             }}
           >
-            上一条
+            {BtnPrior}
           </Button>
           <Button
             type="primary"
@@ -2508,7 +2515,7 @@ const CommonParamsModalComponent = props =&gt; {
               handleBtnParamPage("next");
             }}
           >
-            下一条
+            {BtnNext}
           </Button>
           <Button
             type="primary"
@@ -2517,7 +2524,7 @@ const CommonParamsModalComponent = props =&gt; {
               handleBtnParamPage("last");
             }}
           >
-            末条
+            {BtnLast}
           </Button>
         </Space>
         {[""].map(() => {
@@ -2528,7 +2535,7 @@ const CommonParamsModalComponent = props =&gt; {
             sParamData: [
               {
                 sParamType: "sWorkOrder",
-                sParamName: "工单参数"
+                sParamName: workParam
               }
             ],
             tableName: "process",
@@ -70,6 +70,9 @@ const InputMultiModalComponent = props =&gt; {
     props.onCancel();
   };
+  const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消');
+  const confirm = commonFunc.showLocalMessage(props, 'confirm', '确认');
+
   return (
     <Modal
       width={600}
@@ -81,10 +84,10 @@ const InputMultiModalComponent = props =&gt; {
       footer={
         <Space>
           <Button size="large" onClick={() => props.onCancel()}>
-            取消
+            {BtnCancel}
           </Button>
           <Button type="primary" size="large" onClick={onOk}>
-            确定
+            {confirm}
           </Button>
         </Space>
       }
@@ -446,7 +446,7 @@ const WorkOrderTypeComponent = () =&gt; {
                             flex={"160px"}
                             className={styles.productionTitle}
                           >
-                            {productionSchedule}
+                            <span title={productionSchedule}>{productionSchedule}</span>
                             {/* <Button
                               type="link"
                               icon={<LeftOutlined />}
@@ -492,7 +492,7 @@ const WorkOrderTypeComponent = () =&gt; {
                             flex={"160px"}
                             className={styles.productionTitle}
                           >
-                            {specialFocus}
+                            <span title={specialFocus}>{specialFocus}</span>
                           </Col>
                           <Col
                             flex={1}
@@ -525,7 +525,7 @@ const WorkOrderTypeComponent = () =&gt; {
                             flex={"160px"}
                             className={styles.productionTitle}
                           >
-                            {config.showName}:
+                            <span title={config.showName}>{config.showName}:</span>
                           </Col>
                           <Col
                             flex={1}
@@ -106,12 +106,11 @@ const OpenModalEditPwd = props =&gt; {
   const oldPassword = commonFunc.showLocalMessage(props, 'oldPassword', '请输入原密码');
   const newPassword = commonFunc.showLocalMessage(props, 'newPassword', '请输入新密码');
   const passswordAgain = commonFunc.showLocalMessage(props, 'passswordAgain', '请再次输入密码');
-  const ModifyPassword = commonFunc.showLocalMessage(props, 'ModifyPassword','修改密码');/* 修改 */
+  const ModifyPassword = commonFunc.showLocalMessage(props, 'ModifyPassword', '修改密码');/* 修改 */
   // 确认修改密码
   const handleOk = () => {
-    const url = `${
-      commonConfig.server_host
-    }sftlogininfo/updatePasswordUserName/update?sModelsId=${100}`;
+    const url = `${commonConfig.server_host
+      }sftlogininfo/updatePasswordUserName/update?sModelsId=${100}`;
     props.dispatch({
       type: "app/editPwd",
       payload: {
@@ -369,6 +368,9 @@ const useIndexMesEvent = props =&gt; {
     const { userinfo } = props.app;
     const { sLanguage } = userinfo;
     document.querySelector('html').setAttribute('lang', sLanguage);
+    return () => {
+      document.querySelector('html').setAttribute('lang', 'en');
+    }
   }, []);
   return {
@@ -427,9 +429,8 @@ const IndexMes = baseProps =&gt; {
     token,
     sModelsId
   ) => {
-    const url = `${
-      commonConfig.server_host
-    }procedureCall/doGenericProcedureCall?sModelsId=${sModelsId}`;
+    const url = `${commonConfig.server_host
+      }procedureCall/doGenericProcedureCall?sModelsId=${sModelsId}`;
     const returnData = (await commonServices.postValueService(
       token,
       value,
@@ -446,16 +447,16 @@ const IndexMes = baseProps =&gt; {
   };
   const currentLanguage = props?.app?.userinfo?.sLanguage || 'zhCN'; // 默认为中文
   const getLocale = () => {
-    switch(currentLanguage) {
+    switch (currentLanguage) {
       case 'sEnglish':
         return enUS;
       case 'sBig5':
         return zhTW;
       default:
-      {
-        moment.locale('zh-cn');
-        return zhCN;
-      }
+        {
+          moment.locale('zh-cn');
+          return zhCN;
+        }
     }
   };
   const bExsitLogin = commonFunc.showLocalMessage(props, 'bExsitLogin', '是否退出登录');
@@ -482,7 +483,7 @@ const IndexMes = baseProps =&gt; {
             {logoutShow && (
               <DraggableConfirmModal
                 btnShow={false}
-                title ={FriendlyReminder}
+                title={FriendlyReminder}
                 content={bExsitLogin}
                 props={props}
                 onOk={() => {
@@ -510,7 +511,7 @@ const HeaderConponent = () =&gt; {
   const sLanguage = userinfo.sLanguage;
   let weekday = ["日", "一", "二", "三", "四", "五", "六"];
-  const sunTitle = sLanguage ==='sChinese' ? '星期' : '';
+  const sunTitle = sLanguage === 'sChinese' ? '星期' : '';
   const [time, setTime] = useState("0000-00-00 00:00:00");
   const { logout } = useContext(myContext);
   useEffect(() => {
@@ -532,8 +533,8 @@ const HeaderConponent = () =&gt; {
   const logoTitle = commonFunc.showLocalMessage(props, 'EBC-MES', '小羚羊生产执行系统');
-  const account= commonFunc.showLocalMessage(props, 'account', '账号');
-  const machine= commonFunc.showLocalMessage(props, 'machine', '机台');
+  const account = commonFunc.showLocalMessage(props, 'account', '账号');
+  const machine = commonFunc.showLocalMessage(props, 'machine', '机台');
   const classGroup = commonFunc.showLocalMessage(props, 'classGroup', '班组');
   const dayShift = commonFunc.showLocalMessage(props, 'dayShift', '白班');
   const nightShift = commonFunc.showLocalMessage(props, 'nightShift', '夜班');
@@ -577,16 +578,16 @@ const HeaderConponent = () =&gt; {
-    const [ isModalOpen, setIsModalOpen ] = useState(false);
-    const objRef = useRef({});
-    const handleCancel = () => setIsModalOpen(false);
-    window.$wkcFullStatus = (item , is) =>{
-        objRef.current = {
-            ...objRef.current,
-            ...item
-        }
-        setIsModalOpen(is);
+  const [isModalOpen, setIsModalOpen] = useState(false);
+  const objRef = useRef({});
+  const handleCancel = () => setIsModalOpen(false);
+  window.$wkcFullStatus = (item, is) => {
+    objRef.current = {
+      ...objRef.current,
+      ...item
     }
+    setIsModalOpen(is);
+  }
@@ -626,20 +627,20 @@ const HeaderConponent = () =&gt; {
         <div className="logout" onClick={logout} />
       </div>
-        <Modal
-            title="Basic Modal"
-            open={isModalOpen}
-            width={'100vw'}
-            height={'100vh'}
-            onCancel={handleCancel}
-            footer={null}
-            mask={false}
-            closable={false}
-            destroyOnClose={true}
-            maskClosable={false}
-            wrapClassName={ styles.ztwwwww }>
-            <MachineMessageComponent e={objRef.current} shutDown={handleCancel} props ={props} />
-        </Modal>
+      <Modal
+        title="Basic Modal"
+        open={isModalOpen}
+        width={'100vw'}
+        height={'100vh'}
+        onCancel={handleCancel}
+        footer={null}
+        mask={false}
+        closable={false}
+        destroyOnClose={true}
+        maskClosable={false}
+        wrapClassName={styles.ztwwwww}>
+        <MachineMessageComponent e={objRef.current} shutDown={handleCancel} props={props} />
+      </Modal>
     </div>
   );
@@ -647,41 +648,41 @@ const HeaderConponent = () =&gt; {
 // 停机状态栏
-const MachineMessageComponent = ({ e  , shutDown, props }) => {
-    const value = e.item?.props?.value || {};
-    const { current: startTime } = useRef(moment().format("YYYY-MM-DD HH:mm:ss"));
-    const { backgroundColor, conent2, fontSize } = value;
-    const [currentTime, setCurrentTime] = useState("");
-    const [diffHours, setDiffHours] = useState(0);
-    const [diffMins, setDiffMins] = useState(0);
-    const [diffSecs, setDiffSecs] = useState(0);
-    useEffect(() => {
-      const getTime = () => {
-        const currentTimeNew = moment().format("YYYY-MM-DD HH:mm:ss");
-        setCurrentTime(currentTimeNew);
-
-        const duration = moment.duration(
-          moment(currentTimeNew).diff(moment(startTime))
-        );
-        const hours = duration.asHours().toString().split(".")[0];
-        const minutes = (duration.asMinutes() % 60).toString().split(".")[0];
-        const seconds = duration.asSeconds() % 60;
-
-        setDiffHours(hours<=9? `0${hours}`: hours);
-        setDiffMins(minutes<=9? `0${minutes}`: minutes );
-        setDiffSecs(seconds<=9? `0${seconds}`: seconds);
-      };
+const MachineMessageComponent = ({ e, shutDown, props }) => {
+  const value = e.item?.props?.value || {};
+  const { current: startTime } = useRef(moment().format("YYYY-MM-DD HH:mm:ss"));
+  const { backgroundColor, conent2, fontSize } = value;
+  const [currentTime, setCurrentTime] = useState("");
+  const [diffHours, setDiffHours] = useState(0);
+  const [diffMins, setDiffMins] = useState(0);
+  const [diffSecs, setDiffSecs] = useState(0);
+  useEffect(() => {
+    const getTime = () => {
+      const currentTimeNew = moment().format("YYYY-MM-DD HH:mm:ss");
+      setCurrentTime(currentTimeNew);
+
+      const duration = moment.duration(
+        moment(currentTimeNew).diff(moment(startTime))
+      );
+      const hours = duration.asHours().toString().split(".")[0];
+      const minutes = (duration.asMinutes() % 60).toString().split(".")[0];
+      const seconds = duration.asSeconds() % 60;
+
+      setDiffHours(hours <= 9 ? `0${hours}` : hours);
+      setDiffMins(minutes <= 9 ? `0${minutes}` : minutes);
+      setDiffSecs(seconds <= 9 ? `0${seconds}` : seconds);
+    };
+    getTime();
+    const timer = setInterval(() => {
+      console.log('定时器状态')
       getTime();
-      const timer = setInterval(() => {
-        console.log('定时器状态')
-        getTime();
-      }, 1000);
+    }, 1000);
-      return () => {
-          clearInterval(timer);
-      };
-    }, []);
+    return () => {
+      clearInterval(timer);
+    };
+  }, []);
   const FriendlyReminder = commonFunc.showLocalMessage(props, 'FriendlyReminder', '温馨提示');
   const BtnSure = commonFunc.showLocalMessage(props, 'BtnSure', '确认');
@@ -703,108 +704,108 @@ const MachineMessageComponent = ({ e  , shutDown, props }) =&gt; {
   const about = commonFunc.showLocalMessage(props, 'about', '约：');
   const handleMenuClose = () => {
-      Modal.confirm({
-        title: FriendlyReminder,
-        content: <div>{confirmState}</div>,
-        okText: BtnSure,
-        cancelText: BtnCancel,
-        zIndex: 2000,
-        onOk() {
-          shutDown()
-        },
-        onCancel() {}
-      });
-    };
+    Modal.confirm({
+      title: FriendlyReminder,
+      content: <div>{confirmState}</div>,
+      okText: BtnSure,
+      cancelText: BtnCancel,
+      zIndex: 2000,
+      onOk() {
+        shutDown()
+      },
+      onCancel() { }
+    });
+  };
-    const isMinMax = useRef('max');
-    const draggleRef = useRef(null);
-    const [bounds, setBounds] = useState({ left: 0, top: 0, bottom: 0, right: 0 });
-    const onStart = (_event, uiData) => {
-        const { clientWidth, clientHeight } = window.document.documentElement;
-        const targetRect = draggleRef.current?.getBoundingClientRect();
-        if (!targetRect) {
-          return;
-        }
-        setBounds({
-          left: -targetRect.left + uiData.x,
-          right: clientWidth - (targetRect.right - uiData.x),
-          top: -targetRect.top + uiData.y,
-          bottom: clientHeight - (targetRect.bottom - uiData.y),
-        });
-    };
+  const isMinMax = useRef('max');
+  const draggleRef = useRef(null);
+  const [bounds, setBounds] = useState({ left: 0, top: 0, bottom: 0, right: 0 });
+  const onStart = (_event, uiData) => {
+    const { clientWidth, clientHeight } = window.document.documentElement;
+    const targetRect = draggleRef.current?.getBoundingClientRect();
+    if (!targetRect) {
+      return;
+    }
+    setBounds({
+      left: -targetRect.left + uiData.x,
+      right: clientWidth - (targetRect.right - uiData.x),
+      top: -targetRect.top + uiData.y,
+      bottom: clientHeight - (targetRect.bottom - uiData.y),
+    });
+  };
-    return (
-        <div className={`${styles.modalBoxStyle} ${isMinMax.current}`}>
-
-            {
-                isMinMax.current == 'min'?
-                <Draggable defaultPosition={{ x: document.body.clientWidth-400-30, y: 70 }} bounds={bounds}  onStart={(event, uiData) => onStart(event, uiData)}>
-                    <div ref={draggleRef} className={styles.maxBoxViews} style={{ '--bgColor' : backgroundColor }}>
-                        <div className="mixbox" onDoubleClick={()=>isMinMax.current = 'max'}>
-                            <h2>{conent2}</h2>
-                            <div className="p">{beginTime} {startTime}</div>
-                            <div className="p">{downtimeDuration}{diffHours}{second} {diffMins}{min} {diffSecs}{second}</div>
-                            <div className="btn">
-                                <Button size="large" type="primary" className={styles.btnWg} onClick={()=>isMinMax.current = 'max'} > 最大化 </Button>
-                                <Button size="large" type="primary" className={styles.btnWg} onClick={handleMenuClose} > 退出 </Button>
-                            </div>
-                        </div>
-                    </div>
-                </Draggable>
-                :
-                <div className={styles.machineStatusContent} style={{ backgroundColor }}>
-                    <div className="conent1">{equipmentShutdown}</div>
-                    <div className="conent2" style={fontSize ? { fontSize } : {}}>
-                    {conent2}
-                    </div>
-                    <div className="conent3">
-                    {DowntimeStartTime}
-                    {startTime}
-                    </div>
-                    <div className="conent4">
-                    {sct}
-                    {currentTime}
-                    </div>
-                    <div className="conent5">
-                    {cdd}
-                    <span className="conent6">
-                        {about}
-                        {diffHours}{hour} {diffMins}{min} {diffSecs}{second}
-                    </span>
-                    </div>
-                    <div className="conent7">
-                        <Button size="large" type="primary" className={styles.btnWg} onClick={()=>isMinMax.current = 'min'} > {minimize} </Button>
-                        <Button size="large" type="primary" className={styles.btnWg} onClick={handleMenuClose} > {ExitLogin} </Button>
-                    </div>
+  return (
+    <div className={`${styles.modalBoxStyle} ${isMinMax.current}`}>
+
+      {
+        isMinMax.current == 'min' ?
+          <Draggable defaultPosition={{ x: document.body.clientWidth - 400 - 30, y: 70 }} bounds={bounds} onStart={(event, uiData) => onStart(event, uiData)}>
+            <div ref={draggleRef} className={styles.maxBoxViews} style={{ '--bgColor': backgroundColor }}>
+              <div className="mixbox" onDoubleClick={() => isMinMax.current = 'max'}>
+                <h2>{conent2}</h2>
+                <div className="p">{beginTime} {startTime}</div>
+                <div className="p">{downtimeDuration}{diffHours}{second} {diffMins}{min} {diffSecs}{second}</div>
+                <div className="btn">
+                  <Button size="large" type="primary" className={styles.btnWg} onClick={() => isMinMax.current = 'max'} > 最大化 </Button>
+                  <Button size="large" type="primary" className={styles.btnWg} onClick={handleMenuClose} > 退出 </Button>
                 </div>
-            }
+              </div>
+            </div>
+          </Draggable>
+          :
+          <div className={styles.machineStatusContent} style={{ backgroundColor }}>
+            <div className="conent1">{equipmentShutdown}</div>
+            <div className="conent2" style={fontSize ? { fontSize } : {}}>
+              {conent2}
+            </div>
+            <div className="conent3">
+              {DowntimeStartTime}
+              {startTime}
+            </div>
+            <div className="conent4">
+              {sct}
+              {currentTime}
+            </div>
+            <div className="conent5">
+              {cdd}
+              <span className="conent6">
+                {about}
+                {diffHours}{hour} {diffMins}{min} {diffSecs}{second}
+              </span>
+            </div>
+            <div className="conent7">
+              <Button size="large" type="primary" className={styles.btnWg} onClick={() => isMinMax.current = 'min'} > {minimize} </Button>
+              <Button size="large" type="primary" className={styles.btnWg} onClick={handleMenuClose} > {ExitLogin} </Button>
+            </div>
+          </div>
+      }
-        </div>
-    );
+    </div>
+  );
 };
-  // 左侧侧边栏
+// 左侧侧边栏
 const SiderComponent = () => {
   const { dispatch, hooksProps, props, ...rest } = useContext(myContext);
   const { currentContent, menuMap } = hooksProps;
-  const teamInformation= commonFunc.showLocalMessage(props, 'teamInformation', '班组信息');
+  const teamInformation = commonFunc.showLocalMessage(props, 'teamInformation', '班组信息');
-  const scheduledTask= commonFunc.showLocalMessage(props, 'scheduledTask', '计划任务');
+  const scheduledTask = commonFunc.showLocalMessage(props, 'scheduledTask', '计划任务');
-  const productionExecution= commonFunc.showLocalMessage(props, 'productionExecution', '生产执行');
+  const productionExecution = commonFunc.showLocalMessage(props, 'productionExecution', '生产执行');
-  const maintenanceRepair= commonFunc.showLocalMessage(props, 'maintenanceRepair', '维修保养');
+  const maintenanceRepair = commonFunc.showLocalMessage(props, 'maintenanceRepair', '维修保养');
-  const queryTracing= commonFunc.showLocalMessage(props, 'queryTracing', '查询追踪');
+  const queryTracing = commonFunc.showLocalMessage(props, 'queryTracing', '查询追踪');
-  const operationGuide= commonFunc.showLocalMessage(props, 'teamInformation', '操作指南');
+  const operationGuide = commonFunc.showLocalMessage(props, 'teamInformation', '操作指南');
   const menuList = [
     {
@@ -984,9 +985,8 @@ const SystemFunComponent = () =&gt; {
       value.iFlag = iFlag;
     }
-    const url = `${
-      commonConfig.server_host
-    }procedureCall/doGenericProcedureCall?sModelsId=${sModelsId}`;
+    const url = `${commonConfig.server_host
+      }procedureCall/doGenericProcedureCall?sModelsId=${sModelsId}`;
     const returnData = (await commonServices.postValueService(
       token,
       value,
@@ -1003,7 +1003,7 @@ const SystemFunComponent = () =&gt; {
         onOk() {
           handleProcedureCall(params, 1);
         },
-        onCancel() {}
+        onCancel() { }
       });
     } else if (code === -8) {
       Modal.info({
@@ -1060,9 +1060,8 @@ const SystemFunComponent = () =&gt; {
       value.iFlag = iFlag;
     }
-    const url = `${
-      commonConfig.server_host
-    }procedureCall/doGenericProcedureCall?sModelsId=${sModelsId}`;
+    const url = `${commonConfig.server_host
+      }procedureCall/doGenericProcedureCall?sModelsId=${sModelsId}`;
     const returnData = (await commonServices.postValueService(
       token,
       value,
@@ -1079,7 +1078,7 @@ const SystemFunComponent = () =&gt; {
         onOk() {
           handleProcedureCall1(params, 1);
         },
-        onCancel() {}
+        onCancel() { }
       });
     } else if (code === -8) {
       Modal.info({
@@ -1137,14 +1136,14 @@ const SystemFunComponent = () =&gt; {
   const getSystemFunContent = () => {
     const userinfo = commonUtils.getAppData("userinfo");
-    const ModifyPassword = commonFunc.showLocalMessage(props, 'ModifyPassword','修改密码');/* 修改密码 */
+    const ModifyPassword = commonFunc.showLocalMessage(props, 'ModifyPassword', '修改密码');/* 修改密码 */
     const faceCollection = commonFunc.showLocalMessage(props, 'faceCollection', '人脸采集');
     const moreFunctions = commonFunc.showLocalMessage(props, 'moreFunctions', '更多功能');
     const Logout = commonFunc.showLocalMessage(props, 'Logout', '退出登录');
-    const shutDown= commonFunc.showLocalMessage(props, 'shutDown', '关机');
-    const resetDailyReport= commonFunc.showLocalMessage(props, 'resetDailyReport', '关机');
-    const switchToManual= commonFunc.showLocalMessage(props, 'switchToManual', '切换手动');
-    const SwitchAuto= commonFunc.showLocalMessage(props, 'SwitchAuto', '切换自动');
+    const shutDown = commonFunc.showLocalMessage(props, 'shutDown', '关机');
+    const resetDailyReport = commonFunc.showLocalMessage(props, 'resetDailyReport', '关机');
+    const switchToManual = commonFunc.showLocalMessage(props, 'switchToManual', '切换手动');
+    const SwitchAuto = commonFunc.showLocalMessage(props, 'SwitchAuto', '切换自动');
     const { bPlcSd } = userinfo;
@@ -374,7 +374,7 @@
             const result = await new Promise(resolve => {
               Modal.confirm({
                 title: FriendlyReminder,
-                content: <div>请选择要变更的状态</div>,
+                content: <div>{sLanguage === "sEnglish" ? "Please select the status you want to change" : "请选择要变更的状态"}</div>,
                 okText: finishConstruction,
                 cancelText: pause,
                 onOk() {