diff --git a/src/jmapNew/shape/graph/Station/EStationText.js b/src/jmapNew/shape/graph/Station/EStationText.js index 672c8922d..7d4c96574 100644 --- a/src/jmapNew/shape/graph/Station/EStationText.js +++ b/src/jmapNew/shape/graph/Station/EStationText.js @@ -42,8 +42,8 @@ class EStationText extends Group { z: this.model.z, silent: !model.visible || false, style: { - x: model.subheadPosition.x, - y: model.subheadPosition.y, + x: model.computedSubheadTextPosition.x, + y: model.computedSubheadTextPosition.y, fontWeight: model.fontWeight, fontSize: model.subheadFont || 18, fontFamily: style.fontFamily, diff --git a/src/jmapNew/shape/graph/Station/index.js b/src/jmapNew/shape/graph/Station/index.js index 96fe16def..4061db974 100644 --- a/src/jmapNew/shape/graph/Station/index.js +++ b/src/jmapNew/shape/graph/Station/index.js @@ -34,10 +34,12 @@ export default class Station extends Group { this.computedPosition = pictureDevice.position; this.computedTurnBackPoint = { x: model.turnBackPoint ? model.turnBackPoint.x + offsetX : 0, y: model.turnBackPoint ? model.turnBackPoint.y + offsetY : 0 }; this.computedControlModePoint = { x: model.controlModePoint.x + offsetX, y: model.controlModePoint.y + offsetY }; + this.computedSubheadTextPosition = { x: model.subheadPosition ? model.subheadPosition.x + offsetX : 0, y: model.subheadPosition ? model.subheadPosition.y + offsetY : 0 }; } else { this.computedPosition = model.position; this.computedTurnBackPoint = model.turnBackPoint; this.computedControlModePoint = model.controlModePoint; + this.computedSubheadTextPosition = model.subheadPosition; } this.z = 40; this.model = model; @@ -59,6 +61,7 @@ export default class Station extends Group { 'stationText': EStationText // 车站名称 (普通站台样式) }; model.computedPosition = this.computedPosition; + model.computedSubheadTextPosition = this.computedSubheadTextPosition; // 遍历当前线路下的绘图元素 组合模式 traverseLineElements(style.Station, elementTypeList, model, style, this); diff --git a/src/views/newMap/mapDraftPicture/mapoperate/device.vue b/src/views/newMap/mapDraftPicture/mapoperate/device.vue index b7679d79c..2cfb0e970 100644 --- a/src/views/newMap/mapDraftPicture/mapoperate/device.vue +++ b/src/views/newMap/mapDraftPicture/mapoperate/device.vue @@ -68,7 +68,7 @@ export default { deviceList () { return [...this.sectionList, ...this.signalList, ...this.psdList, ...this.stationStandList, ...this.stationList, ...this.trainWindowList, ...this.arrowList, ...this.automaticRouteButtonList, ...this.axleCounterResetButtonList, ...this.cycleButtonList, ...this.directionRodList, ...this.espList, - ...this.indicatorLightList, ...this.lcList, ...this.lineList, ...this.outerFrameList, ...this.psdList, ...this.resourceList, ...this.responderList, + ...this.indicatorLightList, ...this.lcList, ...this.lineList, ...this.outerFrameList, ...this.resourceList, ...this.responderList, ...this.signalButtonList, ...this.splitStationList, ...this.tbStrategyList, ...this.tempSpeedLimitList, ...this.textList, ...this.totalGuideLockButtonVOList, ...this.zcList]; },