- | {{ item[0] }} |
+
+ {{ item[0] }}
+ |
{{ item[1] }} |
import scEcharts from "@/components/scEcharts";
import { defineAsyncComponent } from "vue";
-const colors = ["#647bfe", "#cbd3fe", "#91CC75", "#EE6666"];
+const colors = ["#647bfe", "#cbd3fe", "#91CC75", "#EE6666", "#CC00CC"];
let tooltip = {
show: true,
trigger: "axis",
@@ -263,7 +266,7 @@ let toolbox = {
};
let legend = {
top: "2%",
- data: ["总产量", "分布电耗", "成本"],
+ data: ["总产量", "分布电耗", "成本", "消耗", "进厂"],
};
let yAxis = [
{
@@ -312,6 +315,38 @@ let yAxis = [
formatter: "{value}",
},
},
+ {
+ type: "value",
+ name: "消耗(t)",
+ position: "right",
+ alignTicks: true,
+ offset: 130,
+ axisLine: {
+ show: true,
+ lineStyle: {
+ color: colors[3],
+ },
+ },
+ axisLabel: {
+ formatter: "{value}",
+ },
+ },
+ {
+ type: "value",
+ name: "进厂(t)",
+ position: "right",
+ alignTicks: true,
+ offset: 180,
+ axisLine: {
+ show: true,
+ lineStyle: {
+ color: colors[4],
+ },
+ },
+ axisLabel: {
+ formatter: "{value}",
+ },
+ },
];
export default {
components: {
@@ -340,6 +375,8 @@ export default {
["产量", "总产量（t）", 0, 0, 0, 0, 0, 0, 0, 0],
["能耗", "单位产品分布电耗（KW·h/t）", 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: "",
apiObj: this.$API.enm.enstat,
@@ -384,6 +421,18 @@ export default {
yAxisIndex: 2,
data: [],
},
+ {
+ name: "消耗",
+ type: "bar",
+ yAxisIndex: 3,
+ data: [],
+ },
+ {
+ name: "进厂",
+ type: "bar",
+ yAxisIndex: 4,
+ data: [],
+ },
],
},
option2: {
@@ -420,6 +469,18 @@ export default {
yAxisIndex: 2,
data: [],
},
+ {
+ name: "消耗",
+ type: "bar",
+ yAxisIndex: 3,
+ data: [],
+ },
+ {
+ name: "进厂",
+ type: "bar",
+ yAxisIndex: 4,
+ data: [],
+ },
],
},
};
@@ -473,7 +534,16 @@ export default {
that.tableDatas[0][2] = data3.total_production;
that.tableDatas[1][2] = data3.elec_consume_unit;
that.tableDatas[2][2] = data3.production_cost_unit;
+ if (data3.imaterial_data.length > 0) {
+ data3.imaterial_data.forEach((item) => {
+ if (item.material_name == "湿电石渣消耗") {
+ that.tableDatas[3][2] = item.amount_consume;
+ }else if(item.material_name == "湿电石渣进厂"){
+ that.tableDatas[4][2] = item.amount_consume;
+ }
+ });
}
+ }
});
//月目标
let params5 = {};
@@ -531,6 +601,15 @@ export default {
that.tableDatas[2][4],
that.tableDatas[2][7]
);
+ if (data1.imaterial_data.length > 0) {
+ data1.imaterial_data.forEach((item) => {
+ if (item.material_name == "湿电石渣消耗") {
+ that.tableDatas[3][4] = item.amount_consume;
+ }else if(item.material_name == "湿电石渣进厂"){
+ that.tableDatas[4][4] = item.amount_consume;
+ }
+ });
+ }
} else {
}
});
@@ -560,6 +639,15 @@ export default {
that.tableDatas[2][3],
that.tableDatas[2][5]
);
+ if (data2.imaterial_data.length > 0) {
+ data2.imaterial_data.forEach((item) => {
+ if (item.material_name == "湿电石渣消耗") {
+ that.tableDatas[3][3] = item.amount_consume;
+ }else if(item.material_name == "湿电石渣进厂"){
+ that.tableDatas[4][3] = item.amount_consume;
+ }
+ });
+ }
}
});
});
@@ -573,7 +661,6 @@ export default {
},
dateChange(val) {
let that = this;
- console.log(val);
if (val !== null) {
if (this.typeRadio == "month") {
let year = val.split("-")[0];
@@ -603,18 +690,31 @@ export default {
this.$API.enm.enstat.req(query1).then((response) => {
let seriesData0 = [],
seriesData1 = [],
- seriesData2 = [];
+ seriesData2 = [],
+ seriesData3 = [],
+ seriesData4 = [];
let data = response;
data.forEach((item) => {
let ind = item.day_s - 1;
seriesData0[ind] = item.total_production;
seriesData1[ind] = item.production_cost_unit;
seriesData2[ind] = item.elec_consume_unit;
+ 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.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 dayXAxis = [];
for (let i = 1; i <= that.days; i++) {
let item = i + "日";
@@ -635,18 +735,31 @@ export default {
this.$API.enm.enstat.req(query2).then((response) => {
let seriesData0 = [],
seriesData1 = [],
- seriesData2 = [];
+ seriesData2 = [],
+ seriesData3 = [],
+ seriesData4 = [];
let data = response;
data.forEach((item) => {
let ind = item.month_s - 1;
seriesData0[ind] = item.total_production;
seriesData1[ind] = item.production_cost_unit;
seriesData2[ind] = item.elec_consume_unit;
+ 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.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 monthXAxis = [];
for (let i = 1; i <= that.month; i++) {
let item = i + "月";
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 38e42be3..bbf754fb 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -61,7 +61,7 @@
- Copyright © 2024 {{ baseConfig.base_right }}
+
diff --git a/src/views/mtm/mgroup_form.vue b/src/views/mtm/mgroup_form.vue
index 668ecf22..d513be79 100644
--- a/src/views/mtm/mgroup_form.vue
+++ b/src/views/mtm/mgroup_form.vue
@@ -226,6 +226,9 @@ export default {
that.visible = false;
that.$message.success("操作成功");
})
+ .catch(error => {
+ console.error("请求失败", error);
+ });
}
}
});
|