From d4416d7c6e111073fa3f7f8c2f2cb6e1af686e21 Mon Sep 17 00:00:00 2001 From: TianyangZhang Date: Mon, 8 Dec 2025 10:03:26 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9tkx=20=E5=90=84?= =?UTF-8?q?=E4=B8=AA=E6=A8=A1=E5=9D=97=E7=9A=84=E7=8E=AF=E6=AF=94=E5=A2=9E?= =?UTF-8?q?=E9=95=BF=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enm_coal/teamAnalysis.vue | 19 +++++++- src/views/enm_coal/workshopAnalysis.vue | 21 ++++----- src/views/enm_energy/electric_peak.vue | 6 ++- src/views/enm_kiln/teamAnalysis.vue | 30 ++++++------ src/views/enm_kiln/workshopAnalysis.vue | 16 +++---- src/views/enm_mill/teamAnalysis.vue | 18 +++++++- src/views/enm_mill/workshopAnalysis.vue | 4 +- src/views/enm_pack/teamAnalysis.vue | 30 ++++++------ src/views/enm_pack/workshopAnalysis.vue | 4 +- src/views/enm_rm/teamAnalysis.vue | 19 +++++++- src/views/enm_rm/workshopAnalysis.vue | 30 +++++------- src/views/enm_rm_copy/teamAnalysis.vue | 20 +++++++- src/views/enm_rm_copy/workshopAnalysis.vue | 33 ++++++------- src/views/enm_slag/teamAnalysis.vue | 54 +++++++++++----------- src/views/enm_slag/workshopAnalysis.vue | 23 ++++----- 15 files changed, 187 insertions(+), 140 deletions(-) diff --git a/src/views/enm_coal/teamAnalysis.vue b/src/views/enm_coal/teamAnalysis.vue index 17314be0..66a3e16c 100644 --- a/src/views/enm_coal/teamAnalysis.vue +++ b/src/views/enm_coal/teamAnalysis.vue @@ -261,8 +261,23 @@ export default { }else{ arr[12] = "/"; //环比增长率（%）= 当期与环期差值（kW·h/t）/环期值（kW·h/t）*100% } - arr[13] = 0; //同比增长率（%） - // arr[15] = 0.0; //得分 + let lastYearArr = wrapArr0[n]; + let tongqiVal = null; + if (lastYearArr && lastYearArr.length > 0) { + lastYearArr.forEach((item0) => { + if (item0.team_name === item.team_name){ + tongqiVal = Number(item0.elec_consume_unit); + } + }); + } + arr[13] = '/'; //同比增长率（%） + if (tongqiVal !== null && tongqiVal !== 0){ + // 同比差（当期值 - 上年同期值） + let tongqicha = (item.elec_consume_unit - tongqiVal).toFixed(2); + // 同比增长率 = 同比差 / 上年同期值 × 100% + let tongBiRate = ((tongqicha / tongqiVal) * 100).toFixed(2); + arr[13] = tongBiRate; + } arr[14] = 0; if (month_obj[n]) { const monthData = month_obj[n]; diff --git a/src/views/enm_coal/workshopAnalysis.vue b/src/views/enm_coal/workshopAnalysis.vue index 621ced59..9b6cb32e 100644 --- a/src/views/enm_coal/workshopAnalysis.vue +++ b/src/views/enm_coal/workshopAnalysis.vue @@ -325,20 +325,15 @@ export default { } arrs[6] = lastRate; //同比增长率（%）需要当前值-上一年同一个月的值即wrapArr0[ind].elec_consume_unit - let sameRate = 0; - if ( - wrapArr0[index] && - wrapArr0[index].elec_consume_unit - ) { - sameRate = - ((arrs[1] - - wrapArr0[index].elec_consume_unit) / - wrapArr0[index].elec_consume_unit) * - 100; - } else { - sameRate = "/"; + let ind = index + 1; + let lastYearItem = wrapArr0[ind]; // 上一年同期值 + let tongqiVal = lastYearItem ? Number(lastYearItem.elec_consume_unit) : null; + arrs[7] = "/"; // 默认无值 + if (tongqiVal !== null && tongqiVal !== 0 && !isNaN(tongqiVal)) { + let tongqicha = (item[1] - tongqiVal).toFixed(2); + let tongBiRate = ((tongqicha / tongqiVal) * 100).toFixed(2); + arrs[7] = tongBiRate; // 同比增长率（%） } - arrs[7] = sameRate; arrs[8] = item[3]; arrs[9] = item[4]; wrapArrs.push(arrs); diff --git a/src/views/enm_energy/electric_peak.vue b/src/views/enm_energy/electric_peak.vue index c2f8b28b..e3bec4b0 100644 --- a/src/views/enm_energy/electric_peak.vue +++ b/src/views/enm_energy/electric_peak.vue @@ -78,6 +78,7 @@ type="primary" @click="exportExcel()" :loading="exportLoading" + v-auth="'export_excel'" >导出xlsx
0) { + lastYearArr.forEach((item0) => { + if (item0.team_name === item.team_name){ + tongqiVal = Number(item0.elec_consume_unit); + } + }); + } + arr[16] = '/'; //同比增长率（%） + if (tongqiVal !== null && tongqiVal !== 0){ + // 同比差（当期值 - 上年同期值） + let tongqicha = (item.elec_consume_unit - tongqiVal).toFixed(2); + // 同比增长率 = 同比差 / 上年同期值 × 100% + let tongBiRate = ((tongqicha / tongqiVal) * 100).toFixed(2); + arr[16] = tongBiRate; } - arr[16] = sameRate; ///同比增长率（%）需要当前值/ 上一年同一个月的值即wrapArr0[ind].elec_consume_unit - //电耗 //设备 arr[17] = item.高温风机_consume_unit != null diff --git a/src/views/enm_kiln/workshopAnalysis.vue b/src/views/enm_kiln/workshopAnalysis.vue index 8bf598ea..b950c7ef 100644 --- a/src/views/enm_kiln/workshopAnalysis.vue +++ b/src/views/enm_kiln/workshopAnalysis.vue @@ -655,10 +655,10 @@ export default { wrapArr0[index].elec_consume_unit ) { sameRate = - ((arrs[1] - + (((arrs[1] - wrapArr0[index].elec_consume_unit) / wrapArr0[index].elec_consume_unit) * - 100; + 100).toFixed(2); } else { sameRate = "/"; } @@ -718,10 +718,10 @@ export default { wrapArr0[index].celec_consume_unit ) { sameRate2 = - ((arrs[1] - + (((arrs[1] - wrapArr0[index].celec_consume_unit) / wrapArr0[index].celec_consume_unit) * - 100; + 100).toFixed(2); } else { sameRate2 = "/"; } @@ -781,10 +781,10 @@ export default { wrapArr0[index].coal_consume_unit ) { sameRate3 = - ((arrs[1] - + (((arrs[1] - wrapArr0[index].coal_consume_unit) / wrapArr0[index].coal_consume_unit) * - 100; + 100).toFixed(2); } else { sameRate3 = "/"; } @@ -844,10 +844,10 @@ export default { wrapArr0[index].cen_consume_unit ) { sameRate4 = - ((arrs[1] - + (((arrs[1] - wrapArr0[index].cen_consume_unit) / wrapArr0[index].cen_consume_unit) * - 100; + 100).toFixed(2); } else { sameRate4 = "/"; } diff --git a/src/views/enm_mill/teamAnalysis.vue b/src/views/enm_mill/teamAnalysis.vue index fe7ccd7c..e6c5cf01 100644 --- a/src/views/enm_mill/teamAnalysis.vue +++ b/src/views/enm_mill/teamAnalysis.vue @@ -277,7 +277,23 @@ export default { tongqi = 0; } - arr[17] = tongqi; //同比增长率（%）:本月-去年本月/去年 + let lastYearArr = wrapArr0[n]; + let tongqiVal = null; + if (lastYearArr && lastYearArr.length > 0) { + lastYearArr.forEach((item0) => { + if (item0.team_name === item.team_name){ + tongqiVal = Number(item0.elec_consume_unit); + } + }); + } + arr[17] = '/'; //同比增长率（%） + if (tongqiVal !== null && tongqiVal !== 0){ + // 同比差（当期值 - 上年同期值） + let tongqicha = (item.elec_consume_unit - tongqiVal).toFixed(2); + // 同比增长率 = 同比差 / 上年同期值 × 100% + let tongBiRate = ((tongqicha / tongqiVal) * 100).toFixed(2); + arr[17] = tongBiRate; + } // arr[18] = 0.0; //同比增长率（%） arr[18] = 0; if (month_obj[n]) { diff --git a/src/views/enm_mill/workshopAnalysis.vue b/src/views/enm_mill/workshopAnalysis.vue index 6a482b8a..7a87fbdc 100644 --- a/src/views/enm_mill/workshopAnalysis.vue +++ b/src/views/enm_mill/workshopAnalysis.vue @@ -405,10 +405,10 @@ export default { wrapArr0[index].elec_consume_unit ) { sameRate = - ((arrs[1] - + (((arrs[1] - wrapArr0[index].elec_consume_unit) / wrapArr0[index].elec_consume_unit) * - 100; + 100).toFixed(2); } else { sameRate = "/"; } diff --git a/src/views/enm_pack/teamAnalysis.vue b/src/views/enm_pack/teamAnalysis.vue index 72d48c73..fa28d432 100644 --- a/src/views/enm_pack/teamAnalysis.vue +++ b/src/views/enm_pack/teamAnalysis.vue @@ -117,7 +117,6 @@ export default { // self.data = res[1]; // console.log("目标数据", self.data); // } - console.log(res,'----------res'); self.getData(res[1]); }) .catch((error) => { @@ -222,20 +221,23 @@ export default { }else{ arr[8] = "/"; //环比增长率（%）= 当期与环期差值（kW·h/t）/环期值（kW·h/t）*100% } - let sameRate = 0; - if ( - wrapArr0[ind] && - wrapArr0[ind].elec_consume_unit - ) { - sameRate = - ((arr[3] - - wrapArr0[ind].elec_consume_unit) / - wrapArr0[ind].elec_consume_unit) * - 100; - } else { - sameRate = "/"; + let lastYearArr = wrapArr0[n]; + let tongqiVal = null; + if (lastYearArr && lastYearArr.length > 0) { + lastYearArr.forEach((item0) => { + if (item0.team_name === item.team_name){ + tongqiVal = Number(item0.elec_consume_unit); + } + }); + } + arr[9] = '/'; //同比增长率（%） + if (tongqiVal !== null && tongqiVal !== 0){ + // 同比差（当期值 - 上年同期值） + let tongqicha = (item.elec_consume_unit - tongqiVal).toFixed(2); + // 同比增长率 = 同比差 / 上年同期值 × 100% + let tongBiRate = ((tongqicha / tongqiVal) * 100).toFixed(2); + arr[9] = tongBiRate; } - arr[9] = sameRate; ///同比增长率（%）需要当前值/ 上一年同一个月的值即wrapArr0[ind].elec_consume_unit // arr[10] = item.celec_consume_unit; //同比增长率（%）需要当前值-上一年同一个月的值即wrapArr0[ind].elec_consume_unit if (month_obj[n]) { const monthData = month_obj[n]; diff --git a/src/views/enm_pack/workshopAnalysis.vue b/src/views/enm_pack/workshopAnalysis.vue index 253de634..88aedf42 100644 --- a/src/views/enm_pack/workshopAnalysis.vue +++ b/src/views/enm_pack/workshopAnalysis.vue @@ -301,10 +301,10 @@ export default { wrapArr0[index].elec_consume_unit ) { sameRate = - ((arrs[1] - + (((arrs[1] - wrapArr0[index].elec_consume_unit) / wrapArr0[index].elec_consume_unit) * - 100; + 100).toFixed(2); } else { sameRate = "/"; } diff --git a/src/views/enm_rm/teamAnalysis.vue b/src/views/enm_rm/teamAnalysis.vue index 4a2b18b3..e745e3db 100644 --- a/src/views/enm_rm/teamAnalysis.vue +++ b/src/views/enm_rm/teamAnalysis.vue @@ -269,7 +269,24 @@ export default { }else{ arr[14] = "/"; //环比增长率（%）= 当期与环期差值（kW·h/t）/环期值（kW·h/t）*100% } - arr[16] = item.celec_consume_unit; //同比增长率（%） + // arr[16] = item.celec_consume_unit; //同比增长率（%） + let lastYearArr = wrapArr0[n]; + let tongqiVal = null; + if (lastYearArr && lastYearArr.length > 0) { + lastYearArr.forEach((item0) => { + if (item0.team_name === item.team_name){ + tongqiVal = Number(item0.elec_consume_unit); + } + }); + } + arr[16] = '/'; //同比增长率（%） + if (tongqiVal !== null && tongqiVal !== 0){ + // 同比差（当期值 - 上年同期值） + let tongqicha = (item.elec_consume_unit - tongqiVal).toFixed(2); + // 同比增长率 = 同比差 / 上年同期值 × 100% + let tongBiRate = ((tongqicha / tongqiVal) * 100).toFixed(2); + arr[16] = tongBiRate; + } arr[17] = 0; if (month_obj[n]) { diff --git a/src/views/enm_rm/workshopAnalysis.vue b/src/views/enm_rm/workshopAnalysis.vue index aa327496..3a9c78fd 100644 --- a/src/views/enm_rm/workshopAnalysis.vue +++ b/src/views/enm_rm/workshopAnalysis.vue @@ -138,7 +138,6 @@ export default { that.$API.mtm.mgroup.list .req({ page: 0, name: "原料磨" }) .then((res) => { - console.log("原料磨", res); that.query.mgroup = res[0].id; //月目标 that.getMonthGoal(); @@ -171,7 +170,6 @@ export default { paramsGoal.page = 0; paramsGoal.year = that.query.year_s; paramsGoal.mgroup = that.query.mgroup; - console.log("paramsGoal", paramsGoal); that.$API.mtm.goal.list.req(paramsGoal).then((ress) => { if (ress.length > 0) { let monthGoal = []; @@ -238,7 +236,7 @@ export default { ? monthGoal[ind] : "/"; arr[3] = item.note; - arr[4] = item.id; + arr[4] = item.id; wrapArr.push(arr); }); wrapArr.forEach((item, index) => { @@ -295,28 +293,22 @@ export default { lastRate = "/"; } arrs[6] = lastRate; - //同比增长率（%）需要当前值-上一年同一个月的值即wrapArr0[ind].elec_consume_unit - let sameRate = 0; - if ( - wrapArr0[index] && - wrapArr0[index].elec_consume_unit - ) { - sameRate = - (((arrs[1] - - wrapArr0[index].elec_consume_unit) / - wrapArr0[index].elec_consume_unit) * - 100).toFixed(2); - } else { - sameRate = "/"; + let ind = index + 1; + let lastYearItem = wrapArr0[ind]; // 上一年同期值 + let tongqiVal = lastYearItem ? Number(lastYearItem.elec_consume_unit) : null; + arrs[7] = "/"; // 默认无值 + if (tongqiVal !== null && tongqiVal !== 0 && !isNaN(tongqiVal)) { + let tongqicha = (item[1] - tongqiVal).toFixed(2); + let tongBiRate = ((tongqicha / tongqiVal) * 100).toFixed(2); + arrs[7] = tongBiRate; // 同比增长率（%） } - arrs[7] = sameRate; arrs[8] = item[3]; arrs[9] = item[4]; wrapArrs.push(arrs); }); + that.tableDatas = wrapArrs; - } else { - } + } else {} }); }); }, diff --git a/src/views/enm_rm_copy/teamAnalysis.vue b/src/views/enm_rm_copy/teamAnalysis.vue index 166695eb..299cadfc 100644 --- a/src/views/enm_rm_copy/teamAnalysis.vue +++ b/src/views/enm_rm_copy/teamAnalysis.vue @@ -273,8 +273,24 @@ export default { }else{ arr[15] = "/"; //环比增长率（%）= 当期与环期差值（kW·h/t）/环期值（kW·h/t）*100% } - arr[16] = item.celec_consume_unit; //同比增长率（%） - + // arr[16] = item.celec_consume_unit; //同比增长率（%） + let lastYearArr = wrapArr0[n]; + let tongqiVal = null; + if (lastYearArr && lastYearArr.length > 0) { + lastYearArr.forEach((item0) => { + if (item0.team_name === item.team_name){ + tongqiVal = Number(item0.elec_consume_unit); + } + }); + } + arr[16] = '/'; //同比增长率（%） + if (tongqiVal !== null && tongqiVal !== 0){ + // 同比差（当期值 - 上年同期值） + let tongqicha = (item.elec_consume_unit - tongqiVal).toFixed(2); + // 同比增长率 = 同比差 / 上年同期值 × 100% + let tongBiRate = ((tongqicha / tongqiVal) * 100).toFixed(2); + arr[16] = tongBiRate; + } arr[17] = 0; if (month_obj[n]) { const monthData = month_obj[n]; diff --git a/src/views/enm_rm_copy/workshopAnalysis.vue b/src/views/enm_rm_copy/workshopAnalysis.vue index 250120ec..6d9d5f40 100644 --- a/src/views/enm_rm_copy/workshopAnalysis.vue +++ b/src/views/enm_rm_copy/workshopAnalysis.vue @@ -140,7 +140,6 @@ export default { that.query.mgroup = res[0].id; //月目标 that.getMonthGoal(); - that.getData(); }); }, methods: { @@ -166,11 +165,12 @@ export default { let that = this; let paramsGoal = {}; paramsGoal.page = 0; + let monthGoal = []; paramsGoal.mgroup = that.query.mgroup; paramsGoal.year = that.query.year_s; that.$API.mtm.goal.list.req(paramsGoal).then((ress) => { if (ress.length > 0) { - let monthGoal = []; + ress.forEach((goal) => { if ( goal.goal_cate_name == "单位产品分布电耗（kW·h/t）" @@ -189,9 +189,9 @@ export default { monthGoal[11] = goal.goal_val_11; monthGoal[12] = goal.goal_val_12; } - this.getData(monthGoal); }); } + that.getData(monthGoal); }); }, getData(monthGoal) { @@ -199,7 +199,7 @@ export default { let query0 = {}; query0.page = 0; query0.type = "month_s"; - query0.year = that.query.year_s - 1; + query0.year_s = that.query.year_s - 1; query0.mgroup = that.query.mgroup; let wrapArr = [], wrapArr0 = [], @@ -228,8 +228,7 @@ export default { let time = "" + item.year_s + "." + item.month_s; arr.push(time); arr.push(item.elec_consume_unit); //当期值（kW·h/t） - arr[2] = - monthGoal[ind] !== undefined + arr[2] = monthGoal[ind] !== undefined ? monthGoal[ind] : "/"; arr[3] = item.note; @@ -290,21 +289,15 @@ export default { lastRate = "/"; } arrs[6] = lastRate; - //同比增长率（%）需要当前值-上一年同一个月的值即wrapArr0[ind].elec_consume_unit - let sameRate = 0; - if ( - wrapArr0[index] && - wrapArr0[index].elec_consume_unit - ) { - sameRate = - (((arrs[1] - - wrapArr0[index].elec_consume_unit) / - wrapArr0[index].elec_consume_unit) * - 100).toFixed(2); - } else { - sameRate = "/"; + let ind = index + 1; + let lastYearItem = wrapArr0[ind]; // 上一年同期值 + let tongqiVal = lastYearItem ? Number(lastYearItem.elec_consume_unit) : null; + arrs[7] = "/"; // 默认无值 + if (tongqiVal !== null && tongqiVal !== 0 && !isNaN(tongqiVal)) { + let tongqicha = (item[1] - tongqiVal).toFixed(2); + let tongBiRate = ((tongqicha / tongqiVal) * 100).toFixed(2); + arrs[7] = tongBiRate; // 同比增长率（%） } - arrs[7] = sameRate; arrs[8] = item[3]; arrs[9] = item[4]; wrapArrs.push(arrs); diff --git a/src/views/enm_slag/teamAnalysis.vue b/src/views/enm_slag/teamAnalysis.vue index 1ca30413..5e02ba99 100644 --- a/src/views/enm_slag/teamAnalysis.vue +++ b/src/views/enm_slag/teamAnalysis.vue @@ -98,7 +98,6 @@ export default { this.timeStamp = myDate.getTime(); that.query.year_s = year; this.$API.mtm.mgroup.list.req({ page: 0, search: "电石渣" }).then((res) => { - console.log("工段数据：", res); that.query.mgroup = res[0].id; that.getGoalData(); }); @@ -114,7 +113,6 @@ export default { if (res.length > 0) { res.forEach((item) => { if (item.goal_cate_name == "单位产品分布电耗（kW·h/t）") { - console.log("目标数据：", item); self.getData(item); } }) @@ -137,11 +135,11 @@ export default { this.$API.enm.enstat.req(query0).then((res0) => { if (res0.length > 0) { res0.forEach((item0) => { - //先按月份排序，再按班组排序 + //先按月份排序，再按班组排序,取上一年的值为了计算同比增长率 let month = item0.month_s; if (!wrapArr0[month]) { wrapArr0[month] = []; - } + } wrapArr0[month].push(item0); }); } else { console.log('No data received.');} @@ -183,27 +181,24 @@ export default { 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; + huanqi = 0; if (n == 1) { ind_pre = 12; if (wrapArr0[ind_pre]) { - wrapArr0[ind_pre].forEach((item0) => { - if (item0.team_name == item.team_name) { - huanqi = item0.elec_consume_unit; - } - }); - } - + wrapArr0[ind_pre].forEach((item0) => { + if (item0.team_name == item.team_name) { + huanqi = item0.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] = Number(huanqi); //环期值（KW·h/t）上个月的值 if (arr[6] !== "/"){ arr[8] = (Number(arr[4]) - arr[7]).toFixed(2); //当期与环期差值（KW·h/t） @@ -217,16 +212,23 @@ export default { 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; + let lastYearArr = wrapArr0[n]; + let tongqiVal = null; + if (lastYearArr && lastYearArr.length > 0) { + lastYearArr.forEach((item0) => { + if (item0.team_name === item.team_name){ + tongqiVal = Number(item0.elec_consume_unit); + } + }); + } + arr[10] = '/'; //同比增长率（%） + if (tongqiVal !== null && tongqiVal !== 0){ + // 同比差（当期值 - 上年同期值） + let tongqicha = (item.elec_consume_unit - tongqiVal).toFixed(2); + // 同比增长率 = 同比差 / 上年同期值 × 100% + let tongBiRate = ((tongqicha / tongqiVal) * 100).toFixed(2); + arr[10] = tongBiRate; } - 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]; diff --git a/src/views/enm_slag/workshopAnalysis.vue b/src/views/enm_slag/workshopAnalysis.vue index c8f0413b..3faaeae4 100644 --- a/src/views/enm_slag/workshopAnalysis.vue +++ b/src/views/enm_slag/workshopAnalysis.vue @@ -237,7 +237,7 @@ export default { : "/"; arr[3] = item.note; arr[4] = item.id; - wrapArr[ind] = arr; + wrapArr.push(arr); }); wrapArr.forEach((item, index) => { let arrs = []; @@ -293,20 +293,15 @@ export default { } arrs[6] = lastRate; //同比增长率（%）需要当前值-上一年同一个月的值即wrapArr0[ind].elec_consume_unit - let sameRate = 0; - if ( - wrapArr0[index] && - wrapArr0[index].elec_consume_unit - ) { - sameRate = - ((arrs[1] - - wrapArr0[index].elec_consume_unit) / - wrapArr0[index].elec_consume_unit) * - 100; - } else { - sameRate = "/"; + let ind = index + 1; + let lastYearItem = wrapArr0[ind]; // 上一年同期值 + let tongqiVal = lastYearItem ? Number(lastYearItem.elec_consume_unit) : null; + arrs[7] = "/"; // 默认无值 + if (tongqiVal !== null && tongqiVal !== 0 && !isNaN(tongqiVal)) { + let tongqicha = (item[1] - tongqiVal).toFixed(2); + let tongBiRate = ((tongqicha / tongqiVal) * 100).toFixed(2); + arrs[7] = tongBiRate; // 同比增长率（%） } - arrs[7] = sameRate; arrs[8] = item[3]; arrs[9] = item[4]; wrapArrs.push(arrs); From a6ac97a906406959615b8527cd065fe4148d4d25 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 8 Dec 2025 14:15:16 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=E5=B7=A5=E5=BA=8F=E5=B8=A6=E6=9D=BF?= =?UTF-8?q?=E6=AE=B5=E5=8F=B7=E6=89=93=E5=8D=B0=E6=A8=A1=E6=9D=BF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=88=87=E7=89=87=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/inmIn.vue | 6 ++++-- src/views/wpm_bx/inmOut.vue | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue index 63331af3..7df7f0d0 100644 --- a/src/views/wpm_bx/inmIn.vue +++ b/src/views/wpm_bx/inmIn.vue @@ -557,9 +557,10 @@ export default { params.tid = row.id; let materialname = row.material_.name + '|' + row.material_.process_name; let specification = row.material_.specification; - if(that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'){ + if(that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'||that.route_code=='tuomoceliang'){ params.label_template_name = '工序带板段号打印模板'; that.wprParams.wm = row.id; + let totalcount = 0; let numbers = ['','','','','','','']; this.$API.wpm.wpr.list.req(that.wprParams).then((res) => { let leng = res.length; @@ -571,6 +572,7 @@ export default { } } if(leng>0){ + totalcount = leng*slice_count; let nums = leng/3; for(let i=0;i { let obj = {}; obj.printer_commands = res.commands; diff --git a/src/views/wpm_bx/inmOut.vue b/src/views/wpm_bx/inmOut.vue index 6d75e000..1da2472c 100644 --- a/src/views/wpm_bx/inmOut.vue +++ b/src/views/wpm_bx/inmOut.vue @@ -586,10 +586,11 @@ export default { params.tid = row.id; let materialname = row.material_.name + '|' + row.material_.process_name; let specification = row.material_.specification; - if(that.route_code=='tuomoceliang'||that.route_code=='reyatuihuo'){ + if(that.route_code=='tuomoceliang'||that.route_code=='reyatuihuo'||that.route_code=='tuomoceliang'){ console.log('route_code',that.route_code); params.label_template_name = '工序带板段号打印模板'; that.wprParams.wm = row.id; + let totalcount = 0; let numbers = ['','','','','','','']; this.$API.wpm.wpr.list.req(that.wprParams).then((res) => { let leng = res.length; @@ -601,6 +602,7 @@ export default { } } if(leng>0){ + totalcount = leng*slice_count; let nums = leng/3; for(let i=0;i { let obj = {}; obj.printer_commands = res.commands; From 8142fbf43a84bb227f0060a50857108fd8aeafc3 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 8 Dec 2025 14:15:52 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=E6=9C=AA=E5=AE=9A=E4=B9=89=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/mioitem_form.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/inm/mioitem_form.vue b/src/views/inm/mioitem_form.vue index 73f4385e..26582ebb 100644 --- a/src/views/inm/mioitem_form.vue +++ b/src/views/inm/mioitem_form.vue @@ -284,6 +284,7 @@ export default { type: "do_in", loading: false, mode: "add", + query: {}, titleMap: { do_out: "生产领料", sale_out: "销售发货", From c59c15167df5768baef58898339a42a90eb524b0 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 8 Dec 2025 14:16:18 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8E=9F=E6=96=99=E5=BA=9F=E5=93=81?= =?UTF-8?q?=E5=BA=93=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/inmScrap.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/inm/inmScrap.vue b/src/views/inm/inmScrap.vue index 1c14032d..3faff3aa 100644 --- a/src/views/inm/inmScrap.vue +++ b/src/views/inm/inmScrap.vue @@ -110,7 +110,7 @@ export default { wmState, apiObj: null, params: { - state : 50, + state : 10, state_all: 1 }, dialog: { @@ -128,7 +128,7 @@ export default { let that = this; that.route_code = that.$route.path.split("/")[2]; if(that.route_code=='scrap'){ - that.params.material__type__in = 30; + that.params.material__type = 30; } that.apiObj = that.$API.wpm.wmaterial.list; that.$API.mtm.mgroup.list.req({ page: 0}).then((res) => { From 46acc0af45646e3df7e9907b6466f483106467a7 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 8 Dec 2025 17:06:03 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=E6=9B=B4=E6=96=B0Cesium.Ion.defaultAcc?= =?UTF-8?q?essToken?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/cesiumtest.vue | 4 ++-- src/views/bigScreen/cesiumtest_ly.vue | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/bigScreen/cesiumtest.vue b/src/views/bigScreen/cesiumtest.vue index a0318585..cd56da67 100644 --- a/src/views/bigScreen/cesiumtest.vue +++ b/src/views/bigScreen/cesiumtest.vue @@ -278,8 +278,8 @@ const loadCesium = async () => { if (Cesium) return; await import("cesium/Build/Cesium/Widgets/widgets.css"); Cesium = await import('cesium'); - Cesium.Ion.defaultAccessToken = - "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI1Yzg3ZDEzOS0zN2Q1LTQ2N2YtOWJhMy1mNWU4MWY5N2ExYzkiLCJpZCI6MjAxMzIsInNjb3BlcyI6WyJhc3IiLCJnYyJdLCJpYXQiOjE1NzY4MTIzNzR9.SfNeHedDyXWLIPiNbc4qSsHBACm7uvaqRsQprL2J4Cw"; + Cesium.Ion.defaultAccessToken ="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJmMmNmMzhhOS0yMzI2LTQ4M2UtYjg2ZS0zZTM0ZWFlZDQ4MWQiLCJpZCI6MjAxODA0LCJpYXQiOjE3NjUxODMyNzR9.lJJBP_YxrRN8CngWtPQLnNhfk0NQGuBfxRsMW1mtAyk"; + // "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI1Yzg3ZDEzOS0zN2Q1LTQ2N2YtOWJhMy1mNWU4MWY5N2ExYzkiLCJpZCI6MjAxMzIsInNjb3BlcyI6WyJhc3IiLCJnYyJdLCJpYXQiOjE1NzY4MTIzNzR9.SfNeHedDyXWLIPiNbc4qSsHBACm7uvaqRsQprL2J4Cw"; } export default { name: "cesium", diff --git a/src/views/bigScreen/cesiumtest_ly.vue b/src/views/bigScreen/cesiumtest_ly.vue index 00b66d2c..187d6dbd 100644 --- a/src/views/bigScreen/cesiumtest_ly.vue +++ b/src/views/bigScreen/cesiumtest_ly.vue @@ -433,9 +433,9 @@ export default { }, mounted() { let that = this; - Cesium.Ion.defaultAccessToken = - "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI1Yzg3ZDEzOS0zN2Q1LTQ2N2YtOWJhMy1mNWU4MWY5N2ExYzkiLCJpZCI6MjAxMzIsInNjb3BlcyI6WyJhc3IiLCJnYyJdLCJpYXQiOjE1NzY4MTIzNzR9.SfNeHedDyXWLIPiNbc4qSsHBACm7uvaqRsQprL2J4Cw"; - + Cesium.Ion.defaultAccessToken ="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJmMmNmMzhhOS0yMzI2LTQ4M2UtYjg2ZS0zZTM0ZWFlZDQ4MWQiLCJpZCI6MjAxODA0LCJpYXQiOjE3NjUxODMyNzR9.lJJBP_YxrRN8CngWtPQLnNhfk0NQGuBfxRsMW1mtAyk"; + // "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI1Yzg3ZDEzOS0zN2Q1LTQ2N2YtOWJhMy1mNWU4MWY5N2ExYzkiLCJpZCI6MjAxMzIsInNjb3BlcyI6WyJhc3IiLCJnYyJdLCJpYXQiOjE1NzY4MTIzNzR9.SfNeHedDyXWLIPiNbc4qSsHBACm7uvaqRsQprL2J4Cw"; + const viewer = new Cesium.Viewer("cesiumContainer", { animation: false, //动画小部件 baseLayerPicker: false, //地图图层组件