Merge remote-tracking branch 'origin/develop' into develop

wangqi

2021-04-16 b0cb4ea7d287fffe598b42f189e6d6e6f06f3d40

 src/components/LayerController/logic/WasteGas.js

@@ -87,7 +87,8 @@
    instance.$mount()
    document.body.appendChild(instance.$el)
    instance.setGasData(e.layer.options.test, result.Result.DataInfo, Mondata.Result.DataInfo, ManualData.Result.DataInfo, 'feiqi')
    this.setPanTo(e.latlng, 80)
    this.setPanTo(e.latlng, 150)
    console.log(e.latlng)
  }
  // 不同类型图片加载
  this.differentTypes = (ContrLevel) => {