diff --git a/src/views/copilot/factoryData/hdIndex.vue b/src/views/copilot/factoryData/hdIndex.vue index d4bb788..c308bb6 100644 --- a/src/views/copilot/factoryData/hdIndex.vue +++ b/src/views/copilot/factoryData/hdIndex.vue @@ -134,11 +134,11 @@ export default { if (preData && preData[0] != null) { for (const factory of preData) { if (factory.previousGlassType === 0) { - preDataDetail[1] = factory.previousYearOutputNumber + preDataDetail[1] = factory.previousOutputNumber } else if (factory.previousGlassType === 1) { - preDataDetail[2] = factory.previousYearOutputNumber - } else if (factory.previousYearOutputNumber === 2) { - currentDataDetail[3] = factory.outputNumber + preDataDetail[2] = factory.previousOutputNumber + } else if (factory.previousGlassType === 2) { + preDataDetail[3] = factory.previousOutputNumber } } } diff --git a/src/views/copilot/factoryData/index.vue b/src/views/copilot/factoryData/index.vue index 7a40566..611ccd5 100644 --- a/src/views/copilot/factoryData/index.vue +++ b/src/views/copilot/factoryData/index.vue @@ -132,16 +132,17 @@ export default { // } } } - if (preData && preData[0] != null) { + if (preData) { for (const factory of preData) { if (factory.previousGlassType === 0) { - preDataDetail[1] = factory.previousYearOutputNumber + console.log('factory', factory) + preDataDetail[1] = factory.previousOutputNumber } else if (factory.previousGlassType === 1) { - preDataDetail[2] = factory.previousYearOutputNumber + preDataDetail[2] = factory.previousOutputNumber } } } - if (targetListResponse && targetListResponse[0] != null) { + if (targetListResponse) { for (const factory of targetListResponse) { targetDataDetail[0] = factory.ftoInput // if (factory.previousGlassType === 0) { @@ -153,7 +154,7 @@ export default { } } // console.log('ftoInvest',ftoInvest) - if (factoryListResponse && factoryListResponse[0] != null) { + if (factoryListResponse) { for (const factory of factoryListResponse) { // targetDataDetail[0] = factory.ftoInput if (factory.glassType === 0) { @@ -163,6 +164,7 @@ export default { } } } + console.log(' this.factoryData.preDataDetail', preDataDetail); this.factoryData.preDataDetail = preDataDetail this.factoryData.currentDataDetail = currentDataDetail this.factoryData.targetDataDetail = targetDataDetail