diff --git a/src/views/enm_pack/report.vue b/src/views/enm_pack/report.vue index 09757fc2..6984f86a 100644 --- a/src/views/enm_pack/report.vue +++ b/src/views/enm_pack/report.vue @@ -269,7 +269,7 @@ let toolbox = { }; let legend = { top: "2%", - data: ["熟料", "分布电耗", "总产量"],} + data: ["袋装合计", "散装合计", "熟料出厂合计", "出厂水泥合计", "复合水泥合计"],} let yAxis = [ { @@ -373,75 +373,59 @@ export default { data: [], }, yAxis: yAxis, + selector:[{ + // 全选 + type: 'all', + // 可以是任意你喜欢的标题 + title: '全选' + }, + { + // 反选 + type: 'inverse', + // 可以是任意你喜欢的标题 + title: '反选' + }], + selector: true, series: [ { - name: "总产量", + name: "袋装合计", type: "bar", yAxisIndex: 0, data: [], }, { - name: "P.O42.5R 散装", + name: "散装合计", type: "bar", yAxisIndex: 0, data: [], }, { - name: "P.O42.5R 袋装", + name: "熟料出厂合计", type: "bar", yAxisIndex: 0, data: [], }, { - name: "P.O42.5 袋装", + name: "出厂水泥合计", type: "bar", yAxisIndex: 0, data: [], }, { - name: "P.O42.5 散装", + name: "复合水泥合计", type: "bar", yAxisIndex: 0, data: [], }, - { - name: "P.C42.5 袋装", - type: "bar", - yAxisIndex: 0, - data: [], - }, - { - name: "P.C42.5 散装", - type: "bar", - yAxisIndex: 0, - data: [], - }, - { - name: "P.O52.5 散装", - type: "bar", - yAxisIndex: 0, - data: [], - }, - { - name: "熟料", - type: "bar", - yAxisIndex: 0, - data: [], - }, - { - name: "分布电耗", - type: "bar", - yAxisIndex: 1, - data: [], - }, + ], }, option2: { color: colors, tooltip: tooltip, + legend: legend, grid: grid, toolbox: toolbox, - legend: legend, xAxis: { axisTick: { show: true, @@ -450,68 +434,51 @@ export default { }, data: [], }, + selector:[{ + // 全选 + type: 'all', + // 可以是任意你喜欢的标题 + title: '全选' + }, + { + // 反选 + type: 'inverse', + // 可以是任意你喜欢的标题 + title: '反选' + }], + selector: true, yAxis: yAxis, series: [ { - name: "总产量", + name: "袋装合计", type: "bar", yAxisIndex: 0, data: [], }, { - name: "P.O42.5R 散装", + name: "散装合计", type: "bar", yAxisIndex: 0, data: [], }, { - name: "P.O42.5R 袋装", + name: "熟料出厂合计", type: "bar", yAxisIndex: 0, data: [], }, { - name: "P.O42.5 袋装", + name: "出厂水泥合计", type: "bar", yAxisIndex: 0, data: [], }, { - name: "P.O42.5 散装", + name: "复合水泥合计", type: "bar", yAxisIndex: 0, data: [], }, - { - name: "P.C42.5 袋装", - type: "bar", - yAxisIndex: 0, - data: [], - }, - { - name: "P.C42.5 散装", - type: "bar", - yAxisIndex: 0, - data: [], - }, - { - name: "P.O52.5 散装", - type: "bar", - yAxisIndex: 0, - data: [], - }, - { - name: "熟料", - type: "bar", - yAxisIndex: 0, - data: [], - }, - { - name: "分布电耗", - type: "bar", - yAxisIndex: 1, - data: [], - }, ], }, }; @@ -753,52 +720,33 @@ export default { query1.type = "day_s"; query1.mgroup = this.query.mgroup; this.$API.enm.mpointstat.list.req(query1).then((response) => { - let seriesData0 = [], - seriesData1 = [], + let seriesData1 = [], seriesData2 = [], seriesData3 = [], seriesData4 = [], - seriesData5 = [], - seriesData6 = [], - seriesData7 = [], - seriesData8 = [], - seriesData9 = []; + seriesData5 = []; let data = response; data.forEach((item) => { let ind = item.day_s - 1; - if (item.mpoint_name == "水泥+P.O42.5R 散装") { + if (item.mpoint_name == "袋装水泥总和") { seriesData1[ind] = item.val; - }else if (item.mpoint_name == "水泥+P.O42.5R 袋装"){ + }else if (item.mpoint_name == "散装水泥总和"){ seriesData2[ind] = item.val; - }else if (item.mpoint_name == "水泥+P.O42.5 袋装") { + }else if (item.mpoint_name == "出厂熟料") { seriesData3[ind] = item.val; - }else if (item.mpoint_name == "水泥+P.O42.5 散装") { - seriesData4[ind] = item.val; - }else if (item.mpoint_name == "复合硅酸盐水泥;42.5R;袋装水泥") { - seriesData5[ind] = item.val; - }else if (item.mpoint_name == "水泥+P.C42.5 散装") { - seriesData6[ind] = item.val; - }else if (item.mpoint_name == "水泥+P.O52.5 散装") { - seriesData7[ind] = item.val; }else if (item.mpoint_name == "出厂水泥") { - seriesData0[ind] = item.val; - }else if (item.mpoint_name == "出厂熟料"){ - seriesData8[ind] = item.val; - }else if (item.mpoint_name == "包装进线") { - seriesData9[ind] = item.elec_consume_unit; + seriesData4[ind] = item.val; + }else if (item.mpoint_name == "复合水泥合计" || item.mpoint_name == "复合硅酸盐水泥;42.5R;袋装水泥") { + seriesData5[ind] = item.val; } + }); let options = { ...that.option1 }; - options.series[0].data = seriesData0; - options.series[1].data = seriesData1; - options.series[2].data = seriesData2; - options.series[3].data = seriesData3; - options.series[4].data = seriesData4; - options.series[5].data = seriesData5; - options.series[6].data = seriesData6; - options.series[7].data = seriesData7; - options.series[8].data = seriesData8; - options.series[9].data = seriesData9; + options.series[0].data = seriesData1; + options.series[1].data = seriesData2; + options.series[2].data = seriesData3; + options.series[3].data = seriesData4; + options.series[4].data = seriesData5; let dayXAxis = []; for (let i = 1; i <= that.days; i++) { let item = i + "日"; @@ -817,52 +765,36 @@ export default { query2.type = "month_s"; query2.mgroup = that.query.mgroup; this.$API.enm.mpointstat.list.req(query2).then((response) => { - let seriesData0 = [], + let seriesData1 = [], seriesData2 = [], seriesData3 = [], seriesData4 = [], - seriesData5 = [], - seriesData6 = [], - seriesData7 = [], - seriesData8 = [], - seriesData9 = []; + seriesData5 = []; + let data = response; data.forEach((item) => { let ind = item.month_s - 1; - if (item.mpoint_name == "水泥+P.O42.5R 散装") { + if (item.mpoint_name == "袋装水泥总和") { seriesData1[ind] = item.val; - }else if (item.mpoint_name == "水泥+P.O42.5R 袋装"){ + }else if (item.mpoint_name == "散装水泥总和"){ seriesData2[ind] = item.val; - }else if (item.mpoint_name == "水泥+P.O42.5 袋装") { + }else if (item.mpoint_name == "出厂熟料") { seriesData3[ind] = item.val; - }else if (item.mpoint_name == "水泥+P.O42.5 散装") { - seriesData4[ind] = item.val; - }else if (item.mpoint_name == "复合硅酸盐水泥;42.5R;袋装水泥") { - seriesData5[ind] = item.val; - }else if (item.mpoint_name == "水泥+P.C42.5 散装") { - seriesData6[ind] = item.val; - }else if (item.mpoint_name == "水泥+P.O52.5 散装") { - seriesData7[ind] = item.val; }else if (item.mpoint_name == "出厂水泥") { - seriesData0[ind] = item.val; - }else if (item.mpoint_name == "出厂熟料"){ - seriesData8[ind] = item.val; - }else if (item.mpoint_name == "包装进线") { - seriesData9[ind] = item.elec_consume_unit; + seriesData4[ind] = item.val; + }else if (item.mpoint_name == "复合水泥合计" || item.mpoint_name == "复合硅酸盐水泥;42.5R;袋装水泥") { + console.log(item.mpoint_name, item.val); + seriesData5[ind] = item.val; } }); let options = { ...that.option2 }; - options.series[0].data = seriesData0; - options.series[1].data = seriesData1; - options.series[2].data = seriesData2; - options.series[3].data = seriesData3; - options.series[4].data = seriesData4; - options.series[5].data = seriesData5; - options.series[6].data = seriesData6; - options.series[7].data = seriesData7; - options.series[8].data = seriesData8; - options.series[9].data = seriesData9; + options.series[0].data = seriesData1; + options.series[1].data = seriesData2; + options.series[2].data = seriesData3; + options.series[3].data = seriesData4; + options.series[4].data = seriesData5; + let monthXAxis = []; for (let i = 1; i <= that.month; i++) { let item = i + "月"; diff --git a/src/views/enm_rm/report.vue b/src/views/enm_rm/report.vue index d7d5566b..37813ad5 100644 --- a/src/views/enm_rm/report.vue +++ b/src/views/enm_rm/report.vue @@ -276,12 +276,12 @@