Merge branch 'dev' into test
This commit is contained in:
commit
e7505d65eb
@ -23,7 +23,7 @@ export default class Line2 extends Group {
|
||||
z: this.z,
|
||||
style: style,
|
||||
x: model.position.x,
|
||||
y: model.position.y,
|
||||
y: model.position.y - (model.height / 2),
|
||||
width: model.width || style.StationStand.safetyDoor.width,
|
||||
height: model.height || style.StationStand.safetyDoor.height,
|
||||
show: model.hasDoor
|
||||
|
@ -99,7 +99,7 @@ export default {
|
||||
standCode: '', // 关联站台唯一code
|
||||
standTrackCode: '', // 关联站台轨编码
|
||||
width: 60,
|
||||
height: 5,
|
||||
height: 3,
|
||||
position: { x: 0, y: 0 },
|
||||
doorLocationType: '01' // 显示方向朝上或朝下
|
||||
},
|
||||
@ -107,7 +107,7 @@ export default {
|
||||
addModel: {
|
||||
standCode: '',
|
||||
width: 60,
|
||||
height: 4,
|
||||
height: 3,
|
||||
standTrackCode: '',
|
||||
doorLocationType: '01' // 显示方向朝上或朝下
|
||||
}
|
||||
@ -258,9 +258,9 @@ export default {
|
||||
};
|
||||
this.stationStandList.forEach(elem => {
|
||||
if (elem.code === this.addModel.standCode) {
|
||||
model.position = { x: elem.position.x, y: elem.position.y - (elem.height / 2) - 15 };
|
||||
model.position = { x: elem.position.x, y: elem.position.y - (elem.height / 2) - 8 };
|
||||
if (this.addModel.doorLocationType == '01') { // 朝下
|
||||
model.position = { x: elem.position.x, y: elem.position.y + (elem.height / 2) + 15 };
|
||||
model.position = { x: elem.position.x, y: elem.position.y + (elem.height / 2) + 8 };
|
||||
}
|
||||
}
|
||||
});
|
||||
|
@ -322,7 +322,7 @@ export default {
|
||||
this.$refs.make.validate((valid) => {
|
||||
if (valid) {
|
||||
const models = [];
|
||||
const space = 15;
|
||||
const space = 8;
|
||||
const Standuid = getUID('PF', this.stationStandList);
|
||||
const model = {
|
||||
_type: 'StationStand',
|
||||
@ -351,7 +351,7 @@ export default {
|
||||
code: uid,
|
||||
name: `Psd${this.psdList.length + 1}`,
|
||||
width: this.addModel.width,
|
||||
height: 4,
|
||||
height: 3,
|
||||
standCode: Standuid, // 关联站台唯一code
|
||||
standTrackCode: this.addModel.standTrackCode, // 关联站台轨编码
|
||||
position: {
|
||||
@ -372,7 +372,7 @@ export default {
|
||||
code: uid,
|
||||
name: `Psd${[...this.psdList, ...arr].length + 1}`,
|
||||
width: this.addModel.width,
|
||||
height: 4,
|
||||
height: 3,
|
||||
standCode: Standuid, // 关联站台唯一code
|
||||
standTrackCode: '', // 关联站台轨编码
|
||||
position: {
|
||||
|
Loading…
Reference in New Issue
Block a user