diff --git a/src/views/enm_energy/day_base.vue b/src/views/enm_energy/day_base.vue index 2a06f0aa..99d9efc2 100644 --- a/src/views/enm_energy/day_base.vue +++ b/src/views/enm_energy/day_base.vue @@ -275,10 +275,11 @@ export default { that.$API.enm.mpoint.list .req({ page: 0, - enabled: true, - need_display: true, + enabled: 1, + need_display: 1, ordering: "report_sortstr", - mpoint__material__code: "elec", + material__code: "elec", + query: { id, name, nickname, mgroup_name, unit }, }) .then((res) => { let data = res.slice(3); diff --git a/src/views/enm_energy/hour_base.vue b/src/views/enm_energy/hour_base.vue index 7c7a4fc3..cadf4bc4 100644 --- a/src/views/enm_energy/hour_base.vue +++ b/src/views/enm_energy/hour_base.vue @@ -335,10 +335,11 @@ export default { that.$API.enm.mpoint.list .req({ page: 0, - enabled: true, - need_display: true, + enabled: 1, + need_display: 1, ordering: "report_sortstr", - mpoint__material__code: "elec", + material__code: "elec", + query: { id, name, nickname, mgroup_name, unit }, }) .then((res) => { let data = res.slice(3); @@ -352,11 +353,7 @@ export default { that.mpointList.forEach((item, index) => { let arr = []; arr[0] = - item.mgroup_name != null - ? item.mgroup_name - : item.nickname != null - ? item.nickname - : item.name; + item.mgroup_name != null ? item.mgroup_name : item.name; arr[1] = item.nickname != null ? item.nickname : item.name; arr[2] = item.unit; for (let i = 0; i < 24; i++) { diff --git a/src/views/enm_energy/month_base.vue b/src/views/enm_energy/month_base.vue index 2e83a3dc..b89419d4 100644 --- a/src/views/enm_energy/month_base.vue +++ b/src/views/enm_energy/month_base.vue @@ -265,10 +265,11 @@ export default { that.$API.enm.mpoint.list .req({ page: 0, - enabled: true, - need_display: true, + enabled: 1, + need_display: 1, ordering: "report_sortstr", - mpoint__material__code: "elec", + material__code: "elec", + query: { id, name, nickname, mgroup_name, unit }, }) .then((res) => { let data = res.slice(3); @@ -282,11 +283,7 @@ export default { that.mpointList.forEach((item, index) => { let arr = []; arr[0] = - item.mgroup_name != null - ? item.mgroup_name - : item.nickname != null - ? item.nickname - : item.name; + item.mgroup_name != null ? item.mgroup_name : item.name; arr[1] = item.nickname != null ? item.nickname : item.name; arr[2] = item.unit; for (let i = 0; i < 12; i++) {