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

道岔绘图代码调整

Browse Source
This commit is contained in:
joylink_cuiweidong 2020-09-04 18:22:41 +08:00
parent 7db89b8351
commit 0d6ed19f4a
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jmapNew/shape/Section/index.js
View File

@ -865,6 +865,7 @@ export default class Section extends Group {
// 区段延时保护倒计时显示
// model.remainTime = 10;
model.remainTime && this.showRemainTime(model.remainTime);
/** 道岔区段更新岔心颜色 */
if (model.type === '03' && model.switch) {
const sectionSwitch = store.getters['map/getDeviceByCode'](model.switch.code);

38
src/jmapNew/shape/Switch/index.js
View File

@ -268,6 +268,7 @@ export default class Switch extends Group {
this.lockArc.hide(); // 圆形单锁框
this.name.getNameText().stopAnimation(false);
this.sheltertriangle.hide(); // 直角梯形覆盖图形
this.sheltertriangle.setColor(this.style.Section.line.spareColor);
this.sheltertriangle.stopAnimation(false);
// this.rhomboid.hide();
this.setHasTextBorder(0);
@ -285,9 +286,6 @@ export default class Switch extends Group {
} else {
this.locShelter.show();
}
this.relocShelter.hide();
this.sheltertriangle.hide();
// this.sheltertriangle.show(); // 直角梯形覆盖图形
// this.sheltertriangle.setColor('red');
if (this.style.Switch.core.graphShow) { // 佛山线路显示
@ -295,6 +293,10 @@ export default class Switch extends Group {
this.sheltertriangle.show();
this.relocShelter.setColor('#00FF00');
this.sheltertriangle.setColor('#00FF00');
console.log(1111111);
} else {
this.relocShelter.hide();
this.sheltertriangle.hide();
}
this.setTextColor(this.style.Switch.text.locateColor);
}
@ -308,16 +310,15 @@ export default class Switch extends Group {
this.relocShelter.show(); // 反位
}
this.locShelter.hide(); // 定位
this.sheltertriangle.hide();
if (this.style.Switch.sectionAction.flag) { // 哈尔滨线路处理道岔相关区段颜色
this.sheltertriangle.show();
this.setSectionState(this.sheltertriangle.getSection(), 'fill', this.model);
} else {
// this.rhomboid.show();
// this.setSectionState(this.rhomboid.getSection(), 'fill', this.model);
this.sheltertriangle.show();
this.setSectionState(this.sheltertriangle.getSection(), 'fill', this.model);
// this.setSectionState(this.sheltertriangle.getSection(), 'fill', this.model);
}
if (this.style.Switch.core.graphShow) { // 佛山线路显示
// this.sheltertriangle.hide();
this.locShelter.show();
@ -497,15 +498,17 @@ export default class Switch extends Group {
setSectionState(section, style, state) {
// && !section.animators.length
if (section) {
if (section && section.ignore) {
console.log(22222222222);
const sectionA = store.getters['map/getDeviceByCode'](state.sectionACode);
/** 空闲 */
section.setStyle(style, this.style.Section.line.spareColor);
section.setStyle('lineWidth', 0);
section.setStyle('stroke', this.style.Section.line.spareColor);
// section.setStyle(style, this.style.Section.line.spareColor);
// section.setStyle('lineWidth', 0);
// section.setStyle('stroke', this.style.Section.line.spareColor);
/** 道岔保护区段锁闭 */
// this.sheltertriangle.hide();
if (sectionA.overlapLock) {
this.sheltertriangle.show();
section.setStyle(style, this.style.Section.line.protectiveLockColor);
}
/** 空闲锁闭或者叫进路锁闭 */
@ -513,21 +516,26 @@ export default class Switch extends Group {
section.setStyle(style, this.style.Section.line.routeLockColor);
section.setStyle('stroke', this.style.Section.line.routeLockColor);
section.setStyle('lineWidth', this.style.Section.line.beyondWidth);
this.sheltertriangle.show();
}
/** 非CBTC车占用 */
if (sectionA.nctOccupied) {
this.sheltertriangle.show();
section.setStyle(style, this.style.Section.line.unCommunicationOccupiedColor);
section.setStyle('stroke', this.style.Section.line.unCommunicationOccupiedColor);
section.setStyle('lineWidth', this.style.Section.line.beyondWidth);
}
/** CBTC车占用 */
if (sectionA.ctOccupied) {
this.sheltertriangle.show();
section.setStyle(style, this.style.Section.line.communicationOccupiedColor);
section.setStyle('stroke', this.style.Section.line.communicationOccupiedColor);
section.setStyle('lineWidth', this.style.Section.line.beyondWidth);
}
if (state.cutOff) {
this.sectionCutOff(section);
if (sectionA.cutOff) {
this.sheltertriangle.show();
// this.sheltertriangle.
// this.sectionCutOff(section);
}
}
}
@ -544,6 +552,7 @@ export default class Switch extends Group {
this.setInversionAction(model); /** 反位*/
} else {
this.setLossAction(); // 失去
console.log(333333333333333);
}
model.isCiConfirm && this.setCiConfirm(); // 道岔使能显示
this.setSwitchFault(model.split);
@ -552,8 +561,9 @@ export default class Switch extends Group {
model.blockade && this.block(); // 道岔封锁
model.singleLock && model.blockade && this.blockMonolock(); // 单锁&锁闭状态
// this.hideSwitchCenter();
// model.routeLock && this.setSectionState(this.rhomboid.getSection(), 'fill', this.model);
model.routeLock && this.setSectionState(this.sheltertriangle.getSection(), 'fill', this.model);
this.setSectionState(this.sheltertriangle.getSection(), 'fill', this.model);
// this.interlockingReserved(); // 联锁预留道岔
if (this.style.Switch.sectionAction.flag) { // 哈尔滨线路处理道岔相关区段颜色