{/* 班组报工行车记录 */}
{["12710101117087404588200", "12710101117260270570210"].includes(
@@ -5061,6 +5061,7 @@ class CommonTableRc extends React.Component {
const delIcon = props.tableProps.setDelete; /* 删除操作 */
const materialIcon = props.tableProps.setMaterial; /* 材料操作 */
const processIcon = props.tableProps.setProcess; /* 工序操作 */
+ const setOperation = commonFunc.showMessage(props.app.commonConst, 'operation') || '操作';
const materailremarkIcon =
props.tableProps.setMaterialRemark; /* 材料备注 */
let uploadIcon = props.tableProps.setUpload; /* 上传 */
@@ -5935,7 +5936,7 @@ class CommonTableRc extends React.Component {
textDecoration: "none"
}}
>
- 操作{" "}
+ {setOperation}{" "}
{uploadIcon ? (
{" "}
- 操作{" "}
+ {setOperation}{" "}
{headPopup ? (
e.sBoardName) || [];
-
+
// 如果版号已存在则过滤
// const result = selectData.filter(item1 =>!newTableData.some(item2 => item2.sBoardName === item1.sBoardName));
let newSelectData = selectData.map((item, index) => {
@@ -6974,7 +6975,7 @@ class CommonTableRc extends React.Component {
-
+
selectData.forEach((item, index) => {
const newCopyTo = {};
diff --git a/src/components/Common/commonFunc.js b/src/components/Common/commonFunc.js
index 394c176..236609c 100644
--- a/src/components/Common/commonFunc.js
+++ b/src/components/Common/commonFunc.js
@@ -509,7 +509,19 @@ export function showMessage(gdsformconst, sName) {
}
return '';
}
-
+export function showLocalMessage(props, sName, sChineseName) {
+ let sTitle = '';
+ if(commonUtils.isNotEmptyObject(props) && commonUtils.isNotEmptyObject(props.app) && commonUtils.isNotEmptyArr(props.app.commonConst)) {
+ const gdsformconst = props.app.commonConst;
+ sTitle = showMessage(gdsformconst, sName)
+ } else {
+ sTitle = sChineseName;
+ }
+ if (sTitle === '') {
+ sTitle = sChineseName
+ }
+ return sTitle;
+}
/** 获取配置showName */
export function getConfigShowName(config, sName) {
const iIndex = config.gdsconfigformslave.findIndex(item => item.sName === sName);
diff --git a/src/mes/common/buttonComponent/index.js b/src/mes/common/buttonComponent/index.js
index ef96693..ef71f35 100644
--- a/src/mes/common/buttonComponent/index.js
+++ b/src/mes/common/buttonComponent/index.js
@@ -3,6 +3,7 @@ import { Image, Badge, Modal } from "antd";
import termClass from "classnames/bind";
import { DoubleRightOutlined } from "@ant-design/icons";
import styles from "./index.less";
+import * as commonFunc from "@/components/Common/commonFunc";
// 通用方法
import * as commonUtils from "@/utils/utils";
// 菜单图标
@@ -14,6 +15,7 @@ const getNavIcon = (bActive, iconName = 2) => {
const ButtonComponent = props => {
const { app, sModelsId, currentContent, menuMap } = props;
const { managementData, userinfo = {} } = app;
+ console.log('3managementData3', managementData);
const { iTeamType, sWorkshopId } = userinfo;
if ([3, 4, 5, 6].includes(iTeamType)) {
@@ -126,7 +128,7 @@ const ButtonComponent = props => {
// 是否为维修保养模块和查询追踪模块
setProcessReport(
props.currentContent === 'queryTracking' ||
- props.currentContent === "serviceUpkeep" ||
+ props.currentContent === "serviceUpkeep" ||
(props.currentContent === "productionExec" && [3, 4, 5, 6].includes(iTeamType))
);
},
@@ -272,7 +274,7 @@ const ButtonComponent = props => {
} else if (e.name === "其它机台日报") {
count = table3;
}
-
+ const workFirst = commonFunc.showLocalMessage(props, 'workFirst！', '请先上班后再操作');
return (
+
);
@@ -384,14 +417,82 @@ const handleGetFormItem = (props, item) => {
// 主入口
const login = baseProps => {
const props = useLoginEvent(useCommonBase(baseProps));
- const { configs } = props;
+ const { configs , app, companys } = props;
+ const sysObj = commonUtils.isNotEmptyArr(companys) ? companys[0] : [];
+ console.log('222', sysObj);
+ const sLanguage = sysObj?.sLanguage || 'sEnglish';
+
+ const oeeTitle =
+ sLanguage === "sChinese" ? "小羚羊生产执行系统" : sLanguage === "sEnglish" ? "Manufacturing Execution System" : "小羚羊生產執行系統";
+
+ const bannerTitle =
+ sLanguage === "sChinese" ? "小羚羊生产执行系统" : sLanguage === "sEnglish" ? "XLY Manufacturing Execution System" : "小羚羊生產執行系統";
+
+ const pleaseInputUserName =
+ sLanguage === "sChinese"
+ ? "用户名"
+ : sLanguage === "sEnglish"
+ ? "UserName"
+ : "用戶名"; /* 用戶名 */
+ const pleaseInputPassword =
+ sLanguage === "sChinese"
+ ? "密码"
+ : sLanguage === "sEnglish"
+ ? "Password"
+ : "密碼"; /* 密码 */
+ const teamName =
+ sLanguage === "sChinese"
+ ? "班组名称"
+ : sLanguage === "sEnglish"
+ ? "Team Name"
+ : "班組名稱"; /* 班组名称 */
+ const equipmentName =
+ sLanguage === "sChinese"
+ ? "设备名称"
+ : sLanguage === "sEnglish"
+ ? "Equipment Name"
+ : "設備名稱"; /* 班组名称 */
+ const btnLogin =
+ sLanguage === "sChinese"
+ ? "登 录"
+ : sLanguage === "sEnglish"
+ ? "Login"
+ : "登 錄"; /* 登 陆 */
+ const btnClose =
+ sLanguage === "sChinese"
+ ? "关 闭"
+ : sLanguage === "sEnglish"
+ ? "Close"
+ : "關 閉"; /* 关 闭 */
+ const btnFace = sLanguage === "sChinese"? "人 脸 登 录" : sLanguage === "sEnglish" ? "FaceLogin" : "人 臉 登 錄"; /* 人 脸 */
+
+ const btnNormal =
+ sLanguage === "sChinese"
+ ? "普 通 登 录"
+ : sLanguage === "sEnglish"
+ ? "CommonLogin"
+ : "普 通 人 臉"; /* 普 通 */
+
+ const chooseBranchCompany =
+ sLanguage === "sChinese"
+ ? "请选择分公司名称"
+ : sLanguage === "sEnglish"
+ ? "Please select branch name"
+ : "請選擇分公司名稱"; /* 请选择分公司名称 */
+
+
const [form] = Form.useForm();
return (
{
// 人脸弹窗后选择其他内容
const FaceLoginAfterModal = props => {
- const { faceLoginAfterModalVisible } = props;
+ const { faceLoginAfterModalVisible , companys } = props;
if (!faceLoginAfterModalVisible) return "";
+ const sLanguage = commonUtils.isNotEmptyArr(companys) ? companys[0].sLanguage : 'English';
+ const sLoginConfirm = sLanguage === "sChinese"? "登陆信息确认" : sLanguage === "sEnglish" ? "Login Information Confirmation" : "登陸信息確認"; /* 人 脸 */
+ const btnConfirm = sLanguage === "sChinese"? "确认" : sLanguage === "sEnglish" ? "Confirm" : "確認"; /* 人 脸 */
+ const btnCancel = sLanguage === "sChinese"? "确认" : sLanguage === "sEnglish" ? "Cancel" : "取消"; /* 取消 */
+
+
const {
configs: configOld = [],
masterData = {},
@@ -522,7 +632,7 @@ const FaceLoginAfterModal = props => {
const [form] = Form.useForm();
return (
{
props.onSubmit({ sEmployeeNo });
}}
>
- 确认
+ {btnConfirm}
}
diff --git a/src/mes/login/index.less b/src/mes/login/index.less
index 280a9ac..84798af 100644
--- a/src/mes/login/index.less
+++ b/src/mes/login/index.less
@@ -13,6 +13,34 @@
font-family: Microsoft YaHei, Microsoft YaHei;
}
+ .loginTitle {
+ position: absolute;
+ top: 0;
+ left: 0;
+ .size(auto, 100%);
+ display: flex;
+ flex-direction: column;
+ // align-items: center;
+ justify-content: center;
+ color: #FFF;
+ font-weight: bold;
+ padding-left: 6%;
+
+ .loginTitle1 {
+ font-size: 34px;
+ }
+
+ .loginTitle2 {
+ font-size: 60px;
+ margin-top: -8px;
+ }
+
+ .loginTitle3 {
+ font-size: 116px;
+ margin-top: -57px;
+ }
+ }
+
.loginBox {
width: 35%;
height: auto;
diff --git a/src/mes/operationGuide/component/BroadsideCard.js b/src/mes/operationGuide/component/BroadsideCard.js
index 6db01af..0278afb 100644
--- a/src/mes/operationGuide/component/BroadsideCard.js
+++ b/src/mes/operationGuide/component/BroadsideCard.js
@@ -1,5 +1,6 @@
import React from "react";
import { Tooltip } from "antd";
+import * as commonFunc from "@/components/Common/commonFunc";
import styles from "../index.less";
const OperationGuide = props => {
@@ -10,13 +11,18 @@ const OperationGuide = props => {
});
};
+ const operationGuide = commonFunc.showLocalMessage(props, 'operationGuide', '操作指引');
+ const digitalFactoryMES = commonFunc.showLocalMessage(props, 'digitalFactoryMES', '数字工厂MES系统操作指引.pdf');
+ const keyOperationMES = commonFunc.showLocalMessage(props, 'keyOperationMES', 'MES关键操作说明.xlsx');
+ const MESPrinterSolutions = commonFunc.showLocalMessage(props, 'MESPrinterSolutions', 'MES打印机更换纸张后亮红灯解决方法.pdf');
+ const workshopMESPrinters = commonFunc.showLocalMessage(props, 'workshopMESPrinters', '车间MES打印机更换纸张.pdf');
return (
MES关键操作说明.xlsx
}
+ title={ {
if (bStartWorkLimit) {
Modal.warning({
title: "温馨提示:",
- content:
);
};
-
+ console.log(menuList, '1menuList ');
return (
请先上班后再操作！
,
+ content: {workFirst}
,
okText: "确认"
});
return;
@@ -321,7 +323,7 @@ const ButtonComponent = props => {
{
const pageLayoutConfig = gdsconfigformslave.find(
item => item.sControlName === "pageLayout"
);
+ console.log('pageLayoutConfig', pageLayoutConfig);
if (pageLayoutConfig) {
pageLayout = commonUtils.convertStrToObj(
pageLayoutConfig.sDefault,
@@ -677,7 +678,6 @@ const useCommonModelEvent = props => {
const { refreshTableListCount = 0 } = props;
let addState = {
refreshTableList: [],
- refreshTableListCount: refreshTableListCount + 1,
...(await handleGetData(refreshTableList, true))
};
@@ -1211,7 +1211,9 @@ const CommonModel = baseProps => {
};
const CommonModelComponent = props => {
- const { tabConfig = [], level, modelStyle } = props;
+ const { tabConfig = [], level, modelStyle, app } = props;
+ const { userinfo } = app;
+ const sLanguage = userinfo.sLanguage;
const getComponent = (config, index = 0) => {
const {
sName,
@@ -1273,10 +1275,14 @@ const CommonModelComponent = props => {
const {
configList = [],
sEntireTabName,
+ sEnglishEntireTabName,
+ sBig5EntireTabName,
mode,
width = "100%",
height = "100%"
} = item;
+ const sEntireTabNameNew = sLanguage === 'sEnglish' ? sEnglishEntireTabName :
+ sLanguage === 'sBig5EntireTabName' ? sBig5EntireTabName : sEntireTabName;
const advancedStyle =
mode === "advanced"
? {
@@ -1345,7 +1351,7 @@ const CommonModelComponent = props => {
style={advancedStyle}
>
{sEntireTabName && (
- {
!props.hideTabList.includes(item.sName)
)
.map((config, index) => {
- const { sName, sTabName } = config;
+ const { sName, sEnglishTabName, sBig5TabName, sTabName } = config;
+ const sTabNewName = sLanguage ==='sEnglish' ? sEnglishTabName : sLanguage ==='sBig5' ?
+ sBig5TabName : sTabName;
let disabled = false;
if (sTabName === "拼接列表" && sName === "slaveWypj3") {
@@ -1419,7 +1427,7 @@ const CommonModelComponent = props => {
return (
@@ -1576,7 +1584,7 @@ const CommonViewTableComponent = props => {
const handleReportInfo = (config = null) => {
reportRef.current = config;
setReportInfoVisible(!reportInfoVisible);
- };
+ };
return (
<>
diff --git a/src/mes/common/commonOperationBarComponent/index.js b/src/mes/common/commonOperationBarComponent/index.js
index ade08d5..7a76e52 100644
--- a/src/mes/common/commonOperationBarComponent/index.js
+++ b/src/mes/common/commonOperationBarComponent/index.js
@@ -78,26 +78,6 @@ const useCommonOperationBarComponentEvent = props => {
// 按钮点击事件
const clickRef = useRef(null);
const handleBtnClick = async (config, searchField) => {
- if (config?.sMinValue === "99") { // 二次确认
- const result = await new Promise(resolve => {
- Modal.confirm({
- title: "温馨提示:",
- content: "是否确认此操作?",
- okText: "确认",
- cancelText: "取消",
- onOk() {
- setTimeout(() => {
- resolve(true);
- }, 500);
- },
- onCancel() {
- resolve(false);
- }
- });
- });
- if (!result) return;
- }
-
// 限制半秒内只能点一次
if (clickRef.current) return;
clickRef.current = true;
@@ -109,6 +89,9 @@ const useCommonOperationBarComponentEvent = props => {
const { sName } = props;
const { sActiveId, sButtonParam, sInstruct, sControlName } = config;
+ const delayedOvertime = commonFunc.showLocalMessage(props, 'delayedOvertime', '延迟加班');
+ const cancelDelayedOvertime = commonFunc.showLocalMessage(props, 'cancelDelayedOvertime', '取消延迟加班');
+
// 自定义按钮事件
if (
costomPageFun({
@@ -254,7 +237,7 @@ const useCommonOperationBarComponentEvent = props => {
},
btnConfig: {
sId: config.sId,
- showName: !bDelayedOvertime ? "延迟加班" : "取消延迟加班",
+ showName: !bDelayedOvertime ? delayedOvertime : cancelDelayedOvertime,
sInstruct: JSON.stringify([
{
opr: "procedure",
@@ -491,6 +474,10 @@ const useCommonOperationBarComponentEvent = props => {
const { sDefault } = config;
+ const delayedOvertime = commonFunc.showLocalMessage(props, 'delayedOvertime', '延迟加班');
+ const cancelDelayedOvertime = commonFunc.showLocalMessage(props, 'cancelDelayedOvertime', '取消延迟加班');
+
+
// 根据sDefault配置控制按钮是否可以操作
if (sDefault && sDefault.includes("${")) {
// 当前页面全部数据
@@ -617,7 +604,6 @@ const useCommonOperationBarComponentEvent = props => {
}
defaultProps.style = style;
}
-
// 隐藏salveWydm2表的新增托盘
if (props.sName === "salveWydm2" && config.sControlName === "BtnLeft.Add") {
defaultProps.style = defaultProps.style || {};
@@ -651,7 +637,7 @@ const useCommonOperationBarComponentEvent = props => {
defaultProps.id = "salveWybz2Print1";
} else if (config.sControlName === "BtnRight.DelayWork") {
const { bDelayedOvertime } = commonUtils.getAppData("userinfo");
- config.showName = bDelayedOvertime ? "取消延迟加班" : "延迟加班";
+ config.showName = bDelayedOvertime ? cancelDelayedOvertime : delayedOvertime;
let style = { width: "150px" };
defaultProps.style = style;
}
@@ -1007,8 +993,9 @@ const CommonOperationBarComponent = basProps => {
return "";
}
+ const btnSearch = commonFunc.showLocalMessage(props, 'btnSearch', '查询');
return (
-
-
);
diff --git a/src/mes/login/index.js b/src/mes/login/index.js
index 6116b92..f484ad0 100644
--- a/src/mes/login/index.js
+++ b/src/mes/login/index.js
@@ -19,6 +19,7 @@ const initValue = {
// 事件层
const useLoginEvent = props => {
+ const [companys, setCompanys] = useState([]); // 添加这行
// 清除浏览器缓存
useEffect(() => {
const ipAddress = localStorage.ipAddress;
@@ -91,6 +92,12 @@ const useLoginEvent = props => {
"mesSysbrands",
JSON.stringify({ sBrandsId: sParentId, sSubsidiaryId: sId })
);
+ /* 测试英文版本 默认英文 */
+ if(companysConfigReturn.dataset.rows) {
+ companysConfigReturn.dataset.rows[0].sLanguage = 'sEnglish';
+ }
+ setCompanys(companysConfigReturn.dataset.rows); // 修改这行2
+
props.onSaveState({
masterData: { sBrandsId: sParentId, sSubsidiaryId: sId }
});
@@ -125,13 +132,32 @@ const useLoginEvent = props => {
};
// 登录事件
- const handleSubmit = async ({ faceLoginValue = {}, sEmployeeNo } = {}) => {
+ const handleSubmit = async ({ faceLoginValue = {}, sEmployeeNo } = {}, configsData) => {
const bFaceLogin = commonUtils.isNotEmptyObject(faceLoginValue);
let dataReturn = {};
if (!bFaceLogin) {
// 账号密码登录
- const { masterData } = props;
+ const { masterData, companys } = props;
+ // 新增方法：根据sName过滤configs
+ const getConfigByName = (name, configs, sLanguage) => {
+ const configObj = configs.find(item => item.sName === name);
+ const showName = sLanguage === 'sChinese' ? configObj.sChinese : sLanguage ==='sEnglish' ? configObj.sEnglish :
+ sLanguage === 'sBig5' ? configObj.sBig5 : configObj.sChinese;
+ return showName;
+ };
+ const sLanguage = commonUtils.isNotEmptyArr(companys) ? companys[0].sLanguage : 'sEnglish';
+
+ const pleaseSelectUser = getConfigByName('pleaseSelectUser', configsData, sLanguage);
+
+ const pleaseInputPassword = getConfigByName('pleaseInputPassword', configsData, sLanguage);
+
+ const pleaseSelectTeam = getConfigByName('pleaseSelectTeam', configsData, sLanguage);
+
+ const pleaseselectShift = getConfigByName('pleaseselectShift', configsData, sLanguage);
+
+ const pleaseSelectMachine = getConfigByName('pleaseSelectMachine', configsData, sLanguage);
+
const {
sUserId: userId,
@@ -172,23 +198,23 @@ const useLoginEvent = props => {
}
if (!username) {
- message.error("请选择用户！");
+ message.error(pleaseSelectUser);
return;
}
if (!sEmployeeNo && !password) {
- message.error("请输入密码！");
+ message.error(pleaseInputPassword);
return;
}
if (sShift === undefined) {
- message.error("请选择班次！");
+ message.error(pleaseselectShift);
return;
}
if (!sTeamId) {
- message.error("请选择班组！");
+ message.error(pleaseSelectTeam);
return;
}
if (!sMachineId) {
- message.error("请选择机台！");
+ message.error(pleaseSelectMachine);
return;
}
@@ -321,6 +347,7 @@ const useLoginEvent = props => {
return {
...props,
+ companys, // 确保返回companys
configs,
onSubmit: handleSubmit,
onFaceLogin: handleFaceLogin,
@@ -331,8 +358,12 @@ const useLoginEvent = props => {
// 遍历登录文本组件
const handleGetFormItem = (props, item) => {
const { sModelsId } = initValue;
- const { masterData = {} } = props;
+ const { masterData = {}, companys } = props;
+ const sLanguage = commonUtils.isNotEmptyArr(companys) && companys[0].sLanguage || 'sEnglish';
let enabledNew = true;
+ if(item.sName?.includes('please') || item.sName?.includes('请')) {
+ return;
+ }
if (item.iTag === 1) {
enabledNew = false;
} else if (item.iTag === 3) {
@@ -374,8 +405,10 @@ const handleGetFormItem = (props, item) => {
bPassWord: item.sName === "sPassWord",
style: { backgroundColor: "#eaeaea" }
};
+ const showName = sLanguage === 'sChinese' ? item.sChinese : sLanguage ==='sEnglish' ? item.sEnglish
+ : item.sBig5;
return (
-
+
{btnLeftConfig.map(item => {
@@ -1078,7 +1065,7 @@ const CommonOperationBarComponent = basProps => {
<>
{
}}
loginAfterInit
onSaveFaceSuccess={() => {
- message.success("人脸采集成功！");
+ message.success(faceCollectionSucess);
modal.destroy();
onCancel();
}}
@@ -124,7 +134,7 @@ const FaceCollectionComponent = baseProps => {
/>
),
wrapClassName: "xlyFaceAuthModal",
- okText: "取消",
+ okText: BtnCancel,
onOk() {
modal.destroy();
}
@@ -134,20 +144,20 @@ const FaceCollectionComponent = baseProps => {
return (
- 下一步
+ {BtnNext}
}
onCancel={onCancel}
>
- 任务：工单信息
+ {task}
{/* {
@@ -488,7 +492,7 @@ const WorkOrderTypeComponent = () => {
flex={"160px"}
className={styles.productionTitle}
>
- 特别关注：
+ {specialFocus}
- 设备及目标信息
+ {equipmentTargetInformation}
{showConfig.map((config, index) => {
if (index > 4) return "";
@@ -756,6 +761,13 @@ const TeamInfoComponent = () => {
const teamShiftInfo = props.teamShiftInfoData?.[0] || {};
const { sEmployeeName = "", sEmployeeNo = "" } = teamShiftInfo;
+ const teamInformation= commonFunc.showLocalMessage(props, 'teamInformation', '班组信息');
+
+ const captain = commonFunc.showLocalMessage(props, 'captain', '机长');
+
+ const shift = commonFunc.showLocalMessage(props, 'shift', '班次');
+
+ const classGroup = commonFunc.showLocalMessage(props, 'classGroup', '班组');
// 当前上班机长人员
const { sActualEmployeeName, sActualEmployeeNo } = tableProps.data[0] || {};
@@ -765,7 +777,7 @@ const TeamInfoComponent = () => {
- 班组信息
+ {teamInformation}
)}
dispatch(["saveState", { isEditPwd: false }])}
>
setPwdForm({ ...pwdForm, sOldPwd: e.target.value })}
/>
setPwdForm({ ...pwdForm, sUserPwd: e.target.value })}
/>
setPwdForm({ ...pwdForm, sUserPwdAgain: e.target.value })
}
@@ -431,9 +438,24 @@ const IndexMes = baseProps => {
const getServiceError = async returnData => {
props.dispatch({ type: "app/throwErrorMes", payload: returnData });
};
+ const currentLanguage = props?.app?.userinfo?.sLanguage || 'zhCN'; // 默认为中文
+ const getLocale = () => {
+ switch(currentLanguage) {
+ case 'sEnglish':
+ return enUS;
+ case 'sBig5':
+ return zhTW;
+ default:
+ {
+ moment.locale('zh-cn');
+ return zhCN;
+ }
+ }
+ };
+ const bExsitLogin = commonFunc.showLocalMessage(props, 'bExsitLogin', '是否退出登录');
return (
-
+
{
{logoutShow && (
{
handleColseOee();
setLogoutShow(false);
@@ -474,15 +496,20 @@ const IndexMes = baseProps => {
// 头部
const HeaderConponent = () => {
const { props } = useContext(myContext);
+ const { app } = props;
+ const { userinfo, sMachineNameStr, sTeamNameSName } = app;
+ const { sUserNameBak: sUserName, sShift } = userinfo;
- const weekday = ["日", "一", "二", "三", "四", "五", "六"];
+ const sLanguage = userinfo.sLanguage;
+ let weekday = ["日", "一", "二", "三", "四", "五", "六"];
+ const sunTitle = sLanguage ==='sChinese' ? '星期' : '';
const [time, setTime] = useState("0000-00-00 00:00:00");
const { logout } = useContext(myContext);
useEffect(() => {
const getTime = () => {
const currentTime = moment().format("YYYY-MM-DD HH:mm:ss");
const currentWeek = moment().weekday();
- setTime(`${currentTime}${" "}${" "}星期${weekday[currentWeek]}`);
+ setTime(`${currentTime}${" "}${" "}${sunTitle}${weekday[currentWeek]}`);
};
getTime();
@@ -495,9 +522,50 @@ const HeaderConponent = () => {
};
}, []);
- const { app } = props;
- const { userinfo, sMachineNameStr, sTeamNameSName } = app;
- const { sUserNameBak: sUserName, sShift } = userinfo;
+
+ const logoTitle = commonFunc.showLocalMessage(props, 'EBC-MES', '小羚羊生产执行系统');
+ 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', '夜班');
+ const delayedOvertime = commonFunc.showLocalMessage(props, 'delayedOvertime', '延迟加班');
+
+ function translateWeekdays() {
+ // 中文星期数组
+ let weekday = ["日", "一", "二", "三", "四", "五", "六"];
+
+ // 定义中英文和繁体中文星期的映射关系
+ const translations = {
+ sEnglish: {
+ "日": "Sunday",
+ "一": "Monday",
+ "二": "Tuesday",
+ "三": "Wednesday",
+ "四": "Thursday",
+ "五": "Friday",
+ "六": "Saturday"
+ },
+ sBig5: {
+ "日": "日",
+ "一": "一",
+ "二": "二",
+ "三": "三",
+ "四": "四",
+ "五": "五",
+ "六": "六"
+ }
+ };
+
+ // 根据用户语言设置进行转换（默认为中文）
+ if (userinfo.sLanguage === 'sEnglish' || userinfo.sLanguage === 'sBig5') {
+ return weekday.map(day => translations[userinfo.sLanguage][day] || day);
+ }
+
+ return weekday;
+ }
+ weekday = translateWeekdays(sLanguage);
+
@@ -521,25 +589,25 @@ const HeaderConponent = () => {
@@ -550,17 +618,17 @@ const HeaderConponent = () => {
-
@@ -583,30 +651,30 @@ const MachineMessageComponent = ({ e , shutDown }) => {
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();
}, 1000);
-
+
return () => {
clearInterval(timer);
};
}, []);
-
+
const handleMenuClose = () => {
Modal.confirm({
title: "温馨提示:",
@@ -621,7 +689,7 @@ const MachineMessageComponent = ({ e , shutDown }) => {
});
};
-
+
const isMinMax = useRef('max');
const draggleRef = useRef(null);
const [bounds, setBounds] = useState({ left: 0, top: 0, bottom: 0, right: 0 });
@@ -639,7 +707,7 @@ const MachineMessageComponent = ({ e , shutDown }) => {
});
};
-
+
return (
{
}}
>
}
@@ -1108,7 +1198,7 @@ const SystemFunComponent = () => {
}}
>
@@ -1138,7 +1228,7 @@ const SystemFunComponent = () => {
diff --git a/src/mes/common/siderInfoComponent/index.js b/src/mes/common/siderInfoComponent/index.js
index feb333f..82be672 100644
--- a/src/mes/common/siderInfoComponent/index.js
+++ b/src/mes/common/siderInfoComponent/index.js
@@ -239,6 +239,8 @@ const useSiderInfoComponentEvent = props => {
const SiderInfoComponent = baseProps => {
const props = useSiderInfoComponentEvent(baseProps);
+ const workLoading = commonFunc.showLocalMessage(props, 'workLoading', '工单数据加载中...');
+ const waitWorkLoading = commonFunc.showLocalMessage(props, 'waitWorkLoading', '工单数据加载中...');
const leftClass = cx({
siderInfoComponent: true
});
@@ -255,7 +257,7 @@ const SiderInfoComponent = baseProps => {
) : (
@@ -350,12 +352,14 @@ const WorkOrderTypeComponent = () => {
const [productionDivId] = useState(
`productionDivId_${commonUtils.createSid()}`
);
+ const task= commonFunc.showLocalMessage(props, 'task', '任务：工单信息');
+ const specialFocus= commonFunc.showLocalMessage(props, 'specialFocus', '任务：工单信息');
return (
- 机长：
+ {captain}：
{sActualEmployeeName || sEmployeeName}
- 班组：
+ {classGroup}：
{sTeamNo}
- 班次：
+ {shift}：
{sShift == 1 ? "白班" : "夜班"}
diff --git a/src/mes/indexMes/index.js b/src/mes/indexMes/index.js
index d25fe80..a8629c1 100644
--- a/src/mes/indexMes/index.js
+++ b/src/mes/indexMes/index.js
@@ -30,7 +30,10 @@ import {
SwapOutlined,
AppstoreOutlined
} from "@ant-design/icons";
+import * as commonFunc from "@/components/Common/commonFunc";
import zhCN from "antd/lib/locale-provider/zh_CN";
+import enUS from 'antd/lib/locale-provider/en_US'; // 导入英文语言包
+import zhTW from 'antd/lib/locale-provider/zh_TW'; // 导入繁体中文语言包
import Draggable from 'react-draggable';
@@ -100,6 +103,10 @@ const OpenModalEditPwd = props => {
sUserPwdAgain: "",
sId: props.app.userinfo.sId
});
+ 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 handleOk = () => {
const url = `${
@@ -127,24 +134,24 @@ const OpenModalEditPwd = props => {
return (
- 劲嘉生产执行系统（EBC-MES）
+ {logoTitle}
- 账号：
+ {account}：
{sUserName}
- 机台：
+ {machine}：
{sMachineNameStr}
- 班组：
+ {classGroup}：
{sTeamNameSName}
- ({sShift == 1 ? "白班" : "夜班"})
+ ({sShift == 1 ? dayShift : nightShift})
- {userinfo.bDelayedOvertime ? "延时加班" : ""}
+ {userinfo.bDelayedOvertime ? delayedOvertime : ""}
@@ -689,53 +757,67 @@ const MachineMessageComponent = ({ e , shutDown }) => {
);
};
-
-// 左侧侧边栏
+
+ // 左侧侧边栏
const SiderComponent = () => {
const { dispatch, hooksProps, props, ...rest } = useContext(myContext);
const { currentContent, menuMap } = hooksProps;
+
+ const teamInformation= commonFunc.showLocalMessage(props, 'teamInformation', '班组信息');
+ console.log('2222', teamInformation);
+
+ const scheduledTask= commonFunc.showLocalMessage(props, 'scheduledTask', '计划任务');
+
+ const productionExecution= commonFunc.showLocalMessage(props, 'productionExecution', '生产执行');
+
+ const maintenanceRepair= commonFunc.showLocalMessage(props, 'maintenanceRepair', '维修保养');
+
+ const queryTracing= commonFunc.showLocalMessage(props, 'queryTracing', '查询追踪');
+
+ const operationGuide= commonFunc.showLocalMessage(props, 'teamInformation', '操作指南');
+
const menuList = [
{
id: "teamInfo",
- title: "班组信息",
+ title: teamInformation,
path: "/indexMes/teamInfo",
icon: teamIcon,
c_icon: c_teamIcon
},
{
id: "scheduledTasks",
- title: "计划任务",
+ title: scheduledTask,
path: "/indexMes/scheduledTasks",
icon: planTaskIcon,
c_icon: c_planTaskIcon
},
{
id: "productionExec",
- title: "生产执行",
+ title: productionExecution,
path: "/indexMes/productionExec",
icon: proExeIcon,
c_icon: c_proExeIcon
},
{
id: "serviceUpkeep",
- title: "维修保养",
+ title: maintenanceRepair,
path: "/indexMes/serviceUpkeep",
icon: serviceIcon,
c_icon: c_serviceIcon
},
{
id: "queryTracking",
- title: "查询追踪",
+ title: queryTracing,
path: "/indexMes/queryTracking",
icon: queryTraceIcon,
c_icon: c_queryTraceIcon
},
{
id: "operationGuide",
- title: "操作指南",
+ title: operationGuide,
path: "/indexMes/operationGuide",
icon: guideIcon,
c_icon: c_guideIcon
@@ -805,6 +887,7 @@ const SystemFunComponent = () => {
const [popoverVisible, setPopoverVisible] = useState(false);
const [popoverVisible1, setPopoverVisible1] = useState(false);
const { props, dispatch } = useContext(myContext);
+ const systemFunctions = commonFunc.showLocalMessage(props, 'systemFunctions', '系统功能');
const stopRef = useRef(false);
const stopClose = useRef(false);
@@ -841,7 +924,7 @@ const SystemFunComponent = () => {
const handleProcedureCall = async (params, iFlag) => {
const { onSuccess } = params;
const { app } = props;
-
+ const FriendlyReminder = commonFunc.showLocalMessage(this.props, 'FriendlyReminder', '温馨提示');
const { sMachineNameSId, sTeamNameSId, sShift, token, sModelsId } = app;
const value = {
@@ -888,10 +971,8 @@ const SystemFunComponent = () => {
onSuccess && onSuccess();
} else if (code === -7) {
Modal.confirm({
- title: "温馨提示:",
+ title: FriendlyReminder,
content: {handleGetMsg(msg)}
,
- okText: "确认",
- cancelText: "取消",
onOk() {
handleProcedureCall(params, 1);
},
@@ -899,9 +980,8 @@ const SystemFunComponent = () => {
});
} else if (code === -8) {
Modal.info({
- title: "温馨提示:",
+ title: FriendlyReminder,
content: {handleGetMsg(msg)}
,
- okText: "确认",
onOk() {
onSuccess && onSuccess();
}
@@ -917,6 +997,8 @@ const SystemFunComponent = () => {
const { onSuccess } = params;
const { app } = props;
+ const FriendlyReminder = commonFunc.showLocalMessage(props, 'FriendlyReminder', '温馨提示');
+
const { sMachineNameSId, sTeamNameSId, sShift, token, sModelsId } = app;
const userinfo = commonUtils.getAppData("userinfo");
@@ -965,10 +1047,8 @@ const SystemFunComponent = () => {
onSuccess && onSuccess();
} else if (code === -7) {
Modal.confirm({
- title: "温馨提示:",
+ title: FriendlyReminder,
content: {handleGetMsg(msg)}
,
- okText: "确认",
- cancelText: "取消",
onOk() {
handleProcedureCall1(params, 1);
},
@@ -976,9 +1056,8 @@ const SystemFunComponent = () => {
});
} else if (code === -8) {
Modal.info({
- title: "温馨提示:",
+ title: FriendlyReminder,
content: {handleGetMsg(msg)}
,
- okText: "确认",
onOk() {
onSuccess && onSuccess();
}
@@ -990,6 +1069,7 @@ const SystemFunComponent = () => {
};
const handleSystemFunClick = type => {
+ const underDevelop = commonFunc.showLocalMessage(props, 'underDevelop', '功能开发中，敬请期待！');
switch (type) {
case "changePwd":
dispatch(["saveState", { isEditPwd: true }]);
@@ -1000,7 +1080,7 @@ const SystemFunComponent = () => {
case "logout":
break;
case "shutdown":
- message.info("功能开发中，敬请期待...");
+ message.info(underDevelop);
break;
case "restDailyReport":
handleProcedureCall({
@@ -1030,6 +1110,16 @@ const SystemFunComponent = () => {
const getSystemFunContent = () => {
const userinfo = commonUtils.getAppData("userinfo");
+ 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 { bPlcSd } = userinfo;
return (
@@ -1040,7 +1130,7 @@ const SystemFunComponent = () => {
}}
>
{
handleSystemFunClick("changePwd");
}}
>
- 修改密码
+ {ModifyPassword}
{
handleSystemFunClick("logout");
}}
>
- 退出登录
+ {Logout}
{
handleSystemFunClick("shutdown");
}}
>
- 关机
+ {shutDown}
{
}}
>
系统功能
+ {systemFunctions}
+ {/*
{/* */}
@@ -436,10 +537,13 @@ const FaceLoginModal = props => {
const { faceLoginModalVisible } = props;
if (!faceLoginModalVisible) return "";
+ const { companys } = props;
+ const sLanguage = commonUtils.isNotEmptyArr(companys) ? companys[0].sLanguage : 'English';
+ const btnFace = sLanguage === "sChinese"? "人 脸 登 录" : sLanguage === "sEnglish" ? "FaceLogin" : "人 臉 登 錄"; /* 人 脸 */
return (
*/}
+ {/*
*/}
Enterprise Business Capability MES
*/}
+ {/* {bannerTitle}
*/}
+ {/* EBC-MES
*/}
+ {/*
-
劲嘉生产执行系统（EBC-MES）
+ {oeeTitle}
@@ -420,7 +521,7 @@ const login = baseProps => {
props.onFaceLogin();
}}
>
- 人脸登录
+ {btnFace}
-
数字工厂MES系统操作指引.pdf
+ MES关键操作说明.xlsx
}
+ title={操作指引
+ {operationGuide}
{digitalFactoryMES}
}
placement="left"
>
@@ -28,7 +34,7 @@ const OperationGuide = props => {
/>
{keyOperationMES}
}
placement="left"
>
{
数字工厂MES系统操作指引.pdf
+ {digitalFactoryMES}
}
>
- 数字工厂MES系统操作指引.pdf
+ {digitalFactoryMES}
{keyOperationMES}
}
>
- MES关键操作说明.xlsx
+ {keyOperationMES}