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

fix:全场能源电量消耗报表

This commit is contained in:
shijing 2024-05-10 11:35:52 +08:00
parent 5f727aea27
commit 3e334416a7
3 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -275,10 +275,11 @@ export default {
that.$API.enm.mpoint.list that.$API.enm.mpoint.list
.req({ .req({
page: 0, page: 0,
enabled: true, enabled: 1,
need_display: true, need_display: 1,
ordering: "report_sortstr", ordering: "report_sortstr",
mpoint__material__code: "elec", material__code: "elec",
query: { id, name, nickname, mgroup_name, unit },
}) })
.then((res) => { .then((res) => {
let data = res.slice(3); let data = res.slice(3);

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

@ -335,10 +335,11 @@ export default {
that.$API.enm.mpoint.list that.$API.enm.mpoint.list
.req({ .req({
page: 0, page: 0,
enabled: true, enabled: 1,
need_display: true, need_display: 1,
ordering: "report_sortstr", ordering: "report_sortstr",
mpoint__material__code: "elec", material__code: "elec",
query: { id, name, nickname, mgroup_name, unit },
}) })
.then((res) => { .then((res) => {
let data = res.slice(3); let data = res.slice(3);
@ -352,11 +353,7 @@ export default {
that.mpointList.forEach((item, index) => { that.mpointList.forEach((item, index) => {
let arr = []; let arr = [];
arr[0] = arr[0] =
item.mgroup_name != null item.mgroup_name != null ? item.mgroup_name : item.name;
? item.mgroup_name
: item.nickname != null
? item.nickname
: item.name;
arr[1] = item.nickname != null ? item.nickname : item.name; arr[1] = item.nickname != null ? item.nickname : item.name;
arr[2] = item.unit; arr[2] = item.unit;
for (let i = 0; i < 24; i++) { for (let i = 0; i < 24; i++) {

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

@ -265,10 +265,11 @@ export default {
that.$API.enm.mpoint.list that.$API.enm.mpoint.list
.req({ .req({
page: 0, page: 0,
enabled: true, enabled: 1,
need_display: true, need_display: 1,
ordering: "report_sortstr", ordering: "report_sortstr",
mpoint__material__code: "elec", material__code: "elec",
query: { id, name, nickname, mgroup_name, unit },
}) })
.then((res) => { .then((res) => {
let data = res.slice(3); let data = res.slice(3);
@ -282,11 +283,7 @@ export default {
that.mpointList.forEach((item, index) => { that.mpointList.forEach((item, index) => {
let arr = []; let arr = [];
arr[0] = arr[0] =
item.mgroup_name != null item.mgroup_name != null ? item.mgroup_name : item.name;
? item.mgroup_name
: item.nickname != null
? item.nickname
: item.name;
arr[1] = item.nickname != null ? item.nickname : item.name; arr[1] = item.nickname != null ? item.nickname : item.name;
arr[2] = item.unit; arr[2] = item.unit;
for (let i = 0; i < 12; i++) { for (let i = 0; i < 12; i++) {