From 245c2b6155e69919e7665a4c6b2ea2ac6f131fc9 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 15 May 2024 11:17:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:power=E6=B7=BB=E5=8A=A0=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/scEnm/lineChartsdialog.vue | 837 ++++++++++++---------- src/views/enm_coalbase/power.vue | 161 +++-- src/views/enm_kilnbase/power.vue | 208 ++++-- src/views/enm_rmbase/power.vue | 232 ++++-- 4 files changed, 878 insertions(+), 560 deletions(-) diff --git a/src/components/scEnm/lineChartsdialog.vue b/src/components/scEnm/lineChartsdialog.vue index b6d80d16..ae6a01f4 100644 --- a/src/components/scEnm/lineChartsdialog.vue +++ b/src/components/scEnm/lineChartsdialog.vue @@ -1,371 +1,486 @@ \ No newline at end of file +.searchHead { + display: flex; +} +.middleText { + height: 32px; + line-height: 32px; + margin: 0 5px; + display: inline-block; +} +.searchBtn { + margin-left: 5px; +} +.sc-dialog__headerbtn { + position: absolute; + top: var(--el-dialog-padding-primary); + right: var(--el-dialog-padding-primary); +} +.sc-dialog__headerbtn button { + padding: 0; + background: transparent; + border: none; + outline: none; + cursor: pointer; + font-size: var(--el-message-close-size, 16px); + margin-left: 15px; + color: var(--el-color-info); +} +.sc-dialog__headerbtn button:hover .el-dialog__close { + color: var(--el-color-primary); +} +.sc-dialog:deep(.el-dialog).is-fullscreen { + display: flex; + flex-direction: column; + top: 0px !important; + left: 0px !important; +} +.sc-dialog:deep(.el-dialog).is-fullscreen .el-dialog__header { +} +.sc-dialog:deep(.el-dialog).is-fullscreen .el-dialog__body { + flex: 1; + overflow: auto; +} +.sc-dialog:deep(.el-dialog).is-fullscreen .el-dialog__footer { + padding-bottom: 10px; + border-top: 1px solid var(--el-border-color-base); +} + diff --git a/src/views/enm_coalbase/power.vue b/src/views/enm_coalbase/power.vue index a3e7b244..5cfbca57 100644 --- a/src/views/enm_coalbase/power.vue +++ b/src/views/enm_coalbase/power.vue @@ -49,21 +49,21 @@ {{ item1 }} {{ item1 }} {{ item1 }} @@ -71,7 +71,7 @@ -
+
本日 本年 +
+ + + +
@@ -113,7 +142,7 @@ :title="title" :cate="cate" :apiObj="apiObj" - :mgroup="query.mgroup" + :mpoint="mpoint" :modelValue="modelValue" :showClose="showClose" :echartType="echartType" @@ -197,11 +226,13 @@ export default { query: { mgroup: "", }, + searchDate: "", tableName: "主要设备（100KW以上）单位产品电耗数据表", tableDatas: [ ["煤磨排风机主电机", "", "KW·h/t", "", "", ""], ["煤磨主电机", "", "KW·h/t", "", "", ""], ], + tableData: [], modelValue: true, type: "hour_s", title: "煤磨工段", @@ -320,11 +351,30 @@ export default { that.days = myDate.getDate(); that.hours = myDate.getHours(); that.getTableHourData(); - that.getHourData(); - that.getDayData(); - that.getMonthData(); + that.getHourData(that.year, that.month, that.days); + that.getDayData(that.year, that.month); + that.getMonthData(that.year); }, methods: { + typeRadioChange() { + this.searchDate = ""; + }, + dateChange(val) { + console.log(val); + if (this.typeRadio == "day") { + let year = val.split("-")[0]; + let month = val.split("-")[1]; + let days = val.split("-")[2]; + this.getHourData(year, month, days); + } else if (this.typeRadio == "month") { + let year = val.split("-")[0]; + let month = val.split("-")[1]; + this.getDayData(year, month); + } else { + this.getMonthData(val); + } + this.searchDate; + }, getTableHourData() { let that = this; that.tableDatas = []; @@ -358,6 +408,7 @@ export default { this.$API.enm.mpoint.stat .req(obj) .then((res) => { + that.tableData = res; console.log("getTableHourData", res); res.forEach((item) => { let obj = []; @@ -366,10 +417,9 @@ export default { obj[2] = item.elec_consume_unit; obj[3] = 0; obj[4] = 0; + obj[5] = item.mpoint; that.tableDatas.push(obj); }); - }) - .then(() => { let yetTime = timeDate - 3600000 * 24; let ystDate = new Date(yetTime); let year_h = ystDate.getFullYear(); @@ -377,52 +427,51 @@ export default { let days_h = ystDate.getDate(); month_h = month_h > 9 ? month_h : "0" + month_h; days_h = days_h > 9 ? days_h : "0" + days_h; - let obj = {}; - obj.type = "day_s"; - obj.year_s = year_h; - obj.month_s = month_h; - obj.day_s = days_h; - obj.mgroup__name = "煤磨"; - obj.mpoint__material__code__in = "elec,elec_0"; - obj.mpoint__ep_monitored__isnull = 0; - obj.mpoint__need_display = 1; - obj.page = 0; - this.$API.enm.mpoint.stat.req(obj).then((res) => { + let obj_d = {}; + obj_d.type = "day_s"; + obj_d.year_s = year_h; + obj_d.month_s = month_h; + obj_d.day_s = days_h; + obj_d.mgroup__name = "煤磨"; + obj_d.mpoint__material__code__in = "elec,elec_0"; + obj_d.mpoint__ep_monitored__isnull = 0; + obj_d.mpoint__need_display = 1; + obj_d.page = 0; + this.$API.enm.mpoint.stat.req(obj_d).then((res) => { console.log("getTableHourData", res); res.forEach((item, index) => { that.tableDatas[index][3] = item.elec_consume_unit; }); - }); - }) - .then(() => { - let obj = {}; - obj.type = "month_s"; - obj.year_s = that.year; - obj.month_s = that.month; - obj.mgroup__name = "煤磨"; - obj.mpoint__material__code__in = "elec,elec_0"; - obj.mpoint__ep_monitored__isnull = 0; - obj.mpoint__need_display = 1; - obj.page = 0; - this.$API.enm.mpoint.stat.req(obj).then((res) => { - console.log("getTableHourData", res); - res.forEach((item, index) => { - that.tableDatas[index][4] = item.elec_consume_unit; + let obj_m = {}; + obj_m.type = "month_s"; + obj_m.year_s = that.year; + obj_m.month_s = that.month; + obj_m.mgroup__name = "煤磨"; + obj_m.mpoint__material__code__in = "elec,elec_0"; + obj_m.mpoint__ep_monitored__isnull = 0; + obj_m.mpoint__need_display = 1; + obj_m.page = 0; + this.$API.enm.mpoint.stat.req(obj_m).then((res) => { + console.log("getTableHourData", res); + res.forEach((item, index) => { + that.tableDatas[index][4] = + item.elec_consume_unit; + }); }); }); - }); + }) + .then(() => {}); }, //获取小时数据 - getHourData() { + getHourData(year, month, days) { let that = this; let query = {}; query.page = 0; - query.year_s = that.year; - query.month_s = that.month; - query.day_s = that.days; + query.year_s = year; + query.month_s = month; + query.day_s = days; query.type = "hour_s"; query.mgroup = that.query.mgroup; - query.mpoint__ep_monitored__power_kw__gte = 100; this.$API.enm.mpoint.stat.req(query).then((response) => { let seriesData0 = [], seriesData1 = []; @@ -439,7 +488,7 @@ export default { options.series[0].data = seriesData0; options.series[1].data = seriesData1; let hourXAxis = []; - for (let i = 1; i <= that.hours; i++) { + for (let i = 0; i < 24; i++) { let item = i + "时"; hourXAxis.push(item); } @@ -448,16 +497,15 @@ export default { }); }, //获取天数据 - getDayData() { + getDayData(year, month) { let that = this; let query1 = {}; query1.page = 0; - query1.year_s = that.year; - query1.month_s = that.month; + query1.year_s = year; + query1.month_s = month; query1.type = "day_s"; query1.mgroup = this.query.mgroup; - query1.mpoint__ep_monitored__power_kw__gte = 100; - this.$API.enm.enstat.req(query1).then((response) => { + this.$API.enm.mpoint.stat.req(query1).then((response) => { let seriesData0 = [], seriesData1 = []; let data = response; @@ -473,7 +521,8 @@ export default { options.series[0].data = seriesData0; options.series[1].data = seriesData1; let dayXAxis = []; - for (let i = 1; i <= that.days; i++) { + let dayss = new Date(year, month, 0).getDate(); + for (let i = 1; i <= dayss; i++) { let item = i + "日"; dayXAxis.push(item); } @@ -482,15 +531,14 @@ export default { }); }, //获取月数据 - getMonthData() { + getMonthData(year) { let that = this; let query2 = {}; query2.page = 0; - query2.year_s = that.year; + query2.year_s = year; query2.type = "month_s"; query2.mgroup = that.query.mgroup; - query2.mpoint__ep_monitored__power_kw__gte = 100; - this.$API.enm.enstat.req(query2).then((response) => { + this.$API.enm.mpoint.stat.req(query2).then((response) => { let seriesData0 = [], seriesData1 = []; let data = response; @@ -506,7 +554,7 @@ export default { options.series[0].data = seriesData0; options.series[1].data = seriesData1; let monthXAxis = []; - for (let i = 1; i <= that.month; i++) { + for (let i = 1; i < 13; i++) { let item = i + "月"; monthXAxis.push(item); } @@ -515,8 +563,10 @@ export default { }); }, itemClick(type, item) { + console.log(type, item); this.type = type; this.cate = item[0]; + this.mpoint = item[5]; this.asynDialog = true; }, handlePrint() { @@ -538,5 +588,6 @@ export default { display: flex; justify-content: center; padding-top: 10px; + position: relative; } diff --git a/src/views/enm_kilnbase/power.vue b/src/views/enm_kilnbase/power.vue index d4944367..501510a9 100644 --- a/src/views/enm_kilnbase/power.vue +++ b/src/views/enm_kilnbase/power.vue @@ -72,13 +72,45 @@
- + 本日 本月 本年 +
+ + + +
小时生产参数统计图
@@ -112,7 +144,7 @@ :title="title" :cate="cate" :apiObj="apiObj" - :mgroup="query.mgroup" + :mpoint="mpoint" :modelValue="modelValue" :showClose="showClose" :echartType="echartType" @@ -198,6 +230,8 @@ export default { query: { mgroup: "", }, + mpoint: "", + searchDate: "", tableName: "主要设备（100KW以上）单位产品电耗数据表", tableDatas: [ ["尾排风机", "KW·h/t", "", "", ""], @@ -352,11 +386,30 @@ export default { that.days = myDate.getDate(); that.hours = myDate.getHours(); that.getTableHourData(); - that.getHourData(); - that.getDayData(); - that.getMonthData(); + that.getHourData(that.year, that.month, that.days); + that.getDayData(that.year, that.month); + that.getMonthData(that.year); }, methods: { + typeRadioChange() { + this.searchDate = ""; + }, + dateChange(val) { + console.log(val); + if (this.typeRadio == "day") { + let year = val.split("-")[0]; + let month = val.split("-")[1]; + let days = val.split("-")[2]; + this.getHourData(year, month, days); + } else if (this.typeRadio == "month") { + let year = val.split("-")[0]; + let month = val.split("-")[1]; + this.getDayData(year, month); + } else { + this.getMonthData(val); + } + this.searchDate; + }, getTableHourData() { let that = this; that.tableDatas = []; @@ -387,71 +440,87 @@ export default { obj.mpoint__ep_monitored__isnull = 0; obj.mpoint__need_display = 1; obj.page = 0; - this.$API.enm.mpoint.stat - .req(obj) - .then((res) => { - console.log("getTableHourData", res); - res.forEach((item) => { - let obj = []; - obj[0] = item.ep_monitored_name; - obj[1] = "KW·h/t"; - obj[2] = item.elec_consume_unit; - obj[3] = 0; - obj[4] = 0; - that.tableDatas.push(obj); + this.$API.enm.mpoint.stat.req(obj).then((res) => { + res.forEach((item) => { + let obj = []; + obj[0] = item.ep_monitored_name; + obj[1] = "KW·h/t"; + obj[2] = item.elec_consume_unit; + obj[3] = 0; + obj[4] = 0; + obj[5] = item.mpoint; + that.tableDatas.push(obj); + }); + let yetTime = timeDate - 3600000 * 24; + let ystDate = new Date(yetTime); + let year_d = ystDate.getFullYear(); + let month_d = ystDate.getMonth() + 1; + let days_d = ystDate.getDate(); + month_d = month_d > 9 ? month_d : "0" + month_d; + days_d = days_d > 9 ? days_d : "0" + days_d; + let obj_d = {}; + obj_d.type = "day_s"; + obj_d.year_s = year_d; + obj_d.month_s = month_d; + obj_d.day_s = days_d; + obj_d.mgroup__name = "回转窑"; + obj_d.mpoint__material__code__in = "elec,elec_0"; + obj_d.mpoint__ep_monitored__isnull = 0; + obj_d.mpoint__need_display = 1; + obj_d.page = 0; + this.$API.enm.mpoint.stat.req(obj_d).then((res) => { + res.forEach((item, index_d) => { + // that.tableDatas[index][3] = item.elec_consume_unit; + if (that.tableDatas[index_d]) { + that.tableDatas[index_d][3] = + item.elec_consume_unit; + } else { + let obj = []; + obj[0] = item.ep_monitored_name; + obj[1] = "KW·h/t"; + obj[3] = item.elec_consume_unit; + obj[5] = item.mpoint; + that.tableDatas.push(obj); + } }); - }) - .then(() => { - let yetTime = timeDate - 3600000 * 24; - let ystDate = new Date(yetTime); - let year_h = ystDate.getFullYear(); - let month_h = ystDate.getMonth() + 1; - let days_h = ystDate.getDate(); - month_h = month_h > 9 ? month_h : "0" + month_h; - days_h = days_h > 9 ? days_h : "0" + days_h; - let obj = {}; - obj.type = "day_s"; - obj.year_s = year_h; - obj.month_s = month_h; - obj.day_s = days_h; - obj.mgroup__name = "回转窑"; - obj.mpoint__material__code__in = "elec,elec_0"; - obj.mpoint__ep_monitored__isnull = 0; - obj.mpoint__need_display = 1; - obj.page = 0; - this.$API.enm.mpoint.stat.req(obj).then((res) => { + let obj_m = {}; + obj_m.type = "month_s"; + obj_m.year_s = that.year; + obj_m.month_s = that.month; + obj_m.mgroup__name = "回转窑"; + obj_m.mpoint__material__code__in = "elec,elec_0"; + obj_m.mpoint__ep_monitored__isnull = 0; + obj_m.mpoint__need_display = 1; + obj_m.page = 0; + this.$API.enm.mpoint.stat.req(obj_m).then((res) => { console.log("getTableHourData", res); - res.forEach((item, index) => { - that.tableDatas[index][3] = item.elec_consume_unit; - }); - }); - }) - .then(() => { - let obj = {}; - obj.type = "month_s"; - obj.year_s = that.year; - obj.month_s = that.month; - obj.mgroup__name = "回转窑"; - obj.mpoint__material__code__in = "elec,elec_0"; - obj.mpoint__ep_monitored__isnull = 0; - obj.mpoint__need_display = 1; - obj.page = 0; - this.$API.enm.mpoint.stat.req(obj).then((res) => { - console.log("getTableHourData", res); - res.forEach((item, index) => { - that.tableDatas[index][4] = item.elec_consume_unit; + res.forEach((item, index_m) => { + // that.tableDatas[index_m][4] = + // item.elec_consume_unit; + if (that.tableDatas[index_m]) { + that.tableDatas[index_m][4] = + item.elec_consume_unit; + } else { + let obj = []; + obj[0] = item.ep_monitored_name; + obj[1] = "KW·h/t"; + obj[4] = item.elec_consume_unit; + obj[5] = item.mpoint; + that.tableDatas.push(obj); + } }); }); }); + }); }, //获取小时数据 - getHourData() { + getHourData(year, month, days) { let that = this; let obj = {}; obj.type = "hour_s"; - obj.year_s = that.year; - obj.month_s = that.month; - obj.day_s = that.days; + obj.year_s = year; + obj.month_s = month; + obj.day_s = days; obj.mgroup__name = "回转窑"; obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__ep_monitored__isnull = 0; @@ -477,7 +546,7 @@ export default { options.series[1].data = seriesData1; options.series[2].data = seriesData2; let hourXAxis = []; - for (let i = 1; i < that.hours + 1; i++) { + for (let i = 0; i < 24; i++) { let item = i + "时"; hourXAxis.push(item); } @@ -486,12 +555,12 @@ export default { }); }, //获取天数据 - getDayData() { + getDayData(year, month) { let that = this; let obj = {}; obj.type = "day_s"; - obj.year_s = that.year; - obj.month_s = that.month; + obj.year_s = year; + obj.month_s = month; obj.mgroup__name = "回转窑"; obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__ep_monitored__isnull = 0; @@ -517,7 +586,8 @@ export default { options.series[1].data = seriesData1; options.series[2].data = seriesData2; let dayXAxis = []; - for (let i = 1; i <= that.days; i++) { + let dayss = new Date(year, month, 0).getDate(); + for (let i = 1; i <= dayss; i++) { let item = i + "日"; dayXAxis.push(item); } @@ -526,11 +596,11 @@ export default { }); }, //获取月数据 - getMonthData() { + getMonthData(year) { let that = this; let obj = {}; obj.type = "month_s"; - obj.year_s = that.year; + obj.year_s = year; obj.mgroup__name = "回转窑"; obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__ep_monitored__isnull = 0; @@ -556,7 +626,7 @@ export default { options.series[1].data = seriesData1; options.series[2].data = seriesData2; let monthXAxis = []; - for (let i = 1; i <= that.month; i++) { + for (let i = 1; i < 13; i++) { let item = i + "月"; monthXAxis.push(item); } @@ -567,6 +637,7 @@ export default { itemClick(type, item) { this.type = type; this.cate = item[0]; + this.mpoint = item[5]; this.asynDialog = true; }, handlePrint() { @@ -588,5 +659,6 @@ export default { display: flex; justify-content: center; padding-top: 10px; + position: relative; } diff --git a/src/views/enm_rmbase/power.vue b/src/views/enm_rmbase/power.vue index 7c1f8600..27d74385 100644 --- a/src/views/enm_rmbase/power.vue +++ b/src/views/enm_rmbase/power.vue @@ -24,9 +24,7 @@ > - - 原料磨工段主要设备（100KW以上）单位产品电耗数据表 - + 主要设备单位产品电耗数据表 设备名称 @@ -73,7 +71,45 @@ -
+
+ + 本日 + 本月 + 本年 + +
+ + + +
+
+
小时生产参数统计图
-
+
本月生产参数统计图
-
+
本年生产参数统计图
{ - console.log("getTableHourData", res); - res.forEach((item) => { - let obj = []; - obj[0] = item.ep_monitored_name; - obj[1] = "KW·h/t"; - obj[2] = item.elec_consume_unit; - obj[3] = 0; - obj[4] = 0; - that.tableDatas.push(obj); - }); - }) - .then(() => { - let yetTime = timeDate - 3600000 * 24; - let ystDate = new Date(yetTime); - let year_h = ystDate.getFullYear(); - let month_h = ystDate.getMonth() + 1; - let days_h = ystDate.getDate(); - month_h = month_h > 9 ? month_h : "0" + month_h; - days_h = days_h > 9 ? days_h : "0" + days_h; - let obj = {}; - obj.type = "day_s"; - obj.year_s = year_h; - obj.month_s = month_h; - obj.day_s = days_h; - obj.mgroup__name = "原料磨"; - obj.mpoint__material__code__in = "elec,elec_0"; - obj.mpoint__ep_monitored__isnull = 0; - obj.mpoint__need_display = 1; - obj.page = 0; - this.$API.enm.mpoint.stat.req(obj).then((res) => { - console.log("getTableHourData", res); - res.forEach((item, index) => { - that.tableDatas[index][3] = item.elec_consume_unit; - }); - }); - }) - .then(() => { - let obj = {}; - obj.type = "month_s"; - obj.year_s = that.year; - obj.month_s = that.month; - obj.mgroup__name = "原料磨"; - obj.mpoint__material__code__in = "elec,elec_0"; - obj.mpoint__ep_monitored__isnull = 0; - obj.mpoint__need_display = 1; - obj.page = 0; - this.$API.enm.mpoint.stat.req(obj).then((res) => { - console.log("getTableHourData", res); - res.forEach((item, index) => { - that.tableDatas[index][4] = item.elec_consume_unit; - }); + this.$API.enm.mpoint.stat.req(obj).then((res) => { + res.forEach((item) => { + let obj = []; + obj[0] = item.ep_monitored_name; + obj[1] = "KW·h/t"; + obj[2] = item.elec_consume_unit; + obj[3] = 0; + obj[4] = 0; + obj[5] = item.mpoint; + that.tableDatas.push(obj); + }); + let yetTime = timeDate - 3600000 * 24; + let ystDate = new Date(yetTime); + let year_d = ystDate.getFullYear(); + let month_d = ystDate.getMonth() + 1; + let days_d = ystDate.getDate(); + month_d = month_d > 9 ? month_d : "0" + month_d; + days_d = days_d > 9 ? days_d : "0" + days_d; + let obj_d = {}; + obj_d.type = "day_s"; + obj_d.year_s = year_d; + obj_d.month_s = month_d; + obj_d.day_s = days_d; + obj_d.mgroup__name = "原料磨"; + obj_d.mpoint__material__code__in = "elec,elec_0"; + obj_d.mpoint__ep_monitored__isnull = 0; + obj_d.mpoint__need_display = 1; + obj_d.page = 0; + this.$API.enm.mpoint.stat.req(obj_d).then((res) => { + console.log("getTableDayData", res); + res.forEach((item, index_d) => { + if (that.tableDatas[index_d]) { + that.tableDatas[index_d][3] = + item.elec_consume_unit; + } else { + let obj = []; + obj[0] = item.ep_monitored_name; + obj[1] = "KW·h/t"; + obj[3] = item.elec_consume_unit; + obj[5] = item.mpoint; + that.tableDatas.push(obj); + } }); }); + let obj_m = {}; + obj_m.type = "month_s"; + obj_m.year_s = that.year; + obj_m.month_s = that.month; + obj_m.mgroup__name = "原料磨"; + obj_m.mpoint__material__code__in = "elec,elec_0"; + obj_m.mpoint__ep_monitored__isnull = 0; + obj_m.mpoint__need_display = 1; + obj_m.page = 0; + this.$API.enm.mpoint.stat.req(obj_m).then((res) => { + console.log("getTableMonthrData", res); + res.forEach((item, index_m) => { + if (that.tableDatas[index_m]) { + that.tableDatas[index_m][4] = + item.elec_consume_unit; + } else { + let obj = []; + obj[0] = item.ep_monitored_name; + obj[1] = "KW·h/t"; + obj[4] = item.elec_consume_unit; + obj[5] = item.mpoint; + that.tableDatas.push(obj); + } + }); + }); + }); }, //获取小时数据 - getHourData() { + getHourData(year, month, days) { let that = this; let obj = {}; obj.type = "hour_s"; - obj.year_s = that.year; - obj.month_s = that.month; - obj.day_s = that.days; + obj.year_s = year; + obj.month_s = month; + obj.day_s = days; obj.mgroup__name = "原料磨"; obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__ep_monitored__isnull = 0; @@ -426,7 +498,7 @@ export default { options.series[0].data = seriesData0; options.series[1].data = seriesData1; let hourXAxis = []; - for (let i = 1; i < that.hours + 1; i++) { + for (let i = 0; i < 24; i++) { let item = i + "时"; hourXAxis.push(item); } @@ -435,12 +507,12 @@ export default { }); }, //获取天数据 - getDayData() { + getDayData(year, month) { let that = this; let obj = {}; obj.type = "day_s"; - obj.year_s = that.year; - obj.month_s = that.month; + obj.year_s = year; + obj.month_s = month; obj.mgroup__name = "原料磨"; obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__ep_monitored__isnull = 0; @@ -462,7 +534,8 @@ export default { options.series[0].data = seriesData0; options.series[1].data = seriesData1; let dayXAxis = []; - for (let i = 1; i <= that.days; i++) { + let dayss = new Date(year, month, 0).getDate(); + for (let i = 1; i <= dayss; i++) { let item = i + "日"; dayXAxis.push(item); } @@ -471,11 +544,11 @@ export default { }); }, //获取月数据 - getMonthData() { + getMonthData(year) { let that = this; let obj = {}; obj.type = "month_s"; - obj.year_s = that.year; + obj.year_s = year; obj.mgroup__name = "原料磨"; obj.mpoint__material__code__in = "elec,elec_0"; obj.mpoint__ep_monitored__isnull = 0; @@ -497,7 +570,7 @@ export default { options.series[0].data = seriesData0; options.series[1].data = seriesData1; let monthXAxis = []; - for (let i = 1; i <= that.month; i++) { + for (let i = 1; i < 13; i++) { let item = i + "月"; monthXAxis.push(item); } @@ -508,6 +581,7 @@ export default { itemClick(type, item) { this.type = type; this.cate = item[0]; + this.mpoint = item[5]; this.asynDialog = true; }, handlePrint() { @@ -525,4 +599,10 @@ export default { .printContainer { padding-left: 20px; } +.radioWrap { + display: flex; + justify-content: center; + padding-top: 10px; + position: relative; +}