zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:coding#741&&生产报告图表纠正

This commit is contained in:
shijing 2024-12-26 16:25:35 +08:00
parent a2320580c1
commit a8c948775e
5 changed files with 99 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/bigScreen/index_enm.vue
View File

@ -4,6 +4,7 @@
<span class="top-line top-line-left"></span> <span class="top-line top-line-left"></span>
{{ bigScreenName }} {{ bigScreenName }}
<span class="top-line top-line-right"></span> <span class="top-line top-line-right"></span>
<div class="backHomeBtn" style="right: 100px;" @click.prevent="backHome">返回首页</div>
</header> </header>
<div id="model" class="model"> <div id="model" class="model">
<div class="top_block"> <div class="top_block">
@ -726,6 +727,10 @@ export default {
clearInterval(this.timerOther);} clearInterval(this.timerOther);}
}, },
methods: { methods: {
backHome(){
// this.$router.push({ name: "user" });
window.location.href = "http://tkx.xxhhcty.xyz:8080/#/dashboard_enm";
},
initializeData() { initializeData() {
this.productNum(); this.productNum();
this.waterAirData(); this.waterAirData();
@ -2049,7 +2054,14 @@ export default {
src: url("../../utils/youShe.ttf"); src: url("../../utils/youShe.ttf");
/* 字体文件相对路径 */ /* 字体文件相对路径 */
} }
.backHomeBtn{
position: absolute;
top: 10px;
right: 10px;
cursor: pointer;
font-size: 22px;
border-bottom: 2px solid rgba(54, 217, 187, 1);
}
.container { .container {
background: url("/public/img/photon_bg.png") no-repeat; background: url("/public/img/photon_bg.png") no-repeat;
background-size: cover; background-size: cover;

12
src/views/enm_mill/report.vue
View File

@ -883,8 +883,8 @@ export default {
options.series[0].data = seriesData0; options.series[0].data = seriesData0;
options.series[1].data = seriesData1; options.series[1].data = seriesData1;
options.series[2].data = seriesData2; options.series[2].data = seriesData2;
options.series[3].data = seriesData3; options.series[3].data = seriesData4;
options.series[4].data = seriesData4; options.series[4].data = seriesData3;
let hourXAxis = []; let hourXAxis = [];
for (let i = 0; i < 24; i++) { for (let i = 0; i < 24; i++) {
let item = i + "时"; let item = i + "时";
@ -922,8 +922,8 @@ export default {
options.series[0].data = seriesData0; options.series[0].data = seriesData0;
options.series[1].data = seriesData1; options.series[1].data = seriesData1;
options.series[2].data = seriesData2; options.series[2].data = seriesData2;
options.series[3].data = seriesData3; options.series[3].data = seriesData4;
options.series[4].data = seriesData4; options.series[4].data = seriesData3;
let dayXAxis = []; let dayXAxis = [];
for (let i = 1; i <= data.length; i++) { for (let i = 1; i <= data.length; i++) {
let item = i + "日"; let item = i + "日";
@ -960,8 +960,8 @@ export default {
options.series[0].data = seriesData0; options.series[0].data = seriesData0;
options.series[1].data = seriesData1; options.series[1].data = seriesData1;
options.series[2].data = seriesData2; options.series[2].data = seriesData2;
options.series[3].data = seriesData3; options.series[3].data = seriesData4;
options.series[4].data = seriesData4; options.series[4].data = seriesData3;
let monthXAxis = []; let monthXAxis = [];
for (let i = 1; i <= that.month; i++) { for (let i = 1; i <= that.month; i++) {
let item = i + "月"; let item = i + "月";

4
src/views/enm_pack/report.vue
View File

@ -237,7 +237,7 @@
</div> </div>
</template> </template>
<script> <script>
const colors = ["#647bfe", "#91CC75", "#EE6666"]; const colors = ["#647bfe", "#cbd3fe", "#91CC75", "#EE6666", "#CC00CC", "#551e13"];
let tooltip = { let tooltip = {
show: true, show: true,
trigger: "axis", trigger: "axis",
@ -262,7 +262,7 @@ let toolbox = {
}; };
let legend = { let legend = {
top: "2%", top: "2%",
data: ["熟料", "分布电耗"], data: ["总产量","P.O42.5R 散装","P.O42.5R 袋装","P.O42.5 袋装","P.O42.5 散装","P.C42.5 散装","P.C42.5 散装","P.O52.5 散装","熟料","分布电耗"],
}; };
let yAxis = [ let yAxis = [
{ {

12
src/views/enm_rm/report.vue
View File

@ -1072,8 +1072,8 @@ export default {
seriesData0[ind] = item.total_production; seriesData0[ind] = item.total_production;
seriesData1[ind] = Number(item.production_hour).toFixed(2); seriesData1[ind] = Number(item.production_hour).toFixed(2);
seriesData2[ind] = item.run_rate; seriesData2[ind] = item.run_rate;
seriesData3[ind] = item.production_cost_unit; seriesData3[ind] = item.elec_consume_unit;
seriesData4[ind] = item.elec_consume_unit; seriesData4[ind] = item.production_cost_unit;
}); });
let options = { ...that.option1 }; let options = { ...that.option1 };
options.series[0].data = seriesData0; options.series[0].data = seriesData0;
@ -1111,8 +1111,8 @@ export default {
seriesData0[ind] = item.total_production; seriesData0[ind] = item.total_production;
seriesData1[ind] = Number(item.production_hour).toFixed(2); seriesData1[ind] = Number(item.production_hour).toFixed(2);
seriesData2[ind] = item.run_rate; seriesData2[ind] = item.run_rate;
seriesData3[ind] = item.production_cost_unit; seriesData3[ind] = item.elec_consume_unit;
seriesData4[ind] = item.elec_consume_unit; seriesData4[ind] = item.production_cost_unit;
}); });
let options = { ...that.option2 }; let options = { ...that.option2 };
options.series[0].data = seriesData0; options.series[0].data = seriesData0;
@ -1149,8 +1149,8 @@ export default {
seriesData0[ind] = item.total_production; seriesData0[ind] = item.total_production;
seriesData1[ind] = Number(item.production_hour).toFixed(2); seriesData1[ind] = Number(item.production_hour).toFixed(2);
seriesData2[ind] = item.run_rate; seriesData2[ind] = item.run_rate;
seriesData3[ind] = item.production_cost_unit; seriesData3[ind] = item.elec_consume_unit;
seriesData4[ind] = item.elec_consume_unit; seriesData4[ind] = item.production_cost_unit;
}); });
let options = { ...that.option3 }; let options = { ...that.option3 };
options.series[0].data = seriesData0; options.series[0].data = seriesData0;

134
src/views/enm_slag/report.vue
View File

@ -279,9 +279,10 @@ let legend = {
let yAxis = [ let yAxis = [
{ {
type: "value", type: "value",
name: "产量 (t)", name: "总产量 (t)",
position: "left", position: "left",
alignTicks: true, alignTicks: true,
nameRotate: 45,
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
@ -294,26 +295,11 @@ let yAxis = [
}, },
{ {
type: "value", type: "value",
name: "总电耗(KW.h)", nameRotate: 45,
name: "分布电耗(KW.h)",
position: "left", position: "left",
alignTicks: true, alignTicks: true,
offset: 80, offset: 100,
axisLine: {
show: true,
lineStyle: {
color: colors[5],
},
},
axisLabel: {
formatter: "{value}",
},
},
{
type: "value",
name: "分布电耗(KW.h)",
position: "right",
alignTicks: true,
offset: 80,
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
@ -326,9 +312,11 @@ let yAxis = [
}, },
{ {
type: "value", type: "value",
name: "成本(元)", nameRotate: 45,
position: "right", name: "总电耗(KW.h)",
position: "left",
alignTicks: true, alignTicks: true,
offset: 50,
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
@ -339,12 +327,13 @@ let yAxis = [
formatter: "{value}", formatter: "{value}",
}, },
}, },
{ {
type: "value", type: "value",
name: "消耗(t)", nameRotate: 45,
name: "成本(元)",
position: "right", position: "right",
alignTicks: true, alignTicks: true,
offset: 130,
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
@ -357,10 +346,11 @@ let yAxis = [
}, },
{ {
type: "value", type: "value",
name: "进厂(t)", name: "消耗(t)",
position: "right", position: "right",
alignTicks: true, alignTicks: true,
offset: 180, nameRotate: 45,
offset: 50,
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
@ -371,6 +361,23 @@ let yAxis = [
formatter: "{value}", formatter: "{value}",
}, },
}, },
{
type: "value",
name: "进厂(t)",
position: "right",
alignTicks: true,
nameRotate: 45,
offset: 100,
axisLine: {
show: true,
lineStyle: {
color: colors[5],
},
},
axisLabel: {
formatter: "{value}",
},
},
]; ];
export default { export default {
components: { components: {
@ -434,18 +441,18 @@ export default {
yAxisIndex: 0, yAxisIndex: 0,
data: [], data: [],
}, },
{
name: "总电耗",
type: "bar",
yAxisIndex: 5,
data: [],
},
{ {
name: "分布电耗", name: "分布电耗",
type: "bar", type: "bar",
yAxisIndex: 1, yAxisIndex: 1,
data: [], data: [],
}, },
{
name: "总电耗",
type: "bar",
yAxisIndex: 5,
data: [],
},
{ {
name: "成本", name: "成本",
type: "bar", type: "bar",
@ -488,12 +495,6 @@ export default {
yAxisIndex: 0, yAxisIndex: 0,
data: [], data: [],
}, },
{
name: "总电耗",
type: "bar",
yAxisIndex: 5,
data: [],
},
{ {
name: "分布电耗", name: "分布电耗",
type: "bar", type: "bar",
@ -501,23 +502,29 @@ export default {
data: [], data: [],
}, },
{ {
name: "成本", name: "总电耗",
type: "bar", type: "bar",
yAxisIndex: 2, yAxisIndex: 2,
data: [], data: [],
}, },
{ {
name: "消耗", name: "成本",
type: "bar", type: "bar",
yAxisIndex: 3, yAxisIndex: 3,
data: [], data: [],
}, },
{ {
name: "进厂", name: "消耗",
type: "bar", type: "bar",
yAxisIndex: 4, yAxisIndex: 4,
data: [], data: [],
}, },
{
name: "进厂",
type: "bar",
yAxisIndex: 5,
data: [],
},
], ],
}, },
}; };
@ -742,21 +749,21 @@ export default {
seriesData5[ind] = item.elec_consume; seriesData5[ind] = item.elec_consume;
if (item.imaterial_data.length > 0) { if (item.imaterial_data.length > 0) {
item.imaterial_data.forEach((items_n) => { item.imaterial_data.forEach((items_n) => {
if (items_n.material_name == "湿电石渣消耗") { if (items_n.material_name == "湿电石渣消耗") {
seriesData3[ind] = items_n.amount_consume; seriesData3[ind] = items_n.amount_consume;
}else if(items_n.material_name == "湿电石渣进厂"){ }else if(items_n.material_name == "湿电石渣进厂"){
seriesData4[ind] = items_n.amount_consume; seriesData4[ind] = items_n.amount_consume;
} }
}); });
} }
}); });
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 = seriesData2;
options.series[2].data = seriesData2; options.series[2].data = seriesData5;
options.series[3].data = seriesData3; options.series[3].data = seriesData1;
options.series[4].data = seriesData4; options.series[4].data = seriesData3;
options.series[5].data = seriesData5; options.series[5].data = seriesData4;
let dayXAxis = []; let dayXAxis = [];
for (let i = 1; i <= data.length; i++) { for (let i = 1; i <= data.length; i++) {
let item = i + "日"; let item = i + "日";
@ -779,29 +786,32 @@ export default {
seriesData1 = [], seriesData1 = [],
seriesData2 = [], seriesData2 = [],
seriesData3 = [], seriesData3 = [],
seriesData4 = []; seriesData4 = [],
seriesData5 = [];
let data = response; let data = response;
data.forEach((item) => { data.forEach((item) => {
let ind = item.month_s - 1; let ind = item.month_s - 1;
seriesData0[ind] = item.total_production; seriesData0[ind] = item.total_production;
seriesData1[ind] = item.production_cost_unit; seriesData1[ind] = item.production_cost_unit;
seriesData2[ind] = item.elec_consume_unit; seriesData2[ind] = item.elec_consume_unit;
seriesData5[ind] = item.elec_consume;
if (item.imaterial_data.length > 0) { if (item.imaterial_data.length > 0) {
item.imaterial_data.forEach((items_n) => { item.imaterial_data.forEach((items_n) => {
if (items_n.material_name == "湿电石渣消耗") { if (items_n.material_name == "湿电石渣消耗") {
seriesData3[ind] = items_n.amount_consume; seriesData3[ind] = Math.round(items_n.amount_consume);
}else if(items_n.material_name == "湿电石渣进厂"){ }else if(items_n.material_name == "湿电石渣进厂"){
seriesData4[ind] = items_n.amount_consume; seriesData4[ind] = items_n.amount_consume;
} }
}); });
} }
}); });
let options = { ...that.option2 }; let options = { ...that.option2 };
options.series[0].data = seriesData0; options.series[0].data = seriesData0;
options.series[1].data = seriesData1; options.series[1].data = seriesData2;
options.series[2].data = seriesData2; options.series[2].data = seriesData5;
options.series[3].data = seriesData3; options.series[3].data = seriesData1;
options.series[4].data = seriesData4; options.series[4].data = seriesData3;
options.series[5].data = seriesData4;
let monthXAxis = []; let monthXAxis = [];
for (let i = 1; i <= that.month; i++) { for (let i = 1; i <= that.month; i++) {
let item = i + "月"; let item = i + "月";