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

feat：增加凌源箱线图 和更改 tkx的测点

This commit is contained in:
zty 2025-08-27 14:00:39 +08:00
parent c6422ed99e
commit 605d05e7c0
8 changed files with 259 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/model/enm.js
View File

@ -165,7 +165,15 @@ export default {
`${config.API_URL}/enm/mpoint/king_sync/`, `${config.API_URL}/enm/mpoint/king_sync/`,
data); data);
} }
} },
showPicture: {
name: "箱线图",
req: async function(data){
return await http.post(
`${config.API_URL}/enm/mpoint/show_picture/`,
data);
}
},
}, },
mpointstat: { mpointstat: {
list: { list: {

12
src/components/scEnm/lineChartsdialog.vue
View File

@ -354,25 +354,25 @@ export default {
that.cateName = "ammonia_consume_unit"; that.cateName = "ammonia_consume_unit";
} }
else if (that.cate == "P.O42.5R 散装（t）") { else if (that.cate == "P.O42.5R 散装（t）") {
that.cateName = "x水泥+P.O42.5R 散装"; that.cateName = "C90002056";
that.isMpoint = true; that.isMpoint = true;
}else if (that.cate == "P.O42.5R 袋装（t）") { }else if (that.cate == "P.O42.5R 袋装（t）") {
that.cateName = "x水泥+P.O42.5R 袋装"; that.cateName = "C90002055";
that.isMpoint = true; that.isMpoint = true;
}else if (that.cate == "P.O42.5 袋装（t）") { }else if (that.cate == "P.O42.5 袋装（t）") {
that.cateName = "x水泥+P.O42.5 袋装"; that.cateName = "x水泥+P.O42.5 袋装";
that.isMpoint = true; that.isMpoint = true;
}else if (that.cate == "P.O42.5 散装（t）") { }else if (that.cate == "P.O42.5 散装（t）") {
that.cateName = "x水泥+P.O42.5 散装"; that.cateName = "C90001124";
that.isMpoint = true; that.isMpoint = true;
}else if (that.cate == "复合硅酸盐水泥;42.5R;袋装水泥(t)") { }else if (that.cate == "复合硅酸盐水泥;42.5R;袋装水泥(t)") {
that.cateName = "x复合硅酸盐水泥;42.5R;袋装水泥"; that.cateName = "C90001612";
that.isMpoint = true; that.isMpoint = true;
}else if (that.cate == "复合硅酸盐水泥;42.5R;散装水泥(t)") { }else if (that.cate == "复合硅酸盐水泥;42.5R;散装水泥(t)") {
that.cateName = "x复合硅酸盐水泥;42.5R;散装水泥"; that.cateName = "C90001609";
that.isMpoint = true; that.isMpoint = true;
}else if (that.cate == "普通硅酸盐水泥;52.5;散装水泥(t)") { }else if (that.cate == "普通硅酸盐水泥;52.5;散装水泥(t)") {
that.cateName = "x普通硅酸盐水泥;52.5;散装水泥"; that.cateName = "C90001125";
that.isMpoint = true; that.isMpoint = true;
}else if (that.cate == "散装水泥(t)") { }else if (that.cate == "散装水泥(t)") {
that.cateName = "szsn_hj"; that.cateName = "szsn_hj";

11
src/config/route.js
View File

@ -2985,6 +2985,17 @@ const routes = [
}, },
component: "fac_cal/mpointstat_point", component: "fac_cal/mpointstat_point",
}, },
{
name:'box_pic',
path: "/fac_cal/box_pic",
meta: {
title: "箱线图",
// icon: "el-icon-postcard",
type: "menu",
perms: ["mpointstat_point"],
},
component: "fac_cal/box_picture",
},
{ {
path: "/fac_cal/mpointstat", path: "/fac_cal/mpointstat",
meta: { meta: {

5
src/views/enm_coal/report_bh.vue
View File

@ -99,31 +99,26 @@
<!-- <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)"
> >
{{ item[1] }} {{ item[1] }}
</td> </td>
<td <td
class="numCell hoursItem" class="numCell hoursItem"
@click="itemClick('hour_s', item)"
> >
{{ item[2] }} {{ item[2] }}
</td> </td>
<td <td
class="numCell daysItem" class="numCell daysItem"
@click="itemClick('day_s', item)"
> >
{{ item[3] }} {{ item[3] }}
</td> </td>
<td <td
class="numCell monthItem" class="numCell monthItem"
@click="itemClick('month_s', item)"
> >
{{ item[4] }} {{ item[4] }}
</td> </td>
<td <td
class="numCell yearItem" class="numCell yearItem"
@click="itemClick('year_s', item)"
> >
{{ item[5] }} {{ item[5] }}
</td> </td>

9
src/views/enm_kilnbase/report_lybh.vue
View File

@ -110,25 +110,21 @@
<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)"
> >
{{ item[2] }} {{ item[2] }}
</td> </td>
<td <td
class="numCell daysItem" class="numCell daysItem"
@click="itemClick('day_s', item)"
> >
{{ item[3] }} {{ item[3] }}
</td> </td>
<td <td
class="numCell monthItem" class="numCell monthItem"
@click="itemClick('month_s', item)"
> >
{{ item[4] }} {{ item[4] }}
</td> </td>
<td <td
class="numCell yearItem" class="numCell yearItem"
@click="itemClick('year_s', item)"
> >
{{ item[5] }} {{ item[5] }}
</td> </td>
@ -451,7 +447,7 @@ export default {
["产量", "台时产量（t/h）", 0, 0, 0, 0, 0, 0, 0, 0], ["产量", "台时产量（t/h）", 0, 0, 0, 0, 0, 0, 0, 0],
["运转时间", "运转时间（h）", 0, 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, 0, 0, 0],
["能耗", "单位产品煤耗（t/t）", 0, 0, 0, 0, 0, 0, 0, 0], ["能耗", "单位产品煤耗（t/kg）", 0, 0, 0, 0, 0, 0, 0, 0],
], ],
tableName: "生产报告", tableName: "生产报告",
modelValue: true, modelValue: true,
@ -721,7 +717,8 @@ export default {
}).then((res4) => { }).then((res4) => {
if (res4.length > 0) { if (res4.length > 0) {
let data4 = res4[0]; let data4 = res4[0];
that.tableDatas[4][3] = (data4.val/that.tableDatas[0][3]).toFixed(2); let calculate = ((data4.val/that.tableDatas[0][3])*1000);
that.tableDatas[4][3] = (calculate > 135 ? 135 : calculate).toFixed(2);
} }
}); });
//本日 //本日

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

@ -606,30 +606,30 @@ export default {
this.$API.enm.mpointstat.list.req(params1).then((res1) => { this.$API.enm.mpointstat.list.req(params1).then((res1) => {
if (res1.length > 0) { if (res1.length > 0) {
res1.forEach((item) => { res1.forEach((item) => {
if (item.mpoint_name == "水泥+P.O42.5R 散装") { if (item.nickname == "水泥+P.O42.5R 散装") {
that.tableDatas[0][5] = item.val; that.tableDatas[0][5] = item.val;
}else if (item.mpoint_name == "水泥+P.O42.5R 袋装"){ }else if (item.nickname == "水泥+P.O42.5R 袋装"){
that.tableDatas[1][5] = item.val; that.tableDatas[1][5] = item.val;
}else if (item.mpoint_name == "水泥+P.O42.5 袋装") { }else if (item.nickname == "水泥+P.O42.5 袋装") {
that.tableDatas[2][5] = item.val; that.tableDatas[2][5] = item.val;
}else if (item.mpoint_name == "水泥+P.O42.5 散装") { }else if (item.nickname == "水泥+P.O42.5 散装") {
that.tableDatas[3][5] = item.val; that.tableDatas[3][5] = item.val;
}else if (item.mpoint_name == "复合硅酸盐水泥;42.5R;袋装水泥") { }else if (item.nickname == "复合硅酸盐水泥;42.5R;袋装水泥") {
that.tableDatas[4][5] = item.val; that.tableDatas[4][5] = item.val;
}else if (item.mpoint_name == "水泥+P.C42.5 散装") { }else if (item.nickname == "水泥+P.C42.5 散装") {
that.tableDatas[5][5] = item.val; that.tableDatas[5][5] = item.val;
}else if (item.mpoint_name == "水泥+P.O52.5 散装") { }else if (item.nickname == "水泥+P.O52.5 散装") {
that.tableDatas[6][5] = item.val; that.tableDatas[6][5] = item.val;
}else if (item.mpoint_name == "散装水泥总和"){ }else if (item.nickname == "散装水泥总和"){
that.tableDatas[7][5] = item.val; that.tableDatas[7][5] = item.val;
}else if (item.mpoint_name == "袋装水泥总和") { }else if (item.nickname == "袋装水泥总和") {
that.tableDatas[8][5] = item.val; that.tableDatas[8][5] = item.val;
} }
else if (item.mpoint_name == "出厂水泥") { else if (item.nickname == "出厂水泥") {
that.tableDatas[9][5] = item.val; that.tableDatas[9][5] = item.val;
}else if (item.mpoint_name == "出厂熟料"){ }else if (item.nickname == "出厂熟料"){
that.tableDatas[10][5] = item.val; that.tableDatas[10][5] = item.val;
}else if (item.mpoint_name == "包装进线") { }else if (item.nickname == "水泥包装用电合计") {
that.tableDatas[11][5] = item.elec_consume_unit; that.tableDatas[11][5] = item.elec_consume_unit;
that.tableDatas[12][5] = item.val; that.tableDatas[12][5] = item.val;
} }
@ -646,30 +646,30 @@ export default {
this.$API.enm.mpointstat.list.req(params2).then((res2) => { this.$API.enm.mpointstat.list.req(params2).then((res2) => {
if (res2.length > 0) { if (res2.length > 0) {
res2.forEach((item) => { res2.forEach((item) => {
if (item.mpoint_name == "水泥+P.O42.5R 散装") { if (item.nickname == "水泥+P.O42.5R 散装") {
that.tableDatas[0][4] = item.val; that.tableDatas[0][4] = item.val;
}else if (item.mpoint_name == "水泥+P.O42.5R 袋装"){ }else if (item.nickname == "水泥+P.O42.5R 袋装"){
that.tableDatas[1][4] = item.val; that.tableDatas[1][4] = item.val;
}else if (item.mpoint_name == "水泥+P.O42.5 袋装") { }else if (item.nickname == "水泥+P.O42.5 袋装") {
that.tableDatas[2][4] = item.val; that.tableDatas[2][4] = item.val;
}else if (item.mpoint_name == "水泥+P.O42.5 散装") { }else if (item.nickname == "水泥+P.O42.5 散装") {
that.tableDatas[3][4] = item.val; that.tableDatas[3][4] = item.val;
}else if (item.mpoint_name == "复合硅酸盐水泥;42.5R;袋装水泥") { }else if (item.nickname == "复合硅酸盐水泥;42.5R;袋装水泥") {
that.tableDatas[4][4] = item.val; that.tableDatas[4][4] = item.val;
}else if (item.mpoint_name == "水泥+P.C42.5 散装") { }else if (item.nickname == "水泥+P.C42.5 散装") {
that.tableDatas[5][4] = item.val; that.tableDatas[5][4] = item.val;
}else if (item.mpoint_name == "水泥+P.O52.5 散装") { }else if (item.nickname == "水泥+P.O52.5 散装") {
that.tableDatas[6][4] = item.val; that.tableDatas[6][4] = item.val;
}else if (item.mpoint_name == "散装水泥总和"){ }else if (item.nickname == "散装水泥总和"){
that.tableDatas[7][4] = item.val; that.tableDatas[7][4] = item.val;
}else if (item.mpoint_name == "袋装水泥总和") { }else if (item.nickname == "袋装水泥总和") {
that.tableDatas[8][4] = item.val; that.tableDatas[8][4] = item.val;
} }
else if (item.mpoint_name == "出厂水泥") { else if (item.nickname == "出厂水泥") {
that.tableDatas[9][4] = item.val; that.tableDatas[9][4] = item.val;
}else if (item.mpoint_name == "出厂熟料"){ }else if (item.nickname == "出厂熟料"){
that.tableDatas[10][4] = item.val; that.tableDatas[10][4] = item.val;
}else if (item.mpoint_name == "包装进线") { }else if (item.nickname == "水泥包装用电合计") {
that.tableDatas[11][4] = item.elec_consume_unit; that.tableDatas[11][4] = item.elec_consume_unit;
that.tableDatas[12][4] = item.val; that.tableDatas[12][4] = item.val;
} }
@ -688,30 +688,30 @@ export default {
this.$API.enm.mpointstat.list.req(params3).then((res3) => { this.$API.enm.mpointstat.list.req(params3).then((res3) => {
if (res3.length > 0) { if (res3.length > 0) {
res3.forEach((item) => { res3.forEach((item) => {
if (item.mpoint_name == "水泥+P.O42.5R 散装") { if (item.nickname == "水泥+P.O42.5R 散装") {
that.tableDatas[0][2] = item.val; that.tableDatas[0][2] = item.val;
}else if (item.mpoint_name == "水泥+P.O42.5R 袋装"){ }else if (item.nickname == "水泥+P.O42.5R 袋装"){
that.tableDatas[1][2] = item.val; that.tableDatas[1][2] = item.val;
}else if (item.mpoint_name == "水泥+P.O42.5 袋装") { }else if (item.nickname == "水泥+P.O42.5 袋装") {
that.tableDatas[2][2] = item.val; that.tableDatas[2][2] = item.val;
}else if (item.mpoint_name == "水泥+P.O42.5 散装") { }else if (item.nickname == "水泥+P.O42.5 散装") {
that.tableDatas[3][2] = item.val; that.tableDatas[3][2] = item.val;
}else if (item.mpoint_name == "复合硅酸盐水泥;42.5R;袋装水泥") { }else if (item.nickname == "复合硅酸盐水泥;42.5R;袋装水泥") {
that.tableDatas[4][2] = item.val; that.tableDatas[4][2] = item.val;
}else if (item.mpoint_name == "水泥+P.C42.5 散装") { }else if (item.nickname == "水泥+P.C42.5 散装") {
that.tableDatas[5][2] = item.val; that.tableDatas[5][2] = item.val;
}else if (item.mpoint_name == "水泥+P.O52.5 散装") { }else if (item.nickname == "水泥+P.O52.5 散装") {
that.tableDatas[6][2] = item.val; that.tableDatas[6][2] = item.val;
}else if (item.mpoint_name == "散装水泥总和"){ }else if (item.nickname == "散装水泥总和"){
that.tableDatas[7][2] = item.val; that.tableDatas[7][2] = item.val;
}else if (item.mpoint_name == "袋装水泥总和") { }else if (item.nickname == "袋装水泥总和") {
that.tableDatas[8][2] = item.val; that.tableDatas[8][2] = item.val;
} }
else if (item.mpoint_name == "出厂水泥") { else if (item.nickname == "出厂水泥") {
that.tableDatas[9][2] = item.val; that.tableDatas[9][2] = item.val;
}else if (item.mpoint_name == "出厂熟料"){ }else if (item.nickname == "出厂熟料"){
that.tableDatas[10][2] = item.val; that.tableDatas[10][2] = item.val;
}else if (item.mpoint_name == "包装进线") { }else if (item.nickname == "水泥包装用电合计") {
that.tableDatas[11][2] = item.elec_consume_unit; that.tableDatas[11][2] = item.elec_consume_unit;
that.tableDatas[12][2] = item.val; that.tableDatas[12][2] = item.val;
} }
@ -731,30 +731,30 @@ export default {
this.$API.enm.mpointstat.list.req(params4).then((res3) => { this.$API.enm.mpointstat.list.req(params4).then((res3) => {
if (res3.length > 0) { if (res3.length > 0) {
res3.forEach((item) => { res3.forEach((item) => {
if (item.mpoint_name == "水泥+P.O42.5R 散装") { if (item.nickname == "水泥+P.O42.5R 散装") {
that.tableDatas[0][3] = item.val; that.tableDatas[0][3] = item.val;
}else if (item.mpoint_name == "水泥+P.O42.5R 袋装"){ }else if (item.nickname == "水泥+P.O42.5R 袋装"){
that.tableDatas[1][3] = item.val; that.tableDatas[1][3] = item.val;
}else if (item.mpoint_name == "水泥+P.O42.5 袋装") { }else if (item.nickname == "水泥+P.O42.5 袋装") {
that.tableDatas[2][3] = item.val; that.tableDatas[2][3] = item.val;
}else if (item.mpoint_name == "水泥+P.O42.5 散装") { }else if (item.nickname == "水泥+P.O42.5 散装") {
that.tableDatas[3][3] = item.val; that.tableDatas[3][3] = item.val;
}else if (item.mpoint_name == "复合硅酸盐水泥;42.5R;袋装水泥") { }else if (item.nickname == "复合硅酸盐水泥;42.5R;袋装水泥") {
that.tableDatas[4][3] = item.val; that.tableDatas[4][3] = item.val;
}else if (item.mpoint_name == "水泥+P.C42.5 散装") { }else if (item.nickname == "水泥+P.C42.5 散装") {
that.tableDatas[5][3] = item.val; that.tableDatas[5][3] = item.val;
}else if (item.mpoint_name == "水泥+P.O52.5 散装") { }else if (item.nickname == "水泥+P.O52.5 散装") {
that.tableDatas[6][3] = item.val; that.tableDatas[6][3] = item.val;
}else if (item.mpoint_name == "散装水泥总和"){ }else if (item.nickname == "散装水泥总和"){
that.tableDatas[7][3] = item.val; that.tableDatas[7][3] = item.val;
}else if (item.mpoint_name == "袋装水泥总和") { }else if (item.nickname == "袋装水泥总和") {
that.tableDatas[8][3] = item.val; that.tableDatas[8][3] = item.val;
} }
else if (item.mpoint_name == "出厂水泥") { else if (item.nickname == "出厂水泥") {
that.tableDatas[9][3] = item.val; that.tableDatas[9][3] = item.val;
}else if (item.mpoint_name == "出厂熟料"){ }else if (item.nickname == "出厂熟料"){
that.tableDatas[10][3] = item.val; that.tableDatas[10][3] = item.val;
}else if (item.mpoint_name == "包装进线") { }else if (item.nickname == "水泥包装用电合计") {
that.tableDatas[11][3] = item.elec_consume_unit; that.tableDatas[11][3] = item.elec_consume_unit;
that.tableDatas[12][3] = item.val; that.tableDatas[12][3] = item.val;
} }
@ -797,30 +797,30 @@ export default {
this.$API.enm.mpointstat.list.req(params1).then((res1) => { this.$API.enm.mpointstat.list.req(params1).then((res1) => {
if (res1.length > 0) { if (res1.length > 0) {
res1.forEach((item) => { res1.forEach((item) => {
if (item.mpoint_name == "水泥+P.O42.5R 散装") { if (item.nickname == "水泥+P.O42.5R 散装") {
that.tableDatas[0][5] = item.val; that.tableDatas[0][5] = item.val;
}else if (item.mpoint_name == "水泥+P.O42.5R 袋装"){ }else if (item.nickname == "水泥+P.O42.5R 袋装"){
that.tableDatas[1][5] = item.val; that.tableDatas[1][5] = item.val;
}else if (item.mpoint_name == "水泥+P.O42.5 袋装") { }else if (item.nickname == "水泥+P.O42.5 袋装") {
that.tableDatas[2][5] = item.val; that.tableDatas[2][5] = item.val;
}else if (item.mpoint_name == "水泥+P.O42.5 散装") { }else if (item.nickname == "水泥+P.O42.5 散装") {
that.tableDatas[3][5] = item.val; that.tableDatas[3][5] = item.val;
}else if (item.mpoint_name == "复合硅酸盐水泥;42.5R;袋装水泥") { }else if (item.nickname == "复合硅酸盐水泥;42.5R;袋装水泥") {
that.tableDatas[4][5] = item.val; that.tableDatas[4][5] = item.val;
}else if (item.mpoint_name == "水泥+P.C42.5 散装") { }else if (item.nickname == "水泥+P.C42.5 散装") {
that.tableDatas[5][5] = item.val; that.tableDatas[5][5] = item.val;
}else if (item.mpoint_name == "水泥+P.O52.5 散装") { }else if (item.nickname == "水泥+P.O52.5 散装") {
that.tableDatas[6][5] = item.val; that.tableDatas[6][5] = item.val;
}else if (item.mpoint_name == "散装水泥总和"){ }else if (item.nickname == "散装水泥总和"){
that.tableDatas[7][5] = item.val; that.tableDatas[7][5] = item.val;
}else if (item.mpoint_name == "袋装水泥总和") { }else if (item.nickname == "袋装水泥总和") {
that.tableDatas[8][5] = item.val; that.tableDatas[8][5] = item.val;
} }
else if (item.mpoint_name == "出厂水泥") { else if (item.nickname == "出厂水泥") {
that.tableDatas[9][5] = item.val; that.tableDatas[9][5] = item.val;
}else if (item.mpoint_name == "出厂熟料"){ }else if (item.nickname == "出厂熟料"){
that.tableDatas[10][5] = item.val; that.tableDatas[10][5] = item.val;
}else if (item.mpoint_name == "包装进线") { }else if (item.nickname == "水泥包装用电合计") {
that.tableDatas[11][5] = item.elec_consume_unit; that.tableDatas[11][5] = item.elec_consume_unit;
that.tableDatas[12][5] = item.val; that.tableDatas[12][5] = item.val;
} }
@ -839,30 +839,30 @@ export default {
this.$API.enm.mpointstat.list.req(params2).then((res2) => { this.$API.enm.mpointstat.list.req(params2).then((res2) => {
if (res2.length > 0) { if (res2.length > 0) {
res2.forEach((item) => { res2.forEach((item) => {
if (item.mpoint_name == "水泥+P.O42.5R 散装") { if (item.nickname == "水泥+P.O42.5R 散装") {
that.tableDatas[0][4] = item.val; that.tableDatas[0][4] = item.val;
}else if (item.mpoint_name == "水泥+P.O42.5R 袋装"){ }else if (item.nickname == "水泥+P.O42.5R 袋装"){
that.tableDatas[1][4] = item.val; that.tableDatas[1][4] = item.val;
}else if (item.mpoint_name == "水泥+P.O42.5 袋装") { }else if (item.nickname == "水泥+P.O42.5 袋装") {
that.tableDatas[2][4] = item.val; that.tableDatas[2][4] = item.val;
}else if (item.mpoint_name == "水泥+P.O42.5 散装") { }else if (item.nickname == "水泥+P.O42.5 散装") {
that.tableDatas[3][4] = item.val; that.tableDatas[3][4] = item.val;
}else if (item.mpoint_name == "复合硅酸盐水泥;42.5R;袋装水泥") { }else if (item.nickname == "复合硅酸盐水泥;42.5R;袋装水泥") {
that.tableDatas[4][4] = item.val; that.tableDatas[4][4] = item.val;
}else if (item.mpoint_name == "水泥+P.C42.5 散装") { }else if (item.nickname == "水泥+P.C42.5 散装") {
that.tableDatas[5][4] = item.val; that.tableDatas[5][4] = item.val;
}else if (item.mpoint_name == "水泥+P.O52.5 散装") { }else if (item.nickname == "水泥+P.O52.5 散装") {
that.tableDatas[6][4] = item.val; that.tableDatas[6][4] = item.val;
}else if (item.mpoint_name == "散装水泥总和"){ }else if (item.nickname == "散装水泥总和"){
that.tableDatas[7][4] = item.val; that.tableDatas[7][4] = item.val;
}else if (item.mpoint_name == "袋装水泥总和") { }else if (item.nickname == "袋装水泥总和") {
that.tableDatas[8][4] = item.val; that.tableDatas[8][4] = item.val;
} }
else if (item.mpoint_name == "出厂水泥") { else if (item.nickname == "出厂水泥") {
that.tableDatas[9][4] = item.val; that.tableDatas[9][4] = item.val;
}else if (item.mpoint_name == "出厂熟料"){ }else if (item.nickname == "出厂熟料"){
that.tableDatas[10][4] = item.val; that.tableDatas[10][4] = item.val;
}else if (item.mpoint_name == "包装进线") { }else if (item.nickname == "水泥包装用电合计") {
that.tableDatas[11][4] = item.elec_consume_unit; that.tableDatas[11][4] = item.elec_consume_unit;
that.tableDatas[12][4] = item.val; that.tableDatas[12][4] = item.val;
} }
@ -890,17 +890,17 @@ export default {
let data = response; let data = response;
data.forEach((item) => { data.forEach((item) => {
let ind = item.day_s - 1; let ind = item.day_s - 1;
if (item.mpoint_name == "袋装水泥总和") { if (item.nickname == "袋装水泥总和") {
seriesData1[ind] = item.val; seriesData1[ind] = item.val;
}else if (item.mpoint_name == "散装水泥总和"){ }else if (item.nickname == "散装水泥总和"){
seriesData2[ind] = item.val; seriesData2[ind] = item.val;
}else if (item.mpoint_name == "出厂熟料") { }else if (item.nickname == "出厂熟料") {
seriesData3[ind] = item.val; seriesData3[ind] = item.val;
}else if (item.mpoint_name == "出厂水泥") { }else if (item.nickname == "出厂水泥") {
seriesData4[ind] = item.val; seriesData4[ind] = item.val;
}else if (item.mpoint_name == "复合水泥合计" || item.mpoint_name == "复合硅酸盐水泥;42.5R;袋装水泥") { }else if (item.nickname == "复合水泥合计" || item.nickname == "复合硅酸盐水泥;42.5R;袋装水泥") {
seriesData5[ind] = item.val; seriesData5[ind] = item.val;
}else if(item.mpoint_name == "包装进线"){ }else if(item.nickname == "水泥包装用电合计"){
seriesData6[ind] = item.elec_consume_unit; seriesData6[ind] = item.elec_consume_unit;
} }
@ -963,18 +963,18 @@ export default {
data.forEach((item) => { data.forEach((item) => {
let goal_index = 'goal_val_' + item.month_s; let goal_index = 'goal_val_' + item.month_s;
let ind = item.month_s - 1; let ind = item.month_s - 1;
if (item.mpoint_name == "袋装水泥总和") { if (item.nickname == "袋装水泥总和") {
seriesData1[ind] = item.val; seriesData1[ind] = item.val;
}else if (item.mpoint_name == "散装水泥总和"){ }else if (item.nickname == "散装水泥总和"){
seriesData2[ind] = item.val; seriesData2[ind] = item.val;
}else if (item.mpoint_name == "出厂熟料") { }else if (item.nickname == "出厂熟料") {
seriesData3[ind] = item.val; seriesData3[ind] = item.val;
}else if (item.mpoint_name == "出厂水泥") { }else if (item.nickname == "出厂水泥") {
seriesData4[ind] = item.val; seriesData4[ind] = item.val;
}else if (item.mpoint_name == "复合水泥合计" || item.mpoint_name == "复合硅酸盐水泥;42.5R;袋装水泥") { }else if (item.nickname == "复合水泥合计" || item.nickname == "复合硅酸盐水泥;42.5R;袋装水泥") {
console.log(item.mpoint_name, item.val); console.log(item.nickname, item.val);
seriesData5[ind] = item.val; seriesData5[ind] = item.val;
}else if(item.mpoint_name == "包装进线"){ }else if(item.nickname == "水泥包装用电合计"){
seriesData7[ind] = item.elec_consume_unit; seriesData7[ind] = item.elec_consume_unit;
} }
seriesData6[ind] = that.goal_list[0][goal_index]; seriesData6[ind] = that.goal_list[0][goal_index];

144
src/views/fac_cal/box_picture.vue Normal file
View File

@ -0,0 +1,144 @@
<template>
<el-container>
<el-main style="background: #fff;">
<div class="pictureContainer">
<div class="pictureHeader">
<div class="left-panel">
<div class="block">
<span class="demonstration">时间段一</span>
<el-date-picker
v-model="dateRange1"
type="datetimerange"
:picker-options="pickerOptions"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
align="right"
/>
</div>
<div class="block">
<span class="demonstration">时间段二</span>
<el-date-picker
v-model="dateRange2"
type="datetimerange"
:picker-options="pickerOptions"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
align="right"
/>
</div>
<el-button
type="primary"
icon="el-icon-search"
@click="dateChange"
class="search-button"
>
查询
</el-button>
</div>
</div>
<img :src="imgUrl" class="flowImg" v-if="imgUrl" />
</div>
</el-main>
</el-container>
</template>
<script>
export default {
data() {
return {
imgUrl:'',
dataObj:{ },
dateRange1: [],
dateRange2: [],
pickerOptions: {
disabeledDate(time) {
return time.getTime() > Date.now();
}
}
};
},
methods: {
dateChange() {
if (this.dateRange1.length !== 2 || this.dateRange2.length !== 2) {
this.$message.warning("请完整选择两个时间段！");
return;
}
let that = this;
const payload = {
startTime1: this.dateRange1[0],
endTime1: this.dateRange1[1],
startTime2: this.dateRange2[0],
endTime2: this.dateRange2[1]
}
try {
this.$API.enm.mpoint.showPicture.req(payload).then(res => {
if (res.rel_path){
this.imgUrl = res.rel_path;
}else{
this.$message.error("没有获取到图片地址");
}
})
}
catch (error) {
console.log(error);
}
}
}
};
</script>
<style scoped>
.pictureContainer {
max-width: 960px;
margin: 0 auto;
padding: 20px;
box-sizing: border-box;
}
.pictureHeader {
position: sticky;
top: 0;
background: #fff;
z-index: 10;
padding: 10px 15px;
border-bottom: 1px solid #eee;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
}
.left-panel {
display: flex;
flex-wrap: wrap;
align-items: center;
gap: 20px;
justify-content: flex-start;
}
.block {
display: flex;
align-items: center;
gap: 6px;
}
.block .demonstration {
margin-bottom: 4px;
font-size: 14px;
color: #666;
}
.search-button {
display: flex;
align-items: center;
}
.flowImg {
display: block;
width: 100%;
max-width: 800px;
height: auto;
margin: 30px auto 0;
object-fit: contain;
}
</style>

2
src/views/fac_cal/mpointstat_point.vue
View File

@ -130,7 +130,7 @@ export default {
apiObjX: this.$API.enm.mplogx.list, apiObjX: this.$API.enm.mplogx.list,
paramsX: {page: 0, timex__gte: null, timex__lte: null, mpoint: null}, paramsX: {page: 0, timex__gte: null, timex__lte: null, mpoint: null},
apiObjM: this.$API.enm.mpoint.list, apiObjM: this.$API.enm.mpoint.list,
paramsM: {material__isnull: 0}, paramsM: {},
apiObjM2: this.$API.mtm.mgroup.list, apiObjM2: this.$API.mtm.mgroup.list,
paramsM2: {page: 0}, paramsM2: {page: 0},
mpointId: null, mpointId: null,