diff --git a/src/pages/BaseMap/LayerData/index.js b/src/pages/BaseMap/LayerData/index.js
index f7091fde..7a51b9e9 100644
--- a/src/pages/BaseMap/LayerData/index.js
+++ b/src/pages/BaseMap/LayerData/index.js
@@ -58,10 +58,25 @@ class LayerData extends React.Component {
'icon': ({ selected }) => (selected ? [,]
: [,]),
'type': layerList[i].type,
+ 'isCustomize': layerList[i].isCustomize,
})
}
return cLayerList;
}
+ //新建点位后修改涂层数量
+ changeUnitAmount = (layerId) => {
+ let treeData = this.state.treeData;
+ for (let i in treeData) {
+ for (let j in treeData[i].children) {
+ if (layerId == treeData[i].children[j].key.split('-')[1]) {
+ treeData[i].children[j].title = 'ooo' ;
+ }
+ }
+ }
+ this.setState ({
+ treeData: treeData
+ })
+ }
// 选中图层
onLayerSelect = (selectedKeys, info) => {
let selectLayerList = [];
@@ -70,7 +85,7 @@ class LayerData extends React.Component {
selectLayerList.push({
'value': info.selectedNodes[i].key.split('-')[1],
'label': info.selectedNodes[i].title,
- 'selected': true,
+ 'isCustomize': info.selectedNodes[i].isCustomize,
})
}
this.setState({
diff --git a/src/pages/BaseMap/index.js b/src/pages/BaseMap/index.js
index 39f9d5d7..cd1bf85b 100644
--- a/src/pages/BaseMap/index.js
+++ b/src/pages/BaseMap/index.js
@@ -115,7 +115,7 @@ class BaseMap extends React.Component{
layerId: layerId
}
}).then((e) => {
- let layerPointsData = e.data.data;
+ let layerPointsData = e.data.data || [];
layerPointsData = layerPointsData.map((item) => {
item.lng = item.location.split(',')[0];
item.lat = item.location.split(',')[1];
@@ -125,7 +125,7 @@ class BaseMap extends React.Component{
if (nodeType === 1) {
this.setMarkers(layerPointsData, layerId);
} else if (nodeType === 4) {
- this.setHeatMap(layerPointsData, layerId);
+ // this.setHeatMap(layerPointsData, layerId);
}
}).then(() => {
this.stopLoading();
@@ -521,8 +521,13 @@ class BaseMap extends React.Component{
return false;
}
let selectLayerList = this.refs.getLayerDataFun.state.selectLayerList;
+ selectLayerList = selectLayerList.filter((item) => {
+ if (item.isCustomize == 1) {
+ return item;
+ }
+ })
if (selectLayerList.length == 0) {
- message.error('请至少选中一个图层');
+ message.error('请至少选中一个个人图层');
return false;
}
this.state.map.addImage(
@@ -590,9 +595,12 @@ class BaseMap extends React.Component{
"location": this.state.newPointLocation,
"provinceAdcode": this.state.provinceAdcode,
}).then((e) => {
+ this.state.pointDrawer.removeActiveFeature();
this.state.pointDrawer.disable();
if (e.success) {
message.success(e.message || '成功!');
+ this.getLayerPoints(this.state.pointAdd.layerId, true, 1);//true新增,1点
+ // this.refs.getLayerDataFun.changeUnitAmount(this.state.pointAdd.layerId);
this.setState({
isModalOpen: false,
pointAdd: {},
@@ -603,6 +611,7 @@ class BaseMap extends React.Component{
})
};
handleCancel = () => {
+ this.state.pointDrawer.removeActiveFeature();
this.state.pointDrawer.disable();
this.setState({
isModalOpen: false,