diff --git a/src/config/route.js b/src/config/route.js
index 5eb783c4..ef8559c2 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -354,7 +354,8 @@ const routes = [
},
],
},
- //原料磨
+
+ //原料磨生料辅料
{
name: "enm_rm",
path: "/enm_rm",
@@ -417,6 +418,70 @@ const routes = [
},
],
},
+ //原料磨二次配料
+ {
+ name: "enm_rm_copy",
+ path: "/enm_rm_copy",
+ meta: {
+ title: "生料工序",
+ icon: "el-icon-menu",
+ type: "menu",
+ perms: ["enm_rm_auxiliary"],
+ },
+ children: [
+ {
+ name: "report_copy",
+ path: "/enm_rm_copy/report",
+ meta: {
+ title: "生产报告",
+ // icon: "el-icon-document",
+ perms: ["enm_rm_auxiliary"],
+ },
+ component: "enm_rm_copy/report",
+ },
+ // {
+ // name: "power_copy",
+ // path: "/enm_rm_copy/power",
+ // meta: {
+ // title: "主要设备单耗",
+ // // icon: "el-icon-odometer",
+ // perms: ["enm_rm_auxiliary"],
+ // },
+ // component: "enm_rm_copy/power",
+ // },
+ // {
+ // name: "teamAnalysis_copy",
+ // path: "/enm_rm_copy/teamAnalysis",
+ // meta: {
+ // title: "班组月度对比",
+ // // icon: "el-icon-operation",
+ // perms: ["enm_rm_auxiliary"],
+ // },
+ // component: "enm_rm_copy/teamAnalysis",
+ // },
+ // {
+ // name: "workshopAnalysis_copy",
+ // path: "/enm_rm_copy/workshopAnalysis",
+ // meta: {
+ // title: "车间单耗分析",
+ // // icon: "el-icon-data-line",
+ // perms: ["enm_rm_auxiliary"],
+ // },
+ // component: "enm_rm_copy/workshopAnalysis",
+ // },
+ {
+ name: "handoverLog_copy",
+ path: "/enm_rm_copy/handoverLog",
+ meta: {
+ title: "交接班日志",
+ // icon: "el-icon-document-copy",
+ perms: ["enm_rm_auxiliary"],
+ },
+ component: "enm_rm_copy/handoverLog",
+ },
+ ],
+ },
+
//原料磨——基础
{
name: "enm_rmbase",
diff --git a/src/views/enm_monthSet/feeset.vue b/src/views/enm_monthSet/feeset.vue
index 04a61e47..d2850967 100644
--- a/src/views/enm_monthSet/feeset.vue
+++ b/src/views/enm_monthSet/feeset.vue
@@ -143,7 +143,7 @@ export default {
data() {
return {
apiObj: null,
- mgroup_name :["电石渣", "回转窑", "水泥磨","原料磨"],
+ mgroup_name :["电石渣", "回转窑", "水泥磨", "生料工序(二次配料)"],
query: {
date: "",
fee: "",
@@ -173,10 +173,10 @@ export default {
this.$API.mtm.mgroup.list.req({ page: 0, cate:"section"}).then((res) => {
//如果res.name=煤磨、原料磨、水泥包装，则不放入options中
res.forEach(element => {
- if(['煤磨','水泥包装'].includes(element.name)){
- return;
+ if(this.mgroup_name.includes(element.name)){
+ this.options.push(element);
}
- this.options.push(element);
+
});
console.log(this.options);
});
diff --git a/src/views/enm_rm/report.vue b/src/views/enm_rm/report.vue
index 1c7e64c6..94fc1092 100644
--- a/src/views/enm_rm/report.vue
+++ b/src/views/enm_rm/report.vue
@@ -308,7 +308,7 @@ let toolbox = {
};
let legend = {
top: "2%",
- data: ["总产量", "台时产量", "运转率", "分布电耗", "成本"],
+ data: ["总产量", "台时产量", "运转率", "分布电耗"],
};
let yAxis = [
{
@@ -357,22 +357,6 @@ let yAxis = [
formatter: "{value}",
},
},
- {
- type: "value",
- name: "成本(元)",
- position: "left",
- alignTicks: true,
- offset: 70,
- axisLine: {
- show: true,
- lineStyle: {
- color: colors[4],
- },
- },
- axisLabel: {
- formatter: "{value}",
- },
- },
];
import * as echarts from "echarts";
import scEcharts from "@/components/scEcharts";
@@ -409,7 +393,7 @@ export default {
["运转时间", "运转率（%）", "/", 0, 0, "/", 0, 0, "/", "/"],
["能耗", "生料分布电耗（KW·h/t）", 0, 0, 0, 0, 0, 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],
],
tableName: "生产报告",
modelValue: true,
@@ -461,12 +445,6 @@ export default {
yAxisIndex: 2,
data: [],
},
- {
- name: "成本",
- type: "bar",
- yAxisIndex: 3,
- data: [],
- },
],
},
option2: {
@@ -523,12 +501,6 @@ export default {
yAxisIndex: 2,
data: [],
},
- {
- name: "成本",
- type: "bar",
- yAxisIndex: 3,
- data: [],
- },
],
},
option3: {
@@ -585,12 +557,6 @@ export default {
yAxisIndex: 2,
data: [],
},
- {
- name: "成本",
- type: "bar",
- yAxisIndex: 3,
- data: [],
- },
],
},
dataX: [],
@@ -629,7 +595,6 @@ export default {
"运转率",
"分布电耗",
"单位产品标煤耗",
- "成本",
],
},
xAxis: [
@@ -674,22 +639,6 @@ export default {
formatter: "{value}",
},
},
- {
- type: "value",
- name: "成本(元)",
- position: "right",
- alignTicks: true,
- offset: 160,
- axisLine: {
- show: true,
- lineStyle: {
- color: colors[2],
- },
- },
- axisLabel: {
- formatter: "{value}",
- },
- },
{
type: "value",
name: "分布电耗(KW.h)",
@@ -838,7 +787,7 @@ export default {
that.tableDatas[3][3] = data3.run_rate;
that.tableDatas[4][3] = data3.elec_consume_unit;
that.tableDatas[5][3] = data3.elec_consume;
- that.tableDatas[6][3] = data3.production_cost_unit;}
+ }
}
});
//本日
@@ -856,11 +805,10 @@ export default {
if (data4.total_production == 0) {
that.tableDatas[4][2] = 0;
that.tableDatas[5][2] = 0;
- that.tableDatas[6][2] = 0;
}else {
that.tableDatas[4][2] = data4.elec_consume_unit;
that.tableDatas[5][2] = data4.elec_consume;
- that.tableDatas[6][2] = data4.production_cost_unit;}
+ }
}
});
//月目标
@@ -906,8 +854,7 @@ export default {
item5.goal_cate_name ==
"单位产品成本（元/吨）"
) {
- that.tableDatas[6][6] = item5[str];
- that.tableDatas[6][8] = item5.goal_val;
+
}
});
}
@@ -934,16 +881,6 @@ export default {
that.tableDatas[1][5],
that.tableDatas[1][8]
);
- // that.tableDatas[2][5] = data1.run_hour;
- // that.tableDatas[2][9] = precen(
- // that.tableDatas[2][5],
- // that.tableDatas[2][8]
- // );
- // that.tableDatas[3][5] = data1.run_rate;
- // that.tableDatas[3][9] = precen(
- // that.tableDatas[3][5],
- // that.tableDatas[3][8]
- // );
that.tableDatas[4][5] =
data1.elec_consume_unit;
that.tableDatas[4][9] = precen(
@@ -951,12 +888,7 @@ export default {
that.tableDatas[4][8]
);
that.tableDatas[5][5] = data1.elec_consume;
- that.tableDatas[6][5] =
- data1.production_cost_unit;
- that.tableDatas[6][9] = precen(
- (that.tableDatas[6][5]-that.tableDatas[6][8]),
- that.tableDatas[6][8]
- );
+
} else {
}
});
@@ -1005,12 +937,7 @@ export default {
that.tableDatas[4][6]
);
that.tableDatas[5][4] = data2.elec_consume;
- that.tableDatas[6][4] =
- data2.production_cost_unit;
- that.tableDatas[6][7] = precen(
- (that.tableDatas[6][4]-that.tableDatas[6][6]),
- that.tableDatas[6][6]
- );
+
}
});
});
@@ -1064,8 +991,7 @@ export default {
let seriesData0 = [],
seriesData1 = [],
seriesData2 = [],
- seriesData3 = [],
- seriesData4 = [];
+ seriesData3 = [];
let data = response;
data.forEach((item) => {
let ind = item.hour;
@@ -1073,14 +999,12 @@ export default {
seriesData1[ind] = Number(item.production_hour).toFixed(2);
seriesData2[ind] = item.run_rate;
seriesData3[ind] = item.elec_consume_unit;
- seriesData4[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[3].data = seriesData3;
- options.series[4].data = seriesData4;
let hourXAxis = [];
for (let i = 0; i < 24; i++) {
let item = i + "时";
@@ -1103,8 +1027,7 @@ export default {
let seriesData0 = [],
seriesData1 = [],
seriesData2 = [],
- seriesData3 = [],
- seriesData4 = [];
+ seriesData3 = [];
let data = response;
data.forEach((item) => {
let ind = item.day_s - 1;
@@ -1112,14 +1035,12 @@ export default {
seriesData1[ind] = Number(item.production_hour).toFixed(2);
seriesData2[ind] = item.run_rate;
seriesData3[ind] = item.elec_consume_unit;
- seriesData4[ind] = item.production_cost_unit;
});
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;
let dayXAxis = [];
for (let i = 1; i <= data.length; i++) {
let item = i + "日";
@@ -1141,8 +1062,7 @@ export default {
let seriesData0 = [],
seriesData1 = [],
seriesData2 = [],
- seriesData3 = [],
- seriesData4 = [];
+ seriesData3 = [];
let data = response;
data.forEach((item) => {
let ind = item.month_s - 1;
@@ -1150,14 +1070,12 @@ export default {
seriesData1[ind] = Number(item.production_hour).toFixed(2);
seriesData2[ind] = item.run_rate;
seriesData3[ind] = item.elec_consume_unit;
- seriesData4[ind] = item.production_cost_unit;
});
let options = { ...that.option3 };
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;
let monthXAxis = [];
for (let i = 1; i <= that.month; i++) {
let item = i + "月";
diff --git a/src/views/enm_rm_copy/handoverLog.vue b/src/views/enm_rm_copy/handoverLog.vue
index fe2546a3..d1f16b10 100644
--- a/src/views/enm_rm_copy/handoverLog.vue
+++ b/src/views/enm_rm_copy/handoverLog.vue
@@ -213,85 +213,6 @@
{{ reportItem.elec_consume_unit }}
-
- | 辅料细度合格率（%） |
-
- {{ reportItem.辅料_细度_rate_pass * 100 }}
- |
- 0 |
- 辅料Fe₂O₃合格率（%） |
-
- {{ reportItem.辅料_Fe2O3_rate_pass * 100 }}
- |
- 0 |
- 辅料水分合格率（%） |
-
- {{ reportItem.辅料_水分_rate_pass * 100 }}
- |
- 0 |
-
-
- | 干混生料CaO合格率（%） |
-
- {{
- reportItem.干混生料_CaO_rate_pass * 100
- }}
- |
- 0 |
-
- 干混生料Fe₂O₃合格率（%）
- |
-
- {{
- reportItem.干混生料_Fe2O3_rate_pass *
- 100
- }}
- |
- 0 |
- 干混生料细度合格率（%） |
-
- {{
- reportItem.干混生料_细度_rate_pass * 100
- }}
- |
- 0 |
-
-
- | 干混生料水分合格率（%） |
-
- {{
- reportItem.干混生料_水分_rate_pass * 100
- }}
- |
- 0 |
- 单位成本（元/吨） |
-
- {{ reportItem.production_cost_unit }}
- |
- |
- |
-
| {
- console.log("原料磨", res);
+ console.log("生料工序(二次配料)", res);
this.mgroupItem = res[0];
this.query.mgroup = res[0].id;
this.apiObj = this.$API.wpm.sflog.list;
diff --git a/src/views/enm_rm_copy/report.vue b/src/views/enm_rm_copy/report.vue
index 1c7e64c6..558383f6 100644
--- a/src/views/enm_rm_copy/report.vue
+++ b/src/views/enm_rm_copy/report.vue
@@ -57,7 +57,7 @@
| {{ item[1] }} |
{{ item[2] }}
|
@@ -812,9 +812,9 @@ export default {
let days_h = hourDate.getDate();
let hours_h = hourDate.getHours();
this.$API.mtm.mgroup.list
- .req({ page: 0, search: "原料磨" })
+ .req({ page: 0, search: "生料工序(二次配料)" })
.then((res) => {
- console.log("原料磨", res);
+ console.log("生料工序(二次配料)", res);
that.query.mgroup = res[0].id;
//昨日
let params3 = {};