From a2e73b25ce10901e83d88fb7b8cac1ebb0617b28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’> Date: Fri, 7 Jun 2024 14:48:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factoryData/components/BarChartBase.vue | 79 +++++++++---------- .../factoryData/components/ChipOee.vue | 4 +- src/views/copilot/factoryData/hdIndex.vue | 7 +- 3 files changed, 44 insertions(+), 46 deletions(-) diff --git a/src/views/copilot/factoryData/components/BarChartBase.vue b/src/views/copilot/factoryData/components/BarChartBase.vue index a477920..5bf1725 100644 --- a/src/views/copilot/factoryData/components/BarChartBase.vue +++ b/src/views/copilot/factoryData/components/BarChartBase.vue @@ -36,6 +36,8 @@ export default { isFullscreen: false, actualOptions: null, chart: "", + data: [], + orderXAxis:[], // obj:{ // seriesArr: [], // targetProduceArr: [], @@ -50,7 +52,7 @@ export default { grid: { left: "7%", right: "7%", - bottom: "8%", + bottom: "15%", top: "15%", }, tooltip: { @@ -66,6 +68,7 @@ export default { }, }, axisLabel: { + rotate:45, color: "rgba(255, 255, 255, 0.7)", fontSize: 12, }, @@ -191,7 +194,7 @@ export default { }, watch: { type(val) { - + this.initChart() }, /** 全屏状态切换时，对柱子粗细和字体大小进行相应调整 */ // isFullscreen(val) { @@ -249,79 +252,62 @@ export default { }, 500)(); }, initChart() { - if (this.chart) { - this.chart.dispose(); - } - this.chart = echarts.init(document.getElementById("factoryEnergyChart")); - const actualOptions = JSON.parse(JSON.stringify(this.options)); if (this.type === '目标产量') { - let orderXAxis = [] - let targetProduceArr = [] + this.orderXAxis = [] + this.data = [] if (this.energyCockpits) { this.energyCockpits.forEach(ele => { - targetProduceArr.push(ele.targetProduction) - orderXAxis.push(ele.workOrderNumber) + this.data.push(ele.targetProduction) + this.orderXAxis.push(ele.workOrderNumber) }); } - actualOptions.xAxis.data = orderXAxis; - actualOptions.series[0].data = targetProduceArr; // this.initChart(targetProduceArr, orderXAxis) } else if (this.type === '计划投入') { - let orderXAxis = [] - let planIn = [] + this.orderXAxis = [] + this.data = [] if (this.energyCockpits) { this.energyCockpits.forEach(ele => { - planIn.push(ele.plannedInvestment) - orderXAxis.push(ele.workOrderNumber) + this.data.push(ele.plannedInvestment) + this.orderXAxis.push(ele.workOrderNumber) }); } - actualOptions.xAxis.data = orderXAxis; - actualOptions.series[0].data = planIn; } else if (this.type === '实际投入') { - let orderXAxis = [] - let acIn = [] + this.orderXAxis = [] + this.data = [] if (this.energyCockpits) { this.energyCockpits.forEach(ele => { - acIn.push(ele.actualInvestment) - orderXAxis.push(ele.workOrderNumber) + this.data.push(ele.actualInvestment) + this.orderXAxis.push(ele.workOrderNumber) }); } - actualOptions.xAxis.data = orderXAxis; - actualOptions.series[0].data = acIn; } else if (this.type === '实际产出') { - let orderXAxis = [] - let acProduceArr = [] + this.orderXAxis = [] + this.data = [] if (this.energyCockpits) { this.energyCockpits.forEach(ele => { - acProduceArr.push(ele.actualProduction) - orderXAxis.push(ele.workOrderNumber) + this.data.push(ele.actualProduction) + this.orderXAxis.push(ele.workOrderNumber) }); } - actualOptions.xAxis.data = orderXAxis; - actualOptions.series[0].data = acProduceArr; } else if (this.type === '废品数量') { - let orderXAxis = [] - let scrapNum = [] + this.orderXAxis = [] + this.data = [] if (this.energyCockpits) { this.energyCockpits.forEach(ele => { - scrapNum.push(ele.wasteNum) - orderXAxis.push(ele.workOrderNumber) + this.data.push(ele.wasteNum) + this.orderXAxis.push(ele.workOrderNumber) }); } - actualOptions.xAxis.data = orderXAxis; - actualOptions.series[0].data = scrapNum; } else if (this.type === '待再加工') { - let orderXAxis = [] - let processNum = [] + this.orderXAxis = [] + this.data = [] if (this.energyCockpits) { this.energyCockpits.forEach(ele => { console.log(ele.reworkNum); - processNum.push(ele.reworkNum) - orderXAxis.push(ele.workOrderNumber) + this.data.push(ele.reworkNum) + this.orderXAxis.push(ele.workOrderNumber) }); } - actualOptions.xAxis.data = orderXAxis; - actualOptions.series[0].data = processNum; } // let seriesArr = [ @@ -370,6 +356,13 @@ export default { // actualOptions.series[1].name = seriesArr[1].name; // actualOptions.series[2].data = seriesArr[2].data; // actualOptions.series[2].name = seriesArr[2].name; + if (this.chart) { + this.chart.dispose(); + } + this.chart = echarts.init(document.getElementById("factoryEnergyChart")); + const actualOptions = JSON.parse(JSON.stringify(this.options)); + actualOptions.xAxis.data = this.orderXAxis; + actualOptions.series[0].data = this.data; this.actualOptions = actualOptions; this.chart.setOption(actualOptions); }, diff --git a/src/views/copilot/factoryData/components/ChipOee.vue b/src/views/copilot/factoryData/components/ChipOee.vue index c555412..a89bef2 100644 --- a/src/views/copilot/factoryData/components/ChipOee.vue +++ b/src/views/copilot/factoryData/components/ChipOee.vue @@ -1,7 +1,7 @@ @@ -49,7 +49,7 @@ export default { computed: { xAxis() { console.log(' this.companyId', this.companyId); - return this.companyId === 0 ? ["fto投入", "芯片产量", "标准组件产量"] : ["fto投入", "芯片产量", "标准组件产量", 'BIPV产量']; + return this.companyId === 0 ? ["FTO投入", "芯片产量", "标准组件产量"] : ["FTO投入", "芯片产量", "标准组件产量", 'BIPV产量']; }, legend() { let items = []; diff --git a/src/views/copilot/factoryData/hdIndex.vue b/src/views/copilot/factoryData/hdIndex.vue index 69bff90..d4bb788 100644 --- a/src/views/copilot/factoryData/hdIndex.vue +++ b/src/views/copilot/factoryData/hdIndex.vue @@ -9,7 +9,7 @@ :prodOutPut="prodOutPut" :prodFto="prodFto" :showBipv="show" /> - + @@ -47,6 +47,7 @@ export default { }, data() { return { + type: '目标产量', companyId: 1, companyName: "邯郸中建材光电材料有限公司", period: 1, @@ -75,6 +76,10 @@ export default { this.getMes(); }, methods: { + updateType(val) { + console.log(val) + this.type = val + }, updateCompany(obj) { this.companyId = obj.companyId; this.companyName = obj.companyName; -- 2.45.2