From 8b1000ebcfabd9484ac07645ee91e726fd7812bd Mon Sep 17 00:00:00 2001 From: guoshipeng <3194674006@qq.com> Date: Mon, 31 Jul 2023 15:54:30 +0800 Subject: [PATCH] fix:显示坐标轴 --- src/views/charts/index.vue | 38 ++++++++++++++++++++++---------------- 1 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/views/charts/index.vue b/src/views/charts/index.vue index ecfdd9b..c79623a 100644 --- a/src/views/charts/index.vue +++ b/src/views/charts/index.vue @@ -168,7 +168,6 @@ } // ������������������������������������������ this.getSensor() - console.log(this.newMac1) }, // ������dataType��������������� select1(nv, ov) { @@ -195,8 +194,7 @@ one === 'a34002' || one === 'a21004' || one === 'a21026' || - one === 'a05024' || - one === 'a21001' + one === 'a05024' ) { this.selectyz = '(������:ug/m��)' } else if ( @@ -224,7 +222,13 @@ this.selectyz = '(������:pcs/0.1L)' } else if (one === 'a00e13') { this.selectyz = '(������:db)' - } else if (one === 'a21028') { + } else if ( + one === 'a21028' || + one === 'a25002' || + one === 'a21001' || + one === 'a25005' || + one === 'a25003' + ) { this.selectyz = '(������:ppm)' } }, @@ -248,6 +252,7 @@ methods: { // ������������ selectData() { + console.log(this.newData) var newLineChartData = { series: [], xAxis: [], @@ -267,22 +272,22 @@ }) .then((res) => { // console.log('������������������������������') - console.log(res) const data = res.data let lockLength = 0 for (let i = 0; i < data.length; i++) { for (let j = 0; j < data[i].deviceData.length; j++) { - // console.log(data[i].deviceData); - if (res.data[0].deviceData.length == 1) { - newLineChartData.series.push({ - data: [], - name: '', - type: 'line', - label: { - show: true, - position: 'top', - }, - }) + if (res.data[0].deviceData.length === 1) { + if (lockLength < data[i].deviceData.length) { + newLineChartData.series.push({ + data: [], + name: '', + type: 'line', + label: { + show: true, + position: 'top', + }, + }) + } } else { newLineChartData.series.push({ data: [], @@ -342,6 +347,7 @@ }, // ��������������������������������� getSensor() { + this.newSensor = [] // stringMacs.su // var newMac = this.newMac[this.newMac.length - 1][this.newMac[this.newMac.length - 1].length - 1] // this.newMac1 = this.newMac[this.newMac.length - 1][this.newMac[this.newMac.length - 1].length - 1] -- Gitblit v1.8.0