合并qzc

src/views/Home/MapCtrl/Markers/ShuiKuLayer.js

@@ -96,7 +96,7 @@ export default class ShuiKuLayer extends BaseLayer {
       // } 
 
       
-      const list = data.filter(o=>o.stcd==="61610700" || o.stcd==="10818")
+      const list = data.filter(o=>o.stcd==="61610700" || o.stcd==="10852")
         .map((i) => {
         return {
           id : i.stcd,

src/views/Home/homePanelsLayoutPage/index.js

@@ -204,7 +204,6 @@ const HomePage = ({ showPanels, mode }) => {
   }
 
   const clickItem = (item) => {
-    debugger
     // 业务规则库
     if (item.type == '业务规则库' || item.type == '调度方案库' || item.type == '工程安全知识库') {
       regularOpen(item)

src/views/Home/homePanelsLayoutPage/item_shuiku.js

@@ -27,7 +27,7 @@ const Page = () => {
     const getData = async (params) => {
       const data = await reservoirlist(params) || []
       // const list = [...data.filter(o=>o.stnm==='檀树岗(新)'),...data.filter(o=>o.stnm!=='檀树岗(新)')]
-      const list = [...data.filter(o=>o.stcd==="61610700"),...data.filter(o=>o.stcd==="10818")]
+      const list = [...data.filter(o=>o.stcd==="61610700"),...data.filter(o=>o.stcd==="10852")]
         setData(list)
       }
 
@@ -41,7 +41,7 @@ const Page = () => {
           }
         })
         // const list2 = [...list.filter(o=>o.stnm==='檀树岗(新)'),...list.filter(o=>o.stnm!=='檀树岗(新)')]
-        const list2 = [...list.filter(o=>o.stcd==="61610700"),...list.filter(o=>o.stcd==="10818")]
+        const list2 = [...list.filter(o=>o.stcd==="61610700"),...list.filter(o=>o.stcd==="10852")]
         console.log('res',list2);
         const data = list2[checked]
         dispatch.runtime.setFeaturePop({

src/views/gcaqjc/gcaqfx/jrx/index.js

@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useMemo, useRef } from 'react'
-import { Table, Card, Button, message, Popconfirm,Spin } from 'antd';
+import { Table, Card, Button, message, Popconfirm, Spin } from 'antd';
 import ToolBar from './toolbar';
 import { useSelector } from 'react-redux';
 import ReactEcharts from 'echarts-for-react';
@@ -19,6 +19,8 @@ export default function Xmzlmb() {
     'ZB0+252': '4',
     'ZB0+370': '5',
     'ZB0+372': '6',
+    'FB0+010': '7',
+    'FB0+030': '8',
   }
   const role = useSelector(state => state.auth.role);
   const [code, setCode] = useState([])
@@ -34,11 +36,11 @@ export default function Xmzlmb() {
   const echartsRef = useRef(null)
   const jrxOptions = useMemo(() => {
     if (dataSources && dbType && dbType1) {
-      return jrxOption(dataSources[0], dbType,dbType1)
+      return jrxOption(dataSources[0], dbType, dbType1)
     } else {
       return dataSources[0];
     }
-  }, [dataSources, dbType,dbType1])
+  }, [dataSources, dbType, dbType1])
 
   const columns = [
     { title: '序号', key: 'inx', dataIndex: 'inx', width: 60, align: "center" },
@@ -126,8 +128,18 @@ export default function Xmzlmb() {
     try {
       const res = await httppost2(apiurl.gcaqjc.sjtjcx.sycx.list)
       const newData = res.data.map(s => ({ projNm: s.profileName, id: s.profileCode }))
-      const filterData = newData.filter(item => item?.projNm?.split('+')[0] == 'ZB0')
+      const filterData = newData.filter(item => (item?.projNm?.split('+')[0] == 'ZB0' || item?.projNm?.split('+')[0] == 'FB0'));
-      setDmList(filterData);
+      const sortedData = filterData.sort((a, b) => {
+        // 判断a、b是否为ZB0开头
+        const isAZB0 = a.projNm.startsWith('ZB0');
+        const isBZB0 = b.projNm.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);
     } catch (error) {
       console.log(error);
     }
@@ -157,7 +169,7 @@ export default function Xmzlmb() {
           v.scrollTop = 0;
           //   setTimeout(() => { v.scrollTop = 0 }, 1000)
         }
-        echartsRef.current.getEchartsInstance().setOption(jrxOption(dataSources[index % dataSources.length], dbType,dbType1))
+        echartsRef.current.getEchartsInstance().setOption(jrxOption(dataSources[index % dataSources.length], dbType, dbType1))
         index++;
       }, Number(1000));
       setTimer(time); // 定时器保存变量 利于停止
@@ -190,13 +202,14 @@ export default function Xmzlmb() {
       let name = dmList.find(s => s.id == code)?.projNm
       let type = (name == "ZB0+130" || name == "ZB0+132") ? "1" :
         (name == "ZB0+250" || name == "ZB0+252") ? "2" :
-          (name == "ZB0+370" || name == "ZB0+372") ? "3" : '';
+          (name == "ZB0+370" || name == "ZB0+372") ? "3" :
+            (name == "FB0+010" || name == "FB0+030") ? '4' : '';
       let type1 = typeName[name];
       setDbType(type)
       setDbType1(type1)
     }
   }, [code, dmList])
-  
+
 
   useEffect(() => {
     getDmList()
@@ -219,91 +232,91 @@ export default function Xmzlmb() {
     const fun = (e) => {
       // 大于0:滚轮向上滚动  小于0:滚轮向下滚动
       if (e.wheelDelta > 0) {
-      scale += 0.05;
+        scale += 0.05;
-      img.style.transform = `scale(${scale})`;
+        img.style.transform = `scale(${scale})`;
       } else {
-      if (scale == 1) {
+        if (scale == 1) {
           img.style.left = 0 + "px";
           img.style.top = 0 + "px";
-      }
+        }
-      // 缩放值大于1时,可以缩小,反之亦然
+        // 缩放值大于1时,可以缩小,反之亦然
-      if (scale > 1) {
+        if (scale > 1) {
           scale -= 0.05;
           img.style.transform = `scale(${scale})`;
-      }
+        }
       }
     }
-    img.addEventListener("wheel",fun)
+    img.addEventListener("wheel", fun)
-    return ()=>{
+    return () => {
-      img.removeEventListener("wheel",fun)
+      img.removeEventListener("wheel", fun)
     }
-    
-  },[loading])
- 
-return (
-  <div className='content-box' style={{ backgroundColor: '#fff', height: '100%', display: 'flex', padding: '10px' }}>
-    <div className='lf adcdTreeSelectorBox' style={{ height: 'calc(100vh - 110px)', width: '260px' }}>
-      <ListSelect
-        setAdcd={setCode}
-        listData={dmList}
-      />
-    </div>
-    <div className='AdcdTreeTableBox' style={{ width: 'calc(100vw - 625px)' }}>
-      <Card
-        className='nonebox'
-      // onMouseOver={() => {
-      //   clearInterval(timer)
-      // }}
-      >
-        <ToolBar
-          setSearchVal={setSearchVal}
-          exportFile={exportExcel}
-          setSwiper={setSwiper}
-          role={role}
-        />
-      </Card>
-      {
-        !loading ? <div className="ant-card-body" style={{ padding: "20px 0 0 0", overflow: "hidden" }}>
 
-        <div style={{ height: 420, width: "100%",overflow:'hidden',position:'relative' }} >
+  }, [loading])
-          <Rnd
+
-            default={{
+  return (
-              x: 0,
+    <div className='content-box' style={{ backgroundColor: '#fff', height: '100%', display: 'flex', padding: '10px' }}>
-              y: 0,
+      <div className='lf adcdTreeSelectorBox' style={{ height: 'calc(100vh - 110px)', width: '260px' }}>
-              width: 1305,
+        <ListSelect
-              height: 380
+          setAdcd={setCode}
-            }}
+          listData={dmList}
-          >
+        />
-            <div id="img">
+      </div>
-              <div style={{ textAlign: "center", marginBottom: 10, fontSize: 20 }}>断面名称:{dmList.find(s => s.id == code)?.projNm}</div>
+      <div className='AdcdTreeTableBox' style={{ width: 'calc(100vw - 625px)' }}>
-              <ReactEcharts
+        <Card
-                option={jrxOptions}
+          className='nonebox'
-                style={{ width: "100%", height: 380 }}
+        // onMouseOver={() => {
-                notMerge={true}
+        //   clearInterval(timer)
-                ref={echartsRef}
+        // }}
+        >
+          <ToolBar
+            setSearchVal={setSearchVal}
+            exportFile={exportExcel}
+            setSwiper={setSwiper}
+            role={role}
+          />
+        </Card>
+        {
+          !loading ? <div className="ant-card-body" style={{ padding: "20px 0 0 0", overflow: "hidden" }}>
+
+            <div style={{ height: 420, width: "100%", overflow: 'hidden', position: 'relative' }} >
+              <Rnd
+                default={{
+                  x: 0,
+                  y: 0,
+                  width: 1305,
+                  height: 380
+                }}
+              >
+                <div id="img">
+                  <div style={{ textAlign: "center", marginBottom: 10, fontSize: 20 }}>断面名称:{dmList.find(s => s.id == code)?.projNm}</div>
+                  <ReactEcharts
+                    option={jrxOptions}
+                    style={{ width: "100%", height: 380 }}
+                    notMerge={true}
+                    ref={echartsRef}
+                  />
+                </div>
+              </Rnd>
+            </div>
+            <div className='body-top' style={{ marginTop: 30 }}>
+              <Table
+                columns={columns1}
+                key="inx"
+                dataSource={dataSources}
+                pagination={false}
+                scroll={{ x: width, y: 250, scrollToFirstRowOnChange: true }}
+                onRow={record => {
+                  return {
+                    onClick: () => { echartsRef.current.getEchartsInstance().setOption(jrxOption(record, dbType, dbType1)) }
+                  }
+                }}
               />
             </div>
-          </Rnd>
+          </div> :
-        </div>
+            <Spin size='large' style={{ width: '100%', margin: '300px auto' }}></Spin>
-        <div className='body-top' style={{ marginTop: 30 }}>
+        }
-          <Table
+
-            columns={columns1}
+      </div>
-            key="inx"
-            dataSource={dataSources}
-            pagination={false}
-            scroll={{ x: width, y: 250, scrollToFirstRowOnChange: true }}
-            onRow={record => {
-              return {
-                onClick: () => { echartsRef.current.getEchartsInstance().setOption(jrxOption(record, dbType,dbType1)) }
-              }
-            }}
-          />
-        </div>
-        </div> :
-          <Spin size='large' style={{width:'100%',margin:'300px auto'}}></Spin>
-      }
-      
     </div>
-  </div>
+  )
-)
 }

src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js

@@ -1,45 +1,54 @@
 
 export default function jrxOptions(data = {}, type = "1",typeName='1') {
    // debugger
+   console.log("data",data);
+   // data.rz = 112
+   // 根据断面类型确定y轴刻度以及最大和最小
    const yMin = type == "3" ? 70 : type == "2" ? 67 : 
-                  type == '1' ? 59 : 70;
+                  type == '1' ? 59 : 99;
    const yMax = type == "3" ? 129 : type == "2" ? 117 
-   : type == "1" ? 118 : 150;
+      : 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"];
    const type6 = ["UPD12", "UPD15"];
+   const type7 = ["UPD24", "UPD26","UPD28"];  //UPD24:109.87,UPD26:109.75,UPD28:109.43
+   const type8 = ["UPD25", "UPD27","UPD29"];  //UPD25:109.87,UPD27:109.75,UPD29:109.43
 
    // 管底高程
-
    const alltype = typeName == "1" ? type1 :
       typeName == "2" ? type2 :
          typeName == "3" ? type3 :
             typeName == "4" ? type4 :
                typeName == "5" ? type5 :
-               typeName == "6" ? type6 :[]
+                  typeName == "6" ? type6 :
-      ;
+                     typeName == "7" ? type7 :
+                        typeName == "8" ? type8 :
+                     [];
 
    // 字体颜色
    const textColor = '#666'
    const imageUrl370 = `${process.env.PUBLIC_URL}/assets/images/zb370.png `
    const imageUrl250 = `${process.env.PUBLIC_URL}/assets/images/zb250.png `
    const imageUrl130 = `${process.env.PUBLIC_URL}/assets/images/zb130.png `
+   const imageUrl010 = `${process.env.PUBLIC_URL}/assets/images/fb010.png `
    const imageUrl = type == "1" ? imageUrl130 :
       type == "2" ? imageUrl250 : 
-      type == "3" ? imageUrl370 : imageUrl370
+      type == "3" ? imageUrl370 : imageUrl010
       ;
    const rule = `${process.env.PUBLIC_URL}/assets/images/ruler.png `
 
    // rz 是最上面那条线  rz1是那条贴近坝面的线 xValue求解的是最上面那条线的末尾横坐标
    const xValue = type == "3" ? (((data?.rz - 86) + 0.6 * 5) / 0.6) :
       type == "2" ? (((data?.rz - 87) + 0.63 * 7) / 0.63) :
-      type == "1" ? (((data?.rz - 88) + 0.7 * 10) / 0.7) :
+         type == "1" ? (((data?.rz - 88) + 0.7 * 10) / 0.7) :
-         (((data?.rz - 99) + 1 * 14) / 1)
+            (((data?.rz - 102) + 0.25 * 4) / 0.25)
    const rz = data?.rz ?
-      [[xValue, data?.rz], [0, data?.rz],] :
+      [[xValue, data?.rz], [0, data?.rz]] :
       []
    const rz1 = data?.rz ?
       type == "3" ?
@@ -48,36 +57,36 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') {
             [[0, 87], [7, 87], [xValue, data?.rz]]
             :
             type == "1" ?
-            [[0, 88], [10, 88], [xValue, data?.rz]]
+               [[0, 88], [10, 88], [xValue, data?.rz]]
-            :
+               :
-            [[0, 99], [14, 99], [xValue, data?.rz]]
+              [[0, 102], [4, 102], [xValue, data?.rz]]
-      :
+      : [];
-      []
    // gz1、gz2、gz3、gz4分别为渗压管
    const gz1 = data[alltype[0]] ?
-      type == "3" ? [[47, typeName =='5' ?76.56:92.18], [47, data[alltype[0]]]] :
+      type == "3" ? [[typeName =='5' ?47:51, typeName =='5' ?76.56:92.18], [typeName =='5' ?47:51, data[alltype[0]]]] :
-         type == "2" ? [[45.5, typeName =='3' ?76.16:77.18], [45.5, 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]]]] :
-            [[47.5, 158], [85, data[alltype[0]]]]
+            [[55, 109.87], [55, data[alltype[0]]]]
       : [];
    
+   
    const gz2 = data[alltype[1]] ?
-      type == "3" ? [[51, typeName =='5' ?77.18:83.50], [51, data[alltype[1]]]] :
+      type == "3" ? [[typeName =='5' ?51:62, typeName =='5' ?77.18:83.50], [typeName =='5' ?51:62, data[alltype[1]]]] :
-         type == "2" ? [[50, typeName =='3' ?77.18:77.50], [50, 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]]]] :
-            [[53.6, 158], [53.6, 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 == "3" ? [[62, 81.50], [62, data[alltype[2]]]] :
-         type == "2" ? [[58, 80.50], [58, data[alltype[2]]]] :
+         type == "2" ? [[61, 80.50], [61, data[alltype[2]]]] :
          type == "1" ? [[58, 66.50], [58, data[alltype[2]]]] :
-            [[73, 161], [73, 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]]]] : [];
    
@@ -86,18 +95,18 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') {
       type == "3" ?
          [
             [xValue, data?.rz],
-            [47, data[alltype[0]]],
+            [typeName =='5' ?47:51, data[alltype[0]]],
-            [51, data[alltype[1]]],
+            [typeName =='5' ?51:62, data[alltype[1]]],
-            [58.5, data[alltype[2]]],
+            [62, data[alltype[2]]],
            
          ] :
          type == "2" ?
             [
                [xValue, data?.rz],
-               [45.5, data[alltype[0]]],
+               [typeName =='3' ? 45.5:50, data[alltype[0]]],
-               [50, data[alltype[1]]],
+               [typeName =='3' ?50:61, data[alltype[1]]],
-               [58, data[alltype[2]]],
+               [61, data[alltype[2]]],
-               [77, data[alltype[3]]]
+               [79, data[alltype[3]]]
             ] :
             type == "1"?
             [
@@ -109,9 +118,9 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') {
             ]:
             [
                [xValue, data?.rz],
-               [51.6, data[alltype[0]]],
+               [55, data[alltype[0]]],
-               [53.6, data[alltype[1]]],
+               [65, data[alltype[1]]],
-               [73, data[alltype[2]]],
+               [77, data[alltype[2]]],
                [85, data[alltype[3]]]
             ]
       : []
@@ -266,7 +275,7 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') {
                origin: "end",
                color: 'rgba(0, 128, 255, 0.3)' // 设置区域填充颜色
             },
-            data: [...rz, ...rz1]
+            data:[...rz, ...rz1]
 
          },
          {

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);
     }

src/views/gcaqjc/sjtjcx/ndwytjb/index.js

@@ -55,9 +55,10 @@ const Page = () => {
     if (trData.length > 0 && wyObj) {
       let dm = trData?.map(item => (
         {
-          title: item.cd,
+          title: item.cdNm,
           width: 100,
           align: "center",
+          cd:item.cd,
           children: wyList?.map(s => ({
             title: s,
             key: `${s}_${item.cd}`,
@@ -69,7 +70,7 @@ const Page = () => {
         }
       ))
 
-      const newDm = dm.filter(item => item.title == wyObj.wy)
+      const newDm = dm.filter(item => item.cd == wyObj.wy)
       return [...columns1,...columns2, ...newDm]
     }
     

src/views/gcaqjc/sjtjcx/ndwytjb/toolbar.js

@@ -38,7 +38,7 @@ const ToolBar = ({ setSearchVal, setDmName, exportFile, role,list,setWyObj }) =>
   useEffect(() => {
     if (list.length > 0) {
       const newList = list.map(item => ({
-        label: item.cd,
+        label: item.cdNm,
         value:item.cd
       }))
       setSource(newList)