From 11d38f550850a187873f732f77c73acf71cd1bf2 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 30 Dec 2024 09:59:16 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:tkx=E7=94=B5=E7=9F=B3=E6=B8=A3=E5=B7=A5?= =?UTF-8?q?=E5=BA=8F=E7=8F=AD=E7=BB=84=E6=9C=88=E5=BA=A6=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enm_slag/teamAnalysis.vue | 268 +++++++++++++--------------- 1 file changed, 123 insertions(+), 145 deletions(-) diff --git a/src/views/enm_slag/teamAnalysis.vue b/src/views/enm_slag/teamAnalysis.vue index e7cf040f..431b0e55 100644 --- a/src/views/enm_slag/teamAnalysis.vue +++ b/src/views/enm_slag/teamAnalysis.vue @@ -95,24 +95,11 @@ export default { let year = myDate.getFullYear(); this.timeStamp = myDate.getTime(); that.query.year_s = year; - this.$API.mtm.mgroup.list - .req({ page: 0, search: "电石渣" }) - .then((res) => { - that.query.mgroup = res[0].id; - let params = {}; - params.page = 0; - params.year = year; - params.mgroup = that.query.mgroup; - this.$API.mtm.goal.list.req(params).then((res) => { - if (res.length > 0) { - res.forEach((item) => { - if (item.goal_cate_name == "单位产品分布电耗（KW·h/t）") { - that.getData(item); - } - }) - } - }); - }); + this.$API.mtm.mgroup.list.req({ page: 0, search: "电石渣" }).then((res) => { + console.log("工段数据：", res); + that.query.mgroup = res[0].id; + that.getGoalData(); + }); }, methods: { getGoalData() { @@ -121,18 +108,18 @@ export default { params.page = 0; params.year = self.query.year_s; params.mgroup = self.query.mgroup; - this.$API.mtm.goal.list.req(params).then((res) => { + self.$API.mtm.goal.list.req(params).then((res) => { if (res.length > 0) { - res.forEach((item) => { - if (item.goal_cate_name == "单位产品分布电耗（KW·h/t）") { - this.getData(item); - } - }) - } - }) - .catch((error) => { - console.error('获取目标数据失败：', error); - }); + res.forEach((item) => { + if (item.goal_cate_name == "单位产品分布电耗（kW·h/t）") { + console.log("目标数据：", item); + self.getData(item); + } + }) + } + }).catch((error) => { + console.error('获取目标数据失败：', error); + }); }, getData(goalData) { let that = this; @@ -155,120 +142,118 @@ export default { } else { } }); - this.$API.enm.enstat.req(that.query).then((res) => { - let data = res; - if (data.length > 0) { - data.forEach((item, index) => { - //先按月份排序，再按班组排序 - let compareArr = []; - compareArr.push(item.month_s); - compareArr.push(item.team_name); - compareArr.push(item.elec_consume_unit); - compareArr0[index]=compareArr; - if (!month_obj[item.month_s]) { - month_obj[item.month_s] = []; + this.$API.enm.enstat.req(that.query).then((res) => { + let data = res; + if (data.length > 0) { + data.forEach((item, index) => { + //先按月份排序，再按班组排序 + let compareArr = []; + compareArr.push(item.month_s); + compareArr.push(item.team_name); + compareArr.push(item.elec_consume_unit); + compareArr0[index]=compareArr; + if (!month_obj[item.month_s]) { + month_obj[item.month_s] = []; + } + month_obj[item.month_s].push( + { + team:item.team_name, + value: item.elec_consume_unit, + elec_consume: item.elec_consume } - month_obj[item.month_s].push( - { - team:item.team_name, - value: item.elec_consume_unit, - elec_consume: item.elec_consume - } - ); - // month_list.push(month_obj) - }); - data.forEach((item) => { - //先按月份排序，再按班组排序 - let n = item.month_s; - let arr = []; - let time = "" + item.year_s + "." + item.month_s; - arr.push(time); - arr.push(item.team_name); - arr.push(item.total_production); - arr.push(item.production_hour); + ); + // month_list.push(month_obj) + }); + data.forEach((item) => { + //先按月份排序，再按班组排序 + let n = item.month_s; + let arr = []; + let time = "" + item.year_s + "." + item.month_s; + arr.push(time); + arr.push(item.team_name); + arr.push(item.total_production); + arr.push(item.production_hour); - arr[4] = item.elec_consume_unit; //当期值（KW·h/t） - let keyVale = "goal_val_" + n; - arr[5] = goalData[keyVale]; //目标值（KW·h/t）//需要接口获取 - arr[6] = (arr[4] - arr[5]).toFixed(2); //当期与目标差值（KW·h/t） - let ind_pre = 0, - huanqi = 0, - huanqicha = 0, - tongqi = 0, - tongqicha = 0; - if (n == 1) { - ind_pre = 12; - huanqi = wrapArr0[ind_pre] - ? wrapArr0[ind_pre].elec_consume_unit - : "/"; - } else { - // 如果 wrapArr数组长度大于0，那么循环遍历wrapArr数组，找到与item.month_s相差1的元素 而 item.name相同，并赋值给huanbi - compareArr0.forEach((item0) => { - if (item0[0] == item.month_s - 1 && item0[1] == item.team_name) { - huanqi = item0[2]; - } - }) + arr[4] = item.elec_consume_unit; //当期值（KW·h/t） + let keyVale = "goal_val_" + n; + arr[5] = goalData[keyVale]; //目标值（KW·h/t）//需要接口获取 + arr[6] = (arr[4] - arr[5]).toFixed(2); //当期与目标差值（KW·h/t） + let ind_pre = 0, + huanqi = 0, + tongqi = 0, + tongqicha = 0; + if (n == 1) { + ind_pre = 12; + huanqi = wrapArr0[ind_pre] + ? wrapArr0[ind_pre].elec_consume_unit + : "/"; + } else { + // 如果 wrapArr数组长度大于0，那么循环遍历wrapArr数组，找到与item.month_s相差1的元素 而 item.name相同，并赋值给huanbi + compareArr0.forEach((item0) => { + if (item0[0] == item.month_s - 1 && item0[1] == item.team_name) { + huanqi = item0[2]; } - arr[7] = huanqi; //环期值（KW·h/t）上个月的值 - if (arr[6] !== "/"){ - arr[8] = (arr[4] - arr[7]).toFixed(2); //当期与环期差值（KW·h/t） - }else{ - arr[8] = "/"; //当期与环期差值（KW·h/t） + }) + } + arr[7] = Number(huanqi); //环期值（KW·h/t）上个月的值 + if (arr[6] !== "/"){ + arr[8] = (Number(arr[4]) - arr[7]).toFixed(2); //当期与环期差值（KW·h/t） + }else{ + arr[8] = "/"; //当期与环期差值（KW·h/t） + } + let growthRate = 0; + if (arr[8]!== "/" && arr[7]!== 0 && arr[8]!== 0 ) { + growthRate = ((Number(arr[8]) /arr[7]) * 100).toFixed(2); + } else{ + growthRate = "/"; + } + arr[9] = growthRate; //环比增长率（%） + if (wrapArr0[n]) { + tongqicha = + item.celec_consume_unit - + wrapArr0[n].celec_consume_unit; + tongqi = tongqicha / tongqi; + } else { + tongqicha = item.celec_consume_unit; + tongqi = 0; + } + arr[10] = tongqi; //同比增长率（%） + //如果n = month_list的key值，则遍历里面的对象按照value排序, 如果 index==0，则arr[11] = 100，如果 index==1，则arr[11] = 80，如果 index==2，则arr[11] = 70，如果 index==3，则arr[11] = 0 + if (month_obj[n]) { + const monthData = month_obj[n]; + const itemValue = item.elec_consume_unit; // 当前项的值 + const sortedData = monthData.sort((a, b) => parseFloat(b.value) - parseFloat(a.value)); + const index = sortedData.findIndex(obj => parseFloat(obj.value) === parseFloat(itemValue)); + if (index === 0){ + arr[11] = 50; + } else if (index === 1) { + arr[11] = 40; + } else if (index === 2) { + arr[11] = 30; + } else if (index === 3) { + arr[11] = 20; } - // arr[8] = huanqicha; //当期与环期差值（KW·h/t） - let growthRate = 0; - if (arr[8]!== "/" && arr[7]!== 0 && arr[8]!== 0 ) { - growthRate = ((arr[8] / arr[7]) * 100).toFixed(2); - } else{ - growthRate = "/"; + const total_elec_consume = item.elec_consume; + const sortedTotalData = monthData.sort((a, b) => parseFloat(b.elec_consume) - parseFloat(a.elec_consume)); + const totalIndex = sortedTotalData.findIndex(obj => parseFloat(obj.elec_consume) === parseFloat(total_elec_consume)); + let total_elec_consume_score = 0; + if (totalIndex === 0){ + total_elec_consume_score = 50; + } else if (totalIndex === 1) { + total_elec_consume_score = 40; + } else if (totalIndex === 2) { + total_elec_consume_score = 30; + } else if (totalIndex === 3) { + total_elec_consume_score = 20; } - arr[9] = growthRate; //环比增长率（%） - if (wrapArr0[n]) { - tongqicha = - item.celec_consume_unit - - wrapArr0[n].celec_consume_unit; - tongqi = tongqicha / tongqi; - } else { - tongqicha = item.celec_consume_unit; - tongqi = 0; - } - arr[10] = tongqi; //同比增长率（%） - //如果n = month_list的key值，则遍历里面的对象按照value排序, 如果 index==0，则arr[11] = 100，如果 index==1，则arr[11] = 80，如果 index==2，则arr[11] = 70，如果 index==3，则arr[11] = 0 - if (month_obj[n]) { - const monthData = month_obj[n]; - const itemValue = item.elec_consume_unit; // 当前项的值 - const sortedData = monthData.sort((a, b) => parseFloat(b.value) - parseFloat(a.value)); - const index = sortedData.findIndex(obj => parseFloat(obj.value) === parseFloat(itemValue)); - if (index === 0){ - arr[11] = 50; - } else if (index === 1) { - arr[11] = 40; - } else if (index === 2) { - arr[11] = 30; - } else if (index === 3) { - arr[11] = 20; - } - const total_elec_consume = item.elec_consume; - const sortedTotalData = monthData.sort((a, b) => parseFloat(b.elec_consume) - parseFloat(a.elec_consume)); - const totalIndex = sortedTotalData.findIndex(obj => parseFloat(obj.elec_consume) === parseFloat(total_elec_consume)); - let total_elec_consume_score = 0; - if (totalIndex === 0){ - total_elec_consume_score = 50; - } else if (totalIndex === 1) { - total_elec_consume_score = 40; - } else if (totalIndex === 2) { - total_elec_consume_score = 30; - } else if (totalIndex === 3) { - total_elec_consume_score = 20; - } - arr[11] += total_elec_consume_score; // 电耗得分 - } - wrapArr.push(arr); - }); - that.tableDatas = wrapArr; - } else { - } - }); + arr[11] += total_elec_consume_score; // 电耗得分 + } + wrapArr.push(arr); + }); + that.tableDatas = wrapArr; + } else { + } + }); }, handleQuery() { this.tableDatas = []; @@ -278,13 +263,6 @@ export default { this.type = type; this.asynDialog = true; }, - itemClick1(type, item) { - this.chartShow = false; - this.$API.bi.dataset.exec.req("3322567213885833216").then((res) => { - this.myOption = JSON.parse(res.echart_options); - this.chartShow = true; - }); - }, handlePrint() { this.$PRINT("#myReport"); }, From f1a031bcd72dd49bb6d00c44eb03ace7a44f1ea8 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 30 Dec 2024 10:07:31 +0800 Subject: [PATCH 2/6] 1230 --- src/components/scEnm/lineChartsdialog.vue | 14 +- src/views/bigScreen/index_enm.vue | 84 +++++----- src/views/bigScreen/index_enm_ly.vue | 16 +- src/views/em/equipmentjl.vue | 2 + src/views/enm_base/mgroup.vue | 5 + src/views/enm_base/mgroup_form.vue | 7 +- src/views/enm_coal/handoverLog.vue | 2 +- src/views/enm_coal/power.vue | 12 +- src/views/enm_coal/report.vue | 35 ++-- src/views/enm_coal/teamAnalysis.vue | 18 +-- src/views/enm_coal/workshopAnalysis.vue | 73 ++++----- src/views/enm_coalbase/handoverLog.vue | 2 +- src/views/enm_coalbase/power.vue | 12 +- src/views/enm_coalbase/report.vue | 8 +- src/views/enm_coalbase/teamAnalysis.vue | 10 +- src/views/enm_coalbase/workshopAnalysis.vue | 22 +-- src/views/enm_cogeneration/handoverLog.vue | 2 +- src/views/enm_cogeneration/report.vue | 22 +-- src/views/enm_cogeneration/teamAnalysis.vue | 10 +- .../enm_cogeneration/workshopAnalysis.vue | 74 ++++----- src/views/enm_energy/electric.vue | 8 +- src/views/enm_energy/electric_peak.vue | 17 +- src/views/enm_energy/electric_total.vue | 2 +- src/views/enm_energy/energy.vue | 4 +- src/views/enm_energy/energyFactory.vue | 4 +- src/views/enm_energy/energyPicture.vue | 38 ++--- src/views/enm_kiln/handoverLog.vue | 2 +- src/views/enm_kiln/power.vue | 12 +- src/views/enm_kiln/report.vue | 38 +++-- src/views/enm_kiln/teamAnalysis.vue | 24 +-- src/views/enm_kiln/workshopAnalysis.vue | 74 ++++----- src/views/enm_kilnbase/handoverLog.vue | 2 +- src/views/enm_kilnbase/power.vue | 14 +- src/views/enm_kilnbase/report.vue | 8 +- src/views/enm_kilnbase/teamAnalysis.vue | 20 +-- src/views/enm_kilnbase/workshopAnalysis.vue | 50 +++--- src/views/enm_limestone/report.vue | 6 +- src/views/enm_limestone/workshopAnalysis.vue | 22 +-- src/views/enm_mill/handoverLog.vue | 2 +- src/views/enm_mill/power.vue | 12 +- src/views/enm_mill/report.vue | 27 ++-- src/views/enm_mill/teamAnalysis.vue | 18 +-- src/views/enm_mill/workshopAnalysis.vue | 26 +-- src/views/enm_monthSet/goalSetting.vue | 4 + src/views/enm_pack/handoverLog.vue | 2 +- src/views/enm_pack/report.vue | 6 +- src/views/enm_pack/teamAnalysis.vue | 14 +- src/views/enm_pack/workshopAnalysis.vue | 22 +-- src/views/enm_report/reportDay.vue | 28 ++-- src/views/enm_report/reportFactory.vue | 2 +- src/views/enm_report/reportMonth.vue | 36 ++--- src/views/enm_rm/power.vue | 18 +-- src/views/enm_rm/report.vue | 38 +++-- src/views/enm_rm/teamAnalysis.vue | 34 ++-- src/views/enm_rm/workshopAnalysis.vue | 22 +-- src/views/enm_rm_copy/power.vue | 18 +-- src/views/enm_rm_copy/report.vue | 30 ++-- src/views/enm_rm_copy/teamAnalysis.vue | 34 ++-- src/views/enm_rm_copy/workshopAnalysis.vue | 22 +-- src/views/enm_rmbase/power.vue | 12 +- src/views/enm_rmbase/report.vue | 10 +- src/views/enm_rmbase/teamAnalysis.vue | 20 +-- src/views/enm_rmbase/workshopAnalysis.vue | 22 +-- src/views/enm_slag/handoverLog.vue | 2 +- src/views/enm_slag/power.vue | 8 +- src/views/enm_slag/report.vue | 10 +- src/views/enm_slag/teamAnalysis.vue | 153 +++++++++--------- src/views/enm_slag/workshopAnalysis.vue | 22 +-- src/views/statistics/total_statistics.vue | 2 +- src/views/wpm_bx/mlog_detail.vue | 1 + src/views/wpm_bx/mlogb_form.vue | 81 +++------- 71 files changed, 772 insertions(+), 761 deletions(-) diff --git a/src/components/scEnm/lineChartsdialog.vue b/src/components/scEnm/lineChartsdialog.vue index f5272061..a1b70c78 100644 --- a/src/components/scEnm/lineChartsdialog.vue +++ b/src/components/scEnm/lineChartsdialog.vue @@ -310,9 +310,9 @@ export default { if (that.cate == "总产量（t）" || that.cate == "出厂水泥合计（t）") { that.cateName = "total_production"; } else if ( - that.cate == "单位产品分布电耗（KW·h/t）" || - that.cate == "生料分布电耗（KW·h/t）" || - that.cate == "煤磨分布电耗（KW·h/t）" + that.cate == "单位产品分布电耗（kW·h/t）" || + that.cate == "生料分布电耗（kW·h/t）" || + that.cate == "煤磨分布电耗（kW·h/t）" ) { that.cateName = "elec_consume_unit"; } else if (that.cate == "台时产量（t/h）") { @@ -328,17 +328,17 @@ export default { that.cate == "生料成本（元/吨）" ) { that.cateName = "production_cost_unit"; - } else if (that.cate == "单位产品综合电耗（KW·h/t）") { + } else if (that.cate == "单位产品综合电耗（kW·h/t）") { that.cateName = "celec_consume_unit"; } else if (that.cate == "单位产品标煤耗（kgce/t）") { that.cateName = "coal_consume_unit"; } else if (that.cate == "单位产品综合能耗（kgce/t）") { that.cateName = "cen_consume_unit"; - } else if (that.cate == "发电功率（KW·h）") { + } else if (that.cate == "发电功率（kW·h）") { that.cateName = "production_hour"; - } else if (that.cate == "吨熟料发电量（KW·h/t）") { + } else if (that.cate == "吨熟料发电量（kW·h/t）") { that.cateName = "production_elec_unit"; - } else if (that.cate == "总电耗（KW·h）"||that.cate =="总电量（KW·h）") { + } else if (that.cate == "总电耗（kW·h）"||that.cate =="总电量（kW·h）") { that.cateName = "elec_consume"; }else if (that.cate == "消耗") { that.cateName = "amount_consume"; diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue index 253eafd7..4a2ddc3a 100644 --- a/src/views/bigScreen/index_enm.vue +++ b/src/views/bigScreen/index_enm.vue @@ -176,7 +176,7 @@ font-weight: 500; font-size: 12px; " - >kw.hkW·h @@ -200,7 +200,7 @@
-
能源消耗
+
本月能源消耗
@@ -215,7 +215,7 @@ 熟料综合电耗

{{ (Number(hotData.celec_consume_unit)+Number(dicData.b_sl_elec)).toFixed(2) }} - kw.h/t + kW·h/t

@@ -251,7 +251,7 @@ 水泥工序电耗

{{ (Number(hotData.sn_elec_consume_unit)+Number(dicData.b_sn_elec)).toFixed(2) }} - kw.h/t + kW·h/t

@@ -260,7 +260,7 @@ 水泥包装工序电耗

{{(Number(hotData.bz_elec_consume_unit) + Number(dicData.b_snbz_elec)).toFixed(2) }} - kw.h/t + kW·h/t

@@ -819,7 +819,7 @@ export default { option1.color = ['#FFFF00','#CC00FF', '#FFBF00'] option1.legend.data = [ { - name: "熟料", + name: "熟料(t)", textStyle: { color: "#fff", }, @@ -829,7 +829,7 @@ export default { }, }, { - name: "水泥", + name: "水泥(t)", textStyle: { color: "#fff", }, @@ -839,7 +839,7 @@ export default { }, }, { - name: "出厂水泥", + name: "出厂水泥(t)", textStyle: { color: "#fff", }, @@ -851,7 +851,7 @@ export default { ]; option1.series = [ { - name: "熟料", + name: "熟料(t)", type: "line", smooth: true, lineStyle: { @@ -868,7 +868,7 @@ export default { data: seriesData, }, { - name: "水泥", + name: "水泥(t)", type: "line", smooth: true, lineStyle: { @@ -885,7 +885,7 @@ export default { data: seriesData1, }, { - name: "出厂水泥", + name: "出厂水泥(t)", type: "line", smooth: true, lineStyle: { @@ -1048,7 +1048,7 @@ export default { option3.color = ['#FFBF00','#6495ED', '#CC00FF'] option3.legend.data = [ { - name: "生活水", + name: "生活水(t)", textStyle: { color: "#fff", }, @@ -1058,7 +1058,7 @@ export default { }, }, { - name: "绿化水", + name: "绿化水(t)", textStyle: { color: "#fff", }, @@ -1068,7 +1068,7 @@ export default { }, }, { - name: "工业水", + name: "工业水(t)", textStyle: { color: "#fff", }, @@ -1080,7 +1080,7 @@ export default { ]; option3.series = [ { - name: '生活水', + name: '生活水(t)', type: 'line', data: seriesData1, lineStyle: { @@ -1088,7 +1088,7 @@ export default { }, }, { - name: '绿化水', + name: '绿化水(t)', type: 'line', data: seriesData3, lineStyle: { @@ -1096,7 +1096,7 @@ export default { }, }, { - name: '工业水', + name: '工业水(t)', type: 'line', data: seriesData5, lineStyle: { @@ -1285,25 +1285,26 @@ export default { let myChart = echarts.init(chartDom); // 初始化各个series数据数组 - let seriesData = new Array(12).fill(0); - let seriesData1 = new Array(12).fill(0); + let seriesData = new Array(31).fill(0); + let seriesData1 = new Array(31).fill(0); // 定义查询参数的生成函数 function generateQuery(mgroupId) { return { page: 0, //获取当前年的第一个月 - start_time: that.currentYear + "-01-01 00:00:00", - end_time: that.currentYear + "-12-31 00:00:00", - type: "month_s", + year_s: that.currentYear, + month_s: that.currentMonth, + type: "day_s", mgroup: mgroupId, }; } function generateQueryMpoint(mpointId) { return { page: 0, - type: "month", - year: that.currentYear, + type: "day_s", + year_s: that.currentYear, + month_s: that.currentMonth, mpoint: mpointId, }; } @@ -1312,18 +1313,18 @@ export default { this.$API.enm.enstat.req(query1).then((response) => { response.forEach((item) => { if (item.qua_data.length > 0) { - let ind = item.month_s - 1; + let ind = item.day_s - 1; seriesData[ind] = item.total_production || 0; } }); - // 获取每个月的全厂电量 + // 获取每日的全厂电量 let query2 = generateQueryMpoint("3631880992400515072"); return this.$API.enm.mpointstat.list.req(query2); }).then((response) => { let maxId; response.forEach((item) => { - let ind = item.month - 1; - maxId = 12; + let ind = item.day_s - 1; + maxId = 31; seriesData1[ind] = item.val || 0; }); // 更新图表数据 @@ -1340,7 +1341,7 @@ export default { }, }, { - name: "全厂电量(kwh)", + name: "全厂电量(kW·h)", textStyle: { color: "#fff", }, @@ -1371,7 +1372,7 @@ export default { }, { - name: '全厂电量(kwh)', + name: '全厂电量(kW·h)', type: 'line', yAxisIndex: 1, data: seriesData1, @@ -1389,20 +1390,7 @@ export default { }, }, ]; - option5.xAxis.data = [ - "1月", - "2月", - "3月", - "4月", - "5月", - "6月", - "7月", - "8月", - "9月", - "10月", - "11月", - "12月", - ]; + // option5.xAxis.data = that.datelist; myChart.setOption(option5); // 设置更新后的图表 let index3 = 0; intervalId = setInterval(function () { @@ -1682,7 +1670,7 @@ export default { value: 100, }, { - label: "单位电耗(kwh)", + label: "单位电耗(kW·h)", field: "elec_consume_unit", value: 100, }, @@ -1926,7 +1914,7 @@ export default { if (value == "余热发电") { info.rows = [ { - label: "发电量(kwh)", + label: "发电量(kW·h)", field: "total_production", value: res[0].total_production, }, @@ -1936,7 +1924,7 @@ export default { value: res[0].run_rate, }, { - label: "发电量(kwh/t)", + label: "发电量(kW·h/t)", field: "production_elec_unit", value: res[0].production_elec_unit ? res[0].production_elec_unit @@ -1956,7 +1944,7 @@ export default { value: res[0].run_rate, }, { - label: "单位电耗(kwh)", + label: "单位电耗(kW·h)", field: "elec_consume_unit", value: res[0].elec_consume_unit, }, diff --git a/src/views/bigScreen/index_enm_ly.vue b/src/views/bigScreen/index_enm_ly.vue index 4f62013c..b0e7d760 100644 --- a/src/views/bigScreen/index_enm_ly.vue +++ b/src/views/bigScreen/index_enm_ly.vue @@ -170,7 +170,7 @@ font-weight: 500; font-size: 12px; " - >kwhkW·h @@ -237,7 +237,7 @@ 当月发电量

{{ hotData.total_production }} - kwh + kW·h

@@ -255,7 +255,7 @@ 发电量

{{ hotData.production_elec_unit }} - kwh + kW·h

@@ -274,7 +274,7 @@ 自用电量

{{ hotData.elec_consume }} - kwh + kW·h

@@ -1232,7 +1232,7 @@ export default { value: 100, }, { - label: "单位电耗(kwh)", + label: "单位电耗(kW·h)", field: "elec_consume_unit", value: 100, }, @@ -1475,7 +1475,7 @@ export default { if (value == "余热发电") { info.rows = [ { - label: "发电量(kwh)", + label: "发电量(kW·h)", field: "total_production", value: res[0].total_production, }, @@ -1485,7 +1485,7 @@ export default { value: res[0].run_rate, }, { - label: "发电量(kwh/t)", + label: "发电量(kW·h/t)", field: "production_elec_unit", value: res[0].production_elec_unit ? res[0].production_elec_unit @@ -1505,7 +1505,7 @@ export default { value: res[0].run_rate, }, { - label: "单位电耗(kwh)", + label: "单位电耗(kW·h)", field: "elec_consume_unit", value: res[0].elec_consume_unit, }, diff --git a/src/views/em/equipmentjl.vue b/src/views/em/equipmentjl.vue index b7cb118f..8faf6841 100644 --- a/src/views/em/equipmentjl.vue +++ b/src/views/em/equipmentjl.vue @@ -51,6 +51,8 @@ + + diff --git a/src/views/enm_base/mgroup.vue b/src/views/enm_base/mgroup.vue index 54637970..df17ccaa 100644 --- a/src/views/enm_base/mgroup.vue +++ b/src/views/enm_base/mgroup.vue @@ -41,6 +41,11 @@ prop="name" min-width="100" > +