From 464f6b39668b153af0fec399dc6aab76c46bbf8d Mon Sep 17 00:00:00 2001
From: guoshipeng <3194674006@qq.com>
Date: Fri, 04 Aug 2023 11:44:06 +0800
Subject: [PATCH] fix:1、无人机页面修改六参设定 2、监测因子趋势五分钟报
---
src/views/charts/index.vue | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/src/views/charts/index.vue b/src/views/charts/index.vue
index 31fb437..1b11a1d 100644
--- a/src/views/charts/index.vue
+++ b/src/views/charts/index.vue
@@ -145,6 +145,10 @@
value: '���������',
},
{
+ label: '������������',
+ value: '������������',
+ },
+ {
label: '������',
value: '������',
},
@@ -183,6 +187,9 @@
} else if (nv === '���������') {
this.dataType = 'HourPicker1'
this.unit = 'hour'
+ } else if (nv === '������������') {
+ this.dataType = 'HourPicker1'
+ this.unit = 'FiveMinute'
} else {
this.dataType = 'CustomPicker'
this.unit = 'hour'
@@ -194,8 +201,7 @@
one === 'a34002' ||
one === 'a21004' ||
one === 'a21026' ||
- one === 'a05024' ||
- one === 'a21001'
+ one === 'a05024'
) {
this.selectyz = '(������:ug/m��)'
} else if (
@@ -223,7 +229,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 +259,7 @@
methods: {
// ������������
selectData() {
+ console.log(this.newData)
var newLineChartData = {
series: [],
xAxis: [],
@@ -274,6 +287,7 @@
if (lockLength < data[i].deviceData.length) {
newLineChartData.series.push({
data: [],
+ // large: true,
name: '',
type: 'line',
label: {
@@ -282,32 +296,25 @@
},
})
}
- } else if (lockLength < data[i].deviceData.length) {
+ } else {
newLineChartData.series.push({
data: [],
name: '',
+ // large: true,
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)
@@ -349,6 +356,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