diff --git a/src/views/Home/MapCtrl/Markers/ShuiKuLayer.js b/src/views/Home/MapCtrl/Markers/ShuiKuLayer.js index fca29726a..b83241eae 100644 --- a/src/views/Home/MapCtrl/Markers/ShuiKuLayer.js +++ b/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, diff --git a/src/views/Home/homePanelsLayoutPage/item_shuiku.js b/src/views/Home/homePanelsLayoutPage/item_shuiku.js index 4a6dddd31..7b527932b 100644 --- a/src/views/Home/homePanelsLayoutPage/item_shuiku.js +++ b/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({ diff --git a/src/views/gcaqjc/sjtjcx/ndwytjb/index.js b/src/views/gcaqjc/sjtjcx/ndwytjb/index.js index 0cc7f165d..b47c0e6f4 100644 --- a/src/views/gcaqjc/sjtjcx/ndwytjb/index.js +++ b/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] } diff --git a/src/views/gcaqjc/sjtjcx/ndwytjb/toolbar.js b/src/views/gcaqjc/sjtjcx/ndwytjb/toolbar.js index a229c653d..a3b803fc0 100644 --- a/src/views/gcaqjc/sjtjcx/ndwytjb/toolbar.js +++ b/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)