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

chenyabin

2021-05-14 f6e2c7d08bb4f29f38a77b9f789c6d7a47d5bebe

 src/components/LayerController/logic/WasteGas.js

@@ -72,9 +72,9 @@
          storagePlaceId: res
        }
      },
      title: title // 标题
      title: '天津石化' + title // 标题
    })
    this.setPanTo(e.latlng, 150)
    this.animalService.setPanTo(e.latlng, 150)
  }
  // 不同类型图片加载
  this.differentTypes = (ContrLevel) => {
@@ -91,12 +91,5 @@
    //   effectOfChange = ImgGray
    // }
    return effectOfChange
  }
  this.setPanTo = (pos, value) => {
    var position = pos
    position = window.map.latLngToLayerPoint(position)
    position.y += value
    position = window.map.layerPointToLatLng(position)
    window.map.flyTo(position)
  }
}