feat: 主要设备单号查询条件处理

This commit is contained in:
caoqianming 2024-12-30 15:04:18 +08:00
parent a55b5612a4
commit 022d95e3d8
5 changed files with 62 additions and 39 deletions

View File

@ -80,11 +80,11 @@
v-model="typeRadio" v-model="typeRadio"
@change="typeRadioChange" @change="typeRadioChange"
> >
<el-radio-button label="day">本日</el-radio-button> <el-radio-button label="day">按时</el-radio-button>
<el-radio-button label="month" <el-radio-button label="month"
>本月</el-radio-button >按日</el-radio-button
> >
<el-radio-button label="year">本年</el-radio-button> <el-radio-button label="year">按月</el-radio-button>
</el-radio-group> </el-radio-group>
<div style="position: absolute; right: 20px"> <div style="position: absolute; right: 20px">
<el-date-picker <el-date-picker
@ -371,9 +371,10 @@ export default {
obj.mgroup__name = "煤磨"; obj.mgroup__name = "煤磨";
obj.page = 0; obj.page = 0;
obj.enabled = 1; obj.enabled = 1;
obj.need_display = 1; // obj.need_display = 1;
obj.ordering = "report_sortstr"; obj.ordering = "report_sortstr";
obj.material__code__in = "elec,elec_0"; obj.material__code__in = "elec,elec_0";
obj.ep_monitored__power_kw__gte = 100;
this.$API.enm.mpoint.list.req(obj).then((res) => { this.$API.enm.mpoint.list.req(obj).then((res) => {
const arr = res.filter(item => item.name !== "烧成车间合计").map(item => item.name) const arr = res.filter(item => item.name !== "烧成车间合计").map(item => item.name)
that.mpoints = arr; that.mpoints = arr;
@ -418,7 +419,8 @@ export default {
obj.hour = hours_h; obj.hour = hours_h;
obj.mgroup__name = "煤磨"; obj.mgroup__name = "煤磨";
obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__material__code__in = "elec,elec_0";
obj.mpoint__need_display = 1; // obj.mpoint__need_display = 1;
obj.mpoint__ep_monitored__power_kw__gte = 100;
obj.page = 0; obj.page = 0;
this.$API.enm.mpoint.stat this.$API.enm.mpoint.stat
.req(obj) .req(obj)
@ -484,6 +486,7 @@ export default {
obj_m.mgroup__name = "煤磨"; obj_m.mgroup__name = "煤磨";
obj_m.mpoint__material__code__in = "elec,elec_0"; obj_m.mpoint__material__code__in = "elec,elec_0";
obj_m.mpoint__need_display = 1; obj_m.mpoint__need_display = 1;
obj_m.mpoint__ep_monitored__power_kw__gte = 100;
obj_m.page = 0; obj_m.page = 0;
this.$API.enm.mpoint.stat.req(obj_m).then((res) => { this.$API.enm.mpoint.stat.req(obj_m).then((res) => {
console.log("getTableHourData", res); console.log("getTableHourData", res);
@ -520,6 +523,7 @@ export default {
obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__material__code__in = "elec,elec_0";
// obj.mpoint__ep_monitored__isnull = 0; // obj.mpoint__ep_monitored__isnull = 0;
obj.mpoint__need_display = 1; obj.mpoint__need_display = 1;
obj.mpoint__ep_monitored__power_kw__gte = 100;
obj.page = 0; obj.page = 0;
this.$API.enm.mpoint.stat.req(obj).then((response) => { this.$API.enm.mpoint.stat.req(obj).then((response) => {
let seriesData = []; let seriesData = [];
@ -566,7 +570,8 @@ export default {
obj.mgroup__name = "煤磨"; obj.mgroup__name = "煤磨";
obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__material__code__in = "elec,elec_0";
// obj.mpoint__ep_monitored__isnull = 0; // obj.mpoint__ep_monitored__isnull = 0;
obj.mpoint__need_display = 1; // obj.mpoint__need_display = 1;
obj.mpoint__ep_monitored__power_kw__gte = 100;
obj.page = 0; obj.page = 0;
this.$API.enm.mpoint.stat.req(obj).then((response) => { this.$API.enm.mpoint.stat.req(obj).then((response) => {
let seriesData = []; let seriesData = [];
@ -613,7 +618,8 @@ export default {
obj.mgroup__name = "煤磨"; obj.mgroup__name = "煤磨";
obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__material__code__in = "elec,elec_0";
// obj.mpoint__ep_monitored__isnull = 0; // obj.mpoint__ep_monitored__isnull = 0;
obj.mpoint__need_display = 1; // obj.mpoint__need_display = 1;
obj.mpoint__ep_monitored__power_kw__gte = 100;
obj.page = 0; obj.page = 0;
this.$API.enm.mpoint.stat.req(obj).then((response) => { this.$API.enm.mpoint.stat.req(obj).then((response) => {
let seriesData = []; let seriesData = [];

View File

@ -80,11 +80,11 @@
v-model="typeRadio" v-model="typeRadio"
@change="typeRadioChange" @change="typeRadioChange"
> >
<el-radio-button label="day">本日</el-radio-button> <el-radio-button label="day">按时</el-radio-button>
<el-radio-button label="month" <el-radio-button label="month"
>本月</el-radio-button >按日</el-radio-button
> >
<el-radio-button label="year">本年</el-radio-button> <el-radio-button label="year">按月</el-radio-button>
</el-radio-group> </el-radio-group>
<div style="position: absolute; right: 20px"> <div style="position: absolute; right: 20px">
<el-date-picker <el-date-picker
@ -485,6 +485,7 @@ export default {
obj.material__code__in = "elec,elec_0"; obj.material__code__in = "elec,elec_0";
obj.need_display = 1; obj.need_display = 1;
obj.ordering = "report_sortstr"; obj.ordering = "report_sortstr";
obj.ep_monitored__power_kw__gte = 100;
this.$API.enm.mpoint.list.req(obj).then((res) => { this.$API.enm.mpoint.list.req(obj).then((res) => {
console.log("mpoints", res); console.log("mpoints", res);
let arr = []; let arr = [];
@ -538,7 +539,8 @@ export default {
obj.hour = hours_h; obj.hour = hours_h;
obj.mgroup__name = "回转窑"; obj.mgroup__name = "回转窑";
obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__material__code__in = "elec,elec_0";
obj.mpoint__need_display = 1; // obj.mpoint__need_display = 1;
obj.mpoint__ep_monitored__power_kw__gte = 100;
obj.page = 0; obj.page = 0;
this.$API.enm.mpoint.stat this.$API.enm.mpoint.stat
.req(obj) .req(obj)
@ -601,7 +603,8 @@ export default {
obj_m.month_s = that.month; obj_m.month_s = that.month;
obj_m.mgroup__name = "回转窑"; obj_m.mgroup__name = "回转窑";
obj_m.mpoint__material__code__in = "elec,elec_0"; obj_m.mpoint__material__code__in = "elec,elec_0";
obj_m.mpoint__need_display = 1; // obj_m.mpoint__need_display = 1;
obj.mpoint__ep_monitored__power_kw__gte = 100;
obj_m.page = 0; obj_m.page = 0;
this.$API.enm.mpoint.stat.req(obj_m).then((res) => { this.$API.enm.mpoint.stat.req(obj_m).then((res) => {
console.log("getTableHourData", res); console.log("getTableHourData", res);
@ -638,7 +641,8 @@ export default {
obj.mgroup__name = "回转窑"; obj.mgroup__name = "回转窑";
obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__material__code__in = "elec,elec_0";
// obj.mpoint__ep_monitored__isnull = 0; // obj.mpoint__ep_monitored__isnull = 0;
obj.mpoint__need_display = 1; // obj.mpoint__need_display = 1;
obj.mpoint__ep_monitored__power_kw__gte = 100;
obj.page = 0; obj.page = 0;
this.$API.enm.mpoint.stat.req(obj).then((response) => { this.$API.enm.mpoint.stat.req(obj).then((response) => {
let seriesData = []; let seriesData = [];
@ -679,7 +683,8 @@ export default {
obj.mgroup__name = "回转窑"; obj.mgroup__name = "回转窑";
obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__material__code__in = "elec,elec_0";
// // obj.mpoint__ep_monitored__isnull = 0; // // obj.mpoint__ep_monitored__isnull = 0;
obj.mpoint__need_display = 1; // obj.mpoint__need_display = 1;
obj.mpoint__ep_monitored__power_kw__gte = 100;
obj.page = 0; obj.page = 0;
this.$API.enm.mpoint.stat.req(obj).then((response) => { this.$API.enm.mpoint.stat.req(obj).then((response) => {
let seriesData = []; let seriesData = [];
@ -720,7 +725,8 @@ export default {
obj.mgroup__name = "回转窑"; obj.mgroup__name = "回转窑";
obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__material__code__in = "elec,elec_0";
// obj.mpoint__ep_monitored__isnull = 0; // obj.mpoint__ep_monitored__isnull = 0;
obj.mpoint__need_display = 1; // obj.mpoint__need_display = 1;
obj.mpoint__ep_monitored__power_kw__gte = 100;
obj.page = 0; obj.page = 0;
this.$API.enm.mpoint.stat.req(obj).then((response) => { this.$API.enm.mpoint.stat.req(obj).then((response) => {
let seriesData = []; let seriesData = [];

View File

@ -80,11 +80,11 @@
v-model="typeRadio" v-model="typeRadio"
@change="typeRadioChange" @change="typeRadioChange"
> >
<el-radio-button label="day">本日</el-radio-button> <el-radio-button label="day">按时</el-radio-button>
<el-radio-button label="month" <el-radio-button label="month"
>本月</el-radio-button >按日</el-radio-button
> >
<el-radio-button label="year">本年</el-radio-button> <el-radio-button label="year">按月</el-radio-button>
</el-radio-group> </el-radio-group>
<div style="position: absolute; right: 20px"> <div style="position: absolute; right: 20px">
<el-date-picker <el-date-picker
@ -446,6 +446,7 @@ export default {
obj.need_display = 1; obj.need_display = 1;
obj.ordering = "report_sortstr"; obj.ordering = "report_sortstr";
obj.material__code__in = "elec,elec_0"; obj.material__code__in = "elec,elec_0";
obj.ep_monitored__power_kw__gte = 100;
this.$API.enm.mpoint.list.req(obj).then((res) => { this.$API.enm.mpoint.list.req(obj).then((res) => {
console.log("mpoints", res); console.log("mpoints", res);
let arr = []; let arr = [];
@ -495,7 +496,8 @@ export default {
obj.hour = hours_h; obj.hour = hours_h;
obj.mgroup__name = "水泥磨"; obj.mgroup__name = "水泥磨";
obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__material__code__in = "elec,elec_0";
obj.mpoint__need_display = 1; // obj.mpoint__need_display = 1;
obj.mpoint__ep_monitored__power_kw__gte = 100;
obj.page = 0; obj.page = 0;
this.$API.enm.mpoint.stat this.$API.enm.mpoint.stat
.req(obj) .req(obj)
@ -529,7 +531,8 @@ export default {
obj_d.day_s = days_d; obj_d.day_s = days_d;
obj_d.mgroup__name = "水泥磨"; obj_d.mgroup__name = "水泥磨";
obj_d.mpoint__material__code__in = "elec,elec_0"; obj_d.mpoint__material__code__in = "elec,elec_0";
obj_d.mpoint__need_display = 1; // obj_d.mpoint__need_display = 1;
obj_d.mpoint__ep_monitored__power_kw__gte = 100;
obj_d.page = 0; obj_d.page = 0;
this.$API.enm.mpoint.stat.req(obj_d).then((res) => { this.$API.enm.mpoint.stat.req(obj_d).then((res) => {
console.log("getTableHourData", res); console.log("getTableHourData", res);
@ -556,7 +559,8 @@ export default {
obj_m.month_s = that.month; obj_m.month_s = that.month;
obj_m.mgroup__name = "水泥磨"; obj_m.mgroup__name = "水泥磨";
obj_m.mpoint__material__code__in = "elec,elec_0"; obj_m.mpoint__material__code__in = "elec,elec_0";
obj_m.mpoint__need_display = 1; // obj_m.mpoint__need_display = 1;
obj_m.mpoint__ep_monitored__power_kw__gte = 100;
obj_m.page = 0; obj_m.page = 0;
this.$API.enm.mpoint.stat.req(obj_m).then((res) => { this.$API.enm.mpoint.stat.req(obj_m).then((res) => {
console.log("getTableHourData", res); console.log("getTableHourData", res);
@ -593,7 +597,8 @@ export default {
obj.mgroup__name = "水泥磨"; obj.mgroup__name = "水泥磨";
obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__material__code__in = "elec,elec_0";
// obj.mpoint__ep_monitored__isnull = 0; // obj.mpoint__ep_monitored__isnull = 0;
obj.mpoint__need_display = 1; // obj.mpoint__need_display = 1;
obj.mpoint__ep_monitored__power_kw__gte = 100;
obj.page = 0; obj.page = 0;
this.$API.enm.mpoint.stat.req(obj).then((response) => { this.$API.enm.mpoint.stat.req(obj).then((response) => {
let seriesData = []; let seriesData = [];
@ -637,7 +642,8 @@ export default {
obj.mgroup__name = "水泥磨"; obj.mgroup__name = "水泥磨";
obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__material__code__in = "elec,elec_0";
// obj.mpoint__ep_monitored__isnull = 0; // obj.mpoint__ep_monitored__isnull = 0;
obj.mpoint__need_display = 1; // obj.mpoint__need_display = 1;
obj.mpoint__ep_monitored__power_kw__gte = 100;
obj.page = 0; obj.page = 0;
this.$API.enm.mpoint.stat.req(obj).then((response) => { this.$API.enm.mpoint.stat.req(obj).then((response) => {
let seriesData = []; let seriesData = [];
@ -681,7 +687,8 @@ export default {
obj.mgroup__name = "水泥磨"; obj.mgroup__name = "水泥磨";
obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__material__code__in = "elec,elec_0";
// obj.mpoint__ep_monitored__isnull = 0; // obj.mpoint__ep_monitored__isnull = 0;
obj.mpoint__need_display = 1; // obj.mpoint__need_display = 1;
obj.mpoint__ep_monitored__power_kw__gte = 100;
obj.page = 0; obj.page = 0;
this.$API.enm.mpoint.stat.req(obj).then((response) => { this.$API.enm.mpoint.stat.req(obj).then((response) => {
let seriesData = []; let seriesData = [];

View File

@ -80,11 +80,11 @@
v-model="typeRadio" v-model="typeRadio"
@change="typeRadioChange" @change="typeRadioChange"
> >
<el-radio-button label="day">本日</el-radio-button> <el-radio-button label="day">按时</el-radio-button>
<el-radio-button label="month" <el-radio-button label="month"
>本月</el-radio-button >按日</el-radio-button
> >
<el-radio-button label="year">本年</el-radio-button> <el-radio-button label="year">按月</el-radio-button>
</el-radio-group> </el-radio-group>
<div style="position: absolute; right: 20px"> <div style="position: absolute; right: 20px">
<el-date-picker <el-date-picker
@ -424,6 +424,7 @@ export default {
obj.need_display = 1; obj.need_display = 1;
obj.ordering = "report_sortstr"; obj.ordering = "report_sortstr";
obj.material__code__in = "elec,elec_0"; obj.material__code__in = "elec,elec_0";
obj.ep_monitored__power_kw__gte = 100;
this.$API.enm.mpoint.list.req(obj).then((res) => { this.$API.enm.mpoint.list.req(obj).then((res) => {
const arr = res.filter(item => item.name !== "原料车间合计").map(item => item.name) const arr = res.filter(item => item.name !== "原料车间合计").map(item => item.name)
console.log("arr", arr); console.log("arr", arr);
@ -469,7 +470,8 @@ export default {
obj.hour = hours_h; obj.hour = hours_h;
obj.mgroup__name = "原料磨"; obj.mgroup__name = "原料磨";
obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__material__code__in = "elec,elec_0";
obj.mpoint__need_display = 1; // obj.mpoint__need_display = 1;
obj.mpoint__ep_monitored__power_kw__gte = 100;
obj.page = 0; obj.page = 0;
this.$API.enm.mpoint.stat this.$API.enm.mpoint.stat
.req(obj) .req(obj)
@ -575,7 +577,8 @@ export default {
obj.mgroup__name = "原料磨"; obj.mgroup__name = "原料磨";
obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__material__code__in = "elec,elec_0";
// obj.mpoint__ep_monitored__isnull = 0; // obj.mpoint__ep_monitored__isnull = 0;
obj.mpoint__need_display = 1; // obj.mpoint__need_display = 1;
obj.mpoint__ep_monitored__power_kw__gte = 100;
obj.page = 0; obj.page = 0;
this.$API.enm.mpoint.stat.req(obj).then((response) => { this.$API.enm.mpoint.stat.req(obj).then((response) => {
let seriesData = []; let seriesData = [];
@ -622,7 +625,8 @@ export default {
obj.mgroup__name = "原料磨"; obj.mgroup__name = "原料磨";
obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__material__code__in = "elec,elec_0";
// obj.mpoint__ep_monitored__isnull = 0; // obj.mpoint__ep_monitored__isnull = 0;
obj.mpoint__need_display = 1; // obj.mpoint__need_display = 1;
obj.mpoint__ep_monitored__power_kw__gte = 100;
obj.page = 0; obj.page = 0;
this.$API.enm.mpoint.stat.req(obj).then((response) => { this.$API.enm.mpoint.stat.req(obj).then((response) => {
let seriesData = []; let seriesData = [];
@ -671,7 +675,8 @@ export default {
obj.mgroup__name = "原料磨"; obj.mgroup__name = "原料磨";
obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__material__code__in = "elec,elec_0";
// obj.mpoint__ep_monitored__isnull = 0; // obj.mpoint__ep_monitored__isnull = 0;
obj.mpoint__need_display = 1; // obj.mpoint__need_display = 1;
obj.mpoint__ep_monitored__power_kw__gte = 100;
obj.page = 0; obj.page = 0;
this.$API.enm.mpoint.stat.req(obj).then((response) => { this.$API.enm.mpoint.stat.req(obj).then((response) => {
let seriesData = []; let seriesData = [];

View File

@ -79,9 +79,9 @@
@change="typeRadioChange" @change="typeRadioChange"
> >
<el-radio-button label="month" <el-radio-button label="month"
>本月</el-radio-button >按日</el-radio-button
> >
<el-radio-button label="year">本年</el-radio-button> <el-radio-button label="year">按月</el-radio-button>
</el-radio-group> </el-radio-group>
<div style="position: absolute; right: 20px"> <div style="position: absolute; right: 20px">
<el-date-picker <el-date-picker
@ -290,6 +290,7 @@ export default {
obj.need_display = 1; obj.need_display = 1;
obj.ordering = "report_sortstr"; obj.ordering = "report_sortstr";
obj.material__code__in = "elec,elec_0"; obj.material__code__in = "elec,elec_0";
obj.ep_monitored__power_kw__gte = 100;
this.$API.enm.mpoint.list.req(obj).then((res) => { this.$API.enm.mpoint.list.req(obj).then((res) => {
console.log("mpoints", res); console.log("mpoints", res);
let arr = []; let arr = [];
@ -343,7 +344,7 @@ export default {
obj_d.day_s = days_d; obj_d.day_s = days_d;
obj_d.mgroup__name = "电石渣"; obj_d.mgroup__name = "电石渣";
obj_d.mpoint__material__code__in = "elec,elec_0"; obj_d.mpoint__material__code__in = "elec,elec_0";
obj_d.mpoint__need_display = 1; obj_d.mpoint__ep_monitored__power_kw__gte = 100;
obj_d.page = 0; obj_d.page = 0;
this.$API.enm.mpoint.stat.req(obj_d).then((res) => { this.$API.enm.mpoint.stat.req(obj_d).then((res) => {
console.log("getTableHourData", res); console.log("getTableHourData", res);
@ -371,7 +372,7 @@ export default {
obj_m.month_s = that.month; obj_m.month_s = that.month;
obj_m.mgroup__name = "电石渣"; obj_m.mgroup__name = "电石渣";
obj_m.mpoint__material__code__in = "elec,elec_0"; obj_m.mpoint__material__code__in = "elec,elec_0";
obj_m.mpoint__need_display = 1; obj_m.mpoint__ep_monitored__power_kw__gte = 100;
obj_m.page = 0; obj_m.page = 0;
this.$API.enm.mpoint.stat.req(obj_m).then((res) => { this.$API.enm.mpoint.stat.req(obj_m).then((res) => {
console.log("getTableHourData", res); console.log("getTableHourData", res);
@ -408,8 +409,7 @@ export default {
obj.month_s = month; obj.month_s = month;
obj.mgroup__name = "电石渣"; obj.mgroup__name = "电石渣";
obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__material__code__in = "elec,elec_0";
// obj.mpoint__ep_monitored__isnull = 0; obj.mpoint__ep_monitored__power_kw__gte = 100;
obj.mpoint__need_display = 1;
obj.page = 0; obj.page = 0;
this.$API.enm.mpoint.stat.req(obj).then((response) => { this.$API.enm.mpoint.stat.req(obj).then((response) => {
let seriesData = []; let seriesData = [];
@ -449,8 +449,7 @@ export default {
obj.year_s = year; obj.year_s = year;
obj.mgroup__name = "电石渣"; obj.mgroup__name = "电石渣";
obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__material__code__in = "elec,elec_0";
// obj.mpoint__ep_monitored__isnull = 0; obj.mpoint__ep_monitored__power_kw__gte = 100;
obj.mpoint__need_display = 1;
obj.page = 0; obj.page = 0;
this.$API.enm.mpoint.stat.req(obj).then((response) => { this.$API.enm.mpoint.stat.req(obj).then((response) => {
let seriesData = []; let seriesData = [];