From cdf271877da4e3806aed2a71e20ba8a4337ad90b Mon Sep 17 00:00:00 2001 From: zty Date: Wed, 27 Nov 2024 09:51:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:tkx=20=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/route.js | 20 +- src/views/bigScreen/index_enm.vue | 213 ++++----- src/views/em/equipment.vue | 7 +- src/views/em/equipment_form.vue | 11 +- src/views/em/equipmentjl.vue | 31 +- src/views/enm_coal/report.vue | 1 - src/views/enm_energy/hour_base.vue | 7 +- src/views/enm_energy/water.vue | 700 +++++++++++++++++++++++++++++ 8 files changed, 856 insertions(+), 134 deletions(-) create mode 100644 src/views/enm_energy/water.vue diff --git a/src/config/route.js b/src/config/route.js index c20b2c11..6b85fe1c 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -1015,15 +1015,25 @@ const routes = [ }, component: "enm_energy/hour_base", }, + { + name: "water", + path: "/enm_energy/water", + meta: { + title: "水报表", + // icon: "el-icon-grid", + perms: ["hour_base"], + }, + component: "enm_energy/water", + }, // { - // name: "dayBase", - // path: "/enm_energy/dayBase", + // name: "ct_elec", + // path: "/enm_energy/ct_elec", // meta: { - // title: "电量消耗日报表", + // title: "峰谷平电量", // // icon: "el-icon-grid", - // perms: ["day_base"], + // perms: ["hour_base"], // }, - // component: "enm_energy/day_base", + // component: "enm_energy/ct_elec", // }, // { // name: "monthBase", diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue index 04c69657..7fd3f00c 100644 --- a/src/views/bigScreen/index_enm.vue +++ b/src/views/bigScreen/index_enm.vue @@ -81,7 +81,7 @@
-
设备运转率
+
台时产量
@@ -199,7 +199,7 @@
-
质量分析
+
能源消耗
@@ -444,7 +444,7 @@ export default { { name: "电石渣", value: 0 }, { name: "原料磨", value: 0 }, { name: "煤磨", value: 0 }, - { name: "回转窑", value: 0 }, + { name: "烧成", value: 0 }, { name: "水泥磨", value: 0 }, { name: "水泥包装", value: 0 }, ], @@ -875,8 +875,8 @@ export default { }); index2++; } else { - index2 = 0; - clearInterval(intervalId); + index2 = 0; + clearInterval(intervalId); } }, 1000); }); @@ -956,53 +956,53 @@ export default { let seriesData5 = new Array(31).fill(0); // 水泥车间用水 // 定义查询参数的生成函数 - function generateQuery(deptId) { + function generateQuery(mpointId) { return { page: 0, - year_s: that.currentYear, - month_s: that.currentMonth, - type: "day_s", - mgroup__belong_dept: deptId, + year: that.currentYear, + month: that.currentMonth, + type: "day", + mpoint: mpointId, }; } // 第一个API查询 - let query1 = generateQuery("3626222645575802880"); - this.$API.enm.enstat.req(query1).then((response) => { + let query1 = generateQuery("3631858687335112704"); + this.$API.enm.mpointstat.list.req(query1).then((response) => { + //反转response数据 + response.reverse(); response.forEach((item) => { - - if (item.mgroup_name === "原料车间用水") { - let ind = item.day_s - 1; - seriesData1[ind] = item.water_consume || 0; - } + let ind = item.day - 1; + seriesData1[ind] = item.val || 0; }); // 第二个API查询 - let query2 = generateQuery("3626252143184752640"); - return this.$API.enm.enstat.req(query2); + let query2 = generateQuery("3631858394648182784"); + return this.$API.enm.mpointstat.list.req(query2); + }).then((response) => { - response.forEach((item) => { - if (item.mgroup_name === "烧成车间用水") { - let ind = item.day_s - 1; - seriesData3[ind] = item.water_consume || 0; - } + response.reverse(); + response.forEach((item) => { + let ind = item.day - 1; + seriesData3[ind] = item.val || 0; + }); // 第三个API查询 - let query3 = generateQuery("3626252144132665344"); - return this.$API.enm.enstat.req(query3); + let query3 = generateQuery("3631858982832218112"); + response.reverse(); + return this.$API.enm.mpointstat.list.req(query3); }).then((response) => { + response.reverse(); response.forEach((item) => { - if (item.mgroup_name === "水泥车间用水") { - let ind = item.day_s - 1; - seriesData5[ind] = item.water_consume || 0; - } + let ind = item.day - 1; + seriesData5[ind] = item.val || 0; }); // 更新图表数据 option3.color = ['#FFBF00','#6495ED', '#CC00FF'] option3.legend.data = [ { - name: "原料车间用水", + name: "生活水", textStyle: { color: "#fff", }, @@ -1012,7 +1012,7 @@ export default { }, }, { - name: "烧成车间用水", + name: "绿化水", textStyle: { color: "#fff", }, @@ -1022,7 +1022,7 @@ export default { }, }, { - name: "水泥车间用水", + name: "工业水", textStyle: { color: "#fff", }, @@ -1034,7 +1034,7 @@ export default { ]; option3.series = [ { - name: '原料车间用水', + name: '生活水', type: 'line', data: seriesData1, lineStyle: { @@ -1042,7 +1042,7 @@ export default { }, }, { - name: '烧成车间用水', + name: '绿化水', type: 'line', data: seriesData3, lineStyle: { @@ -1050,7 +1050,7 @@ export default { }, }, { - name: '水泥车间用水', + name: '工业水', type: 'line', data: seriesData5, lineStyle: { @@ -1073,7 +1073,7 @@ export default { }) }, - //设备运转率 + //台时产量 eqRate() { let that = this; let query = {}; @@ -1086,17 +1086,23 @@ export default { let data = response; data.forEach((item) => { if (item.mgroup_name == "电石渣") { - that.rateData[0].value = Number(item.run_rate); + that.rateData[0].value = item.production_hour + ; } else if (item.mgroup_name == "原料磨") { - that.rateData[1].value = Number(item.run_rate); + that.rateData[1].value = item.production_hour + ; } else if (item.mgroup_name == "煤磨") { - that.rateData[2].value = Number(item.run_rate); + that.rateData[2].value = item.production_hour + ; } else if (item.mgroup_name == "回转窑") { - that.rateData[3].value = Number(item.run_rate); + that.rateData[3].value = item.production_hour + ; } else if (item.mgroup_name == "水泥磨") { - that.rateData[4].value = Number(item.run_rate); + that.rateData[4].value = item.production_hour + ; } else if (item.mgroup_name == "水泥包装") { - that.rateData[5].value = Number(item.run_rate); + that.rateData[5].value = item.production_hour + ; } }); }); @@ -1231,7 +1237,7 @@ export default { radarChart.setOption(that.radarOption); }); }, - //质量分析 + //能源消耗 qualAnalys() { let that = this; // 初始化option2和图表 @@ -1240,48 +1246,55 @@ export default { let myChart = echarts.init(chartDom); // 初始化各个series数据数组 - let seriesData = new Array(31).fill(0); - let seriesData1 = new Array(31).fill(0); - let seriesData2 = new Array(31).fill(0); - let seriesData3 = new Array(31).fill(0); - let seriesData4 = new Array(31).fill(0); + let seriesData = new Array(12).fill(0); + let seriesData1 = new Array(12).fill(0); + // let seriesData2 = new Array(31).fill(0); + // let seriesData3 = new Array(31).fill(0); + // let seriesData4 = new Array(31).fill(0); // 定义查询参数的生成函数 function generateQuery(mgroupId) { return { page: 0, - year_s: that.currentYear, - month_s: that.currentMonth, - type: "day_s", + //获取当前年的第一个月 + start_time: that.currentYear + "-01-01 00:00:00", + end_time: that.currentYear + "-12-31 00:00:00", + type: "month_s", mgroup: mgroupId, }; } - // 第一个API查询 + function generateQueryMpoint(mpointId) { + return { + page: 0, + type: "month", + year: that.currentYear, + mpoint: mpointId, + }; + } + // 第一个API查询 煤磨总产量 月数据 let query1 = generateQuery("3626253029718056960"); this.$API.enm.enstat.req(query1).then((response) => { response.forEach((item) => { if (item.qua_data.length > 0) { - let ind = item.day_s - 1; - seriesData[ind] = item.出窑熟料_fCaO_rate_pass || 0; - seriesData1[ind] = item.出窑熟料_立升重_rate_pass || 0; + let ind = item.month_s - 1; + seriesData[ind] = item.total_production || 0; } }); - let query2 = generateQuery("3626253601661739008"); - return this.$API.enm.enstat.req(query2); + // 获取每个月的全厂电量 + let query2 = generateQueryMpoint("3631880992400515072"); + return this.$API.enm.mpointstat.list.req(query2); }).then((response) => { + console.log(response,'query2'); response.forEach((item) => { - if (item.qua_data.length > 0) { - let ind = item.day_s - 1; - seriesData2[ind] = item.出磨水泥_SO3_rate_pass || 0; - seriesData3[ind] = item.出磨水泥_比表面积_rate_pass || 0; - seriesData4[ind] = item.出磨水泥_掺量_rate_pass || 0; - } - }); + let ind = item.month - 1; + seriesData1[ind] = item.val || 0; + }); // 更新图表数据 option5.color = ["#80FFA5", "#00DDFF", "#37A2FF", "#FF0087", "#FFBF00"], + option5.legend.data = [ { - name: "f-CaO", + name: "原煤消耗(t)", textStyle: { color: "#fff", }, @@ -1291,7 +1304,7 @@ export default { }, }, { - name: "立升重", + name: "全厂电量(kwh)", textStyle: { color: "#fff", }, @@ -1300,65 +1313,35 @@ export default { color: "#00DDFF", }, }, - { - name: "SO3", - textStyle: { - color: "#fff", - }, - borderRadius: 2, - itemStyle: { - color: "#37A2FF", - }, - }, - { - name: "比表面积", - textStyle: { - color: "#fff", - }, - borderRadius: 2, - itemStyle: { - color: "#FF0087", - }, - }, - { - name: "掺量", - textStyle: { - color: "#fff", - }, - borderRadius: 2, - itemStyle: { - color: "#FFBF00", - }, - }, ]; option5.series = [ { - name: 'f-CaO', + name: '原煤消耗(t)', type: 'line', data: seriesData }, { - name: '立升重', + name: '全厂电量(kwh)', type: 'line', data: seriesData1 }, - { - name: 'SO3', - type: 'line', - data: seriesData2 - }, - { - name: '比表面积', - type: 'line', - data: seriesData3 - }, - { - name: '掺量', - type: 'line', - data: seriesData4 - }, ] + option5.yAxis.axisLabel.show = false; + option5.xAxis.data = [ + "1月", + "2月", + "3月", + "4月", + "5月", + "6月", + "7月", + "8月", + "9月", + "10月", + "11月", + "12月", + ]; myChart.setOption(option5); // 设置更新后的图表 }); }, diff --git a/src/views/em/equipment.vue b/src/views/em/equipment.vue index e8f06114..e1430112 100644 --- a/src/views/em/equipment.vue +++ b/src/views/em/equipment.vue @@ -46,6 +46,9 @@ + + +