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:
sunzhenyu 2021-09-26 15:01:12 +08:00
commit d07a4029f0
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/jmapNew/shape/graph/Signal/ESigLamp.js
View File

@ -54,25 +54,25 @@ class ESigLamp extends Group {
this.add(this.lampSector);
this.lampSector.hide();
}
if (style.Signal.lamp.faultType && style.Signal.lamp.faultType == 'flash') {
this.lampFault = new ESigFault({
zlevel: model.zlevel,
z: model.z + 1,
style:{
lineWidth: 1,
stroke: '#F00'
},
shape: {
points: {
x: model.x,
y: model.y
},
radius:style.Signal.lamp.radiusR
}
});
this.add(this.lampFault);
this.lampFault.hide();
}
// if (style.Signal.lamp.faultType && style.Signal.lamp.faultType == 'flash') {
// this.lampFault = new ESigFault({
// zlevel: model.zlevel,
// z: model.z + 1,
// style:{
// lineWidth: 1,
// stroke: '#F00'
// },
// shape: {
// points: {
// x: model.x,
// y: model.y
// },
// radius:style.Signal.lamp.radiusR
// }
// });
// this.add(this.lampFault);
// this.lampFault.hide();
// }
if ( !style.Signal.lamp.logicDisplayNone ) {
this.lstop = new Line({
@ -158,13 +158,13 @@ class ESigLamp extends Group {
}
}
faultShow() {
this.lampFault && this.lampFault.show();
}
faultHide() {
this.lampFault && this.lampFault.hide();
}
// faultShow() {
// this.lampFault && this.lampFault.show();
// }
//
// faultHide() {
// this.lampFault && this.lampFault.hide();
// }
setGuideSectorShowHide(flag) {
if (flag) {
this.lampSector && this.lampSector.show();

4
src/jmapNew/shape/graph/Signal/index.js
View File

@ -751,7 +751,7 @@ class Signal extends Group {
}
fault() {
if (this.style.Signal.lamp.faultType == 'flash') {
this.lamps[0].faultShow();
// this.lamps[0].faultShow();
} else if (this.style.Signal.lamp.faultType == 'cross') {
this.lamps[0].setFault2Corss(true);
} else if (this.style.Signal.lamp.faultType == 'watch') {
@ -913,7 +913,7 @@ class Signal extends Group {
}
if (this.style.Signal.lamp.faultType == 'flash') {
this.lamps && this.lamps[0] && this.lamps[0].faultHide();
// this.lamps && this.lamps[0] && this.lamps[0].faultHide();
} else if (this.style.Signal.lamp.faultType == 'cross') {
this.lamps && this.lamps[0] && this.lamps[0].setFault2Corss(false);
} else if (this.style.Signal.lamp.faultType == 'watch') {