diff --git a/src/api/model/enm.js b/src/api/model/enm.js
index a263a51a..b7a7b62f 100644
--- a/src/api/model/enm.js
+++ b/src/api/model/enm.js
@@ -165,7 +165,15 @@ export default {
`${config.API_URL}/enm/mpoint/king_sync/`,
data);
}
- }
+ },
+ showPicture: {
+ name: "箱线图",
+ req: async function(data){
+ return await http.post(
+ `${config.API_URL}/enm/mpoint/show_picture/`,
+ data);
+ }
+ },
},
mpointstat: {
list: {
diff --git a/src/components/scEnm/lineChartsdialog.vue b/src/components/scEnm/lineChartsdialog.vue
index 55549c27..f2b0c183 100644
--- a/src/components/scEnm/lineChartsdialog.vue
+++ b/src/components/scEnm/lineChartsdialog.vue
@@ -354,25 +354,25 @@ export default {
that.cateName = "ammonia_consume_unit";
}
else if (that.cate == "P.O42.5R 散装(t)") {
- that.cateName = "x水泥+P.O42.5R 散装";
+ that.cateName = "C90002056";
that.isMpoint = true;
}else if (that.cate == "P.O42.5R 袋装(t)") {
- that.cateName = "x水泥+P.O42.5R 袋装";
+ that.cateName = "C90002055";
that.isMpoint = true;
}else if (that.cate == "P.O42.5 袋装(t)") {
that.cateName = "x水泥+P.O42.5 袋装";
that.isMpoint = true;
}else if (that.cate == "P.O42.5 散装(t)") {
- that.cateName = "x水泥+P.O42.5 散装";
+ that.cateName = "C90001124";
that.isMpoint = true;
}else if (that.cate == "复合硅酸盐水泥;42.5R;袋装水泥(t)") {
- that.cateName = "x复合硅酸盐水泥;42.5R;袋装水泥";
+ that.cateName = "C90001612";
that.isMpoint = true;
}else if (that.cate == "复合硅酸盐水泥;42.5R;散装水泥(t)") {
- that.cateName = "x复合硅酸盐水泥;42.5R;散装水泥";
+ that.cateName = "C90001609";
that.isMpoint = true;
}else if (that.cate == "普通硅酸盐水泥;52.5;散装水泥(t)") {
- that.cateName = "x普通硅酸盐水泥;52.5;散装水泥";
+ that.cateName = "C90001125";
that.isMpoint = true;
}else if (that.cate == "散装水泥(t)") {
that.cateName = "szsn_hj";
diff --git a/src/config/route.js b/src/config/route.js
index 86acc2d9..fe0551d7 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -2985,6 +2985,17 @@ const routes = [
},
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",
meta: {
diff --git a/src/views/enm_coal/report_bh.vue b/src/views/enm_coal/report_bh.vue
index d782ce32..88c838c8 100644
--- a/src/views/enm_coal/report_bh.vue
+++ b/src/views/enm_coal/report_bh.vue
@@ -99,31 +99,26 @@
{{ item[1] }}
|
{{ item[2] }}
|
{{ item[3] }}
|
{{ item[4] }}
|
{{ item[5] }}
|
diff --git a/src/views/enm_kilnbase/report_lybh.vue b/src/views/enm_kilnbase/report_lybh.vue
index e03c80ab..b97daa73 100644
--- a/src/views/enm_kilnbase/report_lybh.vue
+++ b/src/views/enm_kilnbase/report_lybh.vue
@@ -110,25 +110,21 @@
{{ item[1] }} |
{{ item[2] }}
|
{{ item[3] }}
|
{{ item[4] }}
|
{{ item[5] }}
|
@@ -451,7 +447,7 @@ export default {
["产量", "台时产量(t/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],
- ["能耗", "单位产品煤耗(t/t)", 0, 0, 0, 0, 0, 0, 0, 0],
+ ["能耗", "单位产品煤耗(t/kg)", 0, 0, 0, 0, 0, 0, 0, 0],
],
tableName: "生产报告",
modelValue: true,
@@ -721,7 +717,8 @@ export default {
}).then((res4) => {
if (res4.length > 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);
}
});
//本日
diff --git a/src/views/enm_pack/report.vue b/src/views/enm_pack/report.vue
index 3c218797..ca6bcad9 100644
--- a/src/views/enm_pack/report.vue
+++ b/src/views/enm_pack/report.vue
@@ -606,30 +606,30 @@ export default {
this.$API.enm.mpointstat.list.req(params1).then((res1) => {
if (res1.length > 0) {
res1.forEach((item) => {
- if (item.mpoint_name == "水泥+P.O42.5R 散装") {
+ if (item.nickname == "水泥+P.O42.5R 散装") {
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;
- }else if (item.mpoint_name == "水泥+P.O42.5 袋装") {
+ }else if (item.nickname == "水泥+P.O42.5 袋装") {
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;
- }else if (item.mpoint_name == "复合硅酸盐水泥;42.5R;袋装水泥") {
+ }else if (item.nickname == "复合硅酸盐水泥;42.5R;袋装水泥") {
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;
- }else if (item.mpoint_name == "水泥+P.O52.5 散装") {
+ }else if (item.nickname == "水泥+P.O52.5 散装") {
that.tableDatas[6][5] = item.val;
- }else if (item.mpoint_name == "散装水泥总和"){
+ }else if (item.nickname == "散装水泥总和"){
that.tableDatas[7][5] = item.val;
- }else if (item.mpoint_name == "袋装水泥总和") {
+ }else if (item.nickname == "袋装水泥总和") {
that.tableDatas[8][5] = item.val;
}
- else if (item.mpoint_name == "出厂水泥") {
+ else if (item.nickname == "出厂水泥") {
that.tableDatas[9][5] = item.val;
- }else if (item.mpoint_name == "出厂熟料"){
+ }else if (item.nickname == "出厂熟料"){
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[12][5] = item.val;
}
@@ -646,30 +646,30 @@ export default {
this.$API.enm.mpointstat.list.req(params2).then((res2) => {
if (res2.length > 0) {
res2.forEach((item) => {
- if (item.mpoint_name == "水泥+P.O42.5R 散装") {
+ if (item.nickname == "水泥+P.O42.5R 散装") {
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;
- }else if (item.mpoint_name == "水泥+P.O42.5 袋装") {
+ }else if (item.nickname == "水泥+P.O42.5 袋装") {
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;
- }else if (item.mpoint_name == "复合硅酸盐水泥;42.5R;袋装水泥") {
+ }else if (item.nickname == "复合硅酸盐水泥;42.5R;袋装水泥") {
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;
- }else if (item.mpoint_name == "水泥+P.O52.5 散装") {
+ }else if (item.nickname == "水泥+P.O52.5 散装") {
that.tableDatas[6][4] = item.val;
- }else if (item.mpoint_name == "散装水泥总和"){
+ }else if (item.nickname == "散装水泥总和"){
that.tableDatas[7][4] = item.val;
- }else if (item.mpoint_name == "袋装水泥总和") {
+ }else if (item.nickname == "袋装水泥总和") {
that.tableDatas[8][4] = item.val;
}
- else if (item.mpoint_name == "出厂水泥") {
+ else if (item.nickname == "出厂水泥") {
that.tableDatas[9][4] = item.val;
- }else if (item.mpoint_name == "出厂熟料"){
+ }else if (item.nickname == "出厂熟料"){
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[12][4] = item.val;
}
@@ -688,30 +688,30 @@ export default {
this.$API.enm.mpointstat.list.req(params3).then((res3) => {
if (res3.length > 0) {
res3.forEach((item) => {
- if (item.mpoint_name == "水泥+P.O42.5R 散装") {
+ if (item.nickname == "水泥+P.O42.5R 散装") {
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;
- }else if (item.mpoint_name == "水泥+P.O42.5 袋装") {
+ }else if (item.nickname == "水泥+P.O42.5 袋装") {
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;
- }else if (item.mpoint_name == "复合硅酸盐水泥;42.5R;袋装水泥") {
+ }else if (item.nickname == "复合硅酸盐水泥;42.5R;袋装水泥") {
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;
- }else if (item.mpoint_name == "水泥+P.O52.5 散装") {
+ }else if (item.nickname == "水泥+P.O52.5 散装") {
that.tableDatas[6][2] = item.val;
- }else if (item.mpoint_name == "散装水泥总和"){
+ }else if (item.nickname == "散装水泥总和"){
that.tableDatas[7][2] = item.val;
- }else if (item.mpoint_name == "袋装水泥总和") {
+ }else if (item.nickname == "袋装水泥总和") {
that.tableDatas[8][2] = item.val;
}
- else if (item.mpoint_name == "出厂水泥") {
+ else if (item.nickname == "出厂水泥") {
that.tableDatas[9][2] = item.val;
- }else if (item.mpoint_name == "出厂熟料"){
+ }else if (item.nickname == "出厂熟料"){
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[12][2] = item.val;
}
@@ -731,30 +731,30 @@ export default {
this.$API.enm.mpointstat.list.req(params4).then((res3) => {
if (res3.length > 0) {
res3.forEach((item) => {
- if (item.mpoint_name == "水泥+P.O42.5R 散装") {
+ if (item.nickname == "水泥+P.O42.5R 散装") {
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;
- }else if (item.mpoint_name == "水泥+P.O42.5 袋装") {
+ }else if (item.nickname == "水泥+P.O42.5 袋装") {
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;
- }else if (item.mpoint_name == "复合硅酸盐水泥;42.5R;袋装水泥") {
+ }else if (item.nickname == "复合硅酸盐水泥;42.5R;袋装水泥") {
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;
- }else if (item.mpoint_name == "水泥+P.O52.5 散装") {
+ }else if (item.nickname == "水泥+P.O52.5 散装") {
that.tableDatas[6][3] = item.val;
- }else if (item.mpoint_name == "散装水泥总和"){
+ }else if (item.nickname == "散装水泥总和"){
that.tableDatas[7][3] = item.val;
- }else if (item.mpoint_name == "袋装水泥总和") {
+ }else if (item.nickname == "袋装水泥总和") {
that.tableDatas[8][3] = item.val;
}
- else if (item.mpoint_name == "出厂水泥") {
+ else if (item.nickname == "出厂水泥") {
that.tableDatas[9][3] = item.val;
- }else if (item.mpoint_name == "出厂熟料"){
+ }else if (item.nickname == "出厂熟料"){
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[12][3] = item.val;
}
@@ -797,30 +797,30 @@ export default {
this.$API.enm.mpointstat.list.req(params1).then((res1) => {
if (res1.length > 0) {
res1.forEach((item) => {
- if (item.mpoint_name == "水泥+P.O42.5R 散装") {
+ if (item.nickname == "水泥+P.O42.5R 散装") {
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;
- }else if (item.mpoint_name == "水泥+P.O42.5 袋装") {
+ }else if (item.nickname == "水泥+P.O42.5 袋装") {
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;
- }else if (item.mpoint_name == "复合硅酸盐水泥;42.5R;袋装水泥") {
+ }else if (item.nickname == "复合硅酸盐水泥;42.5R;袋装水泥") {
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;
- }else if (item.mpoint_name == "水泥+P.O52.5 散装") {
+ }else if (item.nickname == "水泥+P.O52.5 散装") {
that.tableDatas[6][5] = item.val;
- }else if (item.mpoint_name == "散装水泥总和"){
+ }else if (item.nickname == "散装水泥总和"){
that.tableDatas[7][5] = item.val;
- }else if (item.mpoint_name == "袋装水泥总和") {
+ }else if (item.nickname == "袋装水泥总和") {
that.tableDatas[8][5] = item.val;
}
- else if (item.mpoint_name == "出厂水泥") {
+ else if (item.nickname == "出厂水泥") {
that.tableDatas[9][5] = item.val;
- }else if (item.mpoint_name == "出厂熟料"){
+ }else if (item.nickname == "出厂熟料"){
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[12][5] = item.val;
}
@@ -839,30 +839,30 @@ export default {
this.$API.enm.mpointstat.list.req(params2).then((res2) => {
if (res2.length > 0) {
res2.forEach((item) => {
- if (item.mpoint_name == "水泥+P.O42.5R 散装") {
+ if (item.nickname == "水泥+P.O42.5R 散装") {
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;
- }else if (item.mpoint_name == "水泥+P.O42.5 袋装") {
+ }else if (item.nickname == "水泥+P.O42.5 袋装") {
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;
- }else if (item.mpoint_name == "复合硅酸盐水泥;42.5R;袋装水泥") {
+ }else if (item.nickname == "复合硅酸盐水泥;42.5R;袋装水泥") {
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;
- }else if (item.mpoint_name == "水泥+P.O52.5 散装") {
+ }else if (item.nickname == "水泥+P.O52.5 散装") {
that.tableDatas[6][4] = item.val;
- }else if (item.mpoint_name == "散装水泥总和"){
+ }else if (item.nickname == "散装水泥总和"){
that.tableDatas[7][4] = item.val;
- }else if (item.mpoint_name == "袋装水泥总和") {
+ }else if (item.nickname == "袋装水泥总和") {
that.tableDatas[8][4] = item.val;
}
- else if (item.mpoint_name == "出厂水泥") {
+ else if (item.nickname == "出厂水泥") {
that.tableDatas[9][4] = item.val;
- }else if (item.mpoint_name == "出厂熟料"){
+ }else if (item.nickname == "出厂熟料"){
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[12][4] = item.val;
}
@@ -890,17 +890,17 @@ export default {
let data = response;
data.forEach((item) => {
let ind = item.day_s - 1;
- if (item.mpoint_name == "袋装水泥总和") {
+ if (item.nickname == "袋装水泥总和") {
seriesData1[ind] = item.val;
- }else if (item.mpoint_name == "散装水泥总和"){
+ }else if (item.nickname == "散装水泥总和"){
seriesData2[ind] = item.val;
- }else if (item.mpoint_name == "出厂熟料") {
+ }else if (item.nickname == "出厂熟料") {
seriesData3[ind] = item.val;
- }else if (item.mpoint_name == "出厂水泥") {
+ }else if (item.nickname == "出厂水泥") {
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;
- }else if(item.mpoint_name == "包装进线"){
+ }else if(item.nickname == "水泥包装用电合计"){
seriesData6[ind] = item.elec_consume_unit;
}
@@ -963,18 +963,18 @@ export default {
data.forEach((item) => {
let goal_index = 'goal_val_' + item.month_s;
let ind = item.month_s - 1;
- if (item.mpoint_name == "袋装水泥总和") {
+ if (item.nickname == "袋装水泥总和") {
seriesData1[ind] = item.val;
- }else if (item.mpoint_name == "散装水泥总和"){
+ }else if (item.nickname == "散装水泥总和"){
seriesData2[ind] = item.val;
- }else if (item.mpoint_name == "出厂熟料") {
+ }else if (item.nickname == "出厂熟料") {
seriesData3[ind] = item.val;
- }else if (item.mpoint_name == "出厂水泥") {
+ }else if (item.nickname == "出厂水泥") {
seriesData4[ind] = item.val;
- }else if (item.mpoint_name == "复合水泥合计" || item.mpoint_name == "复合硅酸盐水泥;42.5R;袋装水泥") {
- console.log(item.mpoint_name, item.val);
+ }else if (item.nickname == "复合水泥合计" || item.nickname == "复合硅酸盐水泥;42.5R;袋装水泥") {
+ console.log(item.nickname, item.val);
seriesData5[ind] = item.val;
- }else if(item.mpoint_name == "包装进线"){
+ }else if(item.nickname == "水泥包装用电合计"){
seriesData7[ind] = item.elec_consume_unit;
}
seriesData6[ind] = that.goal_list[0][goal_index];
diff --git a/src/views/fac_cal/box_picture.vue b/src/views/fac_cal/box_picture.vue
new file mode 100644
index 00000000..5f95f06d
--- /dev/null
+++ b/src/views/fac_cal/box_picture.vue
@@ -0,0 +1,144 @@
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
diff --git a/src/views/fac_cal/mpointstat_point.vue b/src/views/fac_cal/mpointstat_point.vue
index 0ff96e1a..d9f371b9 100644
--- a/src/views/fac_cal/mpointstat_point.vue
+++ b/src/views/fac_cal/mpointstat_point.vue
@@ -130,7 +130,7 @@ export default {
apiObjX: this.$API.enm.mplogx.list,
paramsX: {page: 0, timex__gte: null, timex__lte: null, mpoint: null},
apiObjM: this.$API.enm.mpoint.list,
- paramsM: {material__isnull: 0},
+ paramsM: {},
apiObjM2: this.$API.mtm.mgroup.list,
paramsM2: {page: 0},
mpointId: null,