From fece6e9979b057550ec2cf38d19a6abfa1e8b9c1 Mon Sep 17 00:00:00 2001 From: lishenfeng Date: Tue, 30 Sep 2025 16:46:13 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E6=B5=B8=E6=B6=A6=E7=BA=BF=E8=BF=9E?= =?UTF-8?q?=E7=BA=BF=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js | 8 +++++++- src/views/gcaqjc/sjtjcx/czcx/dtOptions1.js | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js b/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js index f04eaf5c5..2c2f4b815 100644 --- a/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js +++ b/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js @@ -115,6 +115,12 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') { [85, data[alltype[3]]] ] : [] + const filteredArray = line.filter(subArray => { + return subArray.every(item => item !== null && item !== undefined); + }); + console.log("line",line); + + return { toolbox: { show: true, @@ -377,7 +383,7 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') { lineStyle: { color: '#5487FF', }, - data: line + data: filteredArray }, ] }; diff --git a/src/views/gcaqjc/sjtjcx/czcx/dtOptions1.js b/src/views/gcaqjc/sjtjcx/czcx/dtOptions1.js index 434c92f0a..d6bc6bdc6 100644 --- a/src/views/gcaqjc/sjtjcx/czcx/dtOptions1.js +++ b/src/views/gcaqjc/sjtjcx/czcx/dtOptions1.js @@ -11,7 +11,7 @@ export default function dtOption(doubleData) { const textColor = '#666' return { title: { - text: `${doubleData?.stationCode}测压管水位过程线`, + text: `${doubleData?.cd}测压管水位过程线`, bottom: "5%", left: "40%", textStyle: { @@ -26,7 +26,7 @@ const textColor = '#666' show: true, excludeComponents: ['toolbox'], pixelRatio: 2, - name:`${doubleData?.stationCode}测压管水位过程线` + name:`${doubleData?.cd}测压管水位过程线` } }, right: "20%", @@ -144,7 +144,7 @@ const textColor = '#666' series: [ { - name: doubleData?.stationCode, + name: doubleData?.cd, type: 'line', yAxisIndex: 0, symbol: 'circle',