diff --git a/src/views/enm_energy/day_base.vue b/src/views/enm_energy/day_base.vue index 25f55763..0c320037 100644 --- a/src/views/enm_energy/day_base.vue +++ b/src/views/enm_energy/day_base.vue @@ -364,11 +364,12 @@ export default { need_display: 1, ordering: "report_sortstr", material__code__in: "elec,elec_0", - query: "{ id, name, nickname, mgroup_name, unit }", + query: "{ id, name, nickname, mgroup_name, unit, report_sortstr }", }) .then((res) => { - // let data = res.slice(3); - that.mpointList = res; + that.mpointList = res.filter((item) => { + return item.report_sortstr !== ""; + }); that.dataLoop(); }); }, @@ -409,7 +410,9 @@ export default { obj.mgroupName = item.mgroup_name != null ? item.mgroup_name : item.name; obj.nickname = - item.nickname != null ? item.nickname : item.name; + item.nickname != null && item.nickname != "" + ? item.nickname + : item.name; obj.unit = item.unit; that.tableDatas2.push(obj); that.getData(item.id, index); diff --git a/src/views/enm_energy/hour_base.vue b/src/views/enm_energy/hour_base.vue index e351823c..984744d9 100644 --- a/src/views/enm_energy/hour_base.vue +++ b/src/views/enm_energy/hour_base.vue @@ -382,10 +382,13 @@ export default { need_display: 1, ordering: "report_sortstr", material__code__in: "elec,elec_0", - query: "{ id, name, nickname, mgroup_name, unit }", + query: "{ id, name, nickname, mgroup_name, unit, report_sortstr }", }) .then((res) => { - that.mpointList = res; + // that.mpointList = that.mockDatas.filter((item) => { + that.mpointList = res.filter((item) => { + return item.report_sortstr !== ""; + }); that.dataLoop(); }); }, @@ -431,7 +434,9 @@ export default { obj.mgroupName = item.mgroup_name != null ? item.mgroup_name : item.name; obj.nickname = - item.nickname != null ? item.nickname : item.name; + item.nickname != null && item.nickname != "" + ? item.nickname + : item.name; obj.unit = item.unit; that.tableDatas2.push(obj); that.getData(item.id, index); diff --git a/src/views/enm_energy/month_base.vue b/src/views/enm_energy/month_base.vue index 3cd6013b..1b37f04b 100644 --- a/src/views/enm_energy/month_base.vue +++ b/src/views/enm_energy/month_base.vue @@ -345,10 +345,12 @@ export default { need_display: 1, ordering: "report_sortstr", material__code__in: "elec,elec_0", - query: "{ id, name, nickname, mgroup_name, unit }", + query: "{ id, name, nickname, mgroup_name, unit, report_sortstr }", }) .then((res) => { - that.mpointList = res; + that.mpointList = res.filter((item) => { + return item.report_sortstr !== ""; + }); that.dataLoop(); }); }, @@ -385,7 +387,9 @@ export default { obj.mgroupName = item.mgroup_name != null ? item.mgroup_name : item.name; obj.nickname = - item.nickname != null ? item.nickname : item.name; + item.nickname != null && item.nickname != "" + ? item.nickname + : item.name; obj.unit = item.unit; that.tableDatas2.push(obj); that.getData(item.id, index);