Commit e392be59d831ddc0cbaf0a8b2c6af96de93d447b

Authored by Min
1 parent 3e4c4ec8

1.排程图标根据语言加载对应的语言图标,英文展示英文图标,中文展示中文图标

src/assets/plan/cal_english.svg 0 → 100644
  1 +<svg width="22" height="22" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
  2 + <circle cx="11" cy="11" r="10" fill="none" stroke="#40a9ff" stroke-width="2"/>
  3 + <text x="11" y="15" font-family="Arial" font-size="12" text-anchor="middle" fill="#40a9ff">T</text>
  4 +</svg>
src/assets/plan/cal_english_1.svg 0 → 100644
  1 +<svg width="22" height="22" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
  2 + <circle cx="11" cy="11" r="10" fill="none" stroke="#40a9ff" stroke-width="2"/>
  3 + <text x="11" y="15" font-family="Arial" font-size="12" text-anchor="middle" fill="#40a9ff">T</text>
  4 +</svg>
src/assets/plan/change_english.svg 0 → 100644
  1 +<svg width="22" height="22" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
  2 + <circle cx="11" cy="11" r="10" fill="none" stroke="#40a9ff" stroke-width="2"/>
  3 + <text x="11" y="15" font-family="Arial" font-size="12" text-anchor="middle" fill="#40a9ff">H</text>
  4 +</svg>
src/assets/plan/change_english_1.svg 0 → 100644
  1 +<svg width="22" height="22" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
  2 + <circle cx="11" cy="11" r="10" fill="none" stroke="#8a8a8a" stroke-width="2"/>
  3 + <text x="11" y="15" font-family="Arial" font-size="12" text-anchor="middle" fill="#v">H</text>
  4 +</svg>
src/assets/plan/check_english.svg 0 → 100644
  1 +<svg width="22" height="22" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
  2 + <circle cx="11" cy="11" r="10" fill="none" stroke="#40a9ff" stroke-width="2"/>
  3 + <text x="11" y="15" font-family="Arial" font-size="12" text-anchor="middle" fill="#40a9ff">F</text>
  4 +</svg>
src/assets/plan/check_english_1.svg 0 → 100644
  1 +<svg width="22" height="22" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
  2 + <circle cx="11" cy="11" r="10" fill="none" stroke="#8a8a8a" stroke-width="2"/>
  3 + <text x="11" y="15" font-family="Arial" font-size="12" text-anchor="middle" fill="#8a8a8a">F</text>
  4 +</svg>
src/assets/plan/img.png 0 → 100644

506 Bytes

src/assets/plan/img_1.png 0 → 100644

535 Bytes

src/assets/plan/lock_english.svg 0 → 100644
  1 +<svg width="22" height="22" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
  2 + <circle cx="11" cy="11" r="10" fill="none" stroke="#40a9ff" stroke-width="2"/>
  3 + <text x="11" y="15" font-family="Arial" font-size="12" text-anchor="middle" fill="#40a9ff">L</text>
  4 +</svg>
src/assets/plan/lock_english_1.svg 0 → 100644
  1 +<svg width="22" height="22" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
  2 + <circle cx="11" cy="11" r="10" fill="none" stroke="#8a8a8a" stroke-width="2"/>
  3 + <text x="11" y="15" font-family="Arial" font-size="12" text-anchor="middle" fill="#8a8a8a">L</text>
  4 +</svg>
src/assets/plan/over_english.svg 0 → 100644
  1 +<svg width="22" height="22" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
  2 + <circle cx="11" cy="11" r="10" fill="none" stroke="#40a9ff" stroke-width="2"/>
  3 + <text x="11" y="15" font-family="Arial" font-size="12" text-anchor="middle" fill="#40a9ff">P</text>
  4 +</svg>
src/assets/plan/over_english_1.svg 0 → 100644
  1 +<svg width="22" height="22" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
  2 + <circle cx="11" cy="11" r="10" fill="none" stroke="#8a8a8a" stroke-width="2"/>
  3 + <text x="11" y="15" font-family="Arial" font-size="12" text-anchor="middle" fill="#8a8a8a">P</text>
  4 +</svg>
src/assets/plan/save_english.svg 0 → 100644
  1 +<svg width="22" height="22" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
  2 + <circle cx="11" cy="11" r="10" fill="none" stroke="#40a9ff" stroke-width="2"/>
  3 + <text x="11" y="15" font-family="Arial" font-size="12" text-anchor="middle" fill="#40a9ff">S</text>
  4 +</svg>
src/assets/plan/save_english_1.svg 0 → 100644
  1 +<svg width="22" height="22" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
  2 + <circle cx="11" cy="11" r="10" fill="none" stroke="#8a8a8a" stroke-width="2"/>
  3 + <text x="11" y="15" font-family="Arial" font-size="12" text-anchor="middle" fill="#8a8a8a">S</text>
  4 +</svg>
src/components/productionScheduleTree/productionScheduleTree.js
@@ -21,24 +21,40 @@ import MoveTop from &#39;@/assets/processTop.svg&#39;; @@ -21,24 +21,40 @@ import MoveTop from &#39;@/assets/processTop.svg&#39;;
21 import DisableMoveTop from '@/assets/disableprocessTop.svg'; 21 import DisableMoveTop from '@/assets/disableprocessTop.svg';
22 import MoveBottom from '@/assets/processBottom.svg'; 22 import MoveBottom from '@/assets/processBottom.svg';
23 import DisableMoveBottom from '@/assets/disableprocessBottom.svg'; 23 import DisableMoveBottom from '@/assets/disableprocessBottom.svg';
  24 +
24 import ChangeMachine from '@/assets/plan/change.png'; 25 import ChangeMachine from '@/assets/plan/change.png';
25 import DisableChangeMachine from '@/assets/plan/change_1.png'; 26 import DisableChangeMachine from '@/assets/plan/change_1.png';
  27 +import ChangeMachineEnglish from '@/assets/plan/change_english.svg';
  28 +import DisableChangeMachineEnglish from '@/assets/plan/change_english_1.svg';
26 29
27 import SetSave from '@/assets/plan/save.png'; 30 import SetSave from '@/assets/plan/save.png';
28 import DisableSetSave from '@/assets/plan/save_1.png'; 31 import DisableSetSave from '@/assets/plan/save_1.png';
  32 +import SetSaveEnglish from '@/assets/plan/save_english.svg';
  33 +import DisableSetSaveEnglish from '@/assets/plan/save_english_1.svg';
29 34
30 import SetLock from '@/assets/plan/lock.png'; 35 import SetLock from '@/assets/plan/lock.png';
31 import DisableSetLock from '@/assets/plan/lock_1.png'; 36 import DisableSetLock from '@/assets/plan/lock_1.png';
  37 +import SetLockEnglish from '@/assets/plan/lock_english.svg';
  38 +import DisableSetLockEnglish from '@/assets/plan/lock_english_1.svg';
32 39
33 import SetOverExec from '@/assets/plan/over.png'; 40 import SetOverExec from '@/assets/plan/over.png';
34 import DisableSetOverExec from '@/assets/plan/over_1.png'; 41 import DisableSetOverExec from '@/assets/plan/over_1.png';
  42 +import SetOverExecEnglish from '@/assets/plan/over_english.svg';
  43 +import DisableSetOverExecEnglish from '@/assets/plan/over_english_1.svg';
35 44
36 import ShowGantt from '@/assets/gantt.svg'; 45 import ShowGantt from '@/assets/gantt.svg';
37 import DisableShowGantt from '@/assets/disablegantt.svg'; 46 import DisableShowGantt from '@/assets/disablegantt.svg';
  47 +
38 import ShowCheckModel from '@/assets/plan/check.png'; 48 import ShowCheckModel from '@/assets/plan/check.png';
39 import DisableShowCheckModel from '@/assets/plan/check_1.png'; 49 import DisableShowCheckModel from '@/assets/plan/check_1.png';
  50 +import ShowCheckModelEnglish from '@/assets/plan/check_english.svg';
  51 +import DisableShowCheckModelEnglish from '@/assets/plan/check_english_1.svg';
  52 +
40 import ShowTimer from '@/assets/plan/cal.png'; 53 import ShowTimer from '@/assets/plan/cal.png';
41 import DisableShowTimer from '@/assets/plan/cal_1.png'; 54 import DisableShowTimer from '@/assets/plan/cal_1.png';
  55 +import ShowTimerEnglish from '@/assets/plan/cal_english.svg';
  56 +import DisableShowTimerEnglish from '@/assets/plan/cal_english_1.svg';
  57 +
42 import ShowList from '@/assets/list.svg'; 58 import ShowList from '@/assets/list.svg';
43 import DisableShowList from '@/assets/disablelist.svg'; 59 import DisableShowList from '@/assets/disablelist.svg';
44 import Reset from '@/assets/reset.svg'; 60 import Reset from '@/assets/reset.svg';
@@ -948,6 +964,7 @@ const ProductionScheduleComponent = Form.create({ @@ -948,6 +964,7 @@ const ProductionScheduleComponent = Form.create({
948 }; 964 };
949 const width = '18px'; 965 const width = '18px';
950 const height = '18px'; 966 const height = '18px';
  967 + const sLanguage = app?.userinfo?.sLanguage || 'sChinese';
951 const moveUp = { 968 const moveUp = {
952 title: '上移', 969 title: '上移',
953 width: { width }, 970 width: { width },
@@ -977,32 +994,32 @@ const ProductionScheduleComponent = Form.create({ @@ -977,32 +994,32 @@ const ProductionScheduleComponent = Form.create({
977 disableimg: <img src={DisableMoveBottom} alt="置底" width="24px" height="24px" />, 994 disableimg: <img src={DisableMoveBottom} alt="置底" width="24px" height="24px" />,
978 }; 995 };
979 const changeMachine = { 996 const changeMachine = {
980 - title: '更换机台', 997 + title: sLanguage === 'sEnglish' ? 'ChangeMachine' : '更换机台' ,
981 width: { width }, 998 width: { width },
982 height: { height }, 999 height: { height },
983 - img: <img src={ChangeMachine} alt="更换机台" style={{ width: '24px' }} />,  
984 - disableimg: <img src={DisableChangeMachine} alt="更换机台" style={{ width: '24px' }} />, 1000 + img: <img src={sLanguage === 'sEnglish' ? ChangeMachineEnglish :ChangeMachine} alt="更换机台" style={{ width: '24px' }} />,
  1001 + disableimg: <img src={sLanguage === 'sEnglish' ? DisableChangeMachineEnglish : DisableChangeMachine} alt="更换机台" style={{ width: '24px' }} />,
985 }; 1002 };
986 const slideSave = { 1003 const slideSave = {
987 title: '侧边保存', 1004 title: '侧边保存',
988 width: { width }, 1005 width: { width },
989 height: { height }, 1006 height: { height },
990 - img: <img src={SetSave} alt="保存" style={{ width: '24px' }} />,  
991 - disableimg: <img src={DisableSetSave} alt="保存" style={{ width: '24px' }} />, 1007 + img: <img src={sLanguage === 'sEnglish' ? SetSaveEnglish : SetSave} alt="保存" style={{ width: '24px' }} />,
  1008 + disableimg: <img src={sLanguage === 'sEnglish' ? DisableSetSaveEnglish : DisableSetSave} alt="保存" style={{ width: '24px' }} />,
992 }; 1009 };
993 const slideLock = { 1010 const slideLock = {
994 title: '侧边锁定', 1011 title: '侧边锁定',
995 width: { width }, 1012 width: { width },
996 height: { height }, 1013 height: { height },
997 - img: <img src={SetLock} alt="锁定" style={{ width: '24px' }} />,  
998 - disableimg: <img src={DisableSetLock} alt="锁定" style={{ width: '24px' }} />, 1014 + img: <img src={sLanguage === 'sEnglish' ? SetLockEnglish : SetLock} alt="锁定" style={{ width: '24px' }} />,
  1015 + disableimg: <img src={sLanguage === 'sEnglish' ? DisableSetLockEnglish :DisableSetLock} alt="锁定" style={{ width: '24px' }} />,
999 }; 1016 };
1000 const slideOverExec = { 1017 const slideOverExec = {
1001 title: '侧边超能力', 1018 title: '侧边超能力',
1002 width: { width }, 1019 width: { width },
1003 height: { height }, 1020 height: { height },
1004 - img: <img src={SetOverExec} alt="超能力" style={{ width: '24px' }} />,  
1005 - disableimg: <img src={DisableSetOverExec} alt="超能力" style={{ width: '24px' }} />, 1021 + img: <img src={sLanguage === 'sEnglish' ? SetOverExecEnglish : SetOverExec} alt="超能力" style={{ width: '24px' }} />,
  1022 + disableimg: <img src={sLanguage === 'sEnglish' ? DisableSetOverExecEnglish : DisableSetOverExec} alt="超能力" style={{ width: '24px' }} />,
1006 }; 1023 };
1007 const showGantt = { 1024 const showGantt = {
1008 title: '查看Gantt', 1025 title: '查看Gantt',
@@ -1016,16 +1033,16 @@ const ProductionScheduleComponent = Form.create({ @@ -1016,16 +1033,16 @@ const ProductionScheduleComponent = Form.create({
1016 title: '齐套稽查', 1033 title: '齐套稽查',
1017 width: { width }, 1034 width: { width },
1018 height: { height }, 1035 height: { height },
1019 - img: <img src={ShowCheckModel} alt="齐套稽查" width="24px" height="24px" />,  
1020 - disableimg: <img src={DisableShowCheckModel} alt="齐套稽查" width="24px" height="24px" />, 1036 + img: <img src={sLanguage === 'sEnglish' ? ShowCheckModelEnglish : ShowCheckModel} alt="齐套稽查" width="24px" height="24px" />,
  1037 + disableimg: <img src={sLanguage === 'sEnglish' ? DisableShowCheckModelEnglish : DisableShowCheckModel} alt="齐套稽查" width="24px" height="24px" />,
1021 }; 1038 };
1022 1039
1023 const showTimer = { 1040 const showTimer = {
1024 title: '重算时间', 1041 title: '重算时间',
1025 width: { width }, 1042 width: { width },
1026 height: { height }, 1043 height: { height },
1027 - img: <img src={ShowTimer} alt="重算时间" width="24px" height="24px" />,  
1028 - disableimg: <img src={DisableShowTimer} alt="重算时间" width="24px" height="24px" />, 1044 + img: <img src={sLanguage === 'sEnglish' ? ShowTimerEnglish : ShowTimer} alt="重算时间" width="24px" height="24px" />,
  1045 + disableimg: <img src={sLanguage === 'sEnglish' ? DisableShowTimerEnglish : DisableShowTimer} alt="重算时间" width="24px" height="24px" />,
1029 }; 1046 };
1030 const showList = { 1047 const showList = {
1031 title: '查看列表', 1048 title: '查看列表',
@@ -1151,7 +1168,9 @@ const ProductionScheduleComponent = Form.create({ @@ -1151,7 +1168,9 @@ const ProductionScheduleComponent = Form.create({
1151 const setDown = commonFunc.showMessage(app.commonConst, 'setDown');/* 下移 */ 1168 const setDown = commonFunc.showMessage(app.commonConst, 'setDown');/* 下移 */
1152 const setTop = commonFunc.showMessage(app.commonConst, 'setTop');/* 置顶 */ 1169 const setTop = commonFunc.showMessage(app.commonConst, 'setTop');/* 置顶 */
1153 const setBottom = commonFunc.showMessage(app.commonConst, 'setBottom');/* 置底 */ 1170 const setBottom = commonFunc.showMessage(app.commonConst, 'setBottom');/* 置底 */
1154 - const setMachine = commonFunc.showMessage(app.commonConst, 'changeMachine');/* 置底 */ 1171 + const setMachine = commonFunc.showMessage(app.commonConst, 'changeMachine');/* 更换机台 */
  1172 + const setCheck = commonFunc.showMessage(app.commonConst, 'fullCheck');/* 齐套稽查 */
  1173 + const setCalTime = commonFunc.showMessage(app.commonConst, 'calTime');/* 重算时间 */
1155 const setSave = commonUtils.isNotEmptyObject(commonFunc.showMessage(app.commonConst, 'setSave')) ? commonFunc.showMessage(app.commonConst, 'setSave') : '保存';/* 保存 */ 1174 const setSave = commonUtils.isNotEmptyObject(commonFunc.showMessage(app.commonConst, 'setSave')) ? commonFunc.showMessage(app.commonConst, 'setSave') : '保存';/* 保存 */
1156 const setLock = commonFunc.showMessage(app.commonConst, 'setLock') ? commonFunc.showMessage(app.commonConst, 'setLock') : '锁定';/* 锁定 */ 1175 const setLock = commonFunc.showMessage(app.commonConst, 'setLock') ? commonFunc.showMessage(app.commonConst, 'setLock') : '锁定';/* 锁定 */
1157 const setOverExec = commonFunc.showMessage(app.commonConst, 'setOverExec') ? commonFunc.showMessage(app.commonConst, 'setOverExec') :'超能力';/* 超 */ 1176 const setOverExec = commonFunc.showMessage(app.commonConst, 'setOverExec') ? commonFunc.showMessage(app.commonConst, 'setOverExec') :'超能力';/* 超 */
@@ -1599,10 +1618,10 @@ const ProductionScheduleComponent = Form.create({ @@ -1599,10 +1618,10 @@ const ProductionScheduleComponent = Form.create({
1599 { bSetSave ? <a title={setSave} {...addProps} onClick={ e =>props.onShowSave(e, 'save', 0)}>{slideSave.img}</a> : ''} &nbsp;&nbsp; 1618 { bSetSave ? <a title={setSave} {...addProps} onClick={ e =>props.onShowSave(e, 'save', 0)}>{slideSave.img}</a> : ''} &nbsp;&nbsp;
1600 { bSetLock ? <a title={setLock} {...addProps} onClick={commonUtils.isEmptyObject(props.sortedInfo) ? e => props.onShowLock(e, 'lock', 0) : null}>{commonUtils.isEmptyObject(props.sortedInfo) ? slideLock.img : slideLock.disableimg }</a> : ''} &nbsp;&nbsp; 1619 { bSetLock ? <a title={setLock} {...addProps} onClick={commonUtils.isEmptyObject(props.sortedInfo) ? e => props.onShowLock(e, 'lock', 0) : null}>{commonUtils.isEmptyObject(props.sortedInfo) ? slideLock.img : slideLock.disableimg }</a> : ''} &nbsp;&nbsp;
1601 { bSetTimer ? 1620 { bSetTimer ?
1602 - <a title="重算时间" {...addProps} onClick={commonUtils.isEmptyObject(props.sortedInfo) ? e => props.onShowTimerModal(e, 'changeTimer') : null}>{commonUtils.isEmptyObject(props.sortedInfo) ? showTimer.img : showTimer.disableimg }</a> 1621 + <a title={setCalTime} {...addProps} onClick={commonUtils.isEmptyObject(props.sortedInfo) ? e => props.onShowTimerModal(e, 'changeTimer') : null}>{commonUtils.isEmptyObject(props.sortedInfo) ? showTimer.img : showTimer.disableimg }</a>
1603 : ''}&nbsp;&nbsp; 1622 : ''}&nbsp;&nbsp;
1604 { bSetOverExec ? <a title={setOverExec} {...addProps} onClick={commonUtils.isEmptyObject(props.sortedInfo) ? e => props.onShowOverExec(e, 'overExec', 0) : null}>{commonUtils.isEmptyObject(props.sortedInfo) ? slideOverExec.img : slideOverExec.disableimg }</a> : ''} &nbsp;&nbsp; 1623 { bSetOverExec ? <a title={setOverExec} {...addProps} onClick={commonUtils.isEmptyObject(props.sortedInfo) ? e => props.onShowOverExec(e, 'overExec', 0) : null}>{commonUtils.isEmptyObject(props.sortedInfo) ? slideOverExec.img : slideOverExec.disableimg }</a> : ''} &nbsp;&nbsp;
1605 - { bSetCheckModel ?<a title="齐套稽查" {...addProps} onClick={commonUtils.isEmptyObject(props.sortedInfo) && props.bMachine ? e => props.onCheckModel(e, 'checkModel') : null}> 1624 + { bSetCheckModel ?<a title={setCheck} {...addProps} onClick={commonUtils.isEmptyObject(props.sortedInfo) && props.bMachine ? e => props.onCheckModel(e, 'checkModel') : null}>
1606 {props.checkModelStatus ? 1625 {props.checkModelStatus ?
1607 <LoadingOutlined style={{ fontSize: 16 }} spin></LoadingOutlined> : commonUtils.isEmptyObject(props.sortedInfo) && props.bMachine ? showCheckModel.img : showCheckModel.disableimg 1626 <LoadingOutlined style={{ fontSize: 16 }} spin></LoadingOutlined> : commonUtils.isEmptyObject(props.sortedInfo) && props.bMachine ? showCheckModel.img : showCheckModel.disableimg
1608 } 1627 }