diff --git a/pages/aqjc/jrxOptions.js b/pages/aqjc/jrxOptions.js
index a121d7d..006dd26 100644
--- a/pages/aqjc/jrxOptions.js
+++ b/pages/aqjc/jrxOptions.js
@@ -7,81 +7,13 @@ import imageUrl010 from './dataUrl1/fb010';
 
 
 export default function jrxOptions(data = {}, type = "1", typeName = '1') {
-   // const yMin = type == "1" ? 70 : type == "2" ? 70 : 70;
-   // const yMax = type == "1" ? 154 : type == "2" ? 150 : 150;
-   // const type1 = ["SY05", "SY06", "SY07", "SY08"]
-   // const type2 = ["SY09","SY10","SY11","SY12"]
-   // const alltype = type == "1" ? type1 : type == "2" ? type2 : type2;
-   //  // 字体颜色
-   // const textColor = '#666'
-   // const imageUrl = type == "1" ? imageUrl060:
-   //    type == "2" ? imageUrl090 : imageUrl090;
-   // const xValue = type == "1" ? (((data?.rz - 99) + 1.1 * 13) / 1.1):
-   //    type == "2" ? (((data?.rz - 99) + 1 * 14) / 1) : (((data?.rz - 99) + 1 * 14) / 1)
-   // const rz = data?.rz ?
-   //    [[xValue, data?.rz], [0, data?.rz], ] :
-   //    []
-   // const rz1 = data?.rz ?
-   //       type == "1" ?
-   //       [[0, 99], [13, 99], [xValue, data?.rz]]:
-   //       type == "2" ?
-   //       [[0, 99], [14, 99], [xValue, data?.rz]]
-   //          :  [[0, 99], [14, 99], [xValue, data?.rz]]
-   //       :
-   //    []
-   // const gz1 = data[alltype[0]] ?
-   //    type == "1" ? [[51.6, 85], [51.6, data[alltype[0]]]] :
-   //       type == "2" ? [[47.5, 85], [47.5, data[alltype[0]]]] :
-   //          [[47.5, 158], [85, data[alltype[0]]]]
-   //    : [];
-   // const gz2 = data[alltype[1]] ?
-   // type == "1" ? [[53.6, 85], [53.6, data[alltype[1]]]] :
-   // type == "2" ? [[49.5, 85], [49.5, data[alltype[1]]]] :
-   //    [[53.6, 158], [53.6, data[alltype[1]]]] :
-   //    [];
-   
-   // const gz3 = data[alltype[2]] ?
-   // type == "1" ? [[72.5, 90], [72.5, data[alltype[2]]]] :
-   // type == "2" ? [[66.5, 90], [66.5, data[alltype[2]]]] :
-   //          [[73, 161], [73, data[alltype[2]]]] : [];
-   
-   // const gz4 = data[alltype[3]] ?
-   // type == "1" ? [[84.5, 96], [84.5, data[alltype[3]]]] :
-   // type == "2" ? [[77, 96], [77, data[alltype[3]]]] :
-   //          [[85, 166], [85, data[alltype[3]]]] : [];
-   
-   // const line = data?.rz ?
-   //    type == "1" ? 
-   //    [
-   //       [xValue, data?.rz],
-   //       [51.6, data[alltype[0]]],
-   //       [53.6, data[alltype[1]]],
-   //       [72.5, data[alltype[2]]],
-   //       [84.5, data[alltype[3]]]
-   //       ] :
-   //       type == "2" ?
-   //    [
-   //      [xValue, data?.rz],
-   //      [47.5, data[alltype[0]]],
-   //      [49.5, data[alltype[1]]],
-   //      [66.5, data[alltype[2]]],
-   //      [77, data[alltype[3]]]
-   //          ] :
-   //          [
-   //             [xValue, data?.rz],
-   //             [51.6, data[alltype[0]]],
-   //             [53.6, data[alltype[1]]],
-   //             [73, data[alltype[2]]],
-   //             [85, data[alltype[3]]]
-   //           ]
-   //          : []
    
     const yMin = type == "3" ? 70 : type == "2" ? 67 : 
                   type == '1' ? 58 : 99;
    const yMax = type == "3" ? 129 : type == "2" ? 117 
    : type == "1" ? 118 : 116;
-   const type1 = ["UPD1", "UPD4", "UPD10", "UPD16"];
-   const type2 = ["UPD7", "UPD13"];
+   const type1 = ["UPD1", "UPD4", "UPD7", "UPD16"];
+   const type2 = ["UPD10", "UPD13"];
    const type3 = ["UPD2", "UPD5", "UPD8", "UPD17"];
    const type4 = ["UPD11", "UPD14"];
    const type5 = ["UPD3", "UPD6", "UPD9"];
@@ -131,29 +63,29 @@ export default function jrxOptions(data = {}, type = "1", typeName = '1') {
       []
    // gz1、gz2、gz3、gz4分别为渗压管
    const gz1 = data[alltype[0]] ?
-      type == "3" ? [[52, typeName =='5' ?76.56:92.18], [52, data[alltype[0]]]] :
-         type == "2" ? [[52, typeName =='3' ?76.16:77.18], [52, 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.16:77.18], [typeName =='3' ?50:55, data[alltype[0]]]] :
          type == "1" ? [[49, typeName =='1' ?79.16:77.18], [49, data[alltype[0]]]] :
             [[62, 109.87], [62, data[alltype[0]]]]
       : [];
    
    const gz2 = data[alltype[1]] ?
-      type == "3" ? [[57, typeName =='5' ?77.18:83.50], [57, data[alltype[1]]]] :
-         type == "2" ? [[55, typeName =='3' ?77.18:77.50], [55, 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]]]] :
             [[72, 109.75], [72, data[alltype[1]]]] :
       [];
 
    const gz3 = data[alltype[2]] ?
-      type == "3" ? [[65, 81.50], [65, data[alltype[2]]]] :
-         type == "2" ? [[63, 80.50], [63, data[alltype[2]]]] :
-         type == "1" ? [[67, 66.50], [79, 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]]]] :
             [[87, 109.43], [87, data[alltype[2]]]] : [];
    
    
    const gz4 = data[alltype[3]] ?
       type == "3" ? [] :
-         type == "2" ? [[87, 73.50], [87, data[alltype[3]]]] :
+         type == "2" ? [[91,73.50], [91, data[alltype[3]]]] :
          type == "1" ? [[89, 72.50], [89, data[alltype[3]]]] :
             [[85, 166], [85, data[alltype[3]]]] : [];
    
@@ -162,18 +94,18 @@ export default function jrxOptions(data = {}, type = "1", typeName = '1') {
       type == "3" ?
          [
             [xValue, data?.rz],
-            [52, data[alltype[0]]],
-            [57, data[alltype[1]]],
-            [65, data[alltype[2]]],
+            [typeName =='6' ?57:52, data[alltype[0]]],
+            [typeName =='6' ?71:57, data[alltype[1]]],
+            [71, data[alltype[2]]],
            
          ] :
          type == "2" ?
             [
                [xValue, data?.rz],
-               [52, data[alltype[0]]],
-               [55, data[alltype[1]]],
-               [63, data[alltype[2]]],
-               [87, data[alltype[3]]]
+               [typeName =='3' ?50:55, data[alltype[0]]],
+               [typeName =='3' ?55:68, data[alltype[1]]],
+               [68, data[alltype[2]]],
+               [91, data[alltype[3]]]
             ] :
             type == "1" ?
                [