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

Merge branch 'dev' into test

Browse Source
This commit is contained in:
zyy 2019-12-12 10:05:51 +08:00
commit e7505d65eb
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jmapNew/shape/Psd/index.js
View File

@ -23,7 +23,7 @@ export default class Line2 extends Group {
z: this.z, z: this.z,
style: style, style: style,
x: model.position.x, x: model.position.x,
y: model.position.y, y: model.position.y - (model.height / 2),
width: model.width || style.StationStand.safetyDoor.width, width: model.width || style.StationStand.safetyDoor.width,
height: model.height || style.StationStand.safetyDoor.height, height: model.height || style.StationStand.safetyDoor.height,
show: model.hasDoor show: model.hasDoor

8
src/views/newMap/newMapdraft/mapoperate/psdDraft.vue
View File

@ -99,7 +99,7 @@ export default {
standCode: '', // 关联站台唯一code standCode: '', // 关联站台唯一code
standTrackCode: '', // 关联站台轨编码 standTrackCode: '', // 关联站台轨编码
width: 60, width: 60,
height: 5, height: 3,
position: { x: 0, y: 0 }, position: { x: 0, y: 0 },
doorLocationType: '01' // 显示方向朝上或朝下 doorLocationType: '01' // 显示方向朝上或朝下
}, },
@ -107,7 +107,7 @@ export default {
addModel: { addModel: {
standCode: '', standCode: '',
width: 60, width: 60,
height: 4, height: 3,
standTrackCode: '', standTrackCode: '',
doorLocationType: '01' // 显示方向朝上或朝下 doorLocationType: '01' // 显示方向朝上或朝下
} }
@ -258,9 +258,9 @@ export default {
}; };
this.stationStandList.forEach(elem => { this.stationStandList.forEach(elem => {
if (elem.code === this.addModel.standCode) { 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') { // 朝下 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 };
} }
} }
}); });

6
src/views/newMap/newMapdraft/mapoperate/stationstand.vue
View File

@ -322,7 +322,7 @@ export default {
this.$refs.make.validate((valid) => { this.$refs.make.validate((valid) => {
if (valid) { if (valid) {
const models = []; const models = [];
const space = 15; const space = 8;
const Standuid = getUID('PF', this.stationStandList); const Standuid = getUID('PF', this.stationStandList);
const model = { const model = {
_type: 'StationStand', _type: 'StationStand',
@ -351,7 +351,7 @@ export default {
code: uid, code: uid,
name: `Psd${this.psdList.length + 1}`, name: `Psd${this.psdList.length + 1}`,
width: this.addModel.width, width: this.addModel.width,
height: 4, height: 3,
standCode: Standuid, // 关联站台唯一code standCode: Standuid, // 关联站台唯一code
standTrackCode: this.addModel.standTrackCode, // 关联站台轨编码 standTrackCode: this.addModel.standTrackCode, // 关联站台轨编码
position: { position: {
@ -372,7 +372,7 @@ export default {
code: uid, code: uid,
name: `Psd${[...this.psdList, ...arr].length + 1}`, name: `Psd${[...this.psdList, ...arr].length + 1}`,
width: this.addModel.width, width: this.addModel.width,
height: 4, height: 3,
standCode: Standuid, // 关联站台唯一code standCode: Standuid, // 关联站台唯一code
standTrackCode: '', // 关联站台轨编码 standTrackCode: '', // 关联站台轨编码
position: { position: {