Merge branch 'dev-3.9' of git.mesalab.cn:nezha/nezha-fronted into dev-3.9rel-23.10.08

1 files changed, 5 insertions, 3 deletions

diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js
index ef546147f..48ef1af3b 100644
--- a/nezha-fronted/src/components/chart/chartMixin.js
+++ b/nezha-fronted/src/components/chart/chartMixin.js
@@ -100,15 +100,17 @@ export default {
 
           // 设置右y轴
           if (chartInfo.param.enable.rightYAxis) {
-            chartInfo.param.rightYAxis && chartInfo.param.rightYAxis.elementNames.forEach(item => {
-              if ((data.elements.name == item) && !s.yAxisIndex) {
+            if (chartInfo.param.rightYAxis) {
+              const findItem = chartInfo.param.rightYAxis.elementNames.find(item => data.elements.name == item)
+              console.log(findItem)
+              if (findItem) {
                 s.yAxisIndex = 1
                 data.yAxisIndex = 1
               } else {
                 s.yAxisIndex = 0
                 data.yAxisIndex = 0
               }
-            })
+            }
           }
 
           // 右y轴数据类型