From a60acf8bae5a1f49e1554e0ff63ff79e0aacf611 Mon Sep 17 00:00:00 2001
From: yichenxi <yichenxi0601@163.com>
Date: Sat, 17 Dec 2022 12:59:41 +0800
Subject: [PATCH] 1、监测因子趋势数字显示问题修复
---
src/views/charts/index.vue | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/src/views/charts/index.vue b/src/views/charts/index.vue
index 6ccbfaa..929364a 100644
--- a/src/views/charts/index.vue
+++ b/src/views/charts/index.vue
@@ -18,8 +18,8 @@
style="margin-left: 20px"
>
<el-option
- v-for="item in newSensor"
- :key="item.value"
+ v-for="(item, index) in newSensor"
+ :key="index"
:label="item.label"
:value="item.value"
/>
@@ -168,7 +168,6 @@
}
// ������������������������������������������
this.getSensor()
- console.log(this.newMac1)
},
// ������dataType���������������
select1(nv, ov) {
@@ -267,13 +266,11 @@
})
.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) {
+ if (res.data[0].deviceData.length === 1) {
if (lockLength < data[i].deviceData.length) {
newLineChartData.series.push({
data: [],
@@ -285,32 +282,27 @@
},
})
}
- } 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