From c407b7ef57b54a68c61b8e3f8a3d8dc9199448ff Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Fri, 1 Nov 2024 14:51:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=B4=E8=B0=90=E6=B3=A2=E6=AC=A1=E6=95=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../govern/device/control/tabs/trend.vue      | 23 +++++++++++++++----
 src/views/govern/device/planData/index.vue    |  2 +-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/views/govern/device/control/tabs/trend.vue b/src/views/govern/device/control/tabs/trend.vue
index a97c381..b36854c 100644
--- a/src/views/govern/device/control/tabs/trend.vue
+++ b/src/views/govern/device/control/tabs/trend.vue
@@ -194,10 +194,16 @@ const init = async () => {
         })
     })
     let lists: any = []
+    let frequencys: any = null
     countData.value.map((item: any, index: any) => {
+        if (item.name.includes('间谐波电压')) {
+            frequencys = item.count + 0.5
+        } else {
+            frequencys = item.count
+        }
         lists[index] = {
             statisticalId: item.index,
-            frequencys: [item.count]
+            frequencys: frequencys && frequencys.length != 0 ? [frequencys] : []
         }
     })
     let obj = {
@@ -550,6 +556,15 @@ const formatCountOptions = (list: any) => {
                         if (kk.harmStart && kk.harmEnd) {
                             range(0, 0, 0)
                             countData.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1)
+                            if (kk.showName == '间谐波电压含有率') {
+                                countData.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1).map(
+                                    (item: any) => {
+                                        return item - 0.5
+                                    }
+                                )
+                            } else {
+                                countData.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1)
+                            }
                             //添加默认值
                             if (countData.value[index].count.length == 0) {
                                 countData.value[index].count = countData.value[index].countOptions[0]
@@ -560,11 +575,11 @@ const formatCountOptions = (list: any) => {
             })
         })
         countData.value.map((item: any, key: any) => {
-            if (item.name.includes('谐波电流有效值')) {
+            if (item.name == '谐波电流有效值') {
                 item.name = '谐波电流次数'
-            } else if (item.name.includes('谐波电压含有率')) {
+            } else if (item.name == '谐波电压含有率') {
                 item.name = '谐波电压次数'
-            } else if (item.name.includes('间谐波电压含有率')) {
+            } else if (item.name == '间谐波电压含有率') {
                 item.name = '间谐波电压次数'
             }
         })
diff --git a/src/views/govern/device/planData/index.vue b/src/views/govern/device/planData/index.vue
index d1a0ee5..4e6ec21 100644
--- a/src/views/govern/device/planData/index.vue
+++ b/src/views/govern/device/planData/index.vue
@@ -745,7 +745,7 @@ const formatCountOptions = (list: any) => {
                         if (kk.harmStart && kk.harmEnd) {
                             range(0, 0, 0)
 
-                            if (kk.showName.includes('间谐波电压含有率')) {
+                            if (kk.showName=='间谐波电压含有率') {
                                 countData.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1).map(
                                     (item: any) => {
                                         return item - 0.5