From 5672506c58cefe633ef3858a6b8f2d7a5800ec18 Mon Sep 17 00:00:00 2001 From: lishenfeng Date: Thu, 6 Nov 2025 14:29:25 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E6=B8=97=E5=8E=8B=E7=AE=A1=E4=BD=8D?= =?UTF-8?q?=E7=AE=A1=E5=BA=95=E9=AB=98=E7=A8=8B=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js | 26 +++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js b/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js index 93215800a..94b40e9f7 100644 --- a/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js +++ b/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js @@ -63,31 +63,31 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') { : []; // gz1、gz2、gz3、gz4分别为渗压管 const gz1 = data[alltype[0]] ? - type == "3" ? [[typeName =='5' ?47:51, typeName =='5' ?76.56:92.18], [typeName =='5' ?47:51, data[alltype[0]]]] : - type == "2" ? [[typeName =='3' ? 45.5:50, typeName =='3' ?76.76:77.18], [typeName =='3' ? 45.5:50, data[alltype[0]]]] : - type == "1" ? [[44, typeName =='1' ?79.16:77.18], [44, data[alltype[0]]]] : + type == "3" ? [[typeName =='5' ?47:51, typeName =='5' ?90.50:81.85], [typeName =='5' ?47:51, data[alltype[0]]]] : + type == "2" ? [[typeName =='3' ? 45.5:50, typeName =='3' ?84.41:83.78], [typeName =='3' ? 45.5:50, data[alltype[0]]]] : + type == "1" ? [[typeName =='1' ?44:51.5, typeName =='1' ?80.11:78.64], [typeName =='1' ?44:51.5, data[alltype[0]]]] : [[55, typeName =='7'?109.08:108.77], [55, data[alltype[0]]]] : []; const gz2 = data[alltype[1]] ? - type == "3" ? [[typeName =='5' ?51:62, typeName =='5' ?77.18:83.50], [typeName =='5' ?51:62, data[alltype[1]]]] : - type == "2" ? [[typeName =='3' ?50:61, typeName =='3' ?77.18:77.50], [typeName =='3' ?50:61, data[alltype[1]]]] : - type == "1" ? [[51.5, typeName =='1' ?77.18:74.5], [51.5, data[alltype[1]]]] : + type == "3" ? [[typeName =='5' ?51:62, typeName =='5' ?90.94:84.85], [typeName =='5' ?51:62, data[alltype[1]]]] : + type == "2" ? [[typeName =='3' ?50:61, typeName =='3' ?84.04:81.05], [typeName =='3' ?50:61, data[alltype[1]]]] : + type == "1" ? [[typeName =='1' ?51.5:58, typeName =='1' ?78.61:82.75], [typeName =='1' ?51.5:58, data[alltype[1]]]] : [[65, typeName =='7'?109.32:109.36], [65, data[alltype[1]]]] : []; const gz3 = data[alltype[2]] ? - type == "3" ? [[62, 81.50], [62, data[alltype[2]]]] : - type == "2" ? [[61, 80.50], [61, data[alltype[2]]]] : - type == "1" ? [[58, 66.50], [58, data[alltype[2]]]] : + type == "3" ? [[62, 92.65], [62, data[alltype[2]]]] : + type == "2" ? [[61, 83.93], [61, data[alltype[2]]]] : + type == "1" ? [[58, 81.38], [58, data[alltype[2]]]] : [[77, typeName =='7'?109.01:108.87], [77, data[alltype[2]]]] : []; const gz4 = data[alltype[3]] ? type == "3" ? [] : - type == "2" ? [[79, 73.50], [79, data[alltype[3]]]] : - type == "1" ? [[79, 72.50], [79, data[alltype[3]]]] : + type == "2" ? [[79, 79.57], [79, data[alltype[3]]]] : + type == "1" ? [[79, 79.09], [79, data[alltype[3]]]] : [[85, 166], [85, data[alltype[3]]]] : []; // 将渗压管连起来的线 @@ -111,8 +111,8 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') { type == "1"? [ [xValue, data?.rz], - [44, data[alltype[0]]], - [51.5, data[alltype[1]]], + [typeName =='1' ?44:51.5, data[alltype[0]]], + [typeName =='1' ?51.5:58, data[alltype[1]]], [58, data[alltype[2]]], [79, data[alltype[3]]] ]: