diff --git a/src/components/scEnm/lineChartsdialog.vue b/src/components/scEnm/lineChartsdialog.vue index d3ba9b8c..f83a5da2 100644 --- a/src/components/scEnm/lineChartsdialog.vue +++ b/src/components/scEnm/lineChartsdialog.vue @@ -417,8 +417,8 @@ export default { }); let chartDom = document.getElementById("myChart"); that.myChart = echarts.init(chartDom); - that.option.xAxis.data = xAxisData; - that.option.series[0].data = lineData; + that.option.xAxis.data = xAxisData.reverse(); + that.option.series[0].data = lineData.reverse(); that.myChart.setOption(that.option); }); }, diff --git a/src/config/route.js b/src/config/route.js index 227a2284..bcfdfb8b 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -1869,15 +1869,6 @@ const routes = [ }, component: "inm/mioitem", }, - { - name: "workshop_mio", - path: "/inm/workshop_mio", - meta: { - title: "车间出入库记录", - // hidden: true, - }, - component: "inm/workshop_mio", - }, ], }, diff --git a/src/views/enm_coal/handoverLog.vue b/src/views/enm_coal/handoverLog.vue index bf7527ae..ce6d4a53 100644 --- a/src/views/enm_coal/handoverLog.vue +++ b/src/views/enm_coal/handoverLog.vue @@ -216,17 +216,17 @@ 煤粉细度合格率（%） - {{ reportItem.煤粉_细度_rate_pass * 100 }} + {{ reportItem.出磨煤粉_细度_rate_pass * 100 }} 0 煤粉水分合格率（%） - {{ reportItem.煤粉_水分_rate_pass * 100 }} + {{ reportItem.出磨煤粉_水分_rate_pass * 100 }} 0 diff --git a/src/views/enm_cogeneration/workshopAnalysis.vue b/src/views/enm_cogeneration/workshopAnalysis.vue index c2445aab..72f79574 100644 --- a/src/views/enm_cogeneration/workshopAnalysis.vue +++ b/src/views/enm_cogeneration/workshopAnalysis.vue @@ -95,7 +95,7 @@ width="1075" cellspacing="0" :key="2" - id="myTable1" + id="myTable" class="myTable" v-else-if="query.type == 2" > @@ -145,7 +145,7 @@ width="1075" cellspacing="0" :key="3" - id="myTable1" + id="myTable" class="myTable" v-else-if="query.type == 3" > @@ -195,7 +195,7 @@ width="1075" cellspacing="0" :key="4" - id="myTable1" + id="myTable" class="myTable" v-else-if="query.type == 4" > diff --git a/src/views/enm_energy/day_base.vue b/src/views/enm_energy/day_base.vue index 0c320037..7196654d 100644 --- a/src/views/enm_energy/day_base.vue +++ b/src/views/enm_energy/day_base.vue @@ -172,7 +172,7 @@ - +

{{ tableName }}

- +
diff --git a/src/views/enm_energy/hour_base.vue b/src/views/enm_energy/hour_base.vue index 984744d9..f299cdb8 100644 --- a/src/views/enm_energy/hour_base.vue +++ b/src/views/enm_energy/hour_base.vue @@ -162,7 +162,7 @@ - + - + 0) { res.forEach((item) => { let ind = item.month_s - 1; - wrapArr[ind] = item; + wrapArr[ind] = item; //上年 }); } else { + wrapArr = []; } let obj2 = {}; obj2.year_s = this.year_s; @@ -93,7 +94,7 @@ export default { if (res2.length > 0) { res2.forEach((item2) => { let ind2 = item2.month_s - 1; - wrapArr2[ind2] = item2; + wrapArr2[ind2] = item2; //本年 }); } else { } @@ -141,8 +142,8 @@ export default { } else { hPercent3 = "/"; } - this.tableDatas[i][4] = hPercent3; //环比 - this.tableDatas[i][5] = tPercent3; //同比 + this.tableDatas[i][4] = tPercent3; //环比 + this.tableDatas[i][5] = hPercent3; //同比 this.tableDatas[i][6] = wrapArr2[i].en_consume_unit; //总产值当前 let tValue6 = 0, hValue6 = 0, @@ -156,8 +157,8 @@ export default { tValue6 = wrapArr[12] ? wrapArr[12].en_consume_unit : "/"; - } - if (tValue6 !== "/" && tValue6 !== 0) { + } + if (tValue6 !== "/" && tValue6 !== 0 && wrapArr2[i].en_consume_unit !== 0) { tPercent6 = ((wrapArr2[i].en_consume_unit - tValue6) / tValue6) * @@ -165,6 +166,9 @@ export default { } else { tPercent6 = "/"; } + if (isNaN(tPercent6)){ + tPercent6 = 0 + } hValue6 = wrapArr[i] ? wrapArr[i].en_consume_unit : "/"; @@ -176,8 +180,11 @@ export default { } else { hPercent6 = "/"; } - this.tableDatas[i][7] = hPercent6; //总产值环比 - this.tableDatas[i][8] = tPercent6; //总产值同比 + if(isNaN(hPercent6)){ + hPercent6 = 0 + } + this.tableDatas[i][7] = tPercent6; //总产值环比 + this.tableDatas[i][8] = hPercent6; //总产值同比 this.tableDatas[i][9] = wrapArr2[i].en_add_consume_unit; let tValue9 = 0, @@ -192,7 +199,7 @@ export default { tValue9 = wrapArr[12] ? wrapArr[12].en_add_consume_unit : "/"; - } + }; if (tValue9 !== "/" && tValue9 !== 0) { tPercent9 = ((wrapArr2[i].en_add_consume_unit - @@ -201,7 +208,10 @@ export default { 100; } else { tPercent9 = "/"; - } + }; + if (isNaN(tPercent9)) { + tPercent9=0 + }; hValue9 = wrapArr[i] ? wrapArr[i].en_add_consume_unit : "/"; @@ -213,9 +223,9 @@ export default { 100; } else { hPercent9 = "/"; - } - this.tableDatas[i][10] = hPercent9; - this.tableDatas[i][11] = tPercent9; + }; + this.tableDatas[i][10] = tPercent9; + this.tableDatas[i][11] = hPercent9; } else { } } diff --git a/src/views/enm_kiln/handoverLog.vue b/src/views/enm_kiln/handoverLog.vue index d01bb63e..5ad37a08 100644 --- a/src/views/enm_kiln/handoverLog.vue +++ b/src/views/enm_kiln/handoverLog.vue @@ -232,9 +232,9 @@ diff --git a/src/views/enm_kiln/workshopAnalysis.vue b/src/views/enm_kiln/workshopAnalysis.vue index c13f34af..629e59ef 100644 --- a/src/views/enm_kiln/workshopAnalysis.vue +++ b/src/views/enm_kiln/workshopAnalysis.vue @@ -95,7 +95,7 @@ width="1075" cellspacing="0" :key="2" - id="myTable1" + id="myTable" class="myTable" v-else-if="query.type == 2" > @@ -145,7 +145,7 @@ width="1075" cellspacing="0" :key="3" - id="myTable1" + id="myTable" class="myTable" v-else-if="query.type == 3" > @@ -195,7 +195,7 @@ width="1075" cellspacing="0" :key="4" - id="myTable1" + id="myTable" class="myTable" v-else-if="query.type == 4" > diff --git a/src/views/enm_kilnbase/workshopAnalysis.vue b/src/views/enm_kilnbase/workshopAnalysis.vue index 865640f3..1c6ea3d7 100644 --- a/src/views/enm_kilnbase/workshopAnalysis.vue +++ b/src/views/enm_kilnbase/workshopAnalysis.vue @@ -95,7 +95,7 @@ width="1075" cellspacing="0" :key="2" - id="myTable1" + id="myTable" class="myTable" v-else-if="query.type == 2" > @@ -145,7 +145,7 @@ width="1075" cellspacing="0" :key="3" - id="myTable1" + id="myTable" class="myTable" v-else-if="query.type == 3" > @@ -195,7 +195,7 @@ width="1075" cellspacing="0" :key="4" - id="myTable1" + id="myTable" class="myTable" v-else-if="query.type == 4" > diff --git a/src/views/enm_mill/workshopAnalysis.vue b/src/views/enm_mill/workshopAnalysis.vue index 695e0197..2f558964 100644 --- a/src/views/enm_mill/workshopAnalysis.vue +++ b/src/views/enm_mill/workshopAnalysis.vue @@ -95,7 +95,7 @@ width="1075" cellspacing="0" :key="1" - id="myTable1" + id="myTable" class="myTable" v-else > diff --git a/src/views/enm_report/exception.vue b/src/views/enm_report/exception.vue index 396c1351..20fb9c94 100644 --- a/src/views/enm_report/exception.vue +++ b/src/views/enm_report/exception.vue @@ -1,4 +1,4 @@ - + diff --git a/src/views/enm_report/quality.vue b/src/views/enm_report/quality.vue index 3cfa68fb..a8062ee3 100644 --- a/src/views/enm_report/quality.vue +++ b/src/views/enm_report/quality.vue @@ -69,7 +69,7 @@
-
日期 熟料f-CaO合格率（%） - {{reportItem.出窑熟料_f-CaO_rate_pass*100}} + {{reportItem.出窑熟料_fCaO_rate_pass*100}} 0
+
@@ -163,6 +163,7 @@ if(days<10){ days = '0'+days; } + this.query.month = myDate.getFullYear()+'-'+month this.query.day = myDate.getFullYear()+'-'+month+'-'+days; this.getGroup(); }, diff --git a/src/views/enm_report/reportDay.vue b/src/views/enm_report/reportDay.vue index 47976517..dec49c2c 100644 --- a/src/views/enm_report/reportDay.vue +++ b/src/views/enm_report/reportDay.vue @@ -230,10 +230,10 @@ that.tableDatas[32][3] = dataList.电石渣.elec_consume; that.tableDatas[33][3] = dataList.原料磨.elec_consume; that.tableDatas[34][3] = dataList.回转窑.elec_consume; - that.tableDatas[35][3] = dataList.煤磨.elec_consume; - that.tableDatas[36][3] = dataList.水泥磨.elec_consume; - that.tableDatas[37][3] = dataList.水泥包装.elec_consume; - // that.tableDatas[39][3] = dataList.生活区.elec_consume; + // that.tableDatas[35][3] = dataList.煤磨.elec_consume; + that.tableDatas[35][3] = dataList.水泥磨.elec_consume; + that.tableDatas[36][3] = dataList.水泥包装.elec_consume; + that.tableDatas[37][3] = dataList.生活区.elec_consume; }).then(res=>{ //获取月和年目标 let params1 = {}; diff --git a/src/views/enm_report/reportMonth.vue b/src/views/enm_report/reportMonth.vue index 9dcad74c..37112060 100644 --- a/src/views/enm_report/reportMonth.vue +++ b/src/views/enm_report/reportMonth.vue @@ -75,30 +75,30 @@ [4,'主机设备台产','回转窑台产（t/h）'], [5,'主机设备台产','水泥磨台产（t/h）'], - [6,'能耗','熟料日综合电耗（kw.h/t）'], - [7,'能耗','熟料日单位标煤耗(kgce/t)'], - [8,'能耗','熟料日综合能耗(kgce/t)'], - [9,'能耗','水泥日综合能耗(kgce/t)'], - [10,'能耗','日电石渣分布电耗（kw.h/t）'], - [11,'能耗','日生料分布电耗（kw.h/t）'], - [12,'能耗','日熟料分布电耗（kw.h/t）'], - [13,'能耗','日水泥粉磨分布电耗（kw.h/t）'], - [14,'能耗','日水泥包装分布电耗（kw.h/t）'], + [6,'能耗','熟料月综合电耗（kw.h/t）'], + [7,'能耗','熟料月单位标煤耗(kgce/t)'], + [8,'能耗','熟料月综合能耗(kgce/t)'], + [9,'能耗','水泥月综合能耗(kgce/t)'], + [10,'能耗','月电石渣分布电耗（kw.h/t）'], + [11,'能耗','月生料分布电耗（kw.h/t）'], + [12,'能耗','月熟料分布电耗（kw.h/t）'], + [13,'能耗','月水泥粉磨分布电耗（kw.h/t）'], + [14,'能耗','月水泥包装分布电耗（kw.h/t）'], - [15,'产量','日电石渣产量(t)'], + [15,'产量','月电石渣产量(t)'], [16,'产量','月电石渣产量完成率(%)'], - [17,'产量','日生料产量(t)'], + [17,'产量','月生料产量(t)'], [18,'产量','月生料产量完成率(%)'], - [19,'产量','日熟料产量(t)'], + [19,'产量','月熟料产量(t)'], [20,'产量','月熟料产量完成率(%)'], - [21,'产量','日水泥产量(t)'], + [21,'产量','月水泥产量(t)'], [22,'产量','月水泥产量完成率(%)'], - [23,'产量','日熟料出厂量(t)'], + [23,'产量','月熟料出厂量(t)'], [24,'产量','月熟料累计出厂量(t)'], - [25,'产量','日散装水泥出厂量(t)'], + [25,'产量','月散装水泥出厂量(t)'], [26,'产量','月散装水泥出厂量(t)'], - [27,'产量','日袋装水泥出厂量(t)'], + [27,'产量','月袋装水泥出厂量(t)'], [28,'产量','月袋装水泥出厂量(t)'], @@ -346,9 +346,9 @@ that.tableDatas[33][4] = this.canCompute(that.nowData[33],dataList.电石渣.elec_consume); that.tableDatas[34][4] = this.canCompute(that.nowData[34],dataList.原料磨.elec_consume); that.tableDatas[35][4] = this.canCompute(that.nowData[35],dataList.回转窑.elec_consume); - that.tableDatas[36][4] = this.canCompute(that.nowData[36],dataList.煤磨.elec_consume); - that.tableDatas[37][4] = this.canCompute(that.nowData[37],dataList.水泥磨.elec_consume); - that.tableDatas[38][4] = this.canCompute(that.nowData[38],dataList.水泥包装.elec_consume); + that.tableDatas[36][4] = this.canCompute(that.nowData[36],dataList.水泥磨.elec_consume); + that.tableDatas[37][4] = this.canCompute(that.nowData[37],dataList.水泥包装.elec_consume); + that.tableDatas[38][4] = this.canCompute(that.nowData[38],dataList.生活区.elec_consume); // that.tableDatas[39][3] = dataList.生活区.elec_consume; }).then(res=>{ //获取月和年目标 @@ -440,9 +440,9 @@ that.tableDatas[33][5] = this.canCompute(that.nowData[33],dataList.电石渣.elec_consume); that.tableDatas[34][5] = this.canCompute(that.nowData[34],dataList.原料磨.elec_consume); that.tableDatas[35][5] = this.canCompute(that.nowData[35],dataList.回转窑.elec_consume); - that.tableDatas[36][5] = this.canCompute(that.nowData[36],dataList.煤磨.elec_consume); - that.tableDatas[37][5] = this.canCompute(that.nowData[37],dataList.水泥磨.elec_consume); - that.tableDatas[38][5] = this.canCompute(that.nowData[38],dataList.水泥包装.elec_consume); + that.tableDatas[36][5] = this.canCompute(that.nowData[36],dataList.水泥磨.elec_consume); + that.tableDatas[37][5] = this.canCompute(that.nowData[37],dataList.水泥包装.elec_consume); + that.tableDatas[38][5] = this.canCompute(that.nowData[38],dataList.生活区.elec_consume); } // that.tableDatas[39][4] = dataList.生活区.elec_consume; }).then(res=>{ diff --git a/src/views/enm_rm/handoverLog.vue b/src/views/enm_rm/handoverLog.vue index 9d1b68fc..49d00de2 100644 --- a/src/views/enm_rm/handoverLog.vue +++ b/src/views/enm_rm/handoverLog.vue @@ -202,9 +202,9 @@ - +
日期 {{ reportItem.run_rate }} 停机时长（s）停机时长（h） - {{ reportItem.shut_sec }} + {{ (reportItem.shut_sec/3600).toFixed(2) }} 当期单位产品电耗（kW·h/t） diff --git a/src/views/enm_rm/logDetail.vue b/src/views/enm_rm/logDetail.vue index 64f5c505..bca4e089 100644 --- a/src/views/enm_rm/logDetail.vue +++ b/src/views/enm_rm/logDetail.vue @@ -737,18 +737,18 @@ export default { that.mpointOptions = []; res.forEach((item) => { item.mpFormVal = null; - item.mpFormValAble = false; + that.mpointOptions.push(item); + }); + that.mpointOptions.forEach((item) =>{ that.$API.enm.mpoint.stat.req({mpoint: item.id, sflog: this.form.id, page: 0}).then(res=>{ if(res.length>0){ item.mpFormVal = res[0].val; }else{ item.mpFormVal = 0; } - that.mpointOptions.push(item); }) - - }); + }) that.getMpointStat(); } }); diff --git a/src/views/enm_rm/power.vue b/src/views/enm_rm/power.vue index c4a3ca51..4db4689a 100644 --- a/src/views/enm_rm/power.vue +++ b/src/views/enm_rm/power.vue @@ -645,7 +645,9 @@ export default { let item = i + "日"; dayXAxis.push(item); } + console.log(dayXAxis); options.xAxis.data = dayXAxis; + console.log(dayXAxis); that.optionDay = options; }); }, diff --git a/src/views/enm_slag/workshopAnalysis.vue b/src/views/enm_slag/workshopAnalysis.vue index 26cc28a8..05f8dfd2 100644 --- a/src/views/enm_slag/workshopAnalysis.vue +++ b/src/views/enm_slag/workshopAnalysis.vue @@ -254,7 +254,7 @@ export default { let lastDiff = 0; if (arrs[1] !== "/" && arrs[4] !== "/") { - lastDiff = arrs[1] - arrs[4]; + lastDiff = (arrs[1] - arrs[4]).toFixed(2); } else { lastDiff = "/"; }