diff --git a/src/ibp/shape/elevator.js b/src/ibp/shape/elevator.js index 718dcd491..be2efba41 100644 --- a/src/ibp/shape/elevator.js +++ b/src/ibp/shape/elevator.js @@ -33,8 +33,8 @@ export default class elevator extends Group { }, width: model.width, height: model.height, - fillColor: model.fillColor ||'#adadad', - stroke: model.fillColor ||'#adadad', + fillColor: model.fillColor ||'#313131', + stroke: model.fillColor ||'#313131', lineWidth: 0 } }); diff --git a/src/ibp/shape/elevatorBack.js b/src/ibp/shape/elevatorBack.js index 759571bb7..b9f10f068 100644 --- a/src/ibp/shape/elevatorBack.js +++ b/src/ibp/shape/elevatorBack.js @@ -21,12 +21,14 @@ export default class elevatorBack extends Group { draggable: false, // model.draggable || shape: { - cx: model.point.x + model.width/6*5, - cy: model.point.y + model.height/8, - r: model.width/6 + cx: (model.point.x + model.width/6*5).toFixed(2), + cy: (model.point.y + model.height/8).toFixed(2), + r: (model.width/6).toFixed(2) }, style: { - fill: this.model.fillColor || '#adadad' + brushType: 'fill', + fill: this.model.fillColor || '#313131', + lineWidth: 0 } }); @@ -35,17 +37,18 @@ export default class elevatorBack extends Group { z: model.z, draggable: false, shape: { - points: [[model.point.x+model.width/6, model.point.y + model.height], [model.point.x+model.width/6*2, model.point.y + model.height], - [model.point.x+model.width/6*5, model.point.y + model.height/8*2], - [model.point.x+model.width/6*5, model.point.y], - [model.point.x+model.width/6*4, model.point.y], - [model.point.x+model.width/6, model.point.y + model.height/8*6] + points: [[(model.point.x+model.width/6).toFixed(2), (model.point.y + model.height).toFixed(2)], [(model.point.x+model.width/6*2).toFixed(2), model.point.y + model.height], + [(model.point.x+model.width/6*5).toFixed(2), (model.point.y + model.height/8*2).toFixed(2)], + [(model.point.x+model.width/6*5).toFixed(2), model.point.y], + [(model.point.x+model.width/6*4).toFixed(2), model.point.y], + [(model.point.x+model.width/6).toFixed(2), (model.point.y + model.height/8*6).toFixed(2)] ] }, style: { - stroke: model.stroke || '#adadad', - lineWidth: model.lineWidth, - fill: model.fillColor || '#adadad' + brushType: 'fill', + stroke: model.stroke || '#313131', + lineWidth: 0, + fill: model.fillColor || '#313131' } }); @@ -55,12 +58,14 @@ export default class elevatorBack extends Group { // path: 'M 0 0 Q -70 -50 0 -100 0 -100 L 150 -400 L 200 -400 Q 270 -350 200 -300 200 -300 L 50 0', draggable: false, shape: { - cx: model.point.x + model.width/6, - cy: model.point.y + model.height/8*7, - r: model.width/6 + cx: (model.point.x + model.width/6).toFixed(2), + cy: (model.point.y + model.height/8*7).toFixed(2), + r: (model.width/6).toFixed(2) }, style: { - fill: this.model.fillColor || '#adadad' + fill: this.model.fillColor || '#313131', + lineWidth: 0, + brushType: 'fill' } });