feat:修改生产报告内容
This commit is contained in:
parent
d34b781d9f
commit
8f5c6d3c31
|
@ -33,7 +33,7 @@
|
||||||
<th>设备名称</th>
|
<th>设备名称</th>
|
||||||
<th>设备位号</th>
|
<th>设备位号</th>
|
||||||
<th>单位产品分布电耗</th>
|
<th>单位产品分布电耗</th>
|
||||||
<th>上个小时</th>
|
<th>本日</th>
|
||||||
<th>昨日</th>
|
<th>昨日</th>
|
||||||
<th>本月</th>
|
<th>本月</th>
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -412,11 +412,11 @@ export default {
|
||||||
let days_h = hourDate.getDate();
|
let days_h = hourDate.getDate();
|
||||||
let hours_h = hourDate.getHours();
|
let hours_h = hourDate.getHours();
|
||||||
let obj = {};
|
let obj = {};
|
||||||
obj.type = "hour_s";
|
obj.type = "day_s";
|
||||||
obj.year = year_h;
|
obj.year_s = year_h;
|
||||||
obj.month = month_h;
|
obj.month_s = month_h;
|
||||||
obj.day = days_h;
|
obj.day_s = days_h;
|
||||||
obj.hour = hours_h;
|
// obj.hour = hours_h; //上个小时改为本日
|
||||||
obj.mgroup__name = "煤磨";
|
obj.mgroup__name = "煤磨";
|
||||||
obj.mpoint__material__code__in = "elec,elec_0";
|
obj.mpoint__material__code__in = "elec,elec_0";
|
||||||
// obj.mpoint__need_display = 1;
|
// obj.mpoint__need_display = 1;
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
<th>设备名称</th>
|
<th>设备名称</th>
|
||||||
<th>设备位号</th>
|
<th>设备位号</th>
|
||||||
<th>单位产品分布电耗</th>
|
<th>单位产品分布电耗</th>
|
||||||
<th>上个小时</th>
|
<th>本日</th>
|
||||||
<th>昨日</th>
|
<th>昨日</th>
|
||||||
<th>本月</th>
|
<th>本月</th>
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -532,11 +532,11 @@ export default {
|
||||||
let days_h = hourDate.getDate();
|
let days_h = hourDate.getDate();
|
||||||
let hours_h = hourDate.getHours();
|
let hours_h = hourDate.getHours();
|
||||||
let obj = {};
|
let obj = {};
|
||||||
obj.type = "hour_s";
|
obj.type = "day_s";
|
||||||
obj.year = year_h;
|
obj.year_s = year_h;
|
||||||
obj.month = month_h;
|
obj.month_s = month_h;
|
||||||
obj.day = days_h;
|
obj.day_s = days_h;
|
||||||
obj.hour = hours_h;
|
// obj.hour = hours_h; 上个小时改为本日
|
||||||
obj.mgroup__name = "回转窑";
|
obj.mgroup__name = "回转窑";
|
||||||
obj.mpoint__material__code__in = "elec,elec_0";
|
obj.mpoint__material__code__in = "elec,elec_0";
|
||||||
// obj.mpoint__need_display = 1;
|
// obj.mpoint__need_display = 1;
|
||||||
|
|
|
@ -325,14 +325,16 @@ let legend = {
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
top: "2%",
|
top: "2%",
|
||||||
|
width: "400px",
|
||||||
data: [
|
data: [
|
||||||
"回转窑总产量",
|
"回转窑总产量",
|
||||||
"回转窑台时产量",
|
"台时产量",
|
||||||
"回转窑运转率",
|
"回转窑运转率",
|
||||||
"熟料分布电耗",
|
"熟料分布电耗",
|
||||||
"熟料标煤耗",
|
"熟料标煤耗",
|
||||||
"熟料单位成本",
|
"熟料单位成本",
|
||||||
],
|
],
|
||||||
|
|
||||||
};
|
};
|
||||||
let yAxis = [
|
let yAxis = [
|
||||||
{
|
{
|
||||||
|
@ -353,7 +355,7 @@ let yAxis = [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "value",
|
type: "value",
|
||||||
name: "回转窑台时产量 (t/h)",
|
name: "台时产量 (t/h)",
|
||||||
position: "left",
|
position: "left",
|
||||||
alignTicks: true,
|
alignTicks: true,
|
||||||
nameRotate: 50,
|
nameRotate: 50,
|
||||||
|
@ -403,7 +405,7 @@ let yAxis = [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "value",
|
type: "value",
|
||||||
name: "标煤耗(kgce/t)",
|
name: "熟料标煤耗(kgce/t)",
|
||||||
position: "right",
|
position: "right",
|
||||||
alignTicks: true,
|
alignTicks: true,
|
||||||
nameRotate: 50,
|
nameRotate: 50,
|
||||||
|
@ -491,7 +493,7 @@ export default {
|
||||||
tooltip: tooltip,
|
tooltip: tooltip,
|
||||||
grid: grid,
|
grid: grid,
|
||||||
toolbox: toolbox,
|
toolbox: toolbox,
|
||||||
legend: Object.assign(legend, {data: ["回转窑总产量", "分布电耗", "熟料标煤耗", "熟料单位成本"]}),
|
legend: Object.assign(legend, {data: ["回转窑总产量", "台时产量","回转窑运转率", "熟料分布电耗", "熟料标煤耗", "熟料单位成本"]}),
|
||||||
xAxis: {
|
xAxis: {
|
||||||
axisTick: {
|
axisTick: {
|
||||||
show: true,
|
show: true,
|
||||||
|
@ -631,7 +633,7 @@ export default {
|
||||||
data: [],
|
data: [],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "回转窑台时产量",
|
name: "台时产量",
|
||||||
type: "bar",
|
type: "bar",
|
||||||
yAxisIndex: 1,
|
yAxisIndex: 1,
|
||||||
data: [],
|
data: [],
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
<th>设备名称</th>
|
<th>设备名称</th>
|
||||||
<th>设备位号</th>
|
<th>设备位号</th>
|
||||||
<th>单位产品分布电耗</th>
|
<th>单位产品分布电耗</th>
|
||||||
<th>上个小时</th>
|
<th>本日</th>
|
||||||
<th>昨日</th>
|
<th>昨日</th>
|
||||||
<th>本月</th>
|
<th>本月</th>
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -489,11 +489,11 @@ export default {
|
||||||
let days_h = hourDate.getDate();
|
let days_h = hourDate.getDate();
|
||||||
let hours_h = hourDate.getHours();
|
let hours_h = hourDate.getHours();
|
||||||
let obj = {};
|
let obj = {};
|
||||||
obj.type = "hour_s";
|
obj.type = "day_s";
|
||||||
obj.year = year_h;
|
obj.year_s = year_h;
|
||||||
obj.month = month_h;
|
obj.month_s = month_h;
|
||||||
obj.day = days_h;
|
obj.day_s = days_h;
|
||||||
obj.hour = hours_h;
|
// obj.hour = hours_h; 上个小时改为本日
|
||||||
obj.mgroup__name = "水泥磨";
|
obj.mgroup__name = "水泥磨";
|
||||||
obj.mpoint__material__code__in = "elec,elec_0";
|
obj.mpoint__material__code__in = "elec,elec_0";
|
||||||
// obj.mpoint__need_display = 1;
|
// obj.mpoint__need_display = 1;
|
||||||
|
|
|
@ -431,7 +431,7 @@ export default {
|
||||||
tooltip: tooltip,
|
tooltip: tooltip,
|
||||||
grid: grid,
|
grid: grid,
|
||||||
toolbox: toolbox,
|
toolbox: toolbox,
|
||||||
legend: Object.assign(legend, {data: ["水泥磨总产量", "分布电耗", "水泥单位成本"]}),
|
legend: Object.assign(legend, {data: ["水泥磨总产量", "分布电耗", "水泥单位成本","水泥磨台时产量","水泥磨运转率"]}),
|
||||||
xAxis: {
|
xAxis: {
|
||||||
axisTick: {
|
axisTick: {
|
||||||
show: true,
|
show: true,
|
||||||
|
|
|
@ -42,14 +42,14 @@
|
||||||
@click="handleQuery"
|
@click="handleQuery"
|
||||||
></el-button>
|
></el-button>
|
||||||
</div>
|
</div>
|
||||||
<!-- <div class="right-panel">
|
<div class="right-panel">
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="el-icon-plus"
|
icon="el-icon-plus"
|
||||||
@click="roleAdd"
|
@click="roleAdd"
|
||||||
v-auth="'goal.create'"
|
v-auth="'goal.create'"
|
||||||
></el-button>
|
></el-button>
|
||||||
</div> -->
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
<el-main class="nopadding">
|
<el-main class="nopadding">
|
||||||
<scTable
|
<scTable
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
<th>设备名称</th>
|
<th>设备名称</th>
|
||||||
<th>设备位号</th>
|
<th>设备位号</th>
|
||||||
<th>单位产品分布电耗</th>
|
<th>单位产品分布电耗</th>
|
||||||
<th>上个小时</th>
|
<th>本日</th>
|
||||||
<th>昨日</th>
|
<th>昨日</th>
|
||||||
<th>本月</th>
|
<th>本月</th>
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -463,11 +463,11 @@ export default {
|
||||||
let days_h = hourDate.getDate();
|
let days_h = hourDate.getDate();
|
||||||
let hours_h = hourDate.getHours();
|
let hours_h = hourDate.getHours();
|
||||||
let obj = {};
|
let obj = {};
|
||||||
obj.type = "hour_s";
|
obj.type = "day_s";
|
||||||
obj.year = year_h;
|
obj.year_s = year_h;
|
||||||
obj.month = month_h;
|
obj.month_s = month_h;
|
||||||
obj.day = days_h;
|
obj.day_s = days_h; // 上个小时要求改为本日
|
||||||
obj.hour = hours_h;
|
// obj.hour = hours_h;
|
||||||
obj.mgroup__name = "原料磨";
|
obj.mgroup__name = "原料磨";
|
||||||
obj.mpoint__material__code__in = "elec,elec_0";
|
obj.mpoint__material__code__in = "elec,elec_0";
|
||||||
// obj.mpoint__need_display = 1;
|
// obj.mpoint__need_display = 1;
|
||||||
|
@ -477,7 +477,6 @@ export default {
|
||||||
.req(obj)
|
.req(obj)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
that.tableData = res;
|
that.tableData = res;
|
||||||
console.log("getTableHourData", res);
|
|
||||||
res.forEach((item) => {
|
res.forEach((item) => {
|
||||||
if (item.mpoint_name === "原料车间合计") {
|
if (item.mpoint_name === "原料车间合计") {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -422,10 +422,10 @@ export default {
|
||||||
tableDatas: [
|
tableDatas: [
|
||||||
["产量", "电石渣干粉总产量(t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
["产量", "电石渣干粉总产量(t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
["能耗", "电石渣干粉分布电耗(kW·h/t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
["能耗", "电石渣干粉分布电耗(kW·h/t)", 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
["能耗", "电石渣工段总电量(kW·h)", 0, 0, 0, "/", "/", "/", "/", "/"],
|
["能耗", "电石渣工段总电量(kW·h)", 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
["成本", "电石渣干粉成本(元/吨)", 0, 0, 0, 0, 0, 0, 0, 0],
|
["成本", "电石渣干粉成本(元/吨)", 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
["电石渣", "湿电石渣消耗", 0, 0, 0, "/", "/", "/", "/", "/"],
|
["电石渣", "湿电石渣消耗", 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
["电石渣", "湿电石渣进厂", 0, 0, 0, "/", "/", "/", "/", "/"],
|
["电石渣", "湿电石渣进厂", 0, 0, 0, 0, 0, 0, 0, 0],
|
||||||
],
|
],
|
||||||
cate: "",
|
cate: "",
|
||||||
apiObj: this.$API.enm.enstat,
|
apiObj: this.$API.enm.enstat,
|
||||||
|
|
Loading…
Reference in New Issue