5184130d by 刘远

Merge remote-tracking branch 'origin/master'

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