From dc6d0eff3a7bc9eb1a336ee322ddb69ff00d8bdd Mon Sep 17 00:00:00 2001
From: zhangjian <zhangjian@yisa.com>
Date: Thu, 25 Jan 2024 15:42:29 +0800
Subject: [PATCH] =?UTF-8?q?feat():=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=8F=90=E5=87=BA=E6=9D=A5=E7=9A=84=E4=BB=A3=E7=A0=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/NewEnergy/NewEnergyOverview/Map.jsx                | 6 +++---
 src/pages/NewEnergy/NewEnergyOverview/index.scss             | 4 ++++
 src/pages/NewEnergy/NewEnergyOverview/loadable.jsx           | 4 ++++
 src/pages/NewEnergy/RealtimeMonitor/LockMonitor/loadable.jsx | 7 +++++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/pages/NewEnergy/NewEnergyOverview/Map.jsx b/src/pages/NewEnergy/NewEnergyOverview/Map.jsx
index 84a7091..ef51781 100644
--- a/src/pages/NewEnergy/NewEnergyOverview/Map.jsx
+++ b/src/pages/NewEnergy/NewEnergyOverview/Map.jsx
@@ -120,7 +120,7 @@ function BaseMap(props) {
           content: `
           <div class="map-item">
           <div class="name">${e.data.name}</div>
-          <div class="location"><img src=${mapLocation} />${e.data.location}</div>
+          <div class="location"><img src=${mapLocation} title=${e.data.location} />${e.data.location}</div>
           <div class="pic"><img src=${e.data.pic} /></div>
           <div class="item"><div>慢充占用</div><div>${e.data.slow_charge}</div></div>
           <div class="item"><div>快充占用</div><div>${e.data.fast_charge}</div></div>
@@ -131,8 +131,8 @@ function BaseMap(props) {
       });
       mass.on('mouseout', function (e) {
 
-        marker.setPosition(e.data.lnglat);
-        marker.setLabel()
+        // marker.setPosition(e.data.lnglat);
+        // marker.setLabel()
       });
       mass.setMap(map);
       //这里经纬度需要注意，data里面的lnglat数据格式不知道为什么给改了
diff --git a/src/pages/NewEnergy/NewEnergyOverview/index.scss b/src/pages/NewEnergy/NewEnergyOverview/index.scss
index 37aebc9..9b9e37e 100644
--- a/src/pages/NewEnergy/NewEnergyOverview/index.scss
+++ b/src/pages/NewEnergy/NewEnergyOverview/index.scss
@@ -85,6 +85,10 @@
             }
             .location{
                 margin-bottom:3px;
+                overflow:hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+
                 img{
                     width: 23px;
                 }
diff --git a/src/pages/NewEnergy/NewEnergyOverview/loadable.jsx b/src/pages/NewEnergy/NewEnergyOverview/loadable.jsx
index cf90ca0..cc9e8cb 100644
--- a/src/pages/NewEnergy/NewEnergyOverview/loadable.jsx
+++ b/src/pages/NewEnergy/NewEnergyOverview/loadable.jsx
@@ -26,6 +26,8 @@ function NewEnergyOverview() {
         }
       });
     }
+    const filterOption = (input, option) =>
+  (option?.label ?? '').toLowerCase().includes(input.toLowerCase());
   useEffect(()=>{
     getPointData()
   },[])
@@ -46,6 +48,7 @@ function NewEnergyOverview() {
     <BaseMap zoom={10} data={data} centerPoint={centerPoint}  className="overview-map">
       <div className="search">
       <Select
+         showSearch
           // value={Selectq}
           className="select-map"
           style={{
@@ -53,6 +56,7 @@ function NewEnergyOverview() {
             height:40
           }}
           options={option}
+          filterOption={filterOption}
           onChange={(e) => hangChange(e)}
         />
         <div className="search-pic"></div>
diff --git a/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/loadable.jsx b/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/loadable.jsx
index 5db7645..71b79e7 100644
--- a/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/loadable.jsx
+++ b/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/loadable.jsx
@@ -81,42 +81,49 @@ function PileMonitor() {
       dataIndex: "device_name",
       key: "device_name",
       align: "center",
+      render: (text, record, index) => text||"-",
     },
     {
       title: "设备编码",
       dataIndex: "device_num",
       key: "device_num",
       align: "center",
+      render: (text, record, index) => text||"-",
     },
     {
       title: "设备类型",
       dataIndex: "device_type",
       key: "device_type",
       align: "center",
+      render: (text, record, index) => text||"-",
     },
     {
       title: "设备供应商",
       dataIndex: "device_vendor",
       key: "device_vendor",
       align: "center",
+      render: (text, record, index) => text||"-",
     },
     {
       title: "对接平台",
       dataIndex: "platform",
       key: "platform",
       align: "center",
+      render: (text, record, index) => text||"-",
     },
     {
       title: "车位锁状态",
       dataIndex: "lock_state_name",
       key: "lock_state_name",
       align: "center",
+      render: (text, record, index) => text||"-",
     },
     {
       title: "设备状态",
       dataIndex: "device_state_name",
       key: "device_state_name",
       align: "center",
+      render: (text, record, index) => text||"-",
     },
     {
       title: "操作",