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

fix:完善电量报表

This commit is contained in:
shijing 2024-07-30 14:47:40 +08:00
parent 8917c2cb1b
commit 04a40a6d1f
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/views/enm_energy/day_base.vue
View File

@ -364,11 +364,12 @@ export default {
need_display: 1, need_display: 1,
ordering: "report_sortstr", ordering: "report_sortstr",
material__code__in: "elec,elec_0", material__code__in: "elec,elec_0",
query: "{ id, name, nickname, mgroup_name, unit }", query: "{ id, name, nickname, mgroup_name, unit, report_sortstr }",
}) })
.then((res) => { .then((res) => {
// let data = res.slice(3); that.mpointList = res.filter((item) => {
that.mpointList = res; return item.report_sortstr !== "";
});
that.dataLoop(); that.dataLoop();
}); });
}, },
@ -409,7 +410,9 @@ export default {
obj.mgroupName = obj.mgroupName =
item.mgroup_name != null ? item.mgroup_name : item.name; item.mgroup_name != null ? item.mgroup_name : item.name;
obj.nickname = obj.nickname =
item.nickname != null ? item.nickname : item.name; item.nickname != null && item.nickname != ""
? item.nickname
: item.name;
obj.unit = item.unit; obj.unit = item.unit;
that.tableDatas2.push(obj); that.tableDatas2.push(obj);
that.getData(item.id, index); that.getData(item.id, index);

11
src/views/enm_energy/hour_base.vue
View File

@ -382,10 +382,13 @@ export default {
need_display: 1, need_display: 1,
ordering: "report_sortstr", ordering: "report_sortstr",
material__code__in: "elec,elec_0", material__code__in: "elec,elec_0",
query: "{ id, name, nickname, mgroup_name, unit }", query: "{ id, name, nickname, mgroup_name, unit, report_sortstr }",
}) })
.then((res) => { .then((res) => {
that.mpointList = res; // that.mpointList = that.mockDatas.filter((item) => {
that.mpointList = res.filter((item) => {
return item.report_sortstr !== "";
});
that.dataLoop(); that.dataLoop();
}); });
}, },
@ -431,7 +434,9 @@ export default {
obj.mgroupName = obj.mgroupName =
item.mgroup_name != null ? item.mgroup_name : item.name; item.mgroup_name != null ? item.mgroup_name : item.name;
obj.nickname = obj.nickname =
item.nickname != null ? item.nickname : item.name; item.nickname != null && item.nickname != ""
? item.nickname
: item.name;
obj.unit = item.unit; obj.unit = item.unit;
that.tableDatas2.push(obj); that.tableDatas2.push(obj);
that.getData(item.id, index); that.getData(item.id, index);

10
src/views/enm_energy/month_base.vue
View File

@ -345,10 +345,12 @@ export default {
need_display: 1, need_display: 1,
ordering: "report_sortstr", ordering: "report_sortstr",
material__code__in: "elec,elec_0", material__code__in: "elec,elec_0",
query: "{ id, name, nickname, mgroup_name, unit }", query: "{ id, name, nickname, mgroup_name, unit, report_sortstr }",
}) })
.then((res) => { .then((res) => {
that.mpointList = res; that.mpointList = res.filter((item) => {
return item.report_sortstr !== "";
});
that.dataLoop(); that.dataLoop();
}); });
}, },
@ -385,7 +387,9 @@ export default {
obj.mgroupName = obj.mgroupName =
item.mgroup_name != null ? item.mgroup_name : item.name; item.mgroup_name != null ? item.mgroup_name : item.name;
obj.nickname = obj.nickname =
item.nickname != null ? item.nickname : item.name; item.nickname != null && item.nickname != ""
? item.nickname
: item.name;
obj.unit = item.unit; obj.unit = item.unit;
that.tableDatas2.push(obj); that.tableDatas2.push(obj);
that.getData(item.id, index); that.getData(item.id, index);