diff --git a/src/jmapNew/painter.js b/src/jmapNew/painter.js index d20eacd1f..a642e3474 100644 --- a/src/jmapNew/painter.js +++ b/src/jmapNew/painter.js @@ -154,8 +154,7 @@ class Painter { trainDevice.overLapIndex = index; trainDevice.instance && this.mapInstanceLevel[deviceType.Train].remove(trainDevice.instance); trainDevice.instance = null; - trainDevice.zrOffsetX = this.$jmap.$options.offsetX; - trainDevice.zrOffsetY = this.$jmap.$options.offsetY; + trainDevice.zrOptions = this.$jmap.$options; this.add(trainDevice); }); diff --git a/src/jmapNew/shape/graph/Train/EMouse.js b/src/jmapNew/shape/graph/Train/EMouse.js index 2f73b2a61..f4301f899 100644 --- a/src/jmapNew/shape/graph/Train/EMouse.js +++ b/src/jmapNew/shape/graph/Train/EMouse.js @@ -171,7 +171,7 @@ class EMouse extends Group { } mouseover() { if (this.device.model.style.Train.common.trainTip) { - const zrRect = { x: this.device.model.model.zrOffsetX, y: this.device.model.model.zrOffsetY, width: store.state.config.width, height: store.state.config.height }; + const zrRect = { x: this.device.model.model.zrOptions.offsetX, y: this.device.model.model.zrOptions.offsetY, width: store.state.config.width, height: store.state.config.height }; this.device.deviceModel.__down = true; const arrowTextRect = this.arrowText.getBoundingRect(); const zrRectX = zrRect.x + zrRect.width; diff --git a/src/jmapNew/shape/graph/Train/index.js b/src/jmapNew/shape/graph/Train/index.js index 62a2875d8..c27dd9364 100644 --- a/src/jmapNew/shape/graph/Train/index.js +++ b/src/jmapNew/shape/graph/Train/index.js @@ -44,7 +44,6 @@ export default class Train extends Group { model.trainWindowModel.point = amendData.position; model.trainWindowModel.reversal = amendData.reversal; } - console.log(model.trainWindowModel, amendData); this.point = { x: model.trainWindowModel.point.x, y: model.trainWindowModel.point.y