From d1a606963672990eee0b4db6834fa0c3e74fa946 Mon Sep 17 00:00:00 2001
From: guoshipeng <3194674006@qq.com>
Date: Thu, 06 Jul 2023 09:35:24 +0800
Subject: [PATCH] 上传组件
---
src/views/charts/index.vue | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/views/charts/index.vue b/src/views/charts/index.vue
index 31fb437..73b80cd 100644
--- a/src/views/charts/index.vue
+++ b/src/views/charts/index.vue
@@ -194,8 +194,7 @@
one === 'a34002' ||
one === 'a21004' ||
one === 'a21026' ||
- one === 'a05024' ||
- one === 'a21001'
+ one === 'a05024'
) {
this.selectyz = '(������:ug/m��)'
} else if (
@@ -223,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)'
}
},
@@ -247,6 +252,7 @@
methods: {
// ������������
selectData() {
+ console.log(this.newData)
var newLineChartData = {
series: [],
xAxis: [],
@@ -282,32 +288,24 @@
},
})
}
- } else if (lockLength < data[i].deviceData.length) {
+ } else {
newLineChartData.series.push({
data: [],
name: '',
type: 'line',
- label: {
- show: false,
- position: 'top',
- },
})
}
newLineChartData.series[j].name = data[i].deviceData[j].name
newLineChartData.title.push(data[i].deviceData[j].name)
- lockLength++
newLineChartData.series[j].data.push(
data[i].deviceData[j].sensorValue
)
-
-
-
}
newLineChartData.xAxis.push(data[i].time)
}
// newLineChartData.title = this.value
this.lineChartData = newLineChartData
- // console.log(newLineChartData, 'newLineChartData')
+ console.log(lineChartData, 'newLineChartData')
})
.catch((err) => {
console.log(err)
--
Gitblit v1.8.0