mt-fe-group/yudao-init
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'projects/mescc/zhp' (#71) from projects/mescc/zhp into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Details

Browse Source 
Reviewed-on: #71
This commit is contained in:
朱菊兰 2024-06-27 16:56:15 +08:00
commit dcf4f6c392
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/copilot/factoryData/hdIndex.vue
View File

@ -134,11 +134,11 @@ export default {
if (preData && preData[0] != null) { if (preData && preData[0] != null) {
for (const factory of preData) { for (const factory of preData) {
if (factory.previousGlassType === 0) { if (factory.previousGlassType === 0) {
preDataDetail[1] = factory.previousYearOutputNumber preDataDetail[1] = factory.previousOutputNumber
} else if (factory.previousGlassType === 1) { } else if (factory.previousGlassType === 1) {
preDataDetail[2] = factory.previousYearOutputNumber preDataDetail[2] = factory.previousOutputNumber
} else if (factory.previousYearOutputNumber === 2) { } else if (factory.previousGlassType === 2) {
currentDataDetail[3] = factory.outputNumber preDataDetail[3] = factory.previousOutputNumber
} }
} }
} }

12
src/views/copilot/factoryData/index.vue
View File

@ -132,16 +132,17 @@ export default {
// } // }
} }
} }
if (preData && preData[0] != null) { if (preData) {
for (const factory of preData) { for (const factory of preData) {
if (factory.previousGlassType === 0) { if (factory.previousGlassType === 0) {
preDataDetail[1] = factory.previousYearOutputNumber console.log('factory', factory)
preDataDetail[1] = factory.previousOutputNumber
} else if (factory.previousGlassType === 1) { } 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) { for (const factory of targetListResponse) {
targetDataDetail[0] = factory.ftoInput targetDataDetail[0] = factory.ftoInput
// if (factory.previousGlassType === 0) { // if (factory.previousGlassType === 0) {
@ -153,7 +154,7 @@ export default {
} }
} }
// console.log('ftoInvest',ftoInvest) // console.log('ftoInvest',ftoInvest)
if (factoryListResponse && factoryListResponse[0] != null) { if (factoryListResponse) {
for (const factory of factoryListResponse) { for (const factory of factoryListResponse) {
// targetDataDetail[0] = factory.ftoInput // targetDataDetail[0] = factory.ftoInput
if (factory.glassType === 0) { if (factory.glassType === 0) {
@ -163,6 +164,7 @@ export default {
} }
} }
} }
console.log(' this.factoryData.preDataDetail', preDataDetail);
this.factoryData.preDataDetail = preDataDetail this.factoryData.preDataDetail = preDataDetail
this.factoryData.currentDataDetail = currentDataDetail this.factoryData.currentDataDetail = currentDataDetail
this.factoryData.targetDataDetail = targetDataDetail this.factoryData.targetDataDetail = targetDataDetail