#34 projects/mescc/zhp
Merged
juzi
merged 2 commits from projects/mescc/zhp into projects/mescc/develop 3 months ago
1 changed files with 3 additions and 2 deletions
+ 3
- 2
src/store/modules/home.js
View File
| @@ -96,7 +96,8 @@ const actions = { | |||||
| let preData = dataArr.previousProdOutputOutDO | let preData = dataArr.previousProdOutputOutDO | ||||
| let preFtoData = dataArr.previousProdOutputFtoDO | let preFtoData = dataArr.previousProdOutputFtoDO | ||||
| // const targetArr = await getHomeInfo(); | // const targetArr = await getHomeInfo(); | ||||
| const payload = splitCurrentAndPrevious(dataArr.prodOutputOutDO, dataArr.prodTargetOutputDO,dataArr.prodOutputFtoDO,dataArr.previousProdOutputOutDO,preData,preFtoData); | |||||
| // factoryListResponse, targetListResponse, prodOutputFtoListRes,preData,preFtoData | |||||
| const payload = splitCurrentAndPrevious(dataArr.prodOutputOutDO, dataArr.prodTargetOutputDO,dataArr.prodOutputFtoDO,preData,preFtoData); | |||||
| commit("SET_HOME_INFO", payload); | commit("SET_HOME_INFO", payload); | ||||
| }, | }, | ||||
| /** 初始化驾驶舱数据 */ | /** 初始化驾驶舱数据 */ | ||||
| @@ -399,7 +400,7 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodO | |||||
| } | } | ||||
| function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOutputFtoListRes,preData,preFtoData) { | function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOutputFtoListRes,preData,preFtoData) { | ||||
| console.log('prodOutputFtoListRes',preData); | |||||
| console.log('prodOutputFtoListRes',preFtoData); | |||||
| // 初始数据 | // 初始数据 | ||||
| const { chipInvest, ftoInvest, chipOutput, stdOutput, bipvOutput } = init() | const { chipInvest, ftoInvest, chipOutput, stdOutput, bipvOutput } = init() | ||||
| if (prodOutputFtoListRes) { | if (prodOutputFtoListRes) { | ||||