Commit fa98d491c9b3b15a4e78658791f07dd3830c1d51
1 parent
ad4fc80d
修改组件英文;
Showing
2 changed files
with
5 additions
and
3 deletions
src/components/Common/CommonInstructSet.js
| @@ -1336,7 +1336,7 @@ const handleFaceAuth = async (props, instruct) => { | @@ -1336,7 +1336,7 @@ const handleFaceAuth = async (props, instruct) => { | ||
| 1336 | }; | 1336 | }; |
| 1337 | return ( | 1337 | return ( |
| 1338 | <Form.Item | 1338 | <Form.Item |
| 1339 | - label={item.sName === "sUserName" ? "账号" : item.showName} | 1339 | + label={item.sName === "sUserName" ? account : item.showName} |
| 1340 | key={item.sName} | 1340 | key={item.sName} |
| 1341 | > | 1341 | > |
| 1342 | <ShowType {...showTypeProps} /> | 1342 | <ShowType {...showTypeProps} /> |
src/mes/costomPageFun/index.js
| @@ -1221,8 +1221,10 @@ const handleZlxjCheck = async (props, btnName) => { | @@ -1221,8 +1221,10 @@ const handleZlxjCheck = async (props, btnName) => { | ||
| 1221 | const { table0Data = [], table1Data = [], refreshTableListCount = 0 } = props; | 1221 | const { table0Data = [], table1Data = [], refreshTableListCount = 0 } = props; |
| 1222 | const { sTeamNo } = commonUtils.getAppData("userinfo"); | 1222 | const { sTeamNo } = commonUtils.getAppData("userinfo"); |
| 1223 | 1223 | ||
| 1224 | + const loadFirst = commonFunc.showLocalMessage(props, 'loadFirst', '请先等待页面初始化加载完成'); | ||
| 1225 | + | ||
| 1224 | if (!refreshTableListCount) { | 1226 | if (!refreshTableListCount) { |
| 1225 | - message.warning("请先等待页面初始化加载完成!"); | 1227 | + message.warning(loadFirst); |
| 1226 | return; | 1228 | return; |
| 1227 | } | 1229 | } |
| 1228 | 1230 | ||
| @@ -1444,7 +1446,7 @@ const getFaceResult = async props => { | @@ -1444,7 +1446,7 @@ const getFaceResult = async props => { | ||
| 1444 | // 质量巡检-巡检项目-完成/修改 | 1446 | // 质量巡检-巡检项目-完成/修改 |
| 1445 | const mesTableBtnClick4 = async props => { | 1447 | const mesTableBtnClick4 = async props => { |
| 1446 | if (window.instructSetLock) { | 1448 | if (window.instructSetLock) { |
| 1447 | - message.warning("请先等待上个指令集执行完成!"); | 1449 | + message.warning("Please wait for the previous instruction set to complete!"); |
| 1448 | return; | 1450 | return; |
| 1449 | } | 1451 | } |
| 1450 | const { params = {}, table0Data = [], table1Data = [], tempUserName } = props; | 1452 | const { params = {}, table0Data = [], table1Data = [], tempUserName } = props; |