|
@@ -3,6 +3,19 @@ import { Marker, /*Popup, */Tooltip, withLeaflet } from "react-leaflet";
|
|
|
import { Icon } from 'leaflet';
|
|
|
|
|
|
class MoveableMarker extends Component{
|
|
|
+ createInfo(data){
|
|
|
+ let infos = [];
|
|
|
+ for (let i = 0; i < data.length; i++) {
|
|
|
+ const element = data[i];
|
|
|
+ if(element !== ','){
|
|
|
+ infos.push(<span>{element}</span>);
|
|
|
+ }else{
|
|
|
+ infos.push(<br/>);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return infos;
|
|
|
+ }
|
|
|
+
|
|
|
render(){
|
|
|
return <>
|
|
|
<Marker position={[this.props.data.lat, this.props.data.lng] } icon={new Icon({
|
|
@@ -12,15 +25,9 @@ class MoveableMarker extends Component{
|
|
|
iconAnchor: [10,10]
|
|
|
})} name={`${this.props.data.reader_name}-${this.props.data.reader_id}`} key={this.props.key}>
|
|
|
{this.props.data.info &&
|
|
|
- <Tooltip
|
|
|
- // position=()
|
|
|
- >
|
|
|
- {/* <span>{`卡号:${this.props.data.card} 与基站距离:${this.props.data.distance}米`}</span><br/>
|
|
|
- <span>{`经度:${this.props.data.lng} 纬度:${this.props.data.lat}`}</span><br/>
|
|
|
- <span>{`定位基站:${this.props.data.reader_name}-${this.props.data.reader_id}`}</span><br/>
|
|
|
- <span>{`定位时间:${this.props.data.locTime}`}</span> */}
|
|
|
- {this.props.data.info}
|
|
|
- </Tooltip>
|
|
|
+ <Tooltip>
|
|
|
+ { this.createInfo(this.props.data.info) }
|
|
|
+ </Tooltip>
|
|
|
}
|
|
|
{/* <Popup>
|
|
|
<span>{}</span>
|