diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue index f083af15..f67eb995 100644 --- a/src/views/OperationalOverview/coldBoard.vue +++ b/src/views/OperationalOverview/coldBoard.vue @@ -1,7 +1,7 @@ @@ -40,7 +40,7 @@ --> -
+

产线产量

@@ -250,6 +250,7 @@ export default { funWs: undefined, SJGws: undefined, funWsData: {}, + coldDetData:[], SJGWsData: {}, cxNameList:[], cxDataList:[], @@ -352,7 +353,7 @@ export default { let sumAreaList = [] // let yieldList = [] // this.cutTableDataList = - let coldDetData = [ + this.coldDetData = [ { "first": 0.8834, "lineName": "Y61", @@ -404,7 +405,7 @@ export default { "yield": 0.9133 } ] - coldDetData.forEach((ele, index) => { + this.coldDetData.forEach((ele, index) => { nameList.push(ele.lineName) topNameList.push('产线: ' + ele.lineName + ' ' + '总面积:' + ele.sumArea + '㎡') productList.push(ele.productArea) @@ -596,6 +597,7 @@ export default { let wasteList = [] let sumAreaList = [] let yieldList = [] + this.coldDetData = this.cutWsData.coldDetData // this.cutTableDataList = this.cutWsData.coldDetData.forEach((ele, index) => { nameList.push(ele.lineName) @@ -649,13 +651,12 @@ export default { for (let i in this.funWsData.data.annealFanInfo) { index++, arr.push([ - ` - ${index || ''} + `${index || ''} `, - `${i || ''} - `, - `${i.name || ''}`, - `
${i.run || ''}
`, + // `${i || ''} + // `, + `${i || ''}`, + `
${this.funWsData.data.annealFanInfo[i] || ''}
`, ]) } this.annealFunConfig.data = arr @@ -669,10 +670,10 @@ export default { for (let i in this.funWsData.data.fanInfo) { index++, arr.push([ - `${index || ''}`, - `${i || ''}`, - `${i.name || ''}`, - `
${i.run || ''}
`, + `${index || ''} + `, + `${i || ''}`, + `
${this.funWsData.data.fanInfo[i] || ''}
`, ]) } this.funConfig.data = arr