From 7fd3fa27fc11d566defb4fe8837aae8bd80474a4 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 27 Dec 2024 18:05:14 +0800 Subject: [PATCH 01/12] =?UTF-8?q?feat:=20mgroup=20=E5=A2=9E=E5=8A=A0code?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enm_base/mgroup.vue | 5 +++++ src/views/enm_base/mgroup_form.vue | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/views/enm_base/mgroup.vue b/src/views/enm_base/mgroup.vue index 54637970..df17ccaa 100644 --- a/src/views/enm_base/mgroup.vue +++ b/src/views/enm_base/mgroup.vue @@ -41,6 +41,11 @@ prop="name" min-width="100" > + + + From 89bb16149ffc3f981c8d9191b075995ecad32941 Mon Sep 17 00:00:00 2001 From: zty Date: Fri, 27 Dec 2024 19:19:14 +0800 Subject: [PATCH 03/12] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=83=BD?= =?UTF-8?q?=E6=BA=90=E6=B5=81=E5=90=91=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enm_energy/electric_peak.vue | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/views/enm_energy/electric_peak.vue b/src/views/enm_energy/electric_peak.vue index 77970170..47a381b5 100644 --- a/src/views/enm_energy/electric_peak.vue +++ b/src/views/enm_energy/electric_peak.vue @@ -116,6 +116,7 @@ import * as echarts from 'echarts'; {id:2,name:'年统计'}, ], row_list : ['peak','high','low','deep','flat'], + row_translate: ['峰值', '高峰', '低谷', '深谷', '平谷'], }; }, @@ -149,7 +150,9 @@ import * as echarts from 'echarts'; } } }, - + translate(){ + + }, dateChange() { let that = this; let arr = [], @@ -211,9 +214,9 @@ import * as echarts from 'echarts'; let seriesData = []; let categories = this.mpoint_name; // 横轴设备名称 let rowList = this.row_list; // ['peak', 'high', 'low', 'deep', 'flat'] - + let row_translate = this.row_translate; // ['峰值', '高峰', '低谷', '深谷', '平谷'] // 为每个电量级别('peak', 'high', 'low', 'deep', 'flat')创建一个系列 - rowList.forEach(level => { + rowList.forEach((level, index) => { let data = categories.map(device => { // 查找对应设备和电量级别的数据 let deviceData = chartData[device]?.find(item => item.level === level); @@ -221,7 +224,7 @@ import * as echarts from 'echarts'; }); seriesData.push({ - name: level, // 系列名称(如 peak、high 等) + name: row_translate[index], // 系列名称(如 peak、high 等) type: 'bar', data: data, // 数据数组 label: { @@ -243,7 +246,7 @@ import * as echarts from 'echarts'; axisPointer: { type: 'shadow' } // 鼠标悬停提示 }, legend: { - data: rowList, // 显示 'peak', 'high' 等级别的图例 + data: row_translate, // 显示 'peak', 'high' 等级别的图例 top: '10%' }, xAxis: { @@ -264,7 +267,7 @@ import * as echarts from 'echarts'; // 设置图表选项 myChart.setOption(option); - }, + }, handlePrint() { this.$PRINT('#myReport'); From 03d41fc2396cf72d8f782068cf020aa8fbd5068e Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 27 Dec 2024 19:19:18 +0800 Subject: [PATCH 04/12] =?UTF-8?q?feat:=20report=20=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enm_kiln/report.vue | 26 +++++++++++++++++--------- src/views/enm_mill/report.vue | 19 +++++++++++-------- src/views/enm_rm_copy/report.vue | 4 ++-- 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/src/views/enm_kiln/report.vue b/src/views/enm_kiln/report.vue index 3656e39c..aba33ef5 100644 --- a/src/views/enm_kiln/report.vue +++ b/src/views/enm_kiln/report.vue @@ -398,7 +398,7 @@ let yAxis = [ }, { type: "value", - name: "成本(元)", + name: "成本(元/吨)", position: "left", alignTicks: true, nameRotate: 30, @@ -409,9 +409,9 @@ let yAxis = [ color: colors[5], }, }, - axisLabel: { - formatter: "{value}/元", - }, + // axisLabel: { + // formatter: "{value}/元", + // }, }, ]; import scEcharts from "@/components/scEcharts"; @@ -469,7 +469,15 @@ export default { tooltip: tooltip, grid: grid, toolbox: toolbox, - legend: legend, + legend: { + top: "2%", + data: [ + "总产量", + "分布电耗", + "单位产品标煤耗", + "成本", + ], + }, xAxis: { axisTick: { show: true, @@ -987,16 +995,16 @@ export default { data.forEach((item) => { let ind = item.hour; seriesData0[ind] = item.total_production; - seriesData1[ind] = item.production_hour; - seriesData2[ind] = item.run_rate; + // seriesData1[ind] = item.production_hour; + // seriesData2[ind] = item.run_rate; seriesData3[ind] = item.elec_consume_unit; seriesData4[ind] = item.coal_consume_unit; seriesData5[ind] = item.production_cost_unit; }); let options = { ...that.option1 }; options.series[0].data = seriesData0; - options.series[1].data = seriesData1; - options.series[2].data = seriesData2; + // 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; diff --git a/src/views/enm_mill/report.vue b/src/views/enm_mill/report.vue index b0dbfaf9..344978c1 100644 --- a/src/views/enm_mill/report.vue +++ b/src/views/enm_mill/report.vue @@ -293,8 +293,8 @@ let tooltip = { triggerOn: "mousemove", }; let grid = { - right: "10%", - left: "10%", + right: "11%", + left: "11%", top: "20%", }; let toolbox = { @@ -361,7 +361,7 @@ let yAxis = [ }, { type: "value", - name: "成本(元)", + name: "成本(元/吨)", position: "left", alignTicks: true, nameRotate: 30, @@ -428,7 +428,10 @@ export default { tooltip: tooltip, grid: grid, toolbox: toolbox, - legend: legend, + legend: { + top: "2%", + data: ["总产量", "分布电耗", "成本"], + }, xAxis: { axisTick: { show: true, @@ -877,15 +880,15 @@ export default { data.forEach((item) => { let ind = item.hour; seriesData0[ind] = item.total_production; - seriesData1[ind] = item.production_hour; - seriesData2[ind] = item.run_rate; + // seriesData1[ind] = item.production_hour; + // seriesData2[ind] = item.run_rate; seriesData3[ind] = item.production_cost_unit; seriesData4[ind] = item.elec_consume_unit; }); let options = { ...that.option1 }; options.series[0].data = seriesData0; - options.series[1].data = seriesData1; - options.series[2].data = seriesData2; + // options.series[1].data = seriesData1; + // options.series[2].data = seriesData2; options.series[3].data = seriesData4; options.series[4].data = seriesData3; let hourXAxis = []; diff --git a/src/views/enm_rm_copy/report.vue b/src/views/enm_rm_copy/report.vue index 558383f6..04620a6d 100644 --- a/src/views/enm_rm_copy/report.vue +++ b/src/views/enm_rm_copy/report.vue @@ -359,7 +359,7 @@ let yAxis = [ }, { type: "value", - name: "成本(元)", + name: "成本(元/吨)", position: "left", alignTicks: true, offset: 70, @@ -676,7 +676,7 @@ export default { }, { type: "value", - name: "成本(元)", + name: "成本(元/吨)", position: "right", alignTicks: true, offset: 160, From 6404fd33f1c8b86eedc55781c93a79dc91efa64b Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 27 Dec 2024 20:15:55 +0800 Subject: [PATCH 05/12] =?UTF-8?q?feat:=20=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enm_coal/report.vue | 27 ++++++++++++++++++++++----- src/views/enm_rm/report.vue | 19 +++++++++++-------- src/views/enm_rm_copy/report.vue | 13 ++++++++----- src/views/enm_rmbase/report.vue | 2 +- 4 files changed, 42 insertions(+), 19 deletions(-) diff --git a/src/views/enm_coal/report.vue b/src/views/enm_coal/report.vue index 93e8a3ab..02e9ac2c 100644 --- a/src/views/enm_coal/report.vue +++ b/src/views/enm_coal/report.vue @@ -170,7 +170,7 @@