Commit fa03b313 authored by baoshuang's avatar baoshuang

xiugai

parent a23788b5
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
width: 264px; width: 264px;
height: 100%; height: 100%;
padding: 32px 0; padding: 32px 0;
user-select: none;
.leftContainer { .leftContainer {
width: 100%; width: 100%;
height: 100%; height: 100%;
......
...@@ -105,7 +105,7 @@ class PointsPoolEditPage extends Component { ...@@ -105,7 +105,7 @@ class PointsPoolEditPage extends Component {
/> />
<PatrolPoint <PatrolPoint
{...rest} {...rest}
markers={markers.risk} markers={markers.patrol}
onCreated={(val) => this.onMarkersCreated('risk', val)} onCreated={(val) => this.onMarkersCreated('risk', val)}
/> />
<PersonPoint3D <PersonPoint3D
......
...@@ -106,11 +106,12 @@ class AreaLeftTree extends Component { ...@@ -106,11 +106,12 @@ class AreaLeftTree extends Component {
return ( return (
<TreeNode <TreeNode
title={<div> title={<div>
<span draggable={item.isRegion?false:true} >{item.name}</span> {item.isRegion?<span>{item.name}</span>:<span draggable={true}>{item.name}</span>}
</div>} </div>}
key={item.id} key={item.id}
dataRef={item} dataRef={item}
onDragStart={(e)=>{console.log(e)}}> onDragStart={(e)=>{this.props.dragItemChange(item)}}>
{this.renderTreeNodes(item.children)} {this.renderTreeNodes(item.children)}
</TreeNode> </TreeNode>
); );
...@@ -118,11 +119,11 @@ class AreaLeftTree extends Component { ...@@ -118,11 +119,11 @@ class AreaLeftTree extends Component {
return <TreeNode return <TreeNode
key={item.id} key={item.id}
title={<div> title={<div>
<span draggable={item.isRegion?false:true} >{item.name}</span> {item.isRegion?<span>{item.name}</span>:<span draggable={true}>{item.name}</span>}
</div>} </div>}
{...item} {...item}
onClick={() => {console.log('aaa')}} onClick={() => {console.log('aaa')}}
onDragStart={(e)=>{console.log(e)}}/>; onDragStart={(e)=>{this.props.dragItemChange(item)}}/>;
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment