Merge branch 'lsf-dev'

src/views/Home/MapCtrl/mapstyle/shuichangLayer.js

@@ -155,51 +155,6 @@ const page1 = [
         "rzState": 2,
         "aRz": -6.69
     },
-  {
-      "stcd": "716123001",
-      "type": "sk",
-      "hasRz": true,
-      "stnm": "监测点8",
-      "adcd": "421181112000",
-      "wscd": null,
-      "importancy": 0,
-      "lgtd": 114.9175,
-      "lttd": 31.325556,
-      "elev": 0,
-      "damel": 114.75,
-      "dsflz": 113.39,
-      "fsltdz": 112.3,
-      "ddz": 107.9,
-      "zcxsw": 112.3,
-      "drpTm": "2025-04-11T05:00:00.000Z",
-      "today": 0,
-      "h1": 0,
-      "h3": 0,
-      "h6": 0,
-      "h12": 0,
-      "h24": 0,
-      "h48": 0,
-      "drpState": 2,
-      "rz": 107.53,
-      "w": 0,
-      "a_fsltdz": -4.769999999999996,
-      "rzTm": "2025-04-11T05:00:00.000Z",
-      "rzWarning": 0,
-      "rzState": 2,
-      "pic": [
-          {
-              "stcd": "716123001",
-              "tm": "2023-03-12T07:02:15.000Z",
-              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716123001/20230312150215.jpg"
-          },
-          {
-              "stcd": "716123001",
-              "tm": "2023-03-12T07:04:02.000Z",
-              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716123002/20230312150402.jpg"
-          }
-      ],
-      "aRz": -4.77
-    },
 ]
 
 export default class ShuichangLayer extends BaseLayer {

src/views/Home/components/ShuichangInfo/index.js

@@ -28,7 +28,7 @@ function SkInfo({ record }) {
   return (
     <div>
       <Grid container size="small">
-        <DescriptionItem label="水厂名称">{data.stnm}</DescriptionItem>
+        <DescriptionItem label="水厂名称">{record.stnm}</DescriptionItem>
         <DescriptionItem label="管理单位">用水协会</DescriptionItem>
         <DescriptionItem label="水厂规模">800吨</DescriptionItem>
         <DescriptionItem label="取水水源">山泉水、新水厂</DescriptionItem>