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 |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/views/charts/index.vue b/src/views/charts/index.vue
index 73b80cd..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'
@@ -280,6 +287,7 @@
                 if (lockLength < data[i].deviceData.length) {
                   newLineChartData.series.push({
                     data: [],
+                    // large: true,
                     name: '',
                     type: 'line',
                     label: {
@@ -292,6 +300,7 @@
                 newLineChartData.series.push({
                   data: [],
                   name: '',
+                  // large: true,
                   type: 'line',
                 })
               }
@@ -347,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