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

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
joylink_cuiweidong 2020-07-23 13:38:59 +08:00
commit 72b137435c
4 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/jmapNew/shape/Psd/ESafeDoor.js
View File

@ -142,14 +142,15 @@ class ESafeDoor extends Group {
} }
hasDoor(show) { hasDoor(show) {
if (this.model.style.StationStand.common.special) { const style = this.model.style;
if (style.StationStand.common.special) {
if (show) { if (show) {
this.stand1.hide(); this.stand1.setStyle('fill', style.transparentColor);
this.stand2.hide(); this.stand2.setStyle('fill', style.transparentColor);
} else { } else {
this.stand1.show(); this.stand1.setStyle('fill', style.StationStand.safetyDoor.defaultColor);
this.stand2.show(); this.stand2.setStyle('fill', style.StationStand.safetyDoor.defaultColor);
} }
} else { } else {
if (!this.model.style.StationStand.safetyDoor.special) { if (!this.model.style.StationStand.safetyDoor.special) {
show ? this.safeC.hide() : this.safeC.show(); show ? this.safeC.hide() : this.safeC.show();
@ -169,8 +170,8 @@ class ESafeDoor extends Group {
} }
hide() { hide() {
this.stand1 && this.stand1.hide(); this.stand1 && this.stand1.setStyle('fill', style.transparentColor);
this.stand2 && this.stand2.hide(); this.stand2 && this.stand2.setStyle('fill', style.transparentColor);
this.safeL && this.safeL.hide(); this.safeL && this.safeL.hide();
this.safeC && this.safeC.hide(); this.safeC && this.safeC.hide();
this.safeR && this.safeR.hide(); this.safeR && this.safeR.hide();
@ -178,8 +179,8 @@ class ESafeDoor extends Group {
this.safeB && this.safeB.hide(); this.safeB && this.safeB.hide();
} }
show() { show() {
this.stand1 && this.stand1.show(); this.stand1 && this.stand1.setStyle('fill', style.StationStand.safetyDoor.defaultColor);
this.stand2 && this.stand2.show(); this.stand2 && this.stand2.setStyle('fill', style.StationStand.safetyDoor.defaultColor);
this.safeL && this.safeL.show(); this.safeL && this.safeL.show();
this.safeC && this.safeC.show(); this.safeC && this.safeC.show();
this.safeR && this.safeR.show(); this.safeR && this.safeR.show();

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

@ -29,7 +29,8 @@ export default class Line2 extends Group {
y: model.position.y - (model.height / 2), 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,
standCode:model.standCode standCode:model.standCode,
code: model.code
// show: model.hasDoor // show: model.hasDoor
}); });
this.add(this.safeDoor); this.add(this.safeDoor);
@ -85,15 +86,6 @@ export default class Line2 extends Group {
this.recover(); this.recover();
if (!this.isShowShape) return; if (!this.isShowShape) return;
/** 设置屏蔽门开关*/ /** 设置屏蔽门开关*/
// if (model.code == 'Psd99251') {
// console.log(model, model.fault == 'FAULT_PSD_OPEN', '是否故障状态', model.screenDoorOpenStatus, '0开门，1关门', '02 上');
// } else if (model.code == 'Psd38731') {
// console.log(model, model.fault == 'FAULT_PSD_OPEN', '是否故障状态', model.screenDoorOpenStatus, '0开门，1关门', '03 上');
// } else if (model.code == 'Psd68917') {
// console.log(model, model.fault == 'FAULT_PSD_OPEN', '是否故障状态', model.screenDoorOpenStatus, '0开门，1关门', '04 上');
// } else if (model.code == 'Psd62436') {
// console.log(model, model.fault == 'FAULT_PSD_OPEN', '是否故障状态', model.screenDoorOpenStatus, '0开门，1关门', '05 上');
// }
if (model.fault == 'FAULT_PSD_OPEN') { if (model.fault == 'FAULT_PSD_OPEN') {
this.doorFault(); // 故障 this.doorFault(); // 故障
this.openDoor(); this.openDoor();

4
src/jmapNew/transformHandle.js
View File

@ -21,9 +21,9 @@ class TransformHandle {
view.show(); view.show();
} else { } else {
view.hide(); view.hide();
} }
view.dirty(); view.dirty();
} }
// 视图进行缩放/平移 // 视图进行缩放/平移

3
src/views/newMap/jointTrainingNew/menuDemon.vue
View File

@ -298,7 +298,8 @@ export default {
this.isDisable = false; this.isDisable = false;
// EventBus.$emit('trainView'); // EventBus.$emit('trainView');
exitRunPlan(this.group).then(()=>{ exitRunPlan(this.group).then(()=>{
this.$store.dispatch('map/setRunPlanStatus', false); this.$store.dispatch('map/setRunPlanStatus', false);
this.$store.dispatch('map/setTrainWindowShow', false);
this.$store.dispatch('map/resetActiveTrainList'); this.$store.dispatch('map/resetActiveTrainList');
}).catch(() => { }).catch(() => {
this.$store.dispatch('training/over').then(() => { this.$store.dispatch('training/over').then(() => {