Commit d7bd6201894d51dc83574efe0fe160538119eb8f
1 parent
58a2a993
1.完善字段翻译
Showing
7 changed files
with
13 additions
and
11 deletions
src/components/Common/CommonBase.js
src/components/Common/CommonBillEvent.js
| ... | ... | @@ -501,7 +501,7 @@ export default (ChildComponent) => { |
| 501 | 501 | }); |
| 502 | 502 | } else if (formRoute.indexOf('productionReport') !== -1 && commonUtils.isNotEmptyArr(slaveSelectedRowKeys) && JSON.stringify(slaveSelectedRowKeys) !== JSON.stringify(currentSlaveSelectedRowKeys)) { |
| 503 | 503 | const addState = await this.handleGetDataOne('slave0', nextProps.slave0Config, null, null, null, null, nextProps, true); |
| 504 | - console.log(addState); | |
| 504 | + | |
| 505 | 505 | this.props.onSaveState({ |
| 506 | 506 | ...addState, |
| 507 | 507 | }); | ... | ... |
src/components/Common/CommonHooks/useCommonBase.js
src/mes/common/commonModelComponent/index.js
| ... | ... | @@ -1216,7 +1216,7 @@ const CommonModelComponent = props => { |
| 1216 | 1216 | const { tabConfig = [], level, modelStyle, app } = props; |
| 1217 | 1217 | const { userinfo } = app; |
| 1218 | 1218 | const sLanguage = userinfo.sLanguage; |
| 1219 | - console.log('vvv', sLanguage); | |
| 1219 | + | |
| 1220 | 1220 | const getComponent = (config, index = 0) => { |
| 1221 | 1221 | const { |
| 1222 | 1222 | sName, | ... | ... |
src/mes/common/siderInfoComponent/index.js
| ... | ... | @@ -354,7 +354,7 @@ const WorkOrderTypeComponent = () => { |
| 354 | 354 | ); |
| 355 | 355 | const task= commonFunc.showLocalMessage(props, 'task', '任务:工单信息'); |
| 356 | 356 | const specialFocus= commonFunc.showLocalMessage(props, 'specialFocus', '任务:工单信息'); |
| 357 | - const productionSchedule= commonFunc.showLocalMessage(props, 'productionSchedule', '生产进度'); | |
| 357 | + const productionSchedule= commonFunc.showLocalMessage(props, 'Schedule', '生产进度'); | |
| 358 | 358 | return ( |
| 359 | 359 | <div className={styles.workOrdertype} ref={ref}> |
| 360 | 360 | <div className="mesTitle"> |
| ... | ... | @@ -768,6 +768,10 @@ const TeamInfoComponent = () => { |
| 768 | 768 | const shift = commonFunc.showLocalMessage(props, 'shift', '班次'); |
| 769 | 769 | |
| 770 | 770 | const classGroup = commonFunc.showLocalMessage(props, 'classGroup', '班组'); |
| 771 | + const dayShift = commonFunc.showLocalMessage(props, 'dayShift', '白班'); | |
| 772 | + const nightShift = commonFunc.showLocalMessage(props, 'nightShift', '夜班'); | |
| 773 | + | |
| 774 | + | |
| 771 | 775 | // 当前上班机长人员 |
| 772 | 776 | const { sActualEmployeeName, sActualEmployeeNo } = tableProps.data[0] || {}; |
| 773 | 777 | |
| ... | ... | @@ -805,7 +809,7 @@ const TeamInfoComponent = () => { |
| 805 | 809 | </div> |
| 806 | 810 | <div> |
| 807 | 811 | <span>{shift}:</span> |
| 808 | - <span>{sShift == 1 ? "白班" : "夜班"}</span> | |
| 812 | + <span>{sShift == 1 ? dayShift : nightShift}</span> | |
| 809 | 813 | </div> |
| 810 | 814 | </Col> |
| 811 | 815 | </Row> | ... | ... |
src/mes/login/index.js
src/mes/operationGuide/component/FlowChart.js
| ... | ... | @@ -72,10 +72,9 @@ const resources = { |
| 72 | 72 | const BroadsideCardRender = (props) => { |
| 73 | 73 | // 获取语言设置,默认为中文 |
| 74 | 74 | const sLanguage = props?.app?.userinfo?.sLanguage || 'sChinese'; |
| 75 | - console.log(sLanguage, sLanguage); | |
| 76 | - console.log(3888, props); | |
| 77 | - const teamLogin = resources[sLanguage].teamLogin; | |
| 78 | - console.log(teamLogin, 'teamLogin'); | |
| 75 | + | |
| 76 | + const teamLogin = resources[sLanguage].teamLogin; | |
| 77 | + | |
| 79 | 78 | |
| 80 | 79 | const [ loading , setloading ] = useState(true) |
| 81 | 80 | const [ flowData , setFlowData ] = useState([ | ... | ... |