diff --git a/src/App.vue b/src/App.vue index 545c4771..d399b4ff 100644 --- a/src/App.vue +++ b/src/App.vue @@ -148,6 +148,11 @@ export default { .el-calendar { border-radius: 15px; } +#greenHeadTable .el-table th.el-table__cell, +#greenHeadTable .el-table.is-scrolling-left th.el-table-fixed-column--left, +#greenHeadTable .el-table.is-scrolling-none th.el-table-fixed-column--left{ + background-color: #80f116!important; + } .el-calendar > .el-calendar__body { padding: 0 20px 20px; diff --git a/src/views/enm_coal/report.vue b/src/views/enm_coal/report.vue index ea2a37e2..bbf206d4 100644 --- a/src/views/enm_coal/report.vue +++ b/src/views/enm_coal/report.vue @@ -33,9 +33,10 @@ 昨日 本月 本年 - 月目标值 + 月目标值 月完成度 - 年目标值 + 年目标值 年完成度 @@ -843,6 +844,14 @@ export default { typeRadioChange() { this.searchDate = ""; }, + goToTarget(mgroup_id) { + this.$router.push({ + path: "/enm_monthSet/goalSetting", + query: { + mgroup: mgroup_id, + }, + }) + }, dateChange(val) { let that = this; console.log(val); diff --git a/src/views/enm_coal/teamAnalysis.vue b/src/views/enm_coal/teamAnalysis.vue index 919f0f62..d58c9977 100644 --- a/src/views/enm_coal/teamAnalysis.vue +++ b/src/views/enm_coal/teamAnalysis.vue @@ -38,7 +38,7 @@ > - 煤磨工序班组月度对比分析 + 煤磨工序班组月度对比分析 月份 @@ -47,13 +47,13 @@ 台时产量（t/h） 运转率（%） 质量 - 单位产品电耗 + 单位产品电耗 得分 细度（%） 水分（%） - 煤磨排风机主电机（kW·h/t） + 当期值（kW·h/t） 目标值（kW·h/t） 当期与目标值差值（kW·h/t） @@ -214,16 +214,16 @@ export default { ? item.出磨煤粉_水分_rate_pass : 0; //设备 - arr[7] = - item.煤磨排风机主电机_consume_unit - !== undefined && item.煤磨排风机主电机_consume_unit - !== null - ? item.煤磨排风机主电机_consume_unit - : 0; + // arr[7] = + // item.煤磨排风机主电机_consume_unit + // !== undefined && item.煤磨排风机主电机_consume_unit + // !== null + // ? item.煤磨排风机主电机_consume_unit + // : 0; let keyVale = "goal_val_" + n; - arr[8] = item.elec_consume_unit; //当期值（kW·h/t） - arr[9] = goalData[keyVale]; //目标值（kW·h/t）//需要接口获取 - arr[10] = (arr[8] - arr[9]).toFixed(2); //当期与目标差值（kW·h/t） + arr[7] = item.elec_consume_unit; //当期值（kW·h/t） + arr[8] = goalData[keyVale]; //目标值（kW·h/t）//需要接口获取 + arr[9] = (arr[7] - arr[8]).toFixed(2); //当期与目标差值（kW·h/t） let ind_pre = 0, huanqi = 0; if (item.month_s == 1) { @@ -245,23 +245,23 @@ export default { } }) } - arr[11] = huanqi; //环期值（kW·h/t）上个月的值 + arr[10] = huanqi; //环期值（kW·h/t）上个月的值 let huanqicha = 0; if (huanqi !== "/") { - huanqicha = (arr[8] - arr[11]).toFixed(2); + huanqicha = (arr[7] - arr[10]).toFixed(2); } else { huanqicha = 0; } - arr[12] = huanqicha; //当期与环期差值（kW·h/t） + arr[11] = huanqicha; //当期与环期差值（kW·h/t） // arr[13] = - if (arr[11] !=="/" && arr[11]!=0 && arr[12] !=0 && arr[12] !== "undefined"){ - arr[13] = ((arr[12]/arr[11])*100).toFixed(2); + if (arr[12] !=="/" && arr[10]!=0 && arr[11] !=0 && arr[11] !== "undefined"){ + arr[12] = ((arr[11]/arr[10])*100).toFixed(2); }else{ - arr[13] = "/"; //环比增长率（%）= 当期与环期差值（kW·h/t）/环期值（kW·h/t）*100% + arr[12] = "/"; //环比增长率（%）= 当期与环期差值（kW·h/t）/环期值（kW·h/t）*100% } - arr[14] = 0; //同比增长率（%） + arr[13] = 0; //同比增长率（%） // arr[15] = 0.0; //得分 - arr[15] = 0; + arr[14] = 0; if (month_obj[n]) { const monthData = month_obj[n]; const itemValue = item.elec_consume_unit; // 单位产品电耗的值 @@ -277,7 +277,7 @@ export default { } else if (index === 3) { elec_score= 15; } - arr[15] += elec_score; + arr[14] += elec_score; // const run_rate_itemValue = item.run_rate; // 运转率的值 // const run_rate_sortedData = monthData.sort((a, b) => parseFloat(b.run_rate) - parseFloat(a.run_rate)); @@ -307,7 +307,7 @@ export default { } else if (production_hour_index === 3) { production_hour_score= 4; } - arr[15] += production_hour_score; + arr[14] += production_hour_score; const xidu_itemValue = item.出磨煤粉_细度_rate_pass; // 出磨煤粉细度的值 const xidu_sortedData = monthData.sort((a, b) => parseFloat(b.xidu) - parseFloat(a.xidu)); @@ -322,7 +322,7 @@ export default { } else if (xidu_index === 3) { xidu_score= 3; } - arr[15] += xidu_score; + arr[14] += xidu_score; const coal_powder_itemValue = item.出磨煤粉_水分_rate_pass; // 出磨煤粉水分的值 const coal_powder_sortedData = monthData.sort((a, b) => parseFloat(b.coal_powder) - parseFloat(a.coal_powder)); @@ -337,8 +337,8 @@ export default { } else if (coal_powder_index === 3) { coal_powder_score= 2; } - arr[15] += coal_powder_score; - arr[15] += 60; + arr[14] += coal_powder_score; + arr[14] += 60; } wrapArr.push(arr); }); diff --git a/src/views/enm_energy/carbon.vue b/src/views/enm_energy/carbon.vue index cf41996f..5e352d7f 100644 --- a/src/views/enm_energy/carbon.vue +++ b/src/views/enm_energy/carbon.vue @@ -1,6 +1,6 @@ + + \ No newline at end of file diff --git a/src/views/enm_energy/electric_peak.vue b/src/views/enm_energy/electric_peak.vue index 635e5383..2f5876d7 100644 --- a/src/views/enm_energy/electric_peak.vue +++ b/src/views/enm_energy/electric_peak.vue @@ -7,13 +7,26 @@ placeholder="查询类型" clearable class="headerSearch" - @change="typeCange" + > + + + - + 导出xlsx + 趋势图 + - -
- - - - - - - - - - - - - - -
主要用能设备（100KW以上）{{ header }}
+
+ + + + + + + + + + + + - {{ row[0] }} -
{{ row[1] }}{{ cell }}
-
- -
+ + + + + + + + + +
+ + + \ No newline at end of file diff --git a/src/views/enm_rm/report.vue b/src/views/enm_rm/report.vue index 61b96b2b..79ae3767 100644 --- a/src/views/enm_rm/report.vue +++ b/src/views/enm_rm/report.vue @@ -33,9 +33,14 @@ 昨日 本月 本年 - 月目标值 + 月目标值 月完成度 - 年目标值 + 年目标值 年完成度 @@ -383,6 +388,40 @@ let yAxis = [ nameRotate: 50 } ]; +let yAxis_hour = [ + { + type: "value", + name: "产量 (t)", + position: "left", + alignTicks: true, + axisLine: { + show: true, + lineStyle: { + color: colors[0], + }, + }, + axisLabel: { + formatter: "{value}", + }, + nameRotate: 50 + }, + { + type: "value", + name: "分布电耗(kW·h)", + position: "right", + alignTicks: true, + axisLine: { + show: true, + lineStyle: { + color: colors[3], + }, + }, + axisLabel: { + formatter: "{value}", + }, + nameRotate: 50 + } +]; let yAxis_month = [ { type: "value", @@ -455,6 +494,7 @@ let yAxis_month = [ name: "分布电耗目标值", position: "right", alignTicks: true, + offset: 100, axisLine: { show: true, lineStyle: { @@ -528,40 +568,7 @@ export default { }, data: [], }, - yAxis: [ - { - type: "value", - name: "产量 (t)", - position: "left", - alignTicks: true, - axisLine: { - show: true, - lineStyle: { - color: colors[0], - }, - }, - axisLabel: { - formatter: "{value}", - }, - nameRotate: 50 - }, - { - type: "value", - name: "分布电耗(kW·h)", - position: "right", - alignTicks: true, - axisLine: { - show: true, - lineStyle: { - color: colors[3], - }, - }, - axisLabel: { - formatter: "{value}", - }, - nameRotate: 50 - }, - ], + yAxis: yAxis_hour, series: [ { name: "立磨总产量", @@ -572,7 +579,7 @@ export default { { name: "分布电耗", type: "bar", - yAxisIndex: 0, + yAxisIndex: 1, data: [], }, ], @@ -1121,6 +1128,14 @@ export default { typeRadioChange() { this.searchDate = ""; }, + goToTarget(mgroup_id) { + this.$router.push({ + path: "/enm_monthSet/goalSetting", + query: { + mgroup: mgroup_id, + }, + }) + }, dateChange(val) { let that = this; console.log(val); diff --git a/src/views/enm_rm_copy/report.vue b/src/views/enm_rm_copy/report.vue index c7c4b1c7..deb6eb2b 100644 --- a/src/views/enm_rm_copy/report.vue +++ b/src/views/enm_rm_copy/report.vue @@ -33,9 +33,10 @@ 昨日 本月 本年 - 月目标值 + 月目标值 月完成度 - 年目标值 + 年目标值 年完成度 @@ -1185,6 +1186,14 @@ export default { typeRadioChange() { this.searchDate = ""; }, + goToTarget(mgroup_id) { + this.$router.push({ + path: "/enm_monthSet/goalSetting", + query: { + mgroup: mgroup_id, + }, + }) + }, dateChange(val) { let that = this; console.log(val); diff --git a/src/views/enm_slag/report.vue b/src/views/enm_slag/report.vue index adc8bd85..2257b67b 100644 --- a/src/views/enm_slag/report.vue +++ b/src/views/enm_slag/report.vue @@ -33,9 +33,10 @@ 昨日 本月 本年 - 月目标值 - 月完成度 - 年目标值 + 月目标值 + 月完成度 + 年目标值 年完成度 @@ -82,13 +83,23 @@ + > + 按时 按日 按月
+
- +
+
本日生产参数统计图
+ +
本月生产参数统计图
{ + let seriesData0 = [], + seriesData1 = [], + seriesData2 = [], + seriesData3 = [], + seriesData4 = [], + seriesData5 = []; + let data = response; + data.forEach((item) => { + let ind = item.hour ; + seriesData0[ind] = item.total_production; + seriesData1[ind] = item.production_cost_unit; + seriesData2[ind] = item.elec_consume_unit; + seriesData5[ind] = item.elec_consume; + if (item.imaterial_data.length > 0) { + item.imaterial_data.forEach((items_n) => { + if (items_n.material_name == "湿电石渣消耗") { + seriesData3[ind] = items_n.amount_consume; + }else if(items_n.material_name == "湿电石渣进厂"){ + seriesData4[ind] = items_n.amount_consume; + } + }); + } + }); + let options = { ...that.option3 }; + options.series[0].data = seriesData0; + options.series[1].data = seriesData2; + options.series[2].data = seriesData5; + options.series[3].data = seriesData1; + options.series[4].data = seriesData3; + options.series[5].data = seriesData4; + let hourXAxis = []; + for (let i = 0; i < 24; i++) { + let item = i + "时"; + hourXAxis.push(item); + } + options.xAxis.data = hourXAxis; + that.optionHour = options; + }); + }, //获取天数据 getDayData(year, month) { let that = this;