5184130d by 刘远

Merge remote-tracking branch 'origin/master'

2 parents ed63bf9f 562b792a
......@@ -70,7 +70,7 @@ export default {
get positions() {
return this._positions;
}
startCreate() {
startCreate(func) {
var $this = this;
this.handler.setInputAction(function (evt) { //单机开始绘制
var cartesian = $this.getCatesian3FromPX(evt.position);
......@@ -106,6 +106,7 @@ export default {
$this.handler.destroy();
$this._positions.pop();
$this._positions.push(cartesian);
func($this._positions);
}, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
}
createPolygon(obj) {
......@@ -192,7 +193,8 @@ export default {
var billboard = this.viewer.entities.add({
position: cartesian,
billboard: {
image: 'img/mark4.png',
// image: '../Apicture/icon_标注.png',
image: 'http://localhost:8080/assets/Apicture/icon_标注.png',
scale: 1,
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
......