diff --git a/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js b/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js
index 137800865..a56c7fb97 100644
--- a/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js
+++ b/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js
@@ -10,8 +10,8 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') {
       : 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"];
@@ -63,30 +63,30 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') {
       : [];
    // gz1、gz2、gz3、gz4分别为渗压管
    const gz1 = data[alltype[0]] ?
-      type == "3" ? [[51, typeName =='5' ?76.56:92.18], [51, data[alltype[0]]]] :
-         type == "2" ? [[45.5, typeName =='3' ?76.16:77.18], [45.5, 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.16:77.18], [typeName =='3' ? 45.5:50, data[alltype[0]]]] :
          type == "1" ? [[44, typeName =='1' ?79.16:77.18], [44, data[alltype[0]]]] :
             [[55, 109.87], [55, data[alltype[0]]]]
       : [];
    
    
    const gz2 = data[alltype[1]] ?
-      type == "3" ? [[62, typeName =='5' ?77.18:83.50], [62, data[alltype[1]]]] :
-         type == "2" ? [[50, typeName =='3' ?77.18:77.50], [50, 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]]]] :
             [[65, 109.75], [65, data[alltype[1]]]] :
       [];
 
    const gz3 = data[alltype[2]] ?
-      type == "3" ? [[58.5, 81.50], [58.5, data[alltype[2]]]] :
-         type == "2" ? [[58, 80.50], [58, 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]]]] :
             [[77, 109.43], [77, data[alltype[2]]]] : [];
    
    
    const gz4 = data[alltype[3]] ?
       type == "3" ? [] :
-         type == "2" ? [[77, 73.50], [77, data[alltype[3]]]] :
+         type == "2" ? [[79, 73.50], [79, data[alltype[3]]]] :
          type == "1" ? [[79, 72.50], [79, data[alltype[3]]]] :
             [[85, 166], [85, data[alltype[3]]]] : [];
    
@@ -95,18 +95,18 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') {
       type == "3" ?
          [
             [xValue, data?.rz],
-            [51, data[alltype[0]]],
-            [62, data[alltype[1]]],
-            [58.5, data[alltype[2]]],
+            [typeName =='5' ?47:51, data[alltype[0]]],
+            [typeName =='5' ?51:62, data[alltype[1]]],
+            [62, data[alltype[2]]],
            
          ] :
          type == "2" ?
             [
                [xValue, data?.rz],
-               [45.5, data[alltype[0]]],
-               [50, data[alltype[1]]],
-               [58, data[alltype[2]]],
-               [77, data[alltype[3]]]
+               [typeName =='3' ? 45.5:50, data[alltype[0]]],
+               [typeName =='3' ?50:61, data[alltype[1]]],
+               [61, data[alltype[2]]],
+               [79, data[alltype[3]]]
             ] :
             type == "1"?
             [
diff --git a/src/views/gcaqjc/sjtjcx/ndsytjb/toolbar.js b/src/views/gcaqjc/sjtjcx/ndsytjb/toolbar.js
index 6b98d5b12..30c027583 100644
--- a/src/views/gcaqjc/sjtjcx/ndsytjb/toolbar.js
+++ b/src/views/gcaqjc/sjtjcx/ndsytjb/toolbar.js
@@ -16,7 +16,17 @@ const ToolBar = ({ setSearchVal, setDmName, setTrData, exportFile,role }) => {
   const getDmList = async () => {
     try {
       const res = await httppost2(apiurl.gcaqjc.sjtjcx.sycx.list)
-      setDmList(res.data.map(s=>({label:s.profileName,value:s.profileCode})));
+      const sortedData = res.data.sort((a, b) => {
+        // 判断a、b是否为ZB0开头
+        const isAZB0 = a.profileCode.startsWith('ZB0');
+        const isBZB0 = b.profileCode.startsWith('ZB0');
+
+        // 规则：ZB0开头的排前面；同类型（都ZB0/都非ZB0）保持原顺序
+        if (isAZB0 && !isBZB0) return -1; // a是ZB0，b不是 → a在前
+        if (!isAZB0 && isBZB0) return 1;  // a不是ZB0，b是 → b在前
+        return 0; // 同类型，保持原始相对顺序
+      });
+      setDmList(sortedData.map(s=>({label:s.profileName,value:s.profileCode})));
     } catch (error) {
       console.log(error);
     }