diff --git a/src/assets/plan/cal_english.svg b/src/assets/plan/cal_english.svg new file mode 100644 index 0000000..da2b18d --- /dev/null +++ b/src/assets/plan/cal_english.svg @@ -0,0 +1,4 @@ + + + T + diff --git a/src/assets/plan/cal_english_1.svg b/src/assets/plan/cal_english_1.svg new file mode 100644 index 0000000..da2b18d --- /dev/null +++ b/src/assets/plan/cal_english_1.svg @@ -0,0 +1,4 @@ + + + T + diff --git a/src/assets/plan/change_english.svg b/src/assets/plan/change_english.svg new file mode 100644 index 0000000..2ba5887 --- /dev/null +++ b/src/assets/plan/change_english.svg @@ -0,0 +1,4 @@ + + + H + diff --git a/src/assets/plan/change_english_1.svg b/src/assets/plan/change_english_1.svg new file mode 100644 index 0000000..2eeead4 --- /dev/null +++ b/src/assets/plan/change_english_1.svg @@ -0,0 +1,4 @@ + + + H + diff --git a/src/assets/plan/check_english.svg b/src/assets/plan/check_english.svg new file mode 100644 index 0000000..818729e --- /dev/null +++ b/src/assets/plan/check_english.svg @@ -0,0 +1,4 @@ + + + F + diff --git a/src/assets/plan/check_english_1.svg b/src/assets/plan/check_english_1.svg new file mode 100644 index 0000000..eb17423 --- /dev/null +++ b/src/assets/plan/check_english_1.svg @@ -0,0 +1,4 @@ + + + F + diff --git a/src/assets/plan/img.png b/src/assets/plan/img.png new file mode 100644 index 0000000..4d05efc --- /dev/null +++ b/src/assets/plan/img.png diff --git a/src/assets/plan/img_1.png b/src/assets/plan/img_1.png new file mode 100644 index 0000000..7d3bcc4 --- /dev/null +++ b/src/assets/plan/img_1.png diff --git a/src/assets/plan/lock_english.svg b/src/assets/plan/lock_english.svg new file mode 100644 index 0000000..a9854c3 --- /dev/null +++ b/src/assets/plan/lock_english.svg @@ -0,0 +1,4 @@ + + + L + diff --git a/src/assets/plan/lock_english_1.svg b/src/assets/plan/lock_english_1.svg new file mode 100644 index 0000000..efc5958 --- /dev/null +++ b/src/assets/plan/lock_english_1.svg @@ -0,0 +1,4 @@ + + + L + diff --git a/src/assets/plan/over_english.svg b/src/assets/plan/over_english.svg new file mode 100644 index 0000000..7c7558e --- /dev/null +++ b/src/assets/plan/over_english.svg @@ -0,0 +1,4 @@ + + + P + diff --git a/src/assets/plan/over_english_1.svg b/src/assets/plan/over_english_1.svg new file mode 100644 index 0000000..8db988a --- /dev/null +++ b/src/assets/plan/over_english_1.svg @@ -0,0 +1,4 @@ + + + P + diff --git a/src/assets/plan/save_english.svg b/src/assets/plan/save_english.svg new file mode 100644 index 0000000..0f3379c --- /dev/null +++ b/src/assets/plan/save_english.svg @@ -0,0 +1,4 @@ + + + S + diff --git a/src/assets/plan/save_english_1.svg b/src/assets/plan/save_english_1.svg new file mode 100644 index 0000000..74eaf59 --- /dev/null +++ b/src/assets/plan/save_english_1.svg @@ -0,0 +1,4 @@ + + + S + diff --git a/src/components/productionScheduleTree/productionScheduleTree.js b/src/components/productionScheduleTree/productionScheduleTree.js index 8dc43ab..187d469 100644 --- a/src/components/productionScheduleTree/productionScheduleTree.js +++ b/src/components/productionScheduleTree/productionScheduleTree.js @@ -21,24 +21,40 @@ import MoveTop from '@/assets/processTop.svg'; import DisableMoveTop from '@/assets/disableprocessTop.svg'; import MoveBottom from '@/assets/processBottom.svg'; import DisableMoveBottom from '@/assets/disableprocessBottom.svg'; + import ChangeMachine from '@/assets/plan/change.png'; import DisableChangeMachine from '@/assets/plan/change_1.png'; +import ChangeMachineEnglish from '@/assets/plan/change_english.svg'; +import DisableChangeMachineEnglish from '@/assets/plan/change_english_1.svg'; import SetSave from '@/assets/plan/save.png'; import DisableSetSave from '@/assets/plan/save_1.png'; +import SetSaveEnglish from '@/assets/plan/save_english.svg'; +import DisableSetSaveEnglish from '@/assets/plan/save_english_1.svg'; import SetLock from '@/assets/plan/lock.png'; import DisableSetLock from '@/assets/plan/lock_1.png'; +import SetLockEnglish from '@/assets/plan/lock_english.svg'; +import DisableSetLockEnglish from '@/assets/plan/lock_english_1.svg'; import SetOverExec from '@/assets/plan/over.png'; import DisableSetOverExec from '@/assets/plan/over_1.png'; +import SetOverExecEnglish from '@/assets/plan/over_english.svg'; +import DisableSetOverExecEnglish from '@/assets/plan/over_english_1.svg'; import ShowGantt from '@/assets/gantt.svg'; import DisableShowGantt from '@/assets/disablegantt.svg'; + import ShowCheckModel from '@/assets/plan/check.png'; import DisableShowCheckModel from '@/assets/plan/check_1.png'; +import ShowCheckModelEnglish from '@/assets/plan/check_english.svg'; +import DisableShowCheckModelEnglish from '@/assets/plan/check_english_1.svg'; + import ShowTimer from '@/assets/plan/cal.png'; import DisableShowTimer from '@/assets/plan/cal_1.png'; +import ShowTimerEnglish from '@/assets/plan/cal_english.svg'; +import DisableShowTimerEnglish from '@/assets/plan/cal_english_1.svg'; + import ShowList from '@/assets/list.svg'; import DisableShowList from '@/assets/disablelist.svg'; import Reset from '@/assets/reset.svg'; @@ -948,6 +964,7 @@ const ProductionScheduleComponent = Form.create({ }; const width = '18px'; const height = '18px'; + const sLanguage = app?.userinfo?.sLanguage || 'sChinese'; const moveUp = { title: '上移', width: { width }, @@ -977,32 +994,32 @@ const ProductionScheduleComponent = Form.create({ disableimg: 置底, }; const changeMachine = { - title: '更换机台', + title: sLanguage === 'sEnglish' ? 'ChangeMachine' : '更换机台' , width: { width }, height: { height }, - img: 更换机台, - disableimg: 更换机台, + img: 更换机台, + disableimg: 更换机台, }; const slideSave = { title: '侧边保存', width: { width }, height: { height }, - img: 保存, - disableimg: 保存, + img: 保存, + disableimg: 保存, }; const slideLock = { title: '侧边锁定', width: { width }, height: { height }, - img: 锁定, - disableimg: 锁定, + img: 锁定, + disableimg: 锁定, }; const slideOverExec = { title: '侧边超能力', width: { width }, height: { height }, - img: 超能力, - disableimg: 超能力, + img: 超能力, + disableimg: 超能力, }; const showGantt = { title: '查看Gantt', @@ -1016,16 +1033,16 @@ const ProductionScheduleComponent = Form.create({ title: '齐套稽查', width: { width }, height: { height }, - img: 齐套稽查, - disableimg: 齐套稽查, + img: 齐套稽查, + disableimg: 齐套稽查, }; const showTimer = { title: '重算时间', width: { width }, height: { height }, - img: 重算时间, - disableimg: 重算时间, + img: 重算时间, + disableimg: 重算时间, }; const showList = { title: '查看列表', @@ -1151,7 +1168,9 @@ const ProductionScheduleComponent = Form.create({ const setDown = commonFunc.showMessage(app.commonConst, 'setDown');/* 下移 */ const setTop = commonFunc.showMessage(app.commonConst, 'setTop');/* 置顶 */ const setBottom = commonFunc.showMessage(app.commonConst, 'setBottom');/* 置底 */ - const setMachine = commonFunc.showMessage(app.commonConst, 'changeMachine');/* 置底 */ + const setMachine = commonFunc.showMessage(app.commonConst, 'changeMachine');/* 更换机台 */ + const setCheck = commonFunc.showMessage(app.commonConst, 'fullCheck');/* 齐套稽查 */ + const setCalTime = commonFunc.showMessage(app.commonConst, 'calTime');/* 重算时间 */ const setSave = commonUtils.isNotEmptyObject(commonFunc.showMessage(app.commonConst, 'setSave')) ? commonFunc.showMessage(app.commonConst, 'setSave') : '保存';/* 保存 */ const setLock = commonFunc.showMessage(app.commonConst, 'setLock') ? commonFunc.showMessage(app.commonConst, 'setLock') : '锁定';/* 锁定 */ const setOverExec = commonFunc.showMessage(app.commonConst, 'setOverExec') ? commonFunc.showMessage(app.commonConst, 'setOverExec') :'超能力';/* 超 */ @@ -1599,10 +1618,10 @@ const ProductionScheduleComponent = Form.create({ { bSetSave ? props.onShowSave(e, 'save', 0)}>{slideSave.img} : ''}    { bSetLock ? props.onShowLock(e, 'lock', 0) : null}>{commonUtils.isEmptyObject(props.sortedInfo) ? slideLock.img : slideLock.disableimg } : ''}    { bSetTimer ? - props.onShowTimerModal(e, 'changeTimer') : null}>{commonUtils.isEmptyObject(props.sortedInfo) ? showTimer.img : showTimer.disableimg } + props.onShowTimerModal(e, 'changeTimer') : null}>{commonUtils.isEmptyObject(props.sortedInfo) ? showTimer.img : showTimer.disableimg } : ''}   { bSetOverExec ? props.onShowOverExec(e, 'overExec', 0) : null}>{commonUtils.isEmptyObject(props.sortedInfo) ? slideOverExec.img : slideOverExec.disableimg } : ''}    - { bSetCheckModel ? props.onCheckModel(e, 'checkModel') : null}> + { bSetCheckModel ? props.onCheckModel(e, 'checkModel') : null}> {props.checkModelStatus ? : commonUtils.isEmptyObject(props.sortedInfo) && props.bMachine ? showCheckModel.img : showCheckModel.disableimg }