diff --git a/main.js b/main.js
index d34ba69..15b5636 100644
--- a/main.js
+++ b/main.js
@@ -28,12 +28,14 @@ $http.afterRequest = function (options) {
 	}
 	// uni.hideLoading()
 }
-uni.$showMsg = function (title = '正请求中...', duration = 1500) {
-	return uni.showToast({
-		title,
-		duration,
-		icon: 'none'
-	})
+uni.$showMsg = function (title, duration = 1500) {
+    // 空文案时不弹toast，避免出现一个小黑点的空提示
+    if (!title) return;
+    return uni.showToast({
+        title: String(title),
+        duration,
+        icon: 'none'
+    })
 }
 uni.$stcd = '61610700'
 Vue.config.productionTip = false
diff --git a/pages/aqjc/jrxOptions.js b/pages/aqjc/jrxOptions.js
index 661ab47..40da510 100644
--- a/pages/aqjc/jrxOptions.js
+++ b/pages/aqjc/jrxOptions.js
@@ -63,30 +63,30 @@ export default function jrxOptions(data = {}, type = "1", typeName = '1') {
       []
    // gz1、gz2、gz3、gz4分别为渗压管
    const gz1 = data[alltype[0]] ?
-      type == "3" ? [[typeName =='6' ?57:52, typeName =='5' ?76.56:92.18], [typeName =='6' ?57:52, data[alltype[0]]]] :
-         type == "2" ? [[typeName =='3' ?50:55, typeName =='3' ?76.76:77.18], [typeName =='3' ?50:55, data[alltype[0]]]] :
-         type == "1" ? [[49, typeName =='1' ?79.16:77.18], [49, data[alltype[0]]]] :
+      type == "3" ? [[typeName =='6' ?57:52, typeName =='5' ?90.50:81.85], [typeName =='6' ?57:52, data[alltype[0]]]] :
+         type == "2" ? [[typeName =='3' ?50:55, typeName =='3' ?84.41:83.78], [typeName =='3' ?50:55, data[alltype[0]]]] :
+         type == "1" ? [[typeName =='1' ?49:57, typeName =='1' ?80.11:78.64], [typeName =='1' ?49:57, data[alltype[0]]]] :
             [[62, typeName =='7'?109.08:108.77], [62, data[alltype[0]]]]
       : [];
    
    const gz2 = data[alltype[1]] ?
-      type == "3" ? [[typeName =='6' ?71:57, typeName =='5' ?77.18:83.50], [typeName =='6' ?71:57, data[alltype[1]]]] :
-         type == "2" ? [[typeName =='3' ?55:68, typeName =='3' ?77.18:77.50], [typeName =='3' ?55:68, data[alltype[1]]]] :
-         type == "1" ? [[57, typeName =='1' ?77.18:74.5], [57, data[alltype[1]]]] :
+      type == "3" ? [[typeName =='6' ?71:57, typeName =='5' ?90.94:84.85], [typeName =='6' ?71:57, data[alltype[1]]]] :
+         type == "2" ? [[typeName =='3' ?55:68, typeName =='3' ?84.04:81.05], [typeName =='3' ?55:68, data[alltype[1]]]] :
+         type == "1" ? [[typeName =='1' ?57:67, typeName =='1' ?78.61:82.75], [typeName =='1' ?57:67, data[alltype[1]]]] :
             [[72, typeName =='7'?109.32:109.36], [72, data[alltype[1]]]] :
       [];
 
    const gz3 = data[alltype[2]] ?
-      type == "3" ? [[71, 81.50], [71, data[alltype[2]]]] :
-         type == "2" ? [[68, 80.50], [68, data[alltype[2]]]] :
-         type == "1" ? [[67, 66.50], [67, data[alltype[2]]]] :
+      type == "3" ? [[71, 92.65], [71, data[alltype[2]]]] :
+         type == "2" ? [[68, 83.93], [68, data[alltype[2]]]] :
+         type == "1" ? [[67, 81.38], [67, data[alltype[2]]]] :
             [[87, typeName =='7'?109.01:108.87], [87, data[alltype[2]]]] : [];
    
    
    const gz4 = data[alltype[3]] ?
       type == "3" ? [] :
-         type == "2" ? [[91,73.50], [91, data[alltype[3]]]] :
-         type == "1" ? [[89, 72.50], [89, data[alltype[3]]]] :
+         type == "2" ? [[91,79.57], [91, data[alltype[3]]]] :
+         type == "1" ? [[89, 79.09], [89, data[alltype[3]]]] :
             [[85, 166], [85, data[alltype[3]]]] : [];
    
    // 将渗压管连起来的线
@@ -110,8 +110,8 @@ export default function jrxOptions(data = {}, type = "1", typeName = '1') {
             type == "1" ?
                [
                   [xValue, data?.rz],
-                  [49, data[alltype[0]]],
-                  [57, data[alltype[1]]],
+                  [typeName =='1' ?49:57, data[alltype[0]]],
+                  [typeName =='1' ?57:67, data[alltype[1]]],
                   [67, data[alltype[2]]],
                   [89, data[alltype[3]]]
                ] :