From 20bac7bbc63788b14a40757da47a7f200d4155c1 Mon Sep 17 00:00:00 2001 From: 徐旺旺 <11530253@qq.com> Date: 星期四, 22 四月 2021 09:00:28 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/BaseNav/WasteGas/RealData.vue | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/BaseNav/WasteGas/RealData.vue b/src/components/BaseNav/WasteGas/RealData.vue index b440dda..19184e4 100644 --- a/src/components/BaseNav/WasteGas/RealData.vue +++ b/src/components/BaseNav/WasteGas/RealData.vue @@ -130,7 +130,6 @@ $step: 15 } const result = (await mapApi.DataItems(data)).data - console.log(result) this.getRtdb15s(result) }, // echarts鏁版嵁澶勭悊 @@ -294,7 +293,7 @@ // 涓存椂鏁版嵁 const BBZMAPPING = [ { - COD: 35, + 浜屾哀鍖栫⒊: 35, ph: 9, 鎬绘爱: 15, 鎬荤7: 0.3, @@ -425,13 +424,13 @@ } } - if (ydatas[i].name === '搴熸皵娴侀噺' || ydatas[i].name === '搴熸皵') { + if (ydatas[i].name === '姘哀鍖栫墿' || ydatas[i].name === '搴熸皵') { obj.yAxisIndex = 1 } // 涓存椂 const datatype = 1 if (datatype === 1) { - dataUnit = '娴侀噺(m鲁/d)' + dataUnit = '搴熸皵娴侀噺(m鲁/d)' } else { dataUnit = '娴侀噺(m鲁/h)' } @@ -551,9 +550,10 @@ yAxis: [{ type: 'value', name: yname, - max: function (value) { - return parseInt(value.max + 30) - }, + // max: function (value) { + // console.log(value) + // return parseInt(value.max + 30) + // }, axisLabel: { formatter: '{value}', textStyle: { -- Gitblit v1.8.0