fix:石灰石破碎中生产报告不要小时;余热发电中生产报告的产量单位更正
This commit is contained in:
parent
8b8ff3b48b
commit
0135367fea
|
|
@ -347,7 +347,7 @@ export default {
|
||||||
mgroup: "3347217246321065984",
|
mgroup: "3347217246321065984",
|
||||||
},
|
},
|
||||||
tableDatas: [
|
tableDatas: [
|
||||||
["产量", "总发电量(KW·h/t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
["产量", "总发电量(KW·h)", 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
["产量", "单位发电量(KW·h/t)", "/", 0, 0, 0, 0, 0, 0, 0],
|
["产量", "单位发电量(KW·h/t)", "/", 0, 0, 0, 0, 0, 0, 0],
|
||||||
["运转时间", "运转时间(h)", "/", 0, 0, 0, 0, 0, 0, 0],
|
["运转时间", "运转时间(h)", "/", 0, 0, 0, 0, 0, 0, 0],
|
||||||
["运转时间", "运转率(%)", "/", 0, 0, 0, 0, 0, 0, 0],
|
["运转时间", "运转率(%)", "/", 0, 0, 0, 0, 0, 0, 0],
|
||||||
|
|
|
||||||
|
|
@ -24,11 +24,10 @@
|
||||||
>
|
>
|
||||||
<thead class="myTableHead">
|
<thead class="myTableHead">
|
||||||
<tr>
|
<tr>
|
||||||
<th colspan="10">石灰石破碎工段生产报告</th>
|
<th colspan="9">石灰石破碎工段生产报告</th>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th colspan="2">参数</th>
|
<th colspan="2">参数</th>
|
||||||
<th>上个小时</th>
|
|
||||||
<th>昨日</th>
|
<th>昨日</th>
|
||||||
<th>本月</th>
|
<th>本月</th>
|
||||||
<th>本年</th>
|
<th>本年</th>
|
||||||
|
|
@ -54,12 +53,12 @@
|
||||||
{{ item[0] }}
|
{{ item[0] }}
|
||||||
</td>
|
</td>
|
||||||
<td class="numCell">{{ item[1] }}</td>
|
<td class="numCell">{{ item[1] }}</td>
|
||||||
<td
|
<!-- <td
|
||||||
class="numCell hoursItem"
|
class="numCell hoursItem"
|
||||||
@click="itemClick('hour_s', item)"
|
@click="itemClick('hour_s', item)"
|
||||||
>
|
>
|
||||||
{{ item[2] }}
|
{{ item[2] }}
|
||||||
</td>
|
</td> -->
|
||||||
<td
|
<td
|
||||||
class="numCell daysItem"
|
class="numCell daysItem"
|
||||||
@click="itemClick('day_s', item)"
|
@click="itemClick('day_s', item)"
|
||||||
|
|
@ -86,14 +85,14 @@
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<!-- <div id="main" style="width:1200px;height:600px;"></div> -->
|
<!-- <div id="main" style="width:1200px;height:600px;"></div> -->
|
||||||
<div class="chartWrap">
|
<!-- <div class="chartWrap">
|
||||||
<div class="chartTitle">小时生产参数统计图</div>
|
<div class="chartTitle">小时生产参数统计图</div>
|
||||||
<scEcharts
|
<scEcharts
|
||||||
height="400px"
|
height="400px"
|
||||||
width="1033px"
|
width="1033px"
|
||||||
:option="optionHour"
|
:option="optionHour"
|
||||||
></scEcharts>
|
></scEcharts>
|
||||||
</div>
|
</div> -->
|
||||||
<div class="chartWrap">
|
<div class="chartWrap">
|
||||||
<div class="chartTitle">本月生产参数统计图</div>
|
<div class="chartTitle">本月生产参数统计图</div>
|
||||||
<scEcharts
|
<scEcharts
|
||||||
|
|
@ -488,12 +487,12 @@ export default {
|
||||||
days_d = lastDate.getDate();
|
days_d = lastDate.getDate();
|
||||||
}
|
}
|
||||||
//上一小时的计算
|
//上一小时的计算
|
||||||
let hourTime = timeDate - 3600000;
|
// let hourTime = timeDate - 3600000;
|
||||||
let hourDate = new Date(hourTime);
|
// let hourDate = new Date(hourTime);
|
||||||
let year_h = hourDate.getFullYear();
|
// let year_h = hourDate.getFullYear();
|
||||||
let month_h = hourDate.getMonth() + 1;
|
// let month_h = hourDate.getMonth() + 1;
|
||||||
let days_h = hourDate.getDate();
|
// let days_h = hourDate.getDate();
|
||||||
let hours_h = hourDate.getHours();
|
// let hours_h = hourDate.getHours();
|
||||||
this.$API.mtm.mgroup.list
|
this.$API.mtm.mgroup.list
|
||||||
.req({ page: 0, search: "石灰石破碎" })
|
.req({ page: 0, search: "石灰石破碎" })
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
|
|
@ -514,22 +513,22 @@ export default {
|
||||||
that.tableDatas[1][3] = data3.elec_consume_unit;
|
that.tableDatas[1][3] = data3.elec_consume_unit;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
//上小时
|
// //上小时
|
||||||
let params4 = {};
|
// let params4 = {};
|
||||||
params4.page = 0;
|
// params4.page = 0;
|
||||||
params4.year = year_h;
|
// params4.year = year_h;
|
||||||
params4.month = month_h;
|
// params4.month = month_h;
|
||||||
params4.day = days_h;
|
// params4.day = days_h;
|
||||||
params4.hour = hours_h;
|
// params4.hour = hours_h;
|
||||||
params4.type = "hour_st";
|
// params4.type = "hour_st";
|
||||||
params4.mgroup = that.query.mgroup;
|
// params4.mgroup = that.query.mgroup;
|
||||||
that.$API.enm.enstat.req(params4).then((res4) => {
|
// that.$API.enm.enstat.req(params4).then((res4) => {
|
||||||
if (res4.length > 0) {
|
// if (res4.length > 0) {
|
||||||
let data4 = res4[0];
|
// let data4 = res4[0];
|
||||||
that.tableDatas[0][2] = data4.total_production;
|
// that.tableDatas[0][2] = data4.total_production;
|
||||||
that.tableDatas[1][2] = data4.elec_consume_unit;
|
// that.tableDatas[1][2] = data4.elec_consume_unit;
|
||||||
}
|
// }
|
||||||
});
|
// });
|
||||||
//月目标
|
//月目标
|
||||||
let params5 = {};
|
let params5 = {};
|
||||||
params5.page = 0;
|
params5.page = 0;
|
||||||
|
|
@ -612,45 +611,45 @@ export default {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
that.getHourData();
|
// that.getHourData();
|
||||||
that.getDayData();
|
that.getDayData();
|
||||||
that.getMonthData();
|
that.getMonthData();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
//获取小时数据
|
// //获取小时数据
|
||||||
getHourData() {
|
// getHourData() {
|
||||||
let that = this;
|
// let that = this;
|
||||||
let query = {};
|
// let query = {};
|
||||||
query.page = 0;
|
// query.page = 0;
|
||||||
query.year_s = that.year;
|
// query.year_s = that.year;
|
||||||
query.month_s = that.month;
|
// query.month_s = that.month;
|
||||||
query.day_s = that.days;
|
// query.day_s = that.days;
|
||||||
query.type = "hour_s";
|
// query.type = "hour_s";
|
||||||
query.mgroup = that.query.mgroup;
|
// query.mgroup = that.query.mgroup;
|
||||||
this.$API.enm.enstat.req(query).then((response) => {
|
// this.$API.enm.enstat.req(query).then((response) => {
|
||||||
let seriesData0 = [],
|
// let seriesData0 = [],
|
||||||
seriesData1 = [];
|
// seriesData1 = [];
|
||||||
console.log("获取小时数据", response);
|
// console.log("获取小时数据", response);
|
||||||
let data = response;
|
// let data = response;
|
||||||
data.forEach((item) => {
|
// data.forEach((item) => {
|
||||||
let ind = item.hour - 1;
|
// let ind = item.hour - 1;
|
||||||
seriesData0[ind] = item.total_production;
|
// seriesData0[ind] = item.total_production;
|
||||||
seriesData1[ind] = item.elec_consume_unit;
|
// seriesData1[ind] = item.elec_consume_unit;
|
||||||
});
|
// });
|
||||||
let options = { ...that.option1 };
|
// let options = { ...that.option1 };
|
||||||
options.series[0].data = seriesData0;
|
// options.series[0].data = seriesData0;
|
||||||
options.series[1].data = seriesData1;
|
// options.series[1].data = seriesData1;
|
||||||
let hourXAxis = [];
|
// let hourXAxis = [];
|
||||||
for (let i = 1; i <= that.hours; i++) {
|
// for (let i = 1; i <= that.hours; i++) {
|
||||||
let item = i + "时";
|
// let item = i + "时";
|
||||||
hourXAxis.push(item);
|
// hourXAxis.push(item);
|
||||||
}
|
// }
|
||||||
options.xAxis.data = hourXAxis;
|
// options.xAxis.data = hourXAxis;
|
||||||
that.optionHour = options;
|
// that.optionHour = options;
|
||||||
});
|
// });
|
||||||
},
|
// },
|
||||||
//获取天数据
|
//获取天数据
|
||||||
getDayData() {
|
getDayData() {
|
||||||
let that = this;
|
let that = this;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue