diff --git a/src/pages/BaseMap/LayerData/index.js b/src/pages/BaseMap/LayerData/index.js index b1d1e6b5..e5b2fee5 100644 --- a/src/pages/BaseMap/LayerData/index.js +++ b/src/pages/BaseMap/LayerData/index.js @@ -60,7 +60,12 @@ class LayerData extends React.Component { // 获取基础图层菜单栏,获取列表数据 getBasicLayerMenu = (adcode) => { - + if (adcode === undefined || adcode === null || adcode === "" || adcode === 'undefined') { + this.setState({ + menuData: [], + }) + return false + } return getBasicLayerMenuApi({ adcode: adcode }).then((e) => { let basicLayeData = e.data; console.log('basicLayeData', basicLayeData); diff --git a/src/pages/BaseMap/index.js b/src/pages/BaseMap/index.js index 82546e12..9877d837 100644 --- a/src/pages/BaseMap/index.js +++ b/src/pages/BaseMap/index.js @@ -496,6 +496,12 @@ class BaseMap extends React.Component{ } // 获取市 getCityByProvince = (provinceAdcode) => { + if (provinceAdcode === undefined || provinceAdcode === null || provinceAdcode === "" || provinceAdcode === 'undefined') { + this.setState ({ + cityList: [] + }) + return false + } return getCityByProvinceApi({provinceAdcode: provinceAdcode}).then((e) => { let cityData = e.data; let cityList = []; @@ -517,6 +523,14 @@ class BaseMap extends React.Component{ //选择市 cityAdcode:市编码 data:市数据 onCityChange = (cityAdcode,data) => { var self = this; + if (cityAdcode === undefined || cityAdcode === null || cityAdcode === ""|| cityAdcode === 'undefined') { + this.setState ({ + cityAdcode: '', + cityLabel: '', + districtAdcode: '' + }) + return false + } self.startLoading(); // 清除点位图层 let getLayers = self.state.markerLayerList; @@ -541,6 +555,12 @@ class BaseMap extends React.Component{ } // 获取区 getDistrictByCity = (cityAdcode) => { + if (cityAdcode === undefined || cityAdcode === null || cityAdcode === ""|| cityAdcode === 'undefined') { + this.setState ({ + districtList: [] + }) + return false + } return getDistrictByCityApi({cityAdcode: cityAdcode}).then((e) => { let districtData = e.data; let districtList = []; @@ -561,6 +581,12 @@ class BaseMap extends React.Component{ //选择区 onDistrictChange = (provinceAdcode,data) => { var self = this; + if (provinceAdcode === undefined || provinceAdcode === null || provinceAdcode === ""|| provinceAdcode === 'undefined') { + this.setState({ + districtAdcode: '', + }) + return false + } self.startLoading(); let getLayers = self.state.markerLayerList; for (let i = 0; i < getLayers.length; i++) {