From 1684bef135ac153fe41825921e2448ebc62b6ea1 Mon Sep 17 00:00:00 2001
From: zhugy <zhugy@yisa.com>
Date: Tue, 30 Jan 2024 16:31:19 +0800
Subject: [PATCH] =?UTF-8?q?fix():=E6=96=B0=E5=A2=9E=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6=E9=80=89=E6=8B=A9=E4=B8=8E=E5=9B=9E?=
 =?UTF-8?q?=E5=A1=AB=E7=BB=84=E4=BB=B6,=E4=BF=AE=E6=94=B9=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SelectGaodeLngLat/index.jsx         |  13 +-
 src/components/SelectGaodeLngLat/index.scss        |   3 +
 src/components/SelectGaodeLngLat2/blue-point.png   | Bin 0 -> 2377 bytes
 src/components/SelectGaodeLngLat2/index.jsx        | 231 +++++++++++++++++++++
 src/components/SelectGaodeLngLat2/index.scss       |  29 +++
 src/components/index.jsx                           |   2 +
 .../RecordInquiry/ParkRecordTotal/loadable.jsx     |  71 ++++---
 src/pages/NewEnergy/ChargeStationMgm/index.scss    |   4 +
 src/pages/NewEnergy/ChargeStationMgm/loadable.jsx  |  43 ++--
 9 files changed, 337 insertions(+), 59 deletions(-)
 create mode 100644 src/components/SelectGaodeLngLat2/blue-point.png
 create mode 100644 src/components/SelectGaodeLngLat2/index.jsx
 create mode 100644 src/components/SelectGaodeLngLat2/index.scss

diff --git a/src/components/SelectGaodeLngLat/index.jsx b/src/components/SelectGaodeLngLat/index.jsx
index 02c8f81..e79f2a9 100644
--- a/src/components/SelectGaodeLngLat/index.jsx
+++ b/src/components/SelectGaodeLngLat/index.jsx
@@ -13,7 +13,6 @@ function SelectGaodeLngLat(props) {
   const {
     getLntLat = () => { },
     close,
-    hide,
     lngLatVisible = false,
     open,
     onChange = () => { },
@@ -136,7 +135,7 @@ function SelectGaodeLngLat(props) {
             <Button
               type="primary"
               onClick={() => {
-                hide();
+                close();
                 getLocationMessage();
               }}
             >
@@ -169,7 +168,7 @@ function ModalMap(props) {
   const [map, setMap] = useState(null);
   const [Marker, setMarker] = useState(null);
   const mapRef = useRef(null);
-  const [latLng, setLatLng] = useState([])
+  const [point, setPoint] = useState([])
   const initMap = () => {
     // console.log(mapConfig);
     // const _map = L.map("mapid", {
@@ -208,19 +207,19 @@ function ModalMap(props) {
       setLnglat([e.lnglat.lng.toFixed(4), e.lnglat.lat.toFixed(4)]);
       getLntLat([e.lnglat.lng.toFixed(4), e.lnglat.lat.toFixed(4)]);
       if (isClickMarker) {
-        setLatLng([e.lnglat.lng.toFixed(4), e.lnglat.lat.toFixed(4)])
+        setPoint([e.lnglat.lng.toFixed(4), e.lnglat.lat.toFixed(4)])
       }
     })
     mapRef.current = map
   };
   useEffect(() => {
-    setLatLng(markerPoint)
+    setPoint(markerPoint)
   }, [markerPoint]);
   useEffect(() => {
     if (map) {
-      addMarker(latLng); // 添加点位
+      addMarker(point); // 添加点位
     }
-  }, [latLng]);
+  }, [point]);
   const markerContent = `<div class="custom-content-marker">
       <img src='${Rerm}' />
     </div>`;
diff --git a/src/components/SelectGaodeLngLat/index.scss b/src/components/SelectGaodeLngLat/index.scss
index 1e924cb..7109db3 100644
--- a/src/components/SelectGaodeLngLat/index.scss
+++ b/src/components/SelectGaodeLngLat/index.scss
@@ -2,6 +2,9 @@
 
 }
 .map-modal {
+  .ant-modal-body {
+    border-radius: 4px;
+  }
   .ant-modal-close-x {
     width: 30px;
     height: 30px;
diff --git a/src/components/SelectGaodeLngLat2/blue-point.png b/src/components/SelectGaodeLngLat2/blue-point.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee86a7675844e0d704cfa4d04ad85e96c9334ada
GIT binary patch
literal 2377
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

literal 0
HcmV?d00001

diff --git a/src/components/SelectGaodeLngLat2/index.jsx b/src/components/SelectGaodeLngLat2/index.jsx
new file mode 100644
index 0000000..454fbd4
--- /dev/null
+++ b/src/components/SelectGaodeLngLat2/index.jsx
@@ -0,0 +1,231 @@
+import React, { useState, useEffect, useRef } from "react";
+import { Button, Input, Modal, message, AutoComplete } from "antd";
+import L from "leaflet";
+import "leaflet/dist/leaflet.css";
+import "leaflet.chinatmsproviders";
+import ajax from "@/services";
+import "./index.scss";
+import Rerm from "./blue-point.png";
+let timer = null;
+function SelectGaodeLngLat(props) {
+  const {
+    getLntLat = () => { },
+    onChange = () => { },
+    _lngLat = [], // 数据回填 经纬度
+    _address = "", // 数据回填  地址
+  } = props;
+  const mapConfig = {
+    center: sysConfig.map.center,
+    zoom: sysConfig.map.zoom,
+    zooms: sysConfig.map.zooms,
+    maxZoom: sysConfig.map.zooms[1],
+    minZoom: sysConfig.map.zooms[0],
+    mapTileHost: sysConfig.map.mapTileHost,
+    zoomOffset: sysConfig.map.zoomOffset,
+    mapTileType: sysConfig.map.mapTileType,
+  };
+  const [visible, setVisible] = useState(false);
+  const [lnglat, setLnglat] = useState([]);
+  const [address, setAddress] = useState("");
+  const [searchLnglatValue, setSearchLnglatValue] = useState([]);
+  const [getLngLabel, setGetLngLabel] = useState([])
+  const [map, setMap] = useState(null);
+  const [markers, setMarkers] = useState(null);
+  const mapRef = useRef(null);
+
+  const searchLnglat = (values) => {
+    clearTimeout(timer);
+    timer = setTimeout(() => {
+      ajax.handleLng({
+        keywords: values,
+      }).then(
+        (res) => {
+          if (parseInt(res?.status) === 20000) {
+            setGetLngLabel(
+              res?.data.map((ele) => {
+                return {
+                  ...ele,
+                  label: (
+                    <div className="labds">
+                      <span>{ele.label}</span>
+                    </div>
+                  ),
+                  value: ele.label,
+                  values: ele.value
+                };
+              })
+            );
+          } else {
+            message.error(res?.message);
+          }
+        },
+        (err) => {
+          console.log(err);
+        }
+      );
+    }, 1000);
+
+  };
+  //选择
+  const onSelect = (data) => {
+    let add = getLngLabel.filter((ele) => ele.value == data)[0] || [];
+    setLnglat([add.lng, add.lat]);
+  };
+  function getLocationMessage(v) {
+    // const lat_lng = lnglat.reverse().join(",");
+    const lat_lng = v ? v.join(",") : lnglat.join(",");
+    ajax.getLocationNameByLngLat({ lat_lng }).then((res) => {
+      if (res.status === 20000) {
+        setAddress(res.data.address);
+      } else {
+        message.error(res.message);
+      }
+    });
+  }
+  // 打开弹窗
+  const open = () => {
+    setVisible(true)
+  }
+  // 保存
+  const save = () => {
+    setVisible(false)
+    onChange(address);
+    getLntLat(lnglat);
+    getLocationMessage();
+  }
+  // 地图
+  const initMap = () => {
+    let _map = new AMap.Map("mapid", {
+      resizeEnable: true,
+      layers: [
+        new AMap.TileLayer.Satellite(),
+        new AMap.TileLayer.RoadNet()
+      ]
+    });
+    _map.setCenter([mapConfig.center[1], mapConfig.center[0]], mapConfig.zoom);
+    setMap(_map)
+    if (_lngLat && _lngLat.length) {
+      let marker = new AMap.Marker({
+        position: new AMap.LngLat(parseFloat(_lngLat[0]), parseFloat(_lngLat[1])),
+        content: markerContent,
+        offset: new AMap.Pixel(-24, -45),
+      });
+      _map.add(marker);
+      setMarkers(marker);
+      setTimeout(() => {
+        _map.setCenter(new AMap.LngLat(parseFloat(_lngLat[0]), parseFloat(_lngLat[1])));
+      }, 800);
+    }
+    _map.on('click', function (e) {
+      setLnglat([e.lnglat.lng.toFixed(4), e.lnglat.lat.toFixed(4)]);
+    })
+    mapRef.current = map
+  };
+  const markerContent = `<div class="custom-content-marker">
+      <img src='${Rerm}' />
+    </div>`;
+  // 添加标记
+  const addMarker = (data) => {
+    // console.log('marker',data);
+    if (markers) {
+      map.remove(markers);
+    }
+    if (data.length == 0) return
+    let marker = new AMap.Marker({
+      position: new AMap.LngLat(parseFloat(data[0]), parseFloat(data[1])),
+      content: markerContent,
+      offset: new AMap.Pixel(-24, -45),
+    });
+    map.add(marker);
+    setMarkers(marker);
+    setTimeout(() => {
+      map.setCenter(new AMap.LngLat(parseFloat(data[0]), parseFloat(data[1])));
+    }, 800);
+  };
+
+  useEffect(() => {
+    if (visible) {
+      setAddress(_address);
+      setLnglat(_lngLat);
+      setTimeout(() => {
+        initMap()
+      }, 500)
+    }
+  }, [visible]);
+
+  useEffect(() => {
+    lnglat?.length > 0 && getLocationMessage(lnglat)
+    if (map) {
+      addMarker(lnglat); // 添加点位
+    }
+  }, [lnglat]);
+
+  useEffect(() => {
+    setTimeout(() => {
+      if (searchLnglatValue.length === 0) return;
+      mapRef.current.setView(searchLnglatValue, 13);
+    }, 800)
+  }, [searchLnglatValue]);
+
+  return (
+    <div className="SelectLnglat">
+      <Button
+        onClick={open}
+        type="primary"
+      >
+        打开
+      </Button>
+      <Modal
+        className="map-modal"
+        open={visible}
+        destroyOnClose
+        width={1000}
+        footer={false}
+        onCancel={() => { setVisible(false) }}
+      >
+        <div
+          style={{
+            width: "100%",
+            height: "500px",
+          }}
+        >
+          <div
+            id="mapid"
+            className="map"
+            style={{
+              height: "100%",
+              width: "100%",
+            }}
+          ></div>
+        </div>
+
+        <div className="bottom-input">
+          <div className="input-search">
+            <AutoComplete
+              options={getLngLabel}
+              placeholder={address ? address : "请选择地址"}
+              onSearch={searchLnglat}
+              onSelect={onSelect}
+              // enterButton={"搜索"}
+              style={{ width: 300 }}
+            ></AutoComplete>
+          </div>
+          <div className="result-search">
+            <label>已选择的经纬度:</label>
+            <Input value={lnglat} />
+          </div>
+          <div style={{ marginLeft: "40px" }}>
+            <Button
+              type="primary"
+              onClick={save}
+            >
+              保存
+            </Button>
+          </div>
+        </div>
+      </Modal>
+    </div>
+  );
+}
+
+export default SelectGaodeLngLat;
diff --git a/src/components/SelectGaodeLngLat2/index.scss b/src/components/SelectGaodeLngLat2/index.scss
new file mode 100644
index 0000000..7109db3
--- /dev/null
+++ b/src/components/SelectGaodeLngLat2/index.scss
@@ -0,0 +1,29 @@
+.SelectLnglat {
+
+}
+.map-modal {
+  .ant-modal-body {
+    border-radius: 4px;
+  }
+  .ant-modal-close-x {
+    width: 30px;
+    height: 30px;
+    line-height: 30px;
+  }
+}
+.bottom-input {
+  display: flex;
+  margin: 10px 0 0 0;
+  .input-search {
+    margin: 0 10px 0 0;
+    width: 300px;
+  }
+  .result-search{
+    label{
+      width: 160px;
+      line-height: 32px;
+      height:32px;
+    }
+    display: flex;
+  }
+}
diff --git a/src/components/index.jsx b/src/components/index.jsx
index 48fb281..6636eda 100644
--- a/src/components/index.jsx
+++ b/src/components/index.jsx
@@ -33,6 +33,7 @@ import TableModule from "./TableModule";
 import TreeSelectGroup from "./TreeSelectGroup";
 import SelectLntLat from "./SelectLngLat";
 import SelectGaodeLngLat from "./SelectGaodeLngLat";
+import SelectGaodeLngLat2 from "./SelectGaodeLngLat2";
 import ImportBtn from './ImportBtn';
 import QuickMenu from './QuickMenu';
 import DataSelect from './DataSelect';
@@ -82,6 +83,7 @@ export {
   TreeSelectGroup,
   SelectLntLat,
   SelectGaodeLngLat,
+  SelectGaodeLngLat2,
   ImportBtn,
   QuickMenu,
   DataSelect,
diff --git a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx
index 8f170ad..0bf596d 100644
--- a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx
@@ -22,6 +22,7 @@ import ajax from "@/services";
 import errorImg from '@/assets/images/error-img-new.png'
 import { QuestionCircleOutlined } from '@ant-design/icons';
 import { TableModule } from "@/components";
+import { useSessionStorageState } from 'ahooks';
 import "./index.scss";
 import {
   payRecordColumns,
@@ -35,6 +36,23 @@ const { TextArea } = Input;
 let array = [];
 
 function ParkRecordTotal() {
+  const [sessionTabList, setSessionTabList] = useSessionStorageState("parkRecordTotal", {
+    value: {}
+  })
+  const sType = sessionTabList.type   // 出场类型
+  // 数据来源
+  const [source, setSource] = useState(() => {
+    if (!sType || sType == 1) {
+      return sysConfig?.inSource
+    } else if (sType == 2) {
+      return sysConfig?.outSource
+    }
+  }) 
+  const valueChange = (v) => {
+    // console.log(v.type);
+    let _source = v.type == 1 ? sysConfig?.inSource : sysConfig?.outSource
+    setSource(_source)
+  }
   const roadContent = (
     <div>
       <p>出场时间-入场时间的计算金额</p>
@@ -70,7 +88,7 @@ function ParkRecordTotal() {
       render: (text, record, index) => index + 1,
       width: 100,
     },
- 
+
     {
       title: "路段名称",
       dataIndex: "road",
@@ -178,8 +196,8 @@ function ParkRecordTotal() {
     {
       title: <Popover content={receivableContent} >
         应收金额
-      <QuestionCircleOutlined />
-    </Popover>,
+        <QuestionCircleOutlined />
+      </Popover>,
       dataIndex: "receivable_amount",
       key: "receivable_amount",
       width: 100,
@@ -198,10 +216,10 @@ function ParkRecordTotal() {
       align: "center",
     },
     {
-      title:    <Popover content={preferentialContent} >
+      title: <Popover content={preferentialContent} >
         优惠金额
-      <QuestionCircleOutlined />
-    </Popover>,
+        <QuestionCircleOutlined />
+      </Popover>,
       dataIndex: "preferential_amount",
       key: "preferential_amount",
       width: 100,
@@ -213,10 +231,10 @@ function ParkRecordTotal() {
       //   </Popover>
     },
     {
-      title:  <Popover content={discountContent} >
+      title: <Popover content={discountContent} >
         折扣金额
-      <QuestionCircleOutlined />
-    </Popover>,
+        <QuestionCircleOutlined />
+      </Popover>,
       dataIndex: "discount_amount",
       key: "discount_amount",
       width: 100,
@@ -230,8 +248,8 @@ function ParkRecordTotal() {
     {
       title: <Popover content={refundContent} >
         退款总计
-      <QuestionCircleOutlined />
-    </Popover>,
+        <QuestionCircleOutlined />
+      </Popover>,
       dataIndex: "refund_total",
       key: "refund_total",
       width: 100,
@@ -303,7 +321,7 @@ function ParkRecordTotal() {
       name: "region",
       type: "TreeSelect",
       label: "区域",
-      areaName:1
+      areaName: 1
     },
     {
       name: "operator",
@@ -311,14 +329,14 @@ function ParkRecordTotal() {
       label: "商户名称",
       defaultValue: "0",
       placeholder: "请选择商户名称",
-      operatorName:1
+      operatorName: 1
     },
     {
       name: "road",
       type: "SearchSelect",
       label: "路段名称",
       placeholder: "请输入路段名称",
-      roadName:1
+      roadName: 1
     },
     {
       name: "road_type",
@@ -432,12 +450,12 @@ function ParkRecordTotal() {
       // ],
     },
     {
-      name: "in_source",
+      name: "source",
       type: "Select",
       label: "操作来源",
       placeholder: "请选择操作来源",
       defaultValue: 0,
-      options: sysConfig?.inSource || [],
+      options: source,
     },
     {
       name: "in_person",
@@ -699,7 +717,7 @@ function ParkRecordTotal() {
             <Descriptions.Item label="应收金额">
               {item.receivable_amount}
             </Descriptions.Item>
-            <Descriptions.Item label="优惠券">{item.coupon }</Descriptions.Item>
+            <Descriptions.Item label="优惠券">{item.coupon}</Descriptions.Item>
             <Descriptions.Item label="优惠总额">
               {item.preferential_amount}
             </Descriptions.Item>
@@ -725,17 +743,17 @@ function ParkRecordTotal() {
           <Descriptions title="入场照片">
             <Descriptions.Item label="车辆照片">
               <div className="ltc-item ltc-item-img ">
-                <Image src={item.in_veh_pic || require("../../../../../src/assets/images/error-img-new.png")} onError={handleImgError}/>
+                <Image src={item.in_veh_pic || require("../../../../../src/assets/images/error-img-new.png")} onError={handleImgError} />
               </div>
             </Descriptions.Item>
             <Descriptions.Item label="车牌照片">
               <div className="ltc-item ltc-item-img ">
-                <Image src={item.in_plate_pic || require("../../../../../src/assets/images/error-img-new.png")} onError={handleImgError}/>
+                <Image src={item.in_plate_pic || require("../../../../../src/assets/images/error-img-new.png")} onError={handleImgError} />
               </div>
             </Descriptions.Item>
             <Descriptions.Item label=" 残疾人证件">
               <div className="ltc-item ltc-item-img ">
-                <Image src={item.cj_pic || require("../../../../../src/assets/images/error-img-new.png")} onError={handleImgError}/>
+                <Image src={item.cj_pic || require("../../../../../src/assets/images/error-img-new.png")} onError={handleImgError} />
               </div>
             </Descriptions.Item>
           </Descriptions>
@@ -744,7 +762,7 @@ function ParkRecordTotal() {
     );
   }
   //查看历史详情
-  const [getHistoryData,setGetHistoryData]=useState({})
+  const [getHistoryData, setGetHistoryData] = useState({})
   function checkHistoryDetail(record) {
     setGetHistoryData(record);
     setHistoryVisible(true);
@@ -794,7 +812,7 @@ function ParkRecordTotal() {
     ajax.getHistoryRecord({ park_record_id: park_id }).then((res) => {
       if (res.status === 20000) {
         // res.data.list.map(res=>{
-          setHistoryProgressRecord(res.data.list);
+        setHistoryProgressRecord(res.data.list);
         // })
       } else {
         message.error(res.message)
@@ -809,7 +827,7 @@ function ParkRecordTotal() {
       if (res.status === 20000) {
         setTableData(res.data.list);
         setTotal(res.data.total);
-      }else{
+      } else {
         message.error(res.message)
       }
     });
@@ -826,7 +844,8 @@ function ParkRecordTotal() {
         tableData={tableData}
         formSearch={formSearch}
         pagename="停车记录查询"
-        mandatory={['plate','berth_id']}
+        valueChange={valueChange}
+        mandatory={['plate', 'berth_id']}
         mandatory_name={['车牌号或泊位号']}
         pageName={'parkRecordTotal'}
         initFormData={initFormData}
@@ -1184,11 +1203,11 @@ function ParkRecordTotal() {
               </div>
               <div className="eae-modal-item">
                 <div>车辆照片</div>
-                <Image src={historyDataDetail.in_veh_pic} onError={handleImgError}/>
+                <Image src={historyDataDetail.in_veh_pic} onError={handleImgError} />
               </div>
               <div className="eae-modal-item">
                 <div>车牌照片</div>
-                <Image src={historyDataDetail.in_plate_pic} onError={handleImgError}/>
+                <Image src={historyDataDetail.in_plate_pic} onError={handleImgError} />
               </div>
             </div>
           </Modal>
diff --git a/src/pages/NewEnergy/ChargeStationMgm/index.scss b/src/pages/NewEnergy/ChargeStationMgm/index.scss
index 7f6d376..0047101 100644
--- a/src/pages/NewEnergy/ChargeStationMgm/index.scss
+++ b/src/pages/NewEnergy/ChargeStationMgm/index.scss
@@ -1,4 +1,7 @@
 .add-station-modal {
+  .ant-modal-header {
+    border-radius: 4px 4px 0 0;
+  }
   .add-station-body {
     display: flex;
     justify-content: space-between;
@@ -62,6 +65,7 @@
   .ant-modal-footer{
     display: flex;
     justify-content: center;
+    border-radius: 0 0 4px 4px;
     .ant-btn{
       width: 88px;
       height: 35px;
diff --git a/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx b/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx
index e73c352..fe6d10a 100644
--- a/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx
+++ b/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx
@@ -6,14 +6,14 @@ import {
   Upload,
 } from "antd";
 import ajax from "@/services";
-import { useSessionStorageState, useSetState } from "ahooks"
+import { useSetState } from "ahooks"
 import { LoadingOutlined, PlusOutlined } from '@ant-design/icons';
-import { TableModule, FormInput, FormSelect, FormTreeSelectNew, ImgError, SelectGaodeLngLat } from "@/components";
+import { TableModule, FormInput, FormSelect, FormTreeSelectNew, ImgError, SelectGaodeLngLat2 } from "@/components";
 import "./index.scss";
 
 
 function Appointment() {
-  const pattern = /^\d+$/; // 正整数正则
+  const pattern = /^[1-9][0-9]*$/;  // 正整数正则
   // 详情弹窗
   const [detailVisible, setDetailVisible] = useState(false);
   // 列表数据
@@ -26,8 +26,7 @@ function Appointment() {
   const [areaList, setAreaList] = useState([]);
   //商户名称下拉
   const [operatorList, setOperatorList] = useState([]);
-  // 经纬度选择弹窗
-  const [lngLatVisible, setLngLatVisible] = useState(false);
+
   // 添加站点
   const initAdd = {
     name: "",
@@ -41,6 +40,10 @@ function Appointment() {
     lng_lat: ""
   }
   const [addFormData, setAddFormData] = useSetState(initAdd);
+  const [lngLat, setLngLat] = useSetState({
+    lng_lat: "",
+    address: ""
+  });
   // 搜索参数
   const [formData, setFormData] = useSetState({});
   // 图片上传load
@@ -200,6 +203,7 @@ function Appointment() {
   // 获取商户下拉
   const getAllOperator = () => {
     ajax.getAllOperator().then((res) => {
+      console.log(res);
       const { status, data } = res
       if (status === 20000) {
         if (data && data.length) {
@@ -236,12 +240,8 @@ function Appointment() {
     setLoading(false)
     setDetailVisible(true)
   }
-  const handelClose = () => {
-    setLngLatVisible(false)
-    setAddFormData({ lng_lat: "", address: "" })
-  }
   const handelOk = () => {
-    // console.log(addFormData);
+    console.log(addFormData);
     if (!addFormData.name) {
       message.warn("请输入充电站名称")
       return
@@ -254,18 +254,10 @@ function Appointment() {
       message.warn("请输入车位数量")
       return
     }
-    if (addFormData.count < 1) {
-      message.warn("请输入正确的车位数量")
-      return
-    }
     if (!pattern.test(addFormData.count)) {
       message.warn("请输入正整数的车位数量")
       return
     }
-    if (!addFormData.address) {
-      message.warn("请输入详细地址")
-      return
-    }
     if (!addFormData.site_type) {
       message.warn("请选择站点类型")
       return
@@ -282,6 +274,10 @@ function Appointment() {
       message.warn("请选择经纬度")
       return
     }
+    if (!addFormData.address) {
+      message.warn("请输入详细地址")
+      return
+    }
     if (!addFormData.img) {
       message.warn("请上传充电站图片")
       return
@@ -468,20 +464,15 @@ function Appointment() {
                 disabled={true}
               />
               <div className="latlng-box">
-                <SelectGaodeLngLat
-                  isClickMarker
-                  open={() => setLngLatVisible(true)}
-                  lngLatVisible={lngLatVisible}
+                <SelectGaodeLngLat2
+                  _lngLat={addFormData.lng_lat}
+                  _address={addFormData.address}
                   getLntLat={(value) => {
                     setAddFormData({ lng_lat: value })
                   }}
                   onChange={(adress) => {
-                    // console.log(adress);
                     setAddFormData({ address: adress })
                   }}
-                  // close={handelClose}
-                  close={() => setLngLatVisible(false)}
-                  hide={() => setLngLatVisible(false)}
                 />
               </div>
             </div>