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