Commit 79ff886603d6b440793753c6058eacea0eb5ded4
1 parent
04da4d3c
清空缓存和回滚暂停跳转功能
Showing
2 changed files
with
18 additions
and
6 deletions
src/mes/indexMes/index.js
| @@ -992,6 +992,7 @@ const SystemFunComponent = () => { | @@ -992,6 +992,7 @@ const SystemFunComponent = () => { | ||
| 992 | const resetDailyReport = commonFunc.showLocalMessage(props, 'resetDailyReport', '关机'); | 992 | const resetDailyReport = commonFunc.showLocalMessage(props, 'resetDailyReport', '关机'); |
| 993 | const switchToManual = commonFunc.showLocalMessage(props, 'switchToManual', '切换手动'); | 993 | const switchToManual = commonFunc.showLocalMessage(props, 'switchToManual', '切换手动'); |
| 994 | const SwitchAuto = commonFunc.showLocalMessage(props, 'SwitchAuto', '切换自动'); | 994 | const SwitchAuto = commonFunc.showLocalMessage(props, 'SwitchAuto', '切换自动'); |
| 995 | + const ClearCache = commonFunc.showLocalMessage(props, 'ClearCache', '清空缓存'); | ||
| 995 | 996 | ||
| 996 | 997 | ||
| 997 | const { bPlcSd } = userinfo; | 998 | const { bPlcSd } = userinfo; |
| @@ -1036,7 +1037,7 @@ const SystemFunComponent = () => { | @@ -1036,7 +1037,7 @@ const SystemFunComponent = () => { | ||
| 1036 | overlayClassName={styles.systemFun} | 1037 | overlayClassName={styles.systemFun} |
| 1037 | content={ | 1038 | content={ |
| 1038 | <div className="systemFunContent"> | 1039 | <div className="systemFunContent"> |
| 1039 | - <div | 1040 | + {/* <div |
| 1040 | className="restDailyReport" | 1041 | className="restDailyReport" |
| 1041 | onClick={() => { | 1042 | onClick={() => { |
| 1042 | handleSystemFunClick("restDailyReport"); | 1043 | handleSystemFunClick("restDailyReport"); |
| @@ -1053,6 +1054,17 @@ const SystemFunComponent = () => { | @@ -1053,6 +1054,17 @@ const SystemFunComponent = () => { | ||
| 1053 | > | 1054 | > |
| 1054 | <SwapOutlined /> | 1055 | <SwapOutlined /> |
| 1055 | <span>{bPlcSd ? SwitchAuto : switchToManual}</span> | 1056 | <span>{bPlcSd ? SwitchAuto : switchToManual}</span> |
| 1057 | + </div> */} | ||
| 1058 | + <div | ||
| 1059 | + className="restDailyReport" | ||
| 1060 | + onClick={() => { | ||
| 1061 | + setTimeout(() => { | ||
| 1062 | + message.success('清除缓存成功!'); | ||
| 1063 | + }, 1000); | ||
| 1064 | + }} | ||
| 1065 | + > | ||
| 1066 | + <UndoOutlined /> | ||
| 1067 | + <span>{ClearCache}</span> | ||
| 1056 | </div> | 1068 | </div> |
| 1057 | </div> | 1069 | </div> |
| 1058 | } | 1070 | } |
src/mes/scheduledTasks/machineTasks/index.js
| @@ -432,11 +432,11 @@ const useInfoEvent = props => { | @@ -432,11 +432,11 @@ const useInfoEvent = props => { | ||
| 432 | tempTaskId: "" | 432 | tempTaskId: "" |
| 433 | }); | 433 | }); |
| 434 | } | 434 | } |
| 435 | - // props.onChangeRouter({ | ||
| 436 | - // type: "name", | ||
| 437 | - // path: ["生产执行", "生产执行"] | ||
| 438 | - // }); | ||
| 439 | - handleRefresh(); | 435 | + props.onChangeRouter({ |
| 436 | + type: "name", | ||
| 437 | + path: ["生产执行", "生产执行"] | ||
| 438 | + }); | ||
| 439 | + // handleRefresh(); | ||
| 440 | } else if (code === -7) { | 440 | } else if (code === -7) { |
| 441 | // 如果有开工中的任务,即接口返回-7,弹出确认窗体 | 441 | // 如果有开工中的任务,即接口返回-7,弹出确认窗体 |
| 442 | itemClickRef.current = { data: item }; | 442 | itemClickRef.current = { data: item }; |