From daecd688eb0a34d53bb9fefbad6c26a94bbccdfe Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Wed, 10 Sep 2025 15:39:03 +0800
Subject: [PATCH] =?UTF-8?q?feat():=E9=9A=90=E8=97=8F=E6=B0=B4=E5=BA=93?=
 =?UTF-8?q?=E6=B0=B4=E6=96=87=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home/MapCtrl/Markers/ShuiKuLayer.js      | 5 ++++-
 src/views/Home/homePanelsLayoutPage/index.js       | 2 ++
 src/views/Home/homePanelsLayoutPage/item_shuiku.js | 9 +++++----
 src/views/sq/qth/sksq/index.js                     | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/Home/MapCtrl/Markers/ShuiKuLayer.js b/src/views/Home/MapCtrl/Markers/ShuiKuLayer.js
index d29e5d0fd..ca20e2945 100644
--- a/src/views/Home/MapCtrl/Markers/ShuiKuLayer.js
+++ b/src/views/Home/MapCtrl/Markers/ShuiKuLayer.js
@@ -94,7 +94,10 @@ export default class ShuiKuLayer extends BaseLayer {
       //     }
       //   });
       // } 
-      const list = data.map((i)=>{
+
+      
+      const list = data.filter(o=>o.stnm==='檀树岗' || o.stnm==='檀树岗(新)')
+        .map((i) => {
         return {
           id : i.stcd,
           name: i.stnm,
diff --git a/src/views/Home/homePanelsLayoutPage/index.js b/src/views/Home/homePanelsLayoutPage/index.js
index 579f6a948..132ac12cf 100644
--- a/src/views/Home/homePanelsLayoutPage/index.js
+++ b/src/views/Home/homePanelsLayoutPage/index.js
@@ -628,6 +628,7 @@ const HomePage = ({ showPanels }) => {
           // 清空搜索输入框
           setSearchVal('')
           dispatch.runtime.closeFeaturePopAll()
+          dispatch.map.setLayerVisible({ ShuiKuLayer: false })
           mapObj && mapObj.getLayers().getArray().forEach(layer => {
             if (layer.values_.name && (layer.values_.name.indexOf('ZHZS_WXQ') > -1 || layer.values_.name.indexOf('ZHZS_YQ') > -1 || layer.values_.name.indexOf('ZHZS_YQ_DRP') > -1)) {
               layer.getSource().clear()
@@ -681,6 +682,7 @@ const HomePage = ({ showPanels }) => {
                       setSearchVal('')
                       setCheckedObj(item)
                       setShowTable(true)
+                      dispatch.map.setLayerVisible({ ShuiKuLayer: false })
                       mapObj && mapObj.getLayers().getArray().forEach(layer => {
                         if (layer.values_.name && (layer.values_.name.indexOf('ZHZS_WXQ') > -1 || layer.values_.name.indexOf('ZHZS_YQ') > -1 || layer.values_.name.indexOf('ZHZS_YQ_DRP') > -1)) {
                           layer.getSource().clear()
diff --git a/src/views/Home/homePanelsLayoutPage/item_shuiku.js b/src/views/Home/homePanelsLayoutPage/item_shuiku.js
index 10c0f6321..be6309441 100644
--- a/src/views/Home/homePanelsLayoutPage/item_shuiku.js
+++ b/src/views/Home/homePanelsLayoutPage/item_shuiku.js
@@ -25,13 +25,13 @@ const Page = () => {
     },[])
 
     const getData = async (params) => {
-        const data = await reservoirlist(params) || []
-        const list = [...data.filter(o=>o.stnm==='檀树岗(新)'),...data.filter(o=>o.stnm!=='檀树岗(新)')]
+      const data = await reservoirlist(params) || []
+      // const list = [...data.filter(o=>o.stnm==='檀树岗(新)'),...data.filter(o=>o.stnm!=='檀树岗(新)')]
+      const list = [...data.filter(o=>o.stnm==='檀树岗'),...data.filter(o=>o.stnm==='檀树岗(新)')]
         setData(list)
       }
 
   const getShuiKu = () => {
-      
       SkRealPromiseWX.get().then((res) => {
         const list = [...res].map((i)=>{
           return {
@@ -40,7 +40,8 @@ const Page = () => {
             ...i
           }
         })
-        const list2 = [...list.filter(o=>o.stnm==='檀树岗(新)'),...list.filter(o=>o.stnm!=='檀树岗(新)')]
+        // const list2 = [...list.filter(o=>o.stnm==='檀树岗(新)'),...list.filter(o=>o.stnm!=='檀树岗(新)')]
+        const list2 = [...list.filter(o=>o.stnm==='檀树岗'),...list.filter(o=>o.stnm==='檀树岗(新)')]
         console.log('res',list2);
         const data = list2[checked]
         dispatch.runtime.setFeaturePop({
diff --git a/src/views/sq/qth/sksq/index.js b/src/views/sq/qth/sksq/index.js
index 15bab8363..1bea7b587 100644
--- a/src/views/sq/qth/sksq/index.js
+++ b/src/views/sq/qth/sksq/index.js
@@ -17,7 +17,7 @@ export default function Sksq() {
 
     const getData = async (params) => {
       const data = await reservoirlist(params)
-        setTableData(data);
+        setTableData(data.filter(o=>o.stnm==='檀树岗' || o.stnm==='檀树岗(新)'));
     }
     useEffect(() => {
         let option = {