Browse Source

feat():修复测试提出来的代码问题

tags/PMS_V1.0.0_Alpha6
zhangjian 1 year ago
parent
commit
dc6d0eff3a
  1. 6
      src/pages/NewEnergy/NewEnergyOverview/Map.jsx
  2. 4
      src/pages/NewEnergy/NewEnergyOverview/index.scss
  3. 4
      src/pages/NewEnergy/NewEnergyOverview/loadable.jsx
  4. 7
      src/pages/NewEnergy/RealtimeMonitor/LockMonitor/loadable.jsx

6
src/pages/NewEnergy/NewEnergyOverview/Map.jsx

@ -120,7 +120,7 @@ function BaseMap(props) {
content: ` content: `
<div class="map-item"> <div class="map-item">
<div class="name">${e.data.name}</div> <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="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.slow_charge}</div></div>
<div class="item"><div>快充占用</div><div>${e.data.fast_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) { mass.on('mouseout', function (e) {
marker.setPosition(e.data.lnglat);
marker.setLabel()
// marker.setPosition(e.data.lnglat);
// marker.setLabel()
}); });
mass.setMap(map); mass.setMap(map);
//datalnglat //datalnglat

4
src/pages/NewEnergy/NewEnergyOverview/index.scss

@ -85,6 +85,10 @@
} }
.location{ .location{
margin-bottom:3px; margin-bottom:3px;
overflow:hidden;
white-space: nowrap;
text-overflow: ellipsis;
img{ img{
width: 23px; width: 23px;
} }

4
src/pages/NewEnergy/NewEnergyOverview/loadable.jsx

@ -26,6 +26,8 @@ function NewEnergyOverview() {
} }
}); });
} }
const filterOption = (input, option) =>
(option?.label ?? '').toLowerCase().includes(input.toLowerCase());
useEffect(()=>{ useEffect(()=>{
getPointData() getPointData()
},[]) },[])
@ -46,6 +48,7 @@ function NewEnergyOverview() {
<BaseMap zoom={10} data={data} centerPoint={centerPoint} className="overview-map"> <BaseMap zoom={10} data={data} centerPoint={centerPoint} className="overview-map">
<div className="search"> <div className="search">
<Select <Select
showSearch
// value={Selectq} // value={Selectq}
className="select-map" className="select-map"
style={{ style={{
@ -53,6 +56,7 @@ function NewEnergyOverview() {
height:40 height:40
}} }}
options={option} options={option}
filterOption={filterOption}
onChange={(e) => hangChange(e)} onChange={(e) => hangChange(e)}
/> />
<div className="search-pic"></div> <div className="search-pic"></div>

7
src/pages/NewEnergy/RealtimeMonitor/LockMonitor/loadable.jsx

@ -81,42 +81,49 @@ function PileMonitor() {
dataIndex: "device_name", dataIndex: "device_name",
key: "device_name", key: "device_name",
align: "center", align: "center",
render: (text, record, index) => text||"-",
}, },
{ {
title: "设备编码", title: "设备编码",
dataIndex: "device_num", dataIndex: "device_num",
key: "device_num", key: "device_num",
align: "center", align: "center",
render: (text, record, index) => text||"-",
}, },
{ {
title: "设备类型", title: "设备类型",
dataIndex: "device_type", dataIndex: "device_type",
key: "device_type", key: "device_type",
align: "center", align: "center",
render: (text, record, index) => text||"-",
}, },
{ {
title: "设备供应商", title: "设备供应商",
dataIndex: "device_vendor", dataIndex: "device_vendor",
key: "device_vendor", key: "device_vendor",
align: "center", align: "center",
render: (text, record, index) => text||"-",
}, },
{ {
title: "对接平台", title: "对接平台",
dataIndex: "platform", dataIndex: "platform",
key: "platform", key: "platform",
align: "center", align: "center",
render: (text, record, index) => text||"-",
}, },
{ {
title: "车位锁状态", title: "车位锁状态",
dataIndex: "lock_state_name", dataIndex: "lock_state_name",
key: "lock_state_name", key: "lock_state_name",
align: "center", align: "center",
render: (text, record, index) => text||"-",
}, },
{ {
title: "设备状态", title: "设备状态",
dataIndex: "device_state_name", dataIndex: "device_state_name",
key: "device_state_name", key: "device_state_name",
align: "center", align: "center",
render: (text, record, index) => text||"-",
}, },
{ {
title: "操作", title: "操作",

Loading…
Cancel
Save