joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

画面管理副标题bug 调整

Browse Source
This commit is contained in:
fan 2022-11-07 10:32:45 +08:00
parent 078b07f863
commit 6a03ce8a11
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jmapNew/shape/graph/Station/EStationText.js
View File

@ -42,8 +42,8 @@ class EStationText extends Group {
z: this.model.z, z: this.model.z,
silent: !model.visible || false, silent: !model.visible || false,
style: { style: {
x: model.subheadPosition.x, x: model.computedSubheadTextPosition.x,
y: model.subheadPosition.y, y: model.computedSubheadTextPosition.y,
fontWeight: model.fontWeight, fontWeight: model.fontWeight,
fontSize: model.subheadFont || 18, fontSize: model.subheadFont || 18,
fontFamily: style.fontFamily, fontFamily: style.fontFamily,

3
src/jmapNew/shape/graph/Station/index.js
View File

@ -34,10 +34,12 @@ export default class Station extends Group {
this.computedPosition = pictureDevice.position; this.computedPosition = pictureDevice.position;
this.computedTurnBackPoint = { x: model.turnBackPoint ? model.turnBackPoint.x + offsetX : 0, y: model.turnBackPoint ? model.turnBackPoint.y + offsetY : 0 }; 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.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 { } else {
this.computedPosition = model.position; this.computedPosition = model.position;
this.computedTurnBackPoint = model.turnBackPoint; this.computedTurnBackPoint = model.turnBackPoint;
this.computedControlModePoint = model.controlModePoint; this.computedControlModePoint = model.controlModePoint;
this.computedSubheadTextPosition = model.subheadPosition;
} }
this.z = 40; this.z = 40;
this.model = model; this.model = model;
@ -59,6 +61,7 @@ export default class Station extends Group {
'stationText': EStationText // 车站名称 （普通站台样式） 'stationText': EStationText // 车站名称 （普通站台样式）
}; };
model.computedPosition = this.computedPosition; model.computedPosition = this.computedPosition;
model.computedSubheadTextPosition = this.computedSubheadTextPosition;
// 遍历当前线路下的绘图元素 组合模式 // 遍历当前线路下的绘图元素 组合模式
traverseLineElements(style.Station, elementTypeList, model, style, this); traverseLineElements(style.Station, elementTypeList, model, style, this);

2
src/views/newMap/mapDraftPicture/mapoperate/device.vue
View File

@ -68,7 +68,7 @@ export default {
deviceList () { deviceList () {
return [...this.sectionList, ...this.signalList, ...this.psdList, ...this.stationStandList, ...this.stationList, ...this.trainWindowList, 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.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.signalButtonList, ...this.splitStationList, ...this.tbStrategyList, ...this.tempSpeedLimitList, ...this.textList, ...this.totalGuideLockButtonVOList,
...this.zcList]; ...this.zcList];
}, },