1.完善MES按钮类，弹窗类英文翻译

Min
1 parent e5fd2b6f
Showing 17 changed files with 73 additions and 48 deletions
src/components/Common/CommonBillEvent.js
src/components/Common/CommonComponent/index.js
src/components/Common/CommonListSelect/index.js
src/components/Common/CommonListSelectTree/index.js
src/components/Common/CommonListTreeSelect/index.js
src/components/Common/CommonTable/index.js
src/components/Common/CommonViewDragable/index.js
src/components/Common/SearchComponent/index.js
src/components/Common/SlaveMemo.js
src/components/Common/commonBusiness.js
src/components/Draggable/index.js
src/mes/common/commonModalComponent/index.js
src/mes/common/commonModelComponent/index.js
src/mes/common/commonOperationBarComponent/index.js
src/mes/indexMes/index.js
src/mes/productionExec/quickSwitchTabComponent/index.js
src/mes/scheduledTasks/machineTasks/index.js
@@ -5038,6 +5038,7 @@ export default (ChildComponent) =&gt; {
         this.handleGetData(masterConfig, slaveConfig, checkConfig);
       } else if(name && name.includes('BtnTempSql')) { /* 通过BtnTempSql按钮 自定义调用Sql 并将数据回填到界面上 */
         const { masterConfig, slaveConfig, sModelsId, token } = this.props;
+        const sOperaSuccess = commonFunc.showLocalMessage(props, 'sOperaSuccess', '操作成功');
         let {  masterData,slaveData } = this.props;
         const slave0Data = [];
         const slave1Data = [];
@@ -5211,7 +5212,7 @@ export default (ChildComponent) =&gt; {
           const dataReturn = (await commonServices.postValueService(this.props.app.token, value, url)).data;
           if (dataReturn.code === 1) {
             /*   数据操作 数据回传页面   */
-            message.success('操作成功！');
+            message.success(sOperaSuccess);
             const returnData = dataReturn.dataset.rows[0];
             if (commonUtils.isNotEmptyArr(slaveNameList) && commonUtils.isNotEmptyObject(returnData)) {
               slaveNameList.forEach((name, index) => {
@@ -2,6 +2,7 @@ import moment from &#39;moment&#39;;
 import React, { Component, createRef } from 'react';
 import reactComponentDebounce from '@/components/Common/ReactDebounce';
 import '@ant-design/compatible/assets/index.css';
+import * as commonFunc from '@/components/Common/commonFunc';
 import {
   InputNumber,
   Checkbox,
@@ -558,6 +559,7 @@ export default class CommonComponent extends Component {
   }
   /**   获取selectprops对象   */
   getSelectProps = () => {
+    const noData = commonFunc.showLocalMessage(this.props, 'noData', '暂无数据');
     /*   返回值声明   */
     const obj = {
       showSearch: true, /*   是否有查找功能   */
@@ -567,7 +569,7 @@ export default class CommonComponent extends Component {
       onDropdownVisibleChange: this.onDropdownVisibleChange,
       onPopupScroll: this.handlePopupScroll,
       onSearch: this.handleSearch,
-      notFoundContent: this.state.spinState ? <Spin /> : '暂无数据',
+      notFoundContent: this.state.spinState ? <Spin /> : noData,
       // getPopupContainer: this.props.name === 'slave' || this.props.name === 'searchColumnShow' ? this.getPopupContainer : null,/*解决下拉框不随浏览器滚动问题 */
       onFocus: this.onFocus,
       onBlur: this.onBlur,
@@ -825,6 +827,7 @@ export default class CommonComponent extends Component {
   /**   获取complete对象   */
   getCompleteProps = () => {
     /*   返回值声明  */
+    const noData = commonFunc.showLocalMessage(this.props, 'noData', '暂无数据');
     const obj = {
       // disabled: !this.state.enabled /*   修改的时候传过来的数据  */
       onChange: this.handleCompleteInputEvent, /*   选择触发事件   */
@@ -857,7 +860,7 @@ export default class CommonComponent extends Component {
       /* 区分Oee设置字体与其他系统设置字体 */
       dropdownClassName: commonUtils.isNotEmptyObject(location.pathname) && location.pathname.toLowerCase().indexOf('oee') > -1 ? (location.pathname.toLowerCase().indexOf('loginoee') > -1 ? 'loginOeeDropDown' : 'oeeDropDown') : '',
       onSearch: this.handleSearch,
-      notFoundContent: this.state.spinState ? <Spin /> : '暂无数据',
+      notFoundContent: this.state.spinState ? <Spin /> : noData,
       onFocus: this.onFocus,
       onBlur: this.onBlur,
     };
@@ -1406,7 +1409,7 @@ export default class CommonComponent extends Component {
       obj.title = obj.value;
     }
     obj.placeholder = this.props.showConfig.placeholder;
-    
+
     if (this.props.name === "tableS0" && this.props.showConfig.sName === "sStatus") {
       if (this.state.dataValue === "已提交") {
         obj.className = "sStatusSubmit";
@@ -2716,7 +2719,7 @@ export default class CommonComponent extends Component {
  
     // 登记取样特殊处理
     if(slaveConfig.sId=='12710101117346647176280'){
-        
+
         if(innerInputProps.id.includes('bReturn')){
             window.$xlyStorage = this.props.dataValue;
         }
@@ -2725,7 +2728,7 @@ export default class CommonComponent extends Component {
  
           this.myRef.current.querySelector('input').addEventListener('keydown',(event)=>{
               if (event.code === 'NumpadEnter' || event.code === 'Enter') { // 或者使用 event.keyCode === 13
-                  
+
                 event.preventDefault(); // 阻止默认行为
                 // console.log(this.value)
                 // const inputValue = this.value;
@@ -2767,7 +2770,7 @@ export default class CommonComponent extends Component {
           })
  
  
-            
+
             // debugger
             // innerInputProps.onPressEnter = (event2)=>{
                 // setTimeout(()=>{
@@ -3065,7 +3068,7 @@ export default class CommonComponent extends Component {
     const fieldDecoratorProps = this.getFieldDecoratorProps();
     /*   通用组件(主表存在getFieldDecorator表单验证,而从表则不需要)   */
  
-    
+
     // 班组报工,产量上报信息,label文字颜色特殊处理
     if(slaveConfig.sId=='17087428780006438414984564455000'){
         // 计件
@@ -276,11 +276,12 @@ const CommonListComponent = Form.create({
   const bPadPop =
     props.sModelsId === "12710101117211852461310" ||
     props.sModelsId === "12710101117218031681520";
-  
+
   if (bPadPop) {
     tableProps.fixedHeight = "325px";
   }
-
+  const BtnSure = commonFunc.showLocalMessage(props, 'BtnSure', '确认');
+  const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消');
   return (
     <Form >
       <Layout>
@@ -326,8 +327,8 @@ const CommonListComponent = Form.create({
               }
             </div>
             <div style={{ textAlign: 'right', marginRight: '9px', marginBottom: '9px' }}>
-              <Button key="back" style={{ marginRight: '8px' }} size='large' onClick={props.onCancel}>取消</Button>
-              <Button type="primary" size='large' onClick={props.onSelect}>确认</Button>
+              <Button key="back" style={{ marginRight: '8px' }} size='large' onClick={props.onCancel}>{BtnCancel}</Button>
+              <Button type="primary" size='large' onClick={props.onSelect}>{BtnSure}</Button>
             </div>
           </div> : ''
         }
@@ -450,6 +450,8 @@ const CommonListComponent = Form.create({
       }
     }
   };
+  const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消');
+  const BtnSure = commonFunc.showLocalMessage(props, 'BtnSure', '确认');
   return (
     <div className="modalChooseProcessContent">
       <Form >
@@ -505,8 +507,8 @@ const CommonListComponent = Form.create({
               width: '50%', textAlign: 'right', marginRight: '9px', marginBottom: '9px',
             }}
             >
-              <Button key="back" style={{ marginRight: '8px' }} onClick={props.onCancel}>取消</Button>
-              <Button type="primary" onClick={props.onSelect}>确认</Button>
+              <Button key="back" style={{ marginRight: '8px' }} onClick={props.onCancel}>{BtnCancel}</Button>
+              <Button type="primary" onClick={props.onSelect}>{BtnSure}</Button>
             </div>
           </div>
         </Layout>
@@ -564,7 +564,8 @@ const CommonListComponent = Form.create({
       }
     }
   };
-
+  const BtnSure = commonFunc.showLocalMessage(props, 'BtnSure', '确认');
+  const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消');
   return (
     <Form >
       <Layout>
@@ -609,8 +610,8 @@ const CommonListComponent = Form.create({
               }
             </div>
             <div style={{ textAlign: 'right', marginRight: '9px', marginBottom: '9px' }}>
-              <Button key="back" style={{ marginRight: '8px' }} onClick={props.onCancel}>取消</Button>
-              <Button type="primary" onClick={props.onSelect}>确认</Button>
+              <Button key="back" style={{ marginRight: '8px' }} onClick={props.onCancel}>{BtnCancel}</Button>
+              <Button type="primary" onClick={props.onSelect}>{BtnSure}</Button>
             </div>
           </div> : ''
         }
@@ -12004,10 +12004,11 @@ const useCommonTableEvent = props =&gt; {
   if (props.onGetTotalDiv) {
     addState.getTotalDiv = props.onGetTotalDiv;
   }
-
+  const sDetailTitle =   commonFunc.showLocalMessage(props, 'sDetailTitle', '详细');
+  const BtnClose =   commonFunc.showLocalMessage(props, 'BtnClose', '关闭');
   const handleShowSimpleModal = htmlString => {
     Modal.info({
-      title: <span style={{ color: "#1890FF" }}>详细</span>,
+      title: <span style={{ color: "#1890FF" }}>{sDetailTitle}</span>,
       width: "70%",
       content: (
         <div
@@ -12022,7 +12023,7 @@ const useCommonTableEvent = props =&gt; {
           dangerouslySetInnerHTML={{ __html: htmlString }}
         />
       ),
-      okText: "关闭"
+      okText: BtnClose
     });
   };
  
@@ -135,6 +135,7 @@ const ParamTableComponent = childProps =&gt; {
 const RGLComponent = childProps => {
   const { props, hooksProps } = useContext(myContext);
   const { tableName } = props;
+
   const { selectedData } = hooksProps;
   const { sParamType } = childProps;
   const xlyRGLRef = useRef(null);
@@ -216,12 +217,13 @@ const RGLComponent = childProps =&gt; {
       </ReactGridLayout>
     </div>
   ) : (
-    <EmptyComponent />
+    <EmptyComponent props ={props} />
   );
 };
  
 const EmptyComponent = () => {
-  return <div className="emptyComponent">暂无数据</div>;
+  const noData = commonFunc.showLocalMessage(this.props, 'noData', '暂无数据');
+  return <div className="emptyComponent">{noData}</div>;
 };
  
 // 获取选中数据
@@ -1179,6 +1179,8 @@ export default class SearchComponent extends Component {
     const btnSaveAndSearch = commonFunc.showMessage(app.commonConst, 'btnSaveAndSearch') || "保存并查询";/* 保存并查询 */
     const solutionFilterSave = commonFunc.showMessage(app.commonConst, 'solutionFilterSave');
     const solutionFilterNameUpd = commonFunc.showMessage(app.commonConst, 'solutionFilterNameUpd');
+    const BtnSure = commonFunc.showLocalMessage(props, 'BtnSure', '确认');
+    const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消');
  
     const modalCom = (
       <AntdDraggableModal
@@ -1188,8 +1190,8 @@ export default class SearchComponent extends Component {
           this.handleOk(e);
         }, 300)}
         onCancel={this.handleCancel.bind(this, 'modalVisible')}
-        okText="确认"
-        cancelText="取消"
+        okText={BtnSure}
+        cancelText={BtnCancel}
         confirmLoading={confirmLoading}
         maskClosable={false}
       >
@@ -218,7 +218,8 @@ class SlaveMemoRc extends Component {
     let bVisibleMemo;
     let sMemoField;
     let btnName = "";
-    const title = "详细";
+    const sDetailTitle =   commonFunc.showLocalMessage(props, 'sDetailTitle', '详细');
+    const title = sDetailTitle;
     let bEnabledTextArea = false; /* 多行文本默认可输入 非编辑状态多行文本禁止输入 */
     if (commonUtils.isNotEmptyObject(sCurrMemoProps)) {
       bVisibleMemo = sCurrMemoProps.bVisibleMemo;
@@ -1267,8 +1267,9 @@ export async function clearSocketData(param) {
 * */
 export function createMemoProps(name, props) {
   const { sCurrMemoProps } = props;
+  const sDetailTitle =   commonFunc.showLocalMessage(props, 'sDetailTitle', '详细');
   if (commonUtils.isNotEmptyObject(sCurrMemoProps) && commonUtils.isEmptyStr(sCurrMemoProps.title)) {
-    sCurrMemoProps.title = '详细';
+    sCurrMemoProps.title = sDetailTitle;
     sCurrMemoProps.name = name;
   }
   const sMemoProps = {
@@ -37,6 +37,8 @@ export const DraggableConfirmModal = ({
   });
   const draggleRef = useRef(null);
  
+  // const FriendlyReminder = commonFunc.showLocalMessage(this.props, 'FriendlyReminder', '温馨提示');
+
   const showModal = () => {
     setOpen(true);
   };
 import React, { useEffect, useState } from "react";
 import { Button, Modal, Space } from "antd";
+import * as commonFunc from '@/components/Common//commonFunc';
 import RouterComponent from "@/routes/mes/routerComponent";
  
 // 通用方法
@@ -57,7 +58,7 @@ const CommonModalComponent = props =&gt; {
       window.deviceTargetInfoModalAutoShow = false;
     };
   }, []);
-
+  const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消');
   return (
     <Modal
       title={titleNew}
@@ -79,7 +80,7 @@ const CommonModalComponent = props =&gt; {
               props.onCancel && props.onCancel();
             }}
           >
-            取消
+            {BtnCancel}
           </Button>
         </Space>
       }
@@ -1288,7 +1288,7 @@ const CommonModelComponent = props =&gt; {
             width = "100%",
             height = "100%"
           } = item;
-          console.log('ssconfigLists', configList, sEntireTabName );
+          console.log('ssconfigLists', configList, sEntireTabName, item);
           const sEntireTabNameNew = sLanguage === 'sEnglish' ? sEnglishEntireTabName :
             sLanguage === 'sBig5EntireTabName' ? sBig5EntireTabName : sEntireTabName;
           console.log('sEntireTabNameNew', sEntireTabNameNew);
@@ -2022,10 +2022,10 @@ const CommonRepairComponent = props =&gt; {
             bReturn: false
         })
     }
-
+  const titleNew = title === '异常信息' ? 'Abnormal Info' : title;
   return (
     <Modal
-      title={title}
+      title={titleNew}
       open={visible}
       width={width}
       height={height}
@@ -2606,10 +2606,10 @@ const TaskConfirmModal = props =&gt; {
     props.itemClickRef.current = null;
     props.onSaveState({ taskConfirmModalVisible: false });
   };
-
+  const prompt = commonFunc.showLocalMessage(props, 'prompt', '提示');
   return (
     <Modal
-      title="提示！"
+      title={prompt}
       open={taskConfirmModalVisible}
       width={500}
       height={250}
@@ -1469,7 +1469,8 @@ const ScanCodeToLoadMaterials = props =&gt; {
     },
     [valueNew]
   );
-
+  const BtnSure = commonFunc.showLocalMessage(props, 'BtnSure', '确认');
+  const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消');
   return (
     <Modal
       title="扫码上料"
@@ -1480,10 +1481,10 @@ const ScanCodeToLoadMaterials = props =&gt; {
       footer={
         <Space>
           <Button size="large" onClick={handleCancel}>
-            取消
+            {BtnCancel}
           </Button>
           <Button type="primary" size="large" onClick={handleOk}>
-            确认
+            {BtnSure}
           </Button>
         </Space>
       }
@@ -453,7 +453,7 @@ const IndexMes = baseProps =&gt; {
     }
   };
   const bExsitLogin = commonFunc.showLocalMessage(props, 'bExsitLogin', '是否退出登录');
-
+  const FriendlyReminder = commonFunc.showLocalMessage(props, 'FriendlyReminder', '温馨提示');
   return (
     <ConfigProvider locale={getLocale()}>
       <myContext.Provider
@@ -476,7 +476,9 @@ const IndexMes = baseProps =&gt; {
             {logoutShow && (
               <DraggableConfirmModal
                 btnShow={false}
+                title ={FriendlyReminder}
                 content={bExsitLogin}
+                props={props}
                 onOk={() => {
                   handleColseOee();
                   setLogoutShow(false);
@@ -772,7 +774,7 @@ const SiderComponent = () =&gt; {
   const { currentContent, menuMap } = hooksProps;
  
   const teamInformation= commonFunc.showLocalMessage(props, 'teamInformation', '班组信息');
-  console.log('2222', teamInformation);
+
  
   const scheduledTask= commonFunc.showLocalMessage(props, 'scheduledTask', '计划任务');
  
@@ -929,7 +931,7 @@ const SystemFunComponent = () =&gt; {
   const handleProcedureCall = async (params, iFlag) => {
     const { onSuccess } = params;
     const { app } = props;
-    const FriendlyReminder = commonFunc.showLocalMessage(this.props, 'FriendlyReminder', '温馨提示');
+    const FriendlyReminder = commonFunc.showLocalMessage(props, 'FriendlyReminder', '温馨提示');
     const { sMachineNameSId, sTeamNameSId, sShift, token, sModelsId } = app;
  
     const value = {
 import React, { useEffect, useRef } from "react";
 import * as commonUtils from "@/utils/utils";
 import useCommonBase from "@/components/Common/CommonHooks/useCommonBase";
+import * as commonFunc from '@/components/Common/commonFunc';
 import styles from "./index.less";
 import { message } from "antd";
  
@@ -102,7 +103,7 @@ const QuickSwitchTabComponent = baseProps =&gt; {
   }
   const sLanguage = props.app.userinfo.sLanguage || 'sChinese';
   list = translateList(sLanguage);
-
+  const no = commonFunc.showLocalMessage(props, 'No', '暂无');
   return (
     <div className={styles.quickSwitchTabComponent} ref={ref}>
       {list.map((title, index) => {
@@ -124,7 +125,7 @@ const QuickSwitchTabComponent = baseProps =&gt; {
               } else {
                 props.onGetFileUrl(title, url => {
                   if (!url) {
-                    message.info(`暂无${title}`);
+                    message.info(`${no}${title}`);
                     return;
                   }
                   props.onOpenCommonModal({
@@ -863,10 +863,13 @@
           setPauseValue(args[2].sPausereason);
         }
       };
-
+      const prompt = commonFunc.showLocalMessage(props, 'prompt', '提示');
+      const pause = commonFunc.showLocalMessage(props, 'pause', '提示');
+      const finishConstruction = commonFunc.showLocalMessage(props, 'finishConstruction', '完工');
+      const choosePauseReason = commonFunc.showLocalMessage(props, 'choosePauseReason', '请先选择暂停原因');
       return (
         <Modal
-          title={<span style={{ fontSize: 22 }}>提示！</span>}
+          title={<span style={{ fontSize: 22 }}>{prompt}</span>}
           open={taskConfirmModalVisible}
           width={500}
           height={320}
@@ -881,13 +884,13 @@
                     className={styles.btnZt}
                     onClick={() => {
                         if (!pauseValue.trim()) {
-                        message.warning("请先选择暂停原因！");
+                        message.warning(choosePauseReason);
                         return;
                         }
                         props.pauseCallback(pauseValue.trim());
                     }}
                     >
-                    暂停
+                      {pause}
                     </Button>
                 </Space>
               ) : (
@@ -905,7 +908,7 @@
                             // handleClose();
                             }}
                         >
-                        完工
+                          {finishConstruction}
                         </Button>
                         <Button
                             size="large"
@@ -913,7 +916,7 @@
                             className={styles.btnZt}
                             onClick={() => {
                             if (!pauseValue.trim()) {
-                                message.warning("请先选择暂停原因！");
+                                message.warning(choosePauseReason);
                                 return;
                             }
                             if (props.itemClickRef.current?.data)
@@ -925,7 +928,7 @@
                             // handleClose();
                             }}
                         >
-                        暂停
+                         {pause}
                     </Button>
                 </Space>
               )}