diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue index 71b049fd..4ac70ce9 100644 --- a/src/views/OperationalOverview/coldBoard.vue +++ b/src/views/OperationalOverview/coldBoard.vue @@ -1,7 +1,7 @@ @@ -617,14 +617,14 @@ export default { this.cutWsData = event?.data ? JSON.parse(event?.data) : {} if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'table') { let cutArr = this.cutWsData.productHourData.map((item, index) => [ - `${index + 1 || ''} + `${index + 1 || ''} `, - `${item.lineName || ''} + `${item.lineName || ''} `, - `${this.formatTime(item.time) || ''}`, - `${this.getSize(item.size) || ''}`, - `${item.productArea + '㎡' || ''}`, - `${item.wasteArea + '㎡' || ''}`, + `${this.formatTime(item.time) || ''}`, + `${this.getSize(item.size) || ''}`, + `${this, NumFormat(item.productArea) + '㎡' || ''}`, + `${this, NumFormat(item.wasteArea) + '㎡' || ''}`, `
${(item.product * 100).toFixed(2) + '%' || ''}
${(item.product * 100).toFixed(2) + '%' || ''}
` ]) @@ -657,7 +657,7 @@ export default { this.$refs.firstPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]]) this.$refs.secondPileChart.initChart(nameList, [topNameList[1]], [nameWasteList[1]], [productList[1]], [wasteList[1]]) this.$refs.thirdPileChart.initChart(nameList, [topNameList[2]], [nameWasteList[2]], [productList[2]], [wasteList[2]]) - this.$refs.fourthPileChart.initChart(nameList, [topNameList[3]], [nameWasteList[3]], [productList[4]], [wasteList[5]]) + this.$refs.fourthPileChart.initChart(nameList, [topNameList[3]], [nameWasteList[3]], [productList[3]], [wasteList[3]]) this.$refs.fifthPileChart.initChart(nameList, [topNameList[4]], [nameWasteList[4]], [productList[4]], [wasteList[4]]) this.$refs.productChart.initChart(nameList, yieldList, sumAreaList) }) diff --git a/src/views/OperationalOverview/components/coldDoubleYChart.vue b/src/views/OperationalOverview/components/coldDoubleYChart.vue index e284a301..39242365 100644 --- a/src/views/OperationalOverview/components/coldDoubleYChart.vue +++ b/src/views/OperationalOverview/components/coldDoubleYChart.vue @@ -2,7 +2,7 @@ @@ -100,7 +100,7 @@ export default { show: true, //开启显示 position: 'top', //在上方显示 textStyle: { //数值样式 - color: '#ced1d5', + color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色 fontSize: 12, fontWight: 'bolder' } @@ -200,7 +200,7 @@ export default { }, axisLabel: { textStyle: { - align: 'left', + align: 'center', color: 'rgba(255,255,255,0.5)' // 坐标值得具体的颜色 } }, diff --git a/src/views/OperationalOverview/components/doubleYChart .vue b/src/views/OperationalOverview/components/doubleYChart .vue index fec77879..9c46b271 100644 --- a/src/views/OperationalOverview/components/doubleYChart .vue +++ b/src/views/OperationalOverview/components/doubleYChart .vue @@ -1,7 +1,7 @@ @@ -105,7 +105,7 @@ export default { show: true, //开启显示 position: 'top', //在上方显示 textStyle: { //数值样式 - color: '#ced1d5', + color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色 fontSize: 12, fontWight:'bolder' } diff --git a/src/views/OperationalOverview/components/pileBarChart.vue b/src/views/OperationalOverview/components/pileBarChart.vue index 5ae11fb4..42f0c936 100644 --- a/src/views/OperationalOverview/components/pileBarChart.vue +++ b/src/views/OperationalOverview/components/pileBarChart.vue @@ -1,7 +1,7 @@ @@ -167,7 +167,7 @@ export default { let singleData = series.filter(function (item) { return item.name == name }) - return name + parseFloat((singleData[0].data * 100).toFixed(2)) + '%' + return name + parseFloat((singleData[0].data * 100).toFixed(0)) + '%' }, itemWidth: 12, itemHeight: 12,